1510 files changed, 28911 insertions, 23843 deletions

diff --git a/media-sound/SmarTagger/SmarTagger-0.1-r2.ebuild b/media-sound/SmarTagger/SmarTagger-0.1-r3.ebuild
index b8f2b6651fd5..53b370b5c173 100644
--- a/media-sound/SmarTagger/SmarTagger-0.1-r2.ebuild
+++ b/media-sound/SmarTagger/SmarTagger-0.1-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Perl script for renaming and tagging mp3s"
 HOMEPAGE="http://freshmeat.net/projects/smartagger/"
@@ -10,7 +10,6 @@ SRC_URI="http://freshmeat.net/redir/smartagger/9680/url_tgz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
 
 RDEPEND="
 	dev-lang/perl
@@ -19,8 +18,8 @@ RDEPEND="
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/smartagger
+	dobin SmarTagger
+	dosym SmarTagger /usr/bin/smartagger
 	dodoc changelog README TODO
 	newdoc album.id3 example.id3
 }
diff --git a/media-sound/SmarTagger/metadata.xml b/media-sound/SmarTagger/metadata.xml
index ac4687340df1..93423219a5bc 100644
--- a/media-sound/SmarTagger/metadata.xml
+++ b/media-sound/SmarTagger/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">smartagger</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest
index 26f2765d5971..edc85bc615c2 100644
--- a/media-sound/a2jmidid/Manifest
+++ b/media-sound/a2jmidid/Manifest
@@ -1 +1,2 @@
+DIST a2jmidid-12.tar.bz2 309227 BLAKE2B 8041bda96cf2bfe3d51cdf9162857e1c484e95581dd132fbe3f582022ecc5ba89bfbe005884646ac8064a62285c16195f2066aadb6841660c2935b245f8bd3b2 SHA512 1556dc5d9ca0a241177246de16f251db815d29ed3bc50b0db7ebededa1d34e5432fddfc7bc85643864ebf641fe95d9040462787962753d60adb8f02a1e94f815
 DIST a2jmidid-9.tar.gz 47925 BLAKE2B ad079e76a54f56ee8f82150c306f91aead52f86632978ea6f3376a0bf163744379210b34701b39da4ee14fc4d8a1c6be82d1052abeb8ccf79410bc242d174d62 SHA512 5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c
diff --git a/media-sound/a2jmidid/a2jmidid-12.ebuild b/media-sound/a2jmidid/a2jmidid-12.ebuild
new file mode 100644
index 000000000000..5cda705a3362
--- /dev/null
+++ b/media-sound/a2jmidid/a2jmidid-12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit meson python-single-r1
+
+DESCRIPTION="Daemon for exposing ALSA sequencer applications in JACK MIDI system"
+HOMEPAGE="https://a2jmidid.ladish.org"
+SRC_URI="https://dl.ladish.org/a2jmidid/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 x86"
+IUSE="dbus"
+REQUIRED_USE="dbus? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	media-libs/alsa-lib
+	virtual/jack
+	dbus? ( sys-apps/dbus ${PYTHON_DEPS} )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS.rst NEWS.rst README internals.txt )
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-dbus=$(usex dbus false true)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use dbus; then
+		python_fix_shebang "${ED}"
+	fi
+}
diff --git a/media-sound/a2jmidid/a2jmidid-9-r1.ebuild b/media-sound/a2jmidid/a2jmidid-9-r1.ebuild
new file mode 100644
index 000000000000..6611af19c248
--- /dev/null
+++ b/media-sound/a2jmidid/a2jmidid-9-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit meson python-single-r1
+
+DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"
+HOMEPAGE="https://github.com/jackaudio/a2jmidid"
+SRC_URI="https://github.com/jackaudio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="dbus python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	media-libs/alsa-lib
+	virtual/jack
+	dbus? ( sys-apps/dbus )
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst README.rst internals.txt )
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-dbus=$(usex dbus false true)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python; then
+		python_fix_shebang "${ED}"
+	else
+		rm "${ED}/usr/bin/a2j_control" || die
+	fi
+}
diff --git a/media-sound/a2jmidid/a2jmidid-9.ebuild b/media-sound/a2jmidid/a2jmidid-9.ebuild
deleted file mode 100644
index 62228ef8c0d6..000000000000
--- a/media-sound/a2jmidid/a2jmidid-9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"
-HOMEPAGE="https://github.com/linuxaudio/a2jmidid"
-SRC_URI="https://github.com/linuxaudio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="dbus"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	media-libs/alsa-lib
-	virtual/jack
-	dbus? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst internals.txt )
-
-src_configure() {
-	local emasonargs=(
-		-Ddisable-dbus=$(usex dbus false true)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/a2jmidid/a2jmidid-9999.ebuild b/media-sound/a2jmidid/a2jmidid-9999.ebuild
index 7609deb0eba6..f09df4ca9c5f 100644
--- a/media-sound/a2jmidid/a2jmidid-9999.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-9999.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit meson git-r3
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
 
-DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"
-HOMEPAGE="https://github.com/linuxaudio/a2jmidid"
-EGIT_REPO_URI="https://github.com/linuxaudio/a2jmidid.git"
+inherit meson python-single-r1 git-r3
+
+DESCRIPTION="Daemon for exposing ALSA sequencer applications in JACK MIDI system"
+HOMEPAGE="https://a2jmidid.ladish.org"
+EGIT_REPO_URI="https://gitea.ladish.org/LADI/a2jmidid.git"
+EGIT_BRANCH="main"
+EGIT_SUBMODULES=( waf-autooptions waftoolchainflags siginfo )
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="dbus"
+REQUIRED_USE="dbus? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -20,17 +25,25 @@ BDEPEND="
 CDEPEND="
 	media-libs/alsa-lib
 	virtual/jack
-	dbus? ( sys-apps/dbus )
+	dbus? ( sys-apps/dbus ${PYTHON_DEPS} )
 "
 RDEPEND="${CDEPEND}"
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst internals.txt )
+DOCS=( AUTHORS.rst NEWS.rst README internals.txt )
 
 src_configure() {
-	local emasonargs=(
+	local emesonargs=(
 		-Ddisable-dbus=$(usex dbus false true)
 	)
 
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+
+	if use dbus; then
+		python_fix_shebang "${ED}"
+	fi
+}
diff --git a/media-sound/a2jmidid/metadata.xml b/media-sound/a2jmidid/metadata.xml
index a452e4ef669c..a7b9dd3c727c 100644
--- a/media-sound/a2jmidid/metadata.xml
+++ b/media-sound/a2jmidid/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>aballier@gentoo.org</email>
@@ -9,4 +9,8 @@
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="codeberg">LADI/a2jmidid</remote-id>
+		<bugs-to>https://codeberg.org/LADI/a2jmidid/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/abcde/abcde-2.9.3-r1.ebuild b/media-sound/abcde/abcde-2.9.3-r4.ebuild
index 2c0f83b27dd3..fce3ba2901e2 100644
--- a/media-sound/abcde/abcde-2.9.3-r1.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Command line CD encoder"
 HOMEPAGE="https://abcde.einval.com/"
@@ -9,26 +9,23 @@ SRC_URI="https://abcde.einval.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 # Enable MP3 related flags by default
 IUSE="aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
 
 # See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
 RDEPEND="
+	media-libs/glyr
 	media-sound/cd-discid
 	net-misc/wget
-	virtual/eject
+	sys-apps/util-linux
 	|| (
 		dev-libs/libcdio-paranoia
 		media-sound/cdparanoia
 		media-sound/dagrab
 	)
 	aac? (
-		media-libs/faac
-		|| (
-			media-video/atomicparsley
-			media-video/atomicparsley-wez
-		)
+		media-libs/faac ( media-video/atomicparsley )
 	)
 	aiff? ( media-video/ffmpeg )
 	cdr? ( app-cdr/cdrtools )
@@ -41,7 +38,7 @@ RDEPEND="
 	lame? ( media-sound/lame )
 	mac? (
 		media-sound/apetag
-		media-sound/mac
+		<=media-sound/mac-4.12
 	)
 	musepack? ( media-sound/musepack-tools )
 	musicbrainz? (
diff --git a/media-sound/abcde/metadata.xml b/media-sound/abcde/metadata.xml
index 3069c6bba43c..10c6de35a3c1 100644
--- a/media-sound/abcde/metadata.xml
+++ b/media-sound/abcde/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index e7eeb1a128f4..1285daafe15a 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,3 +1 @@
-DIST abcm2ps-8.14.11.tar.gz 259453 BLAKE2B a5b2b4142b9d3190fdedd3b560f8baa582293badd90fd380ddb9991871b2e08050d07c3c97f908529be715bce62b9cda242487f3d6a7885ecf802318a64b7df8 SHA512 b156c84cfa929aa5999a42b23564af5bac399dccbf116342891b5e5ed2e34e81b4658fab9f3c51f5de084cc96d8ea0965a2bdf81de14de6eb324b8998dbb8b98
-DIST abcm2ps-8.14.4.tar.gz 258383 BLAKE2B 7f9163309cb7a31eaecf443b5bd754c7389b4717ed891e2082f618499b4491428ae0fff7b4804d2c21c8ff3d948557c9d649afb0c2a9ae9407aad39545ed66d5 SHA512 7ba5a25ef7ad18a46bdd45393836a0ede2838af2c24822ecf3c1759328619663fe600eaf607de900527f88fa4a9c21d1da8965cafa45f4aa6dc5754b37ae3722
-DIST abcm2ps-8.14.6.tar.gz 258520 BLAKE2B 99aba76df4ee0259d46924f5d37e707d2fcc1872502c475bca52c22353d4a6f7dcb3f52b0639b8d619f2414a6cb1d20b7b8bf6808218f0b99c71eb76b9766bf9 SHA512 f9863480bc757971eacb0a3bb30e046bcafe2f27bb15ac0e9c4d89afa568f23682fca4388523c429a72b01386e44c390efc8c487cae569b59eb6fcca8ad9a98a
+DIST abcm2ps-8.14.15.tar.gz 260077 BLAKE2B 4791e66efb741f2d3ea5f8ef252d60da80018f843059510c32dd4e4dfadf7ad7626592f6b84e93ee93053b436eda2da5246b2150a0af29e866c4517c6077ce8a SHA512 5466051b337328cccf9c12838aecfffc782e9906b7b659f4929c5da3af9d25eb67bf679720a924197cf0ffaae68e0bdc5e3e8efcc7614524fe954769379a79e1
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild
deleted file mode 100644
index 48eee1a8dfd2..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program to convert abc files to Postscript files"
-HOMEPAGE="https://github.com/leesavide/abcm2ps"
-SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	pango? (
-		media-libs/freetype:2
-		x11-libs/pango
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc README.md
-
-	if use examples ; then
-		docinto examples
-		dodoc sample*.*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.15.ebuild
index 644672be443e..8e99f9fb85fe 100644
--- a/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.14.15.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Program to convert abc files to Postscript files"
-HOMEPAGE="https://github.com/leesavide/abcm2ps"
-SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/lewdlime/abcm2ps"
+SRC_URI="https://github.com/lewdlime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="examples pango"
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.6.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.6.ebuild
deleted file mode 100644
index db152444cf7d..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.14.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program to convert abc files to Postscript files"
-HOMEPAGE="https://github.com/leesavide/abcm2ps"
-SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	pango? (
-		media-libs/freetype:2
-		x11-libs/pango
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc README.md
-
-	if use examples ; then
-		docinto examples
-		dodoc sample*.*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-sound/abcm2ps/metadata.xml b/media-sound/abcm2ps/metadata.xml
index 60d7833c9176..47130e2902e5 100644
--- a/media-sound/abcm2ps/metadata.xml
+++ b/media-sound/abcm2ps/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -9,6 +9,6 @@
 		<flag name="pango">Use the pango library to render fonts with non-latin characters</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">leesavide/abcm2ps</remote-id>
+		<remote-id type="github">lewdlime/abcm2ps</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index f4e54b6c5d8f..053639f6cfdb 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,2 +1,2 @@
-DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de
-DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969
+DIST abcMIDI-2024.03.21.zip 633558 BLAKE2B 7ef0dc301b7584164a4c761d9f232c15269f39d0b23ddf980f2bfede1beb6bff571cc5a38758fbf69c909357ec35fa603490f1a87a6edf1c92715f69668d43f3 SHA512 0b156621839947fc158f813bed87c09198358b7bf29161ca7a08a4fef76b9f3786bf78780170c4fd3580d82818a8379d22dc9fd2604cce8ad138df73d1f21497
+DIST abcMIDI-2024.04.30.zip 633484 BLAKE2B 39935e46647556e2de2f920bb2ae4eebc8497827f22f950f7f6473cec4145009e5f6d31649c9e560424102bbd926684b338539076d157974c16abae978673d27 SHA512 95f78bb6d88f285ce74febb8937921a6c4740902caf1dc67cfca0c1a934636035792a0c5426ead46c85745e5900905e5530d9ab7feaa6107e7c6b10eeeb36aef
diff --git a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild b/media-sound/abcmidi/abcmidi-2024.03.21.ebuild
index 893a32ea9da0..45b003914d76 100644
--- a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild
+++ b/media-sound/abcmidi/abcmidi-2024.03.21.ebuild
@@ -1,43 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 MY_P="abcMIDI-${PV}"
-
 DESCRIPTION="Programs for processing ABC music notation files"
 HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
 SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
+IUSE="examples"
 
 BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2016.05.05-docs.patch
-	"${FILESDIR}"/${PN}-2016.05.05-fno-common.patch
-)
-
 src_prepare() {
 	default
-
-	rm configure Makefile || die
 	sed -i "s:-O2::" configure.ac || die
-
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
 	eautoreconf
 }
 
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/876421
+	# https://github.com/sshlien/abcmidi/issues/9
+	filter-lto
+
+	default
+}
+
 src_install() {
 	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
 
-	docinto examples
-	dodoc samples/*.abc
-	docompress -x /usr/share/doc/${PF}/examples
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
 }
diff --git a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild b/media-sound/abcmidi/abcmidi-2024.04.30.ebuild
index cec3c72c3b03..8aed3dc3a8d2 100644
--- a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild
+++ b/media-sound/abcmidi/abcmidi-2024.04.30.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 MY_P="abcMIDI-${PV}"
 DESCRIPTION="Programs for processing ABC music notation files"
 HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
 SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
 	default
@@ -26,6 +25,15 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/876421
+	# https://github.com/sshlien/abcmidi/issues/9
+	filter-lto
+
+	default
+}
+
 src_install() {
 	default
 
diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch
deleted file mode 100644
index bc36b260bd34..000000000000
--- a/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install docs via Gentoo mechanisms instead of the build system.
-
---- abcmidi/Makefile.in
-+++ abcmidi/Makefile.in
-@@ -143,13 +143,6 @@
- 	$(INSTALL) -d $(DESTDIR)$(bindir)

- 	$(INSTALL) -m 755 ${binaries} $(DESTDIR)$(bindir)

- 

--	# install documentation

--	$(INSTALL) -d $(DESTDIR)${docdir}

--	$(INSTALL)  -m 644 doc/*.txt $(DESTDIR)$(docdir)

--	$(INSTALL)  -m 644 doc/AUTHORS $(DESTDIR)$(docdir)

--	$(INSTALL)  -m 644 doc/CHANGES $(DESTDIR)$(docdir)

--	$(INSTALL)  -m 644 VERSION $(DESTDIR)$(docdir)

--

- 	# install manpages

- 	$(INSTALL)  -d $(DESTDIR)${mandir}

- 	$(INSTALL)  -m 644 doc/*.1 $(DESTDIR)$(mandir)

diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch
deleted file mode 100644
index e8ed8bec37ee..000000000000
--- a/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drawtune.c
-+++ b/drawtune.c
-@@ -75,7 +75,8 @@
- int rootstem;

- int fontsize, fontnum;

- int donemeter;

--int ingrace, inchord;

-+extern int ingrace;

-+int inchord;

- int chordcount;

- struct feature* chordhead;

- 

---- a/toabc.c
-+++ b/toabc.c
-@@ -85,7 +85,7 @@
- int new_key_number;  /* used for gchord transposition */

- int oldtable[7], newtable[7]; /* for handling transposition */

- int inchord; /* are we in a chord [ ] ? */

--int ingrace; /* are we in a grace note set { } ? */

-+extern int ingrace; /* are we in a grace note set { } ? */

- int chordcount; /* number of notes or rests in current chord */

- int inlinefield; /* boolean - are we in [<field>: ] ? */

- int cleanup; /* boolean to indicate -u option (update notation) */

diff --git a/media-sound/abcmidi/metadata.xml b/media-sound/abcmidi/metadata.xml
index b96cfba7bec1..8d7a1ecbc3fd 100644
--- a/media-sound/abcmidi/metadata.xml
+++ b/media-sound/abcmidi/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">sshlien/abcmidi</remote-id>
 		<remote-id type="sourceforge">abc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
index 15e88bbbb732..59c4a5a40bb9 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1 +1 @@
-DIST aeolus-0.9.9.tar.bz2 66552 BLAKE2B 3e3aafd29477f660cfada1e7bf68e0143c32bebbde26abb653411041741273b7617f580b5c71a5315528d089e9dd9a18c9e56922ffe2a069afd35844b2dd9277 SHA512 423278564e83b00e90b91a408a098de8feb3c03809b2b96cf0b320522206ca1afea1d7f3f5cccad80fc4f03e0f31bb2d19f7256e30e6fbd25d25eb777c669ea2
+DIST aeolus-0.10.4.tar.bz2 66492 BLAKE2B 7a0861cacb1c8cb4c02f081883c0f61de3cfbea1da8716dba394b63cac325795d51cdf935c3f6cc242ed68d0ccc474d7c424eaf93d7084fe8e8af20fe4b16355 SHA512 4ef84ce7ca28c109ebc1327d3ecd18b1757617eca87313f4ed03a63a65c874de76bebf8dca780587a64e92dc881706c7fe888147475a30134648f02b570bad5a
diff --git a/media-sound/aeolus/aeolus-0.9.9.ebuild b/media-sound/aeolus/aeolus-0.10.4.ebuild
index 4d71f3088f41..81f44ef16f3c 100644
--- a/media-sound/aeolus/aeolus-0.9.9.ebuild
+++ b/media-sound/aeolus/aeolus-0.10.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs flag-o-matic multilib desktop xdg
+inherit toolchain-funcs flag-o-matic desktop xdg
 
 DESCRIPTION="A synthesised pipe organ emulator"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
@@ -36,7 +36,7 @@ RDEPEND="
 DOCS=( README COPYING AUTHORS )
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-Makefile.patch
+	"${FILESDIR}"/${PN}-0.9.9-fix-Makefile.patch
 )
 
 src_compile() {
diff --git a/media-sound/aeolus/metadata.xml b/media-sound/aeolus/metadata.xml
index 40ae2e1863c3..d41425628200 100644
--- a/media-sound/aeolus/metadata.xml
+++ b/media-sound/aeolus/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
diff --git a/media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild b/media-sound/alac_decoder/alac_decoder-0.2.0-r2.ebuild
index cb01260fa6f3..5edc07ba8cfc 100644
--- a/media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
+++ b/media-sound/alac_decoder/alac_decoder-0.2.0-r2.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Basic decoder for Apple Lossless Audio Codec files (ALAC)"
 HOMEPAGE="http://craz.net/programs/itunes/alac.html"
 SRC_URI="http://craz.net/programs/itunes/files/${P}.tgz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}/${PN}
+KEYWORDS="amd64 ppc x86 ~ppc-macos"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.2.0-fix-build-system.patch )
 
diff --git a/media-sound/alac_decoder/metadata.xml b/media-sound/alac_decoder/metadata.xml
index 4695e790fa97..ebf7b5fe387e 100644
--- a/media-sound/alac_decoder/metadata.xml
+++ b/media-sound/alac_decoder/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
diff --git a/media-sound/alacenc/Manifest b/media-sound/alacenc/Manifest
new file mode 100644
index 000000000000..39da1dfe285c
--- /dev/null
+++ b/media-sound/alacenc/Manifest
@@ -0,0 +1 @@
+DIST alacenc-0.4.0.tar.gz 114463 BLAKE2B 6682a77d1df90f22969bbdf82b3ad273cac8855f245ff533b90e81a02952c9dc3f9f14f4e7ec23059ebe7ba9e3a7fff51f009dbe7ee945fca5a9a04d1f2fb8c9 SHA512 2a95725b6aa4ef3f42b2c8d379cd8a83dbf46d69faa0bd6a03bec4d0b56665b3d0716c76e9c7183096a0761d36a282a559f2e5c70f0a9aa1a9808587db004727
diff --git a/media-sound/alacenc/alacenc-0.4.0.ebuild b/media-sound/alacenc/alacenc-0.4.0.ebuild
new file mode 100644
index 000000000000..d1e6d081f081
--- /dev/null
+++ b/media-sound/alacenc/alacenc-0.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Encodes audio into the Apple Lossless Audio Codec (ALAC) format"
+HOMEPAGE="https://github.com/flacon/alacenc"
+SRC_URI="https://github.com/flacon/alacenc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+src_install() {
+	dobin "${BUILD_DIR}/alacenc"
+	einstalldocs
+}
diff --git a/media-sound/alacenc/metadata.xml b/media-sound/alacenc/metadata.xml
new file mode 100644
index 000000000000..9f443a92ed0a
--- /dev/null
+++ b/media-sound/alacenc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">flacon/alacenc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/alsa-scarlett-gui/Manifest b/media-sound/alsa-scarlett-gui/Manifest
new file mode 100644
index 000000000000..8d9183725f08
--- /dev/null
+++ b/media-sound/alsa-scarlett-gui/Manifest
@@ -0,0 +1 @@
+DIST alsa-scarlett-gui-0.4.0.tar.gz 3434771 BLAKE2B 5bdab633a8271e99eec06aac8b9629ad50eb9a4cf892fe962f30848fc7644036093056d0db75f60accd13757dbeb578c0cfa365aa6dcd2655985564e1039a7d9 SHA512 9cc316f153cd197823295dc57012931f75b3cb06f9ea87661853626e3d9326ce1a433adfb8af23bcdc1e76f9ab59d2175bee9e3d02da0b4a7b3365caf734e1e2
diff --git a/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0.ebuild b/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0.ebuild
new file mode 100644
index 000000000000..0961a09d3b1e
--- /dev/null
+++ b/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="A UI for Focusrite Scarlett and Clarett audio interfaces"
+HOMEPAGE="https://github.com/geoffreybennett/alsa-scarlett-gui"
+SRC_URI="https://github.com/geoffreybennett/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/glib:2
+	gui-libs/gtk:4
+	media-libs/alsa-lib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-no-Werror.patch"
+)
+
+MAKEOPTS="${MAKEOPTS} -C src"
+
+export PREFIX="/usr"
diff --git a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch
new file mode 100644
index 000000000000..e6c98f5c4889
--- /dev/null
+++ b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,7 +13,7 @@ DEPDIR := .deps
+ DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
+ 
+ CFLAGS ?= -ggdb -fno-omit-frame-pointer -O2
+-CFLAGS += -Wall -Werror -D_FORTIFY_SOURCE=2
++CFLAGS += -Wall -D_FORTIFY_SOURCE=2
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ CFLAGS += -Wno-error=deprecated-declarations
+ 
diff --git a/media-sound/alsa-scarlett-gui/metadata.xml b/media-sound/alsa-scarlett-gui/metadata.xml
new file mode 100644
index 000000000000..14a5040e976b
--- /dev/null
+++ b/media-sound/alsa-scarlett-gui/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+<name>Jason A. Donenfeld</name>
+</maintainer>
+<maintainer type="project">
+<email>proaudio@gentoo.org</email>
+<name>Gentoo ProAudio Project</name>
+</maintainer>
+<upstream>
+<remote-id type="github">geoffreybennett/alsa-scarlett-gui</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 6d2751688e27..86475fb683bc 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1 +1,2 @@
-DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
+DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498
+DIST alsa-tools-1.2.11.tar.bz2 1882262 BLAKE2B 2c429cb0dceb1dcb186578e2109a1b3b6eece7ba5e8e1c6de14cc5e2f37ecc947469247e95fb894bb1171fa490deb000405135ec82e822d0fc24bf5c920ec724 SHA512 b5a29a83121a637eaa16d225875feeabaea893eabc61b97d0c18a5852d851ff2e6932bd732786bb43525b410c2bb9185261cc4509fd3ee5fd8536557f12b2154
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild
index 4686591d3c14..5b99762b58ca 100644
--- a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild
@@ -1,33 +1,39 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools flag-o-matic xdg
+inherit autotools flag-o-matic libtool xdg
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
 alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
 
-DEPEND=">=media-libs/alsa-lib-${PV}
+# bug #468294
+DEPEND="
+	>=media-libs/alsa-lib-${PV}
 	>=dev-python/pyalsa-1.0.26
 	fltk? ( >=x11-libs/fltk-1.3.0:1 )
 	gtk? (
 		dev-libs/gobject-introspection
 		x11-libs/gtk+:2
 		x11-libs/gtk+:3
-	)" #468294
-RDEPEND="${DEPEND}
-	gtk? ( media-fonts/font-misc-misc )" #456114
+	)
+"
+# bug #456114
+RDEPEND="
+	${DEPEND}
+	gtk? ( media-fonts/font-misc-misc )
+"
 BDEPEND="
 	virtual/pkgconfig
 "
@@ -42,18 +48,18 @@ pkg_setup() {
 		us428control
 		hwmixvolume
 		hda-verb
-		$(usex alsa_cards_mixart mixartloader '')
-		$(usex alsa_cards_vx222 vxloader '')
-		$(usex alsa_cards_usb-usx2y usx2yloader '')
-		$(usex alsa_cards_pcxhr pcxhrloader '')
-		$(usex alsa_cards_sscape sscape_ctl '')
+		$(usev alsa_cards_mixart mixartloader)
+		$(usev alsa_cards_vx222 vxloader)
+		$(usev alsa_cards_usb-usx2y usx2yloader)
+		$(usev alsa_cards_pcxhr pcxhrloader)
+		$(usev alsa_cards_sscape sscape_ctl)
 	)
 
 	if use gtk; then
 		ALSA_TOOLS+=(
 			echomixer
 			hdajackretask
-			$(usex alsa_cards_ice1712 envy24control '')
+			$(usev alsa_cards_ice1712 envy24control)
 		)
 		# Perhaps a typo the following && logic?
 		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
@@ -64,7 +70,7 @@ pkg_setup() {
 	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
 		ALSA_TOOLS+=(
 			hdsploader
-			$(usex fltk 'hdspconf hdspmixer' '')
+			$(usev fltk 'hdspconf hdspmixer')
 		)
 	fi
 
@@ -84,17 +90,17 @@ src_prepare() {
 	# AM_PATH_GTK macro.
 	for dir in echomixer envy24control rmedigicontrol; do
 		has "${dir}" "${ALSA_TOOLS[*]}" || continue
-		pushd "${dir}" &> /dev/null
+		pushd "${dir}" &> /dev/null || die
 		eautoreconf
-		popd &> /dev/null
+		popd &> /dev/null || die
 	done
 
 	# This block deals with the tools that are being patched
 	for dir in hdspconf; do
 		has "${dir}" "${ALSA_TOOLS[*]}" || continue
-		pushd "${dir}" &> /dev/null
+		pushd "${dir}" &> /dev/null || die
 		eautoreconf
-		popd &> /dev/null
+		popd &> /dev/null || die
 	done
 
 	elibtoolize
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..26f5ef8563c1
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool xdg
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+
+IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
+
+# bug #468294
+DEPEND="
+	>=media-libs/alsa-lib-${PV}
+	>=dev-python/pyalsa-1.0.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		dev-libs/gobject-introspection
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+	)
+"
+# bug #456114
+RDEPEND="
+	${DEPEND}
+	gtk? ( media-fonts/font-misc-misc )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/envy24control-config-dir.patch
+	"${FILESDIR}"/${PN}-1.2.5-hdspmixer-crash.patch
+)
+
+pkg_setup() {
+	ALSA_TOOLS=(
+		seq/sbiload
+		us428control
+		hwmixvolume
+		hda-verb
+		$(usev alsa_cards_mixart mixartloader)
+		$(usev alsa_cards_vx222 vxloader)
+		$(usev alsa_cards_usb-usx2y usx2yloader)
+		$(usev alsa_cards_pcxhr pcxhrloader)
+		$(usev alsa_cards_sscape sscape_ctl)
+	)
+
+	if use gtk; then
+		ALSA_TOOLS+=(
+			echomixer
+			hdajackretask
+			$(usev alsa_cards_ice1712 envy24control)
+		)
+		# Perhaps a typo the following && logic?
+		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
+			ALSA_TOOLS+=( rmedigicontrol )
+		fi
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
+		ALSA_TOOLS+=(
+			hdsploader
+			$(usev fltk 'hdspconf hdspmixer')
+		)
+	fi
+
+	if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
+		ALSA_TOOLS+=( sb16_csp )
+	fi
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS+=( as10k1 ld10k1 )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# This block only deals with the tools that still use GTK and the
+	# AM_PATH_GTK macro.
+	for dir in echomixer envy24control rmedigicontrol; do
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
+		pushd "${dir}" &> /dev/null || die
+		eautoreconf
+		popd &> /dev/null || die
+	done
+
+	# This block deals with the tools that are being patched
+	for dir in hdspconf; do
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
+		pushd "${dir}" &> /dev/null || die
+		eautoreconf
+		popd &> /dev/null || die
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2
+			;;
+			* )
+				econf
+			;;
+		esac
+	done
+}
+
+src_compile() {
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
+		emake
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		# Install the main stuff
+		cd "${S}/${f}" || die
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS; do
+			if [[ -f "${doc}" ]]; then
+				mv "${doc}" "${doc}.$(basename ${f})" || die
+				dodoc "${doc}.$(basename ${f})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch b/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch
new file mode 100644
index 000000000000..c80e3f7e47bb
--- /dev/null
+++ b/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch
@@ -0,0 +1,23 @@
+https://github.com/alsa-project/alsa-tools/commit/8c8d6941f21ea68894ce7fd13e92b3ac9f16dc8a
+
+From 8c8d6941f21ea68894ce7fd13e92b3ac9f16dc8a Mon Sep 17 00:00:00 2001
+From: wynnfeng <wynnfeng@tencent.com>
+Date: Sun, 29 Jan 2023 20:47:53 +0800
+Subject: [PATCH] hdspmixer: fix core dump
+
+Initialize the name pointer to NULL.
+
+Fixes: https://github.com/alsa-project/alsa-tools/pull/14
+Signed-off-by: wynnfeng <wynnfeng@tencent.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- a/hdspmixer/src/hdspmixer.cxx
++++ b/hdspmixer/src/hdspmixer.cxx
+@@ -39,7 +39,7 @@ int main(int argc, char **argv)
+ {
+     HDSPMixerWindow *window;
+     HDSPMixerCard *hdsp_cards[3];
+-    char *name, *shortname;
++    char *name = NULL, *shortname;
+     int card;
+     int cards = 0;
+ 
diff --git a/media-sound/alsa-tools/metadata.xml b/media-sound/alsa-tools/metadata.xml
index 1de885aecc13..d2e8313dec39 100644
--- a/media-sound/alsa-tools/metadata.xml
+++ b/media-sound/alsa-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>alsa-bugs@gentoo.org</email>
-  </maintainer>
+	<maintainer type="project">
+		<email>alsa-bugs@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alsa-project/alsa-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index d04366a09319..5a95b8e1063e 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,3 +1,3 @@
-DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
-DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
-DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
+DIST alsa-utils-1.2.10-patches.tar.xz 4984 BLAKE2B aa46afe25e709905285c3255d80a086b843c078d12385e8787812cb33ec0f16bff5fa1f35867166824978c99354cf74d10f2596e026b3b10b0180049486ea15f SHA512 d26e7276ac6636ac71d8bbaa9978999e13ce36f228c9854e90d29a63fae3cc0c3f8b2fb25effdd461d2b77e91fda3069987fa8355f5ef6f22a37af282e26ff6c
+DIST alsa-utils-1.2.10.tar.bz2 1625707 BLAKE2B 077b4ad090c1ab40dd4fa22db01ae2a080ca849a5564dfe612654993297c80bd3584541c7e68aaad56c4c05538ba0de449e4677b1c4a9dfe56d8e11706c4ca35 SHA512 22adedf6d491d7768d24f054262a9c12bc952049db8374e104c0477ebf84266dcbeb0a2a3a1765b89958073d341f64dedbae63e3cae66f4983a0424e5cb3243f
+DIST alsa-utils-1.2.11.tar.bz2 1627148 BLAKE2B dcf96705f9e3f1b4abaa7e1f107d1154a05500bf1cd07c821e0fe8c4ba7d7f08de0cf126be8c9c8dda3980d85c144318c12ffc8a95d5da4e98c49a6e9c2ee8ef SHA512 5ce76807b53357584bfb4ace5acfdac4db9168ffaf5cdd1e499738eec046c36112bf84a99970f66368063a9baf73bad93af2d439630572f3eba5c9321071172d
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.10-r1.ebuild
index 0ec8d4c4e195..a4f53c4d0384 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.10-r1.ebuild
@@ -1,35 +1,46 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.2.10-patches.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
 
-CDEPEND=">=media-libs/alsa-lib-${PV}
+DEPEND="
+	>=media-libs/alsa-lib-${PV}
 	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
+	ieee1394? ( media-libs/libffado )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:= )
+	bat? ( sci-libs/fftw:= )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-alsa )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+	"${WORKDIR}"/${PN}-1.2.10-patches
 )
 
 src_configure() {
+	export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394)
+
 	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod, bug #456214
 		--disable-alsaconf
 		--disable-maintainer-mode
 		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
@@ -39,7 +50,7 @@ src_configure() {
 		$(use_enable libsamplerate alsaloop)
 		$(use_enable ncurses alsamixer)
 		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
+		$(usev !doc '--disable-xmlto')
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -51,19 +62,20 @@ src_install() {
 	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
 	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
 
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
 	keepdir /var/lib/alsa
 
 	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
 	# scan directory /usr/share/alsa/ucm: No such file or directory
 	# alsaucm: unable to obtain card list: No such file or directory
 	keepdir /usr/share/alsa/ucm
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	udev_reload
+
+	if [[ -z ${REPLACING_VERSIONS} ]] && ! systemd_is_booted ; then
 		elog
 		elog "To take advantage of the init script, and automate the process of"
 		elog "saving and restoring sound-card mixer levels you should"
@@ -75,3 +87,7 @@ pkg_postinst() {
 		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.11.ebuild
index 24b8ba3949fe..69b5aa9a2ca6 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.11.ebuild
@@ -1,35 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
 
-CDEPEND=">=media-libs/alsa-lib-${PV}
+DEPEND="
+	>=media-libs/alsa-lib-${PV}
 	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
+	ieee1394? ( media-libs/libffado )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:= )
+	bat? ( sci-libs/fftw:= )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-alsa )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
 )
 
 src_configure() {
+	export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394)
+
 	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod, bug #456214
 		--disable-alsaconf
 		--disable-maintainer-mode
 		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
@@ -39,7 +48,7 @@ src_configure() {
 		$(use_enable libsamplerate alsaloop)
 		$(use_enable ncurses alsamixer)
 		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
+		$(usev !doc '--disable-xmlto')
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -51,19 +60,20 @@ src_install() {
 	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
 	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
 
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
 	keepdir /var/lib/alsa
 
 	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
 	# scan directory /usr/share/alsa/ucm: No such file or directory
 	# alsaucm: unable to obtain card list: No such file or directory
 	keepdir /usr/share/alsa/ucm
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	udev_reload
+
+	if [[ -z ${REPLACING_VERSIONS} ]] && ! systemd_is_booted ; then
 		elog
 		elog "To take advantage of the init script, and automate the process of"
 		elog "saving and restoring sound-card mixer levels you should"
@@ -75,3 +85,7 @@ pkg_postinst() {
 		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
deleted file mode 100644
index 0ec8d4c4e195..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/files/alsa-modules.conf-rc b/media-sound/alsa-utils/files/alsa-modules.conf-rc
deleted file mode 100644
index 40e99df8d3f4..000000000000
--- a/media-sound/alsa-utils/files/alsa-modules.conf-rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# Alsa kernel modules' configuration file.
-
-# ALSA portion
-alias char-major-116 snd
-# OSS/Free portion
-alias char-major-14 soundcore
-
-##
-## IMPORTANT:
-## You need to customise this section for your specific sound card(s)
-## and then run `update-modules' command.
-## Read alsa-driver's INSTALL file in /usr/share/doc for more info.
-##
-##  ALSA portion
-## alias snd-card-0 snd-interwave
-## alias snd-card-1 snd-ens1371
-##  OSS/Free portion
-## alias sound-slot-0 snd-card-0
-## alias sound-slot-1 snd-card-1
-##
-
-# OSS/Free portion - card #1
-alias sound-service-0-0 snd-mixer-oss
-alias sound-service-0-1 snd-seq-oss
-alias sound-service-0-3 snd-pcm-oss
-alias sound-service-0-8 snd-seq-oss
-alias sound-service-0-12 snd-pcm-oss
-##  OSS/Free portion - card #2
-## alias sound-service-1-0 snd-mixer-oss
-## alias sound-service-1-3 snd-pcm-oss
-## alias sound-service-1-12 snd-pcm-oss
-
-alias /dev/mixer snd-mixer-oss
-alias /dev/dsp snd-pcm-oss
-alias /dev/midi snd-seq-oss
-
-# Set this to the correct number of cards.
-options snd cards_limit=1
diff --git a/media-sound/alsa-utils/metadata.xml b/media-sound/alsa-utils/metadata.xml
index 0df2c0a53a87..d5e35b0955b0 100644
--- a/media-sound/alsa-utils/metadata.xml
+++ b/media-sound/alsa-utils/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>alsa-bugs@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="bat">install basic audio tester (BAT) util</flag>
-    <flag name="libsamplerate">install utils that use libsamplerate (e.g. alsaloop)</flag>
-    <flag name="ncurses">install utils that use ncurses (e.g. alsamixer)</flag>
-  </use>
+	<maintainer type="project">
+		<email>alsa-bugs@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="bat">install basic audio tester (BAT) util</flag>
+		<flag name="libsamplerate">install utils that use libsamplerate (e.g. alsaloop)</flag>
+		<flag name="ncurses">install utils that use ncurses (e.g. alsamixer)</flag>
+	</use>
+	<upstream>
+		<changelog>https://www.alsa-project.org/wiki/Main_Page_News</changelog>
+		<remote-id type="github">alsa-project/alsa-utils</remote-id>
+		<remote-id type="cpe">cpe:/a:alsa-project:alsa</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/alsamixer-app/metadata.xml b/media-sound/alsamixer-app/metadata.xml
index fa8d74ec580b..a61c99b0a51f 100644
--- a/media-sound/alsamixer-app/metadata.xml
+++ b/media-sound/alsamixer-app/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
 	<email>voyageur@gentoo.org</email>
diff --git a/media-sound/alsamixergui/metadata.xml b/media-sound/alsamixergui/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/alsamixergui/metadata.xml
+++ b/media-sound/alsamixergui/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r4.ebuild
index 27659636bbb5..90a7f0517f13 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r4.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools desktop xdg
+inherit autotools desktop flag-o-matic xdg
 
 DESCRIPTION="A heavily multi-threaded pluggable audio player"
-HOMEPAGE="http://www.alsaplayer.org/"
-SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
+HOMEPAGE="https://alsaplayer.sourceforge.net/"
+SRC_URI="https://alsaplayer.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
+KEYWORDS="amd64 ~mips ~ppc ~riscv ~sparc x86"
 IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
+REQUIRED_USE="|| ( alsa jack nas oss )"
 
 RDEPEND="
 	media-libs/libsndfile:=
 	sys-libs/zlib:=
 	alsa? ( media-libs/alsa-lib )
-	audiofile? ( media-libs/audiofile )
-	flac? ( media-libs/flac )
+	audiofile? ( media-libs/audiofile:= )
+	flac? ( media-libs/flac:= )
 	gtk? ( >=x11-libs/gtk+-2.10:2 )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod:0 )
@@ -31,27 +32,26 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis )
 	xosd? ( x11-libs/xosd )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
 	oss? ( virtual/os-headers )"
-REQUIRED_USE="|| ( alsa jack nas oss )"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 
 src_prepare() {
 	default
-
-	sed -i \
-		-e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \
-		output/jack/Makefile.am || die
-
-	sed -i \
-		-e 's:-O2 -funroll-loops -finline-functions -ffast-math::' \
-		configure.ac || die
-
+	cp "${BROOT}"/usr/share/gettext/config.rpath . || die
 	eautoreconf
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860423
+	# https://github.com/alsaplayer/alsaplayer/issues/28
+	filter-lto
+
 	export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false)
 	export ac_cv_lib_xosd_xosd_create=$(usex xosd)
 
@@ -79,5 +79,5 @@ src_install() {
 
 	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.patch
new file mode 100644
index 000000000000..b51277317e0f
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.patch
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,11 +82,6 @@
+ dnl PKGCONFIG preparations
+ dnl ======================
+ 
+-if test -z $PKG_CONFIG_PATH; then
+-	PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+-fi
+-
+-export PKG_CONFIG_PATH
+ 
+ 
+ dnl ===============
+@@ -639,10 +634,10 @@
+ 
+ AC_MSG_CHECKING(for gcc optimization flags)
+ old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -O2 -funroll-loops -finline-functions -ffast-math -Wall"
++CFLAGS="$CFLAGS -Wall"
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="$CFLAGS -O2 -funroll-loops -finline-functions -ffast-math -Wall"],[ EXTRA_OPT_CFLAGS=""])
++[ EXTRA_OPT_CFLAGS="$CFLAGS -Wall"],[ EXTRA_OPT_CFLAGS=""])
+ CFLAGS=$old_cflags
+ AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+ 
+--- a/output/jack/Makefile.am
++++ b/output/jack/Makefile.am
+@@ -24,7 +24,6 @@
+ 
+ AM_CXXFLAGS = $(COMMON_FLAGS) $(JACK_CFLAGS)
+ 
+-AM_CFLAGS = $(AM_CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/output
+ 
diff --git a/media-sound/alsaplayer/metadata.xml b/media-sound/alsaplayer/metadata.xml
index b3559d99410e..5a3019b520b3 100644
--- a/media-sound/alsaplayer/metadata.xml
+++ b/media-sound/alsaplayer/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -8,4 +8,8 @@
 	<use>
 		<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">alsaplayer</remote-id>
+		<remote-id type="github">alsaplayer/alsaplayer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index cb833a8f9779..73d7bcab2672 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1 +1,2 @@
-DIST amsynth-1.8.0.tar.bz2 1170068 BLAKE2B 0b570efe1db69bba04215055147792a9635bc086749ca7d70b5b3f8bc16613310591802c6cdabfd83009bda2c3b109b17ccc9d4ace7681614bed8c42c5f84f8d SHA512 a47489b103dbdd1cb2233d8629acfda2a1d26ac1f7ea5b8c4e7925676842cac21758ca94b50894e71426517bd826e9a9b6fd26800516054e24d62f7cbce4f0f9
+DIST amsynth-1.13.3.tar.gz 1641606 BLAKE2B 65c1bffa46f71f1fe9c89288da700348670575c59738f43f6b712ddb6555770677926fbac508dc11f7e34829bcb46f66cc850a651a2bcbeab3b63555aa4f2abd SHA512 b7d1592d6d4b06fa1d6b3892804433bde617d566044aad82c93d0e75af30ea04d07c3ed98cc9ff24c83efd4b829d109ecc4e7758d0a13127f7e6642ebb74c119
+DIST amsynth-1.13.4.tar.gz 1641690 BLAKE2B 7041009e34f3b7b82db89d64e515fd542c1be06328317fdbabca6c3a8aea158e71d9372c83e65235b84cdd6c409d7f83830203418cdb49b195124a64668aceb7 SHA512 94da080036667cc89dd22c04cadc8993fa4ff534b0f009f84d374fa20d391928a3b104287e6c6856edbdb1e5d26daf2c730a73fc08734db8c7eb62c8f35cc129
diff --git a/media-sound/amsynth/amsynth-1.8.0.ebuild b/media-sound/amsynth/amsynth-1.13.3.ebuild
index 6d9f401eeefb..30583b4bdf1b 100644
--- a/media-sound/amsynth/amsynth-1.8.0.ebuild
+++ b/media-sound/amsynth/amsynth-1.13.3.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic
+inherit xdg
 
 DESCRIPTION="Virtual analogue synthesizer"
 HOMEPAGE="https://github.com/amsynth/amsynth"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa dssi gtk jack lash lv2 oss sndfile"
+IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
 
-REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk ) vst? ( gtk )"
 
 BDEPEND="
+	dev-util/intltool
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -28,25 +29,36 @@ RDEPEND="
 		media-libs/dssi:=
 		media-libs/liblo:=
 	)
-	gtk? ( >=x11-libs/gtk+-2.20:2 )
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+	)
 	jack? ( virtual/jack )
 	lash? ( media-sound/lash )
 	lv2? ( media-libs/lv2 )
-	sndfile? ( >=media-libs/libsndfile-1:= )
 "
 DEPEND="${RDEPEND}
 	oss? ( virtual/os-headers )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12.2-metadata.patch"
+)
+
+src_prepare() {
+	default
+	! use gtk && eapply "${FILESDIR}/${PN}-1.12.2-x11.patch"
+}
+
 src_configure() {
-	append-cxxflags -std=c++11
 	econf \
-		$(use_with oss) \
 		$(use_with alsa) \
+		$(use_with dssi) \
 		$(use_with gtk gui) \
 		$(use_with jack) \
 		$(use_with lash) \
 		$(use_with lv2) \
-		$(use_with sndfile) \
-		$(use_with dssi)
+		$(use_with nsm) \
+		$(use_with oss) \
+		$(use_with vst)
 }
diff --git a/media-sound/amsynth/amsynth-1.13.4.ebuild b/media-sound/amsynth/amsynth-1.13.4.ebuild
new file mode 100644
index 000000000000..f736fc0d0a4c
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.13.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
+
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk ) vst? ( gtk )"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+RDEPEND="
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+	)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12.2-metadata.patch"
+)
+
+src_prepare() {
+	default
+	! use gtk && eapply "${FILESDIR}/${PN}-1.12.2-x11.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with dssi) \
+		$(use_with gtk gui) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with lv2) \
+		$(use_with nsm) \
+		$(use_with oss) \
+		$(use_with vst)
+}
diff --git a/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch b/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch
new file mode 100644
index 000000000000..24b73ea31190
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index e0dd2a6..9bca63f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1416,7 +1416,7 @@ appiconsvg_DATA = data/icons/scalable/amsynth.svg
+ desktopdir = $(datadir)/applications
+ desktop_in_files = data/amsynth.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metadata
+ appdata_in_files = data/amsynth.appdata.xml.in \
+ 	data/dssi-amsynth-plugin.metainfo.xml.in \
+ 	data/lv2-amsynth-plugin.metainfo.xml.in \
diff --git a/media-sound/amsynth/files/amsynth-1.12.2-x11.patch b/media-sound/amsynth/files/amsynth-1.12.2-x11.patch
new file mode 100644
index 000000000000..2222fc1eb355
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.12.2-x11.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.in b/Makefile.in
+index e0dd2a6..4449599 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1297,7 +1297,7 @@ amsynth_SOURCES = $(libcore_sources) $(libdsp_sources) \
+ 	$(am__append_1) $(am__append_3) $(am__append_4)
+ amsynth_CPPFLAGS = $(AM_CPPFLAGS) @ALSA_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ @LIBLO_CFLAGS@ @GTK_CFLAGS@
+ amsynth_LDADD = @ALSA_LIBS@ @JACK_LIBS@ @LASH_LIBS@ @LIBLO_LIBS@ \
+-	@LIBS@ -lX11 $(am__append_2)
++	@LIBS@ $(am__append_2)
+ @DARWIN_TRUE@amsynth_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework CoreAudio -framework CoreMIDI
+ 
+ #
+@@ -1317,7 +1317,7 @@ noinst_LTLIBRARIES = $(am__append_5) $(am__append_6) $(am__append_7)
+ @BUILD_DSSI_TRUE@amsynth_dssi_la_LDFLAGS = -rpath $(dssidir) -avoid-version -module -export-symbols-regex "dssi_descriptor" -disable-static
+ @BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_SOURCES = src/amsynth_dssi_gtk.cpp $(libcore_sources) $(libgui_sources)
+ @BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_CPPFLAGS = $(AM_CPPFLAGS) @DSSI_CFLAGS@ @GTK_CFLAGS@ @LIBLO_CFLAGS@
+-@BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_LDADD = @DSSI_LIBS@ @GTK_LIBS@ @LIBLO_LIBS@ -lstdc++ -lX11
++@BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_LDADD = @DSSI_LIBS@ @GTK_LIBS@ @LIBLO_LIBS@ -lstdc++
+ 
+ #
+ # LV2
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
index 6ac5d966f1b7..0379b456f9bd 100644
--- a/media-sound/amsynth/metadata.xml
+++ b/media-sound/amsynth/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -8,6 +8,8 @@
 	<use>
 		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
 		<flag name="lv2">Add support for Ladspa V2</flag>
+		<flag name="nsm">Build support for Non Session Manager</flag>
+		<flag name="vst">Build VST plug-in</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">amsynth/amsynth</remote-id>
diff --git a/media-sound/apetag/apetag-1.12-r3.ebuild b/media-sound/apetag/apetag-1.12-r3.ebuild
index b6cf8e73f54c..183648ad647a 100644
--- a/media-sound/apetag/apetag-1.12-r3.ebuild
+++ b/media-sound/apetag/apetag-1.12-r3.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="Command-line ape 2.0 tagger"
-HOMEPAGE="http://muth.org/Robert/Apetag/"
-SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
+HOMEPAGE="https://robert.muth.org/Apetag/"
+SRC_URI="https://robert.muth.org/Apetag/${PN}.${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/apetag/metadata.xml b/media-sound/apetag/metadata.xml
index 39626a990be5..cd1cfc033621 100644
--- a/media-sound/apetag/metadata.xml
+++ b/media-sound/apetag/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/apulse/apulse-0.1.13.ebuild b/media-sound/apulse/apulse-0.1.13-r2.ebuild
index 8fc4e08becf5..2b0fe6849406 100644
--- a/media-sound/apulse/apulse-0.1.13.ebuild
+++ b/media-sound/apulse/apulse-0.1.13-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
-inherit multilib cmake-multilib
+inherit cmake-multilib multiprocessing
 
 DESCRIPTION="PulseAudio emulation for ALSA"
 HOMEPAGE="https://github.com/i-rinat/apulse"
@@ -19,9 +18,9 @@ RESTRICT="!test? ( test )"
 
 DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
 	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	sdk? ( !media-sound/pulseaudio ) "
+	sdk? ( !media-libs/libpulse !media-sound/pulseaudio ) "
 RDEPEND="${DEPEND}
-	!!media-plugins/alsa-plugins[pulseaudio]"
+	!media-plugins/alsa-plugins[pulseaudio]"
 
 PATCHES=(
 	"${FILESDIR}/sdk.patch"
@@ -55,7 +54,8 @@ multilib_src_test() {
 		pushd tests || die
 		cmake -S "${S}/tests" -B . || die
 		emake test_ringbuffer
-		ctest -j "$(makeopts_jobs)" --test-load "$(makeopts_loadavg)" || die
+		ctest -j "$(makeopts_jobs "${MAKEOPTS}" 999)" \
+			--test-load "$(makeopts_loadavg)" || die
 		popd || die
 	}
 	multilib_foreach_abi _test
diff --git a/media-sound/apulse/metadata.xml b/media-sound/apulse/metadata.xml
index 273b2be58659..dd24f7fe124f 100644
--- a/media-sound/apulse/metadata.xml
+++ b/media-sound/apulse/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="sdk">Install PulseAudio headers and pkg-config files. Be aware apulse is not
     a full PulseAudio replacement by design and some functionality may be missing.</flag>
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index e2cdd8f4efc8..a36bb2cb8cac 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,2 +1 @@
-DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
-DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
+DIST aqualung-1.2.tar.gz 1974910 BLAKE2B 4956865a5897cf92d3ebb65cb30f27164e7717fadbbff8e275b25d5fa9c60382846877f644d3a8393935df82f9b92d282fe41befe27cd86accc3f6885650063f SHA512 0e11f307344c8ada7f3869d953e6fb8b088a8af345d51f3e93af18b4b57ea6f35bbc47eefea40956114d56882e4a0d66c1496a7b9a14dfd82e6a95cfc0ef52c5
diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild b/media-sound/aqualung/aqualung-1.0-r5.ebuild
deleted file mode 100644
index 442799d70ce8..000000000000
--- a/media-sound/aqualung/aqualung-1.0-r5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libxml2
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lame? ( media-sound/lame )
-	libsamplerate? ( media-libs/libsamplerate )
-	lua? ( dev-lang/lua:0= )
-	mac? ( media-sound/mac )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-	"${FILESDIR}/${P}-gcc10.patch"
-	"${FILESDIR}/${P}-ar.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-loop \
-		--enable-nls \
-		--enable-transcoding \
-		$(use_enable debug) \
-		$(use_enable podcast) \
-		$(use_enable systray) \
-		$(use_enable jack jack-mgmt) \
-		$(use_with alsa) \
-		$(use_with cdda) \
-		$(use_with cddb) \
-		$(use_with ffmpeg lavc) \
-		$(use_with flac) \
-		$(use_with ifp) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with lame) \
-		$(use_with libsamplerate src) \
-		$(use_with lua) \
-		$(use_with mac) \
-		$(use_with modplug mod) \
-		$(use_with mp3 mpeg) \
-		$(use_with musepack mpc) \
-		$(use_with oss) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis vorbis) \
-		$(use_with vorbis vorbisenc) \
-		$(use_with wavpack)
-}
-
-src_install() {
-	default
-
-	newicon src/img/icon_64.png aqualung.png
-	make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild
deleted file mode 100644
index 0e4f24b9cf57..000000000000
--- a/media-sound/aqualung/aqualung-1.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libxml2
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lame? ( media-sound/lame )
-	libsamplerate? ( media-libs/libsamplerate )
-	lua? ( dev-lang/lua:0= )
-	mac? ( media-sound/mac )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ifp.patch"
-	"${FILESDIR}/${P}-var-collision.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-loop \
-		--enable-nls \
-		--enable-transcoding \
-		$(use_enable debug) \
-		$(use_enable podcast) \
-		$(use_enable systray) \
-		$(use_enable jack jack-mgmt) \
-		$(use_with alsa) \
-		$(use_with cdda) \
-		$(use_with cddb) \
-		$(use_with ffmpeg lavc) \
-		$(use_with flac) \
-		$(use_with ifp) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with lame) \
-		$(use_with libsamplerate src) \
-		$(use_with lua) \
-		$(use_with mac) \
-		$(use_with modplug mod) \
-		$(use_with mp3 mpeg) \
-		$(use_with musepack mpc) \
-		$(use_with oss) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis vorbis) \
-		$(use_with vorbis vorbisenc) \
-		$(use_with wavpack)
-}
-
-src_install() {
-	default
-
-	newicon src/img/icon_64.png aqualung.png
-	make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.2-r3.ebuild
index 2390bf4b1184..f53ee4c90007 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.2-r3.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit autotools desktop lua-single xdg
 
 DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+HOMEPAGE="https://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
 SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
 BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
@@ -30,33 +32,53 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	cdda? ( dev-libs/libcdio-paranoia )
 	cddb? ( media-libs/libcddb )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
 	ifp? ( media-libs/libifp )
 	jack? ( virtual/jack )
 	ladspa? ( media-libs/liblrdf )
 	lame? ( media-sound/lame )
 	libsamplerate? ( media-libs/libsamplerate )
 	lua? ( ${LUA_DEPS} )
-	mac? ( media-sound/mac )
+	mac? ( >=media-sound/mac-10.24:= )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-libs/libmad )
 	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	speex? (
+		media-libs/speex
+		media-libs/liboggz
+		media-libs/libogg
+	)
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libogg
+	)
 	wavpack? ( media-sound/wavpack )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-ifp.patch"
-	"${FILESDIR}/${P}-var-collision.patch"
+	"${FILESDIR}/${PN}-1.1-configure-lua-version.patch"
+	"${FILESDIR}/${PN}-1.2-mac-configure.patch"
+	"${FILESDIR}/${PN}-1.2-mac-dec.patch"
+	"${FILESDIR}/${PN}-1.2-mac-endianness.patch"
+	"${FILESDIR}/${PN}-1.2-mac-glib.patch"
 )
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-rpath \
@@ -78,7 +100,7 @@ src_configure() {
 		$(use_with lame) \
 		$(use_with libsamplerate src) \
 		$(use_with lua) \
-		$(use_with mac) \
+		$(use_with mac MAC) \
 		$(use_with modplug mod) \
 		$(use_with mp3 mpeg) \
 		$(use_with musepack mpc) \
diff --git a/media-sound/aqualung/files/aqualung-1.0-ar.patch b/media-sound/aqualung/files/aqualung-1.0-ar.patch
deleted file mode 100644
index 3df4d75eaf1b..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ar.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur aqualung-1.0_orig/configure.ac aqualung-1.0/configure.ac
---- aqualung-1.0_orig/configure.ac	2020-08-05 20:00:50.758797358 +0200
-+++ aqualung-1.0/configure.ac	2020-08-05 20:01:33.198796503 +0200
-@@ -25,11 +25,12 @@
- 
- 
- # Checks for programs.
-+AC_USE_SYSTEM_EXTENSIONS
- AC_PROG_CC
- AC_PROG_RANLIB
- AC_PROG_CXX
- AM_PROG_CC_C_O
--AC_USE_SYSTEM_EXTENSIONS
-+AM_PROG_AR
- m4_ifndef([AM_GNU_GETTEXT],
-     [m4_fatal([GNU gettext is required to prepare the Aqualung build])])
- AM_GNU_GETTEXT([external])
diff --git a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
deleted file mode 100644
index 111ee70c8774..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
-From: Jamie Heilman <jamie@audible.transient.net>
-Date: Sun, 8 May 2016 19:34:36 +0000
-Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
-
-With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
-were deprecated; the new default AVCodecContext.get_buffer2()
-implementation works fine for us.
----
- src/decoder/dec_lavc.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
-index e2c81c6..5268a64 100644
---- a/src/decoder/dec_lavc.c
-+++ b/src/decoder/dec_lavc.c
-@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
- 		return DECODER_OPEN_BADLIB;
- 
- 	pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #if LIBAVCODEC_VERSION_MAJOR >= 53
- 	pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
- 	pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
- #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
- 
- 	pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
- 
diff --git a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
deleted file mode 100644
index 620bcb873d95..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From de448507343a86ee97949eb4be0092d1659092da Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sat, 18 Jul 2020 17:02:32 +0100
-Subject: [PATCH 1/2] Remove unused variable.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), but it's not used anyway.
----
- src/playlist.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/playlist.c b/src/playlist.c
-index 35483d1..96fac75 100644
---- a/src/playlist.c
-+++ b/src/playlist.c
-@@ -134,8 +134,6 @@ GtkWidget * plist__send_songs_to_iriver;
- GtkWidget * plist__export;
- #endif /* HAVE_TRANSCODING */
- 
--gchar command[RB_CONTROL_SIZE];
--
- GtkTreeIter * fileinfo_iter = NULL;
- 
- int playlist_dirty;
-
-From 7f5d1f266957b3fa73799d3edef6b19ff9716d02 Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sat, 18 Jul 2020 17:06:41 +0100
-Subject: [PATCH 2/2] Rename timeout_tag to ports_timeout_tag.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), because there's also a global timeout_tag in main.c.
-
-Also correct the type to guint rather than gint.
----
- src/ports.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ports.c b/src/ports.c
-index f17a5ab..f4de59d 100644
---- a/src/ports.c
-+++ b/src/ports.c
-@@ -63,7 +63,7 @@ GtkTreeViewColumn * column_out_R;
- int n_clients;
- GtkListStore * store_out_nb[MAX_JACK_CLIENTS];
- 
--gint timeout_tag;
-+guint ports_timeout_tag;
- 
- int out_selector = 0;
- 
-@@ -242,7 +242,7 @@ tree_out_L_selection_changed(GtkTreeSelection * selection, gpointer * data) {
- 			fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- 		}
- 		g_free(str);
--		timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
-+		ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
-         }
- }
- 
-@@ -262,7 +262,7 @@ tree_out_R_selection_changed(GtkTreeSelection *selection, gpointer * data) {
- 			fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- 		}
- 		g_free(str);
--		timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
-+		ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
-         }
- }
- 
diff --git a/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
new file mode 100644
index 000000000000..a88839728c53
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -401,24 +401,11 @@
+ ])
+ 
+ AQUALUNG_DETECT([lua], [Lua Extension],
+-    [PKG_CHECK_MODULES([lua], [lua5.2],
++    [PKG_CHECK_MODULES([lua], [lua],
+         [AQUALUNG_FOUND([lua])],
+-        [PKG_CHECK_MODULES([lua], [lua-5.2],
+-            [AQUALUNG_FOUND([lua])],
+-            [PKG_CHECK_MODULES([lua], [lua52],
+-                [AQUALUNG_FOUND([lua])],
+-                [PKG_CHECK_MODULES([lua], [lua5.1],
+-                    [AQUALUNG_FOUND([lua])],
+-                    [PKG_CHECK_MODULES([lua], [lua-5.1],
+-                        [AQUALUNG_FOUND([lua])],
+-                        [PKG_CHECK_MODULES([lua], [lua51],
+-                            [AQUALUNG_FOUND([lua])],
+-                            [PKG_CHECK_MODULES([lua], [lua >= 5.2],
+-                                [AQUALUNG_FOUND([lua])],
+-                                    [PKG_CHECK_MODULES([lua], [lua >= 5.1],
+-                                    [AQUALUNG_FOUND([lua])],
+-                                [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])])
+-
++        [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])]
++    )]
++)
+ 
+ # Compiler and linker variables.
+ AS_VAR_IF([GCC], [yes], [CFLAGS="-Wall $CFLAGS"])
diff --git a/media-sound/aqualung/files/aqualung-1.1-ifp.patch b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
deleted file mode 100644
index 490999be9485..000000000000
--- a/media-sound/aqualung/files/aqualung-1.1-ifp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Tue, 8 Sep 2020 15:55:12 +0100
-Subject: [PATCH] Fix arr_strlcpy call in ifp_device.
-
-directory_chooser needs to know the length of the target.
----
- src/ifp_device.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ifp_device.c b/src/ifp_device.c
-index 9ef5741..42236cb 100644
---- a/src/ifp_device.c
-+++ b/src/ifp_device.c
-@@ -824,7 +824,7 @@ gchar *npath;
- 
- 
- void
--directory_chooser(char * title, GtkWidget * parent, char * directory) {
-+directory_chooser(char * title, GtkWidget * parent, char * directory, size_t directory_len) {
- 
-         GtkWidget * dialog;
- 	const gchar * selected_directory;
-@@ -855,7 +855,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) {
- 			gtk_widget_destroy(dialog);
- 		}
- 
--                arr_strlcpy(directory, selected_directory);
-+                g_strlcpy(directory, selected_directory, directory_len);
- 		g_free(utf8);
-         }
- 
-@@ -865,7 +865,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) {
- 
- void
- local_path_selected_cb(GtkButton * button, gpointer data) {
--	directory_chooser(_("Please select a local path."), aifp_window, dest_dir);
-+	directory_chooser(_("Please select a local path."), aifp_window, dest_dir, sizeof dest_dir);
-         gtk_entry_set_text(GTK_ENTRY(local_path_entry), dest_dir);
- }
- 
diff --git a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch b/media-sound/aqualung/files/aqualung-1.1-var-collision.patch
deleted file mode 100644
index 2606a0bea00c..000000000000
--- a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e49f31ba779c938fa6dd3eaf848c68735e3386f5 Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sun, 10 Jan 2021 22:32:04 +0000
-Subject: [PATCH] Don't call a variable "bool".
-
-If one of the headers happens to #include <stdbool.h>, this'll clash
-with the C99 type definition.
----
- src/build_store.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/build_store.c b/src/build_store.c
-index 56b0eaf..ed4bfca 100644
---- a/src/build_store.c
-+++ b/src/build_store.c
-@@ -382,12 +382,12 @@ data_src_cell_toggled(GtkCellRendererToggle * cell, gchar * path, gpointer data)
- 	data_src_gui_t * gui = (data_src_gui_t *)data;
- 
- 	if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(gui->list), &iter, path)) {
--		gboolean bool;
-+		gboolean value;
- 		int type;
- 
--		gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &bool, 1, &type, -1);
-+		gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &value, 1, &type, -1);
- 		gtk_list_store_set(GTK_LIST_STORE(gui->list), &iter,
--				   0, !bool && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
-+				   0, !value && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
- 	}
- }
- 
diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch b/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch
new file mode 100644
index 000000000000..6418228158bf
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch
@@ -0,0 +1,48 @@
+diff -Naur aqualung-1.2_orig/configure.ac aqualung-1.2/configure.ac
+--- aqualung-1.2_orig/configure.ac	2023-08-13 18:12:52.281251038 +0200
++++ aqualung-1.2/configure.ac	2023-08-13 18:13:55.693247259 +0200
+@@ -275,11 +275,11 @@
+         [AQUALUNG_FOUND([lavc])],
+         [AQUALUNG_MISSING([lavc], [$lavc_PKG_ERRORS])])])
+ 
+-AQUALUNG_DETECT([mac], [Monkey's Audio Codec],
+-    [AC_CHECK_LIB([mac], [CreateIAPEDecompress],
+-        [AQUALUNG_FOUND([mac], [-lmac -lstdc++])],
+-        [AQUALUNG_MISSING([mac],
+-            [Monkey's Audio Codec support requires libmac])],
++AQUALUNG_DETECT([MAC], [Monkey's Audio Codec],
++    [AC_CHECK_LIB([MAC], [CreateIAPEDecompress],
++        [AQUALUNG_FOUND([MAC], [-lMAC -lstdc++])],
++        [AQUALUNG_MISSING([MAC],
++            [Monkey's Audio Codec support requires libMAC])],
+         [-lstdc++])])
+ 
+ AQUALUNG_DETECT([mod], [MOD Audio],
+diff -Naur aqualung-1.2_orig/src/decoder/dec_mac.cpp aqualung-1.2/src/decoder/dec_mac.cpp
+--- aqualung-1.2_orig/src/decoder/dec_mac.cpp	2023-08-13 18:20:40.318223141 +0200
++++ aqualung-1.2/src/decoder/dec_mac.cpp	2023-08-13 18:21:33.661219962 +0200
+@@ -31,9 +31,9 @@
+ #define DLLEXPORT
+ 
+ #include "../undef_ac_pkg.h"
+-#include <mac/All.h>
+-#include <mac/MACLib.h>
+-#include <mac/CharacterHelper.h>
++#include <MAC/All.h>
++#include <MAC/MACLib.h>
++#include <MAC/CharacterHelper.h>
+ #include "../undef_ac_pkg.h"
+ #include <config.h>	/* re-establish undefined autoconf macros */
+ 
+diff -Naur aqualung-1.2_orig/src/Makefile.am aqualung-1.2/src/Makefile.am
+--- aqualung-1.2_orig/src/Makefile.am	2023-08-14 00:51:00.972827161 +0200
++++ aqualung-1.2/src/Makefile.am	2023-08-14 00:51:10.563826590 +0200
+@@ -25,7 +25,7 @@
+ aqualung_LDADD = $(LDADD) $(xml_LIBS) $(gtk_LIBS) $(glib_LIBS) \
+                  $(alsa_LIBS) $(jack_LIBS) $(oss_LIBS) $(pulse_LIBS) \
+                  $(sndio_LIBS) $(winmm_LIBS) \
+-                 $(flac_LIBS) $(lame_LIBS) $(lavc_LIBS) $(mac_LIBS) \
++                 $(flac_LIBS) $(lame_LIBS) $(lavc_LIBS) $(MAC_LIBS) \
+                  $(mad_LIBS) $(mod_LIBS) $(mpc_LIBS) $(sndfile_LIBS) \
+                  $(speex_LIBS) $(vorbis_LIBS) $(vorbisenc_LIBS) \
+                  $(wavpack_LIBS) \
diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch b/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch
new file mode 100644
index 000000000000..a7fb369cb1c2
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch
@@ -0,0 +1,136 @@
+--- aqualung-1.2_orig/src/decoder/dec_mac.cpp	2023-08-13 19:40:59.245935911 +0200
++++ aqualung-1.2/src/decoder/dec_mac.cpp	2023-08-13 19:41:33.660933860 +0200
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <glib.h>
+ 
+ 
+ /* expand this to nothing so there's no error when including MACLib.h */
+@@ -60,16 +61,16 @@
+ 
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++        APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 
+-	int act_read = 0;
++	APE::int64 act_read = 0;
+ 	unsigned long scale = 1 << (pd->bits_per_sample - 1);
+ 	float fbuf[2 * BLOCKS_PER_READ];
+ 	int n = 0;
+ 
+ 	switch (pd->bits_per_sample) {
+ 	case 8:
+-		char data8[2 * BLOCKS_PER_READ];
++		unsigned char data8[2 * BLOCKS_PER_READ];
+ 		pdecompress->GetData(data8, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+@@ -84,7 +85,7 @@
+ 
+ 	case 16:
+ 		short data16[2 * BLOCKS_PER_READ];
+-		pdecompress->GetData((char *)data16, BLOCKS_PER_READ, &act_read);
++		pdecompress->GetData((unsigned char *)data16, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+ 		}
+@@ -100,7 +101,7 @@
+ 
+ 	case 32:
+ 		int data32[2 * BLOCKS_PER_READ];
+-		pdecompress->GetData((char *)data32, BLOCKS_PER_READ, &act_read);
++		pdecompress->GetData((unsigned char *)data32, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+ 		}
+@@ -170,31 +171,33 @@
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+ 	metadata_t * meta;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 	const char * comp_level = NULL;
+ 
+ 
+ 	int ret = 0;
+ #ifdef __OpenBSD__
+         wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+-#else
+-        wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
+-#endif
+         pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+         free(pUTF16);
++#else
++        gunichar2 * pUTF16 = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL);
++        pdecompress = CreateIAPEDecompress((wchar_t *)pUTF16, &ret, FALSE, FALSE, FALSE);
++        g_free(pUTF16);
++#endif
+ 
+         if (!pdecompress || ret != ERROR_SUCCESS) {
+                 return DECODER_OPEN_BADLIB;
+         }
+ 
+ 	pd->decompress = (void *)pdecompress;
+-        pd->sample_rate = pdecompress->GetInfo(APE_INFO_SAMPLE_RATE);
+-        pd->bits_per_sample = pdecompress->GetInfo(APE_INFO_BITS_PER_SAMPLE);
+-        pd->bitrate = pdecompress->GetInfo(APE_DECOMPRESS_AVERAGE_BITRATE);
+-        pd->channels = pdecompress->GetInfo(APE_INFO_CHANNELS);
+-        pd->length_in_ms = pdecompress->GetInfo(APE_DECOMPRESS_LENGTH_MS);
+-        pd->block_align = pdecompress->GetInfo(APE_INFO_BLOCK_ALIGN);
+-	pd->compression_level = pdecompress->GetInfo(APE_INFO_COMPRESSION_LEVEL);
++        pd->sample_rate = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_SAMPLE_RATE);
++        pd->bits_per_sample = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_BITS_PER_SAMPLE);
++        pd->bitrate = pdecompress->GetInfo(APE::IAPEDecompress::APE_DECOMPRESS_AVERAGE_BITRATE);
++        pd->channels = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_CHANNELS);
++        pd->length_in_ms = pdecompress->GetInfo(APE::IAPEDecompress::APE_DECOMPRESS_LENGTH_MS);
++        pd->block_align = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_BLOCK_ALIGN);
++	pd->compression_level = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_COMPRESSION_LEVEL);
+ 
+ 	if ((pd->channels != 1) && (pd->channels != 2)) {
+ 		printf("Sorry, MAC file with %d channels is not supported.\n", pd->channels);
+@@ -218,19 +221,19 @@
+ 	fdec->file_lib = MAC_LIB;
+ 
+ 	switch (pd->compression_level) {
+-	case COMPRESSION_LEVEL_FAST:
++	case APE_COMPRESSION_LEVEL_FAST:
+ 		comp_level = _("Compression: Fast");
+ 		break;
+-	case COMPRESSION_LEVEL_NORMAL:
++	case APE_COMPRESSION_LEVEL_NORMAL:
+ 		comp_level = _("Compression: Normal");
+ 		break;
+-	case COMPRESSION_LEVEL_HIGH:
++	case APE_COMPRESSION_LEVEL_HIGH:
+ 		comp_level = _("Compression: High");
+ 		break;
+-	case COMPRESSION_LEVEL_EXTRA_HIGH:
++	case APE_COMPRESSION_LEVEL_EXTRA_HIGH:
+ 		comp_level = _("Compression: Extra High");
+ 		break;
+-	case COMPRESSION_LEVEL_INSANE:
++	case APE_COMPRESSION_LEVEL_INSANE:
+ 		comp_level = _("Compression: Insane");
+ 		break;
+ 	default:
+@@ -255,7 +258,7 @@
+ mac_decoder_close(decoder_t * dec) {
+ 
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 
+ 	delete(pdecompress);
+ 	rb_free(pd->rb);
+@@ -294,7 +297,7 @@
+ 	
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 	char flush_dest;
+ 
+ 	pdecompress->Seek(seek_to_pos);
diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch b/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch
new file mode 100644
index 000000000000..3296bd67ad7e
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch
@@ -0,0 +1,73 @@
+From d2c88317b6042a05c236faf3c09f600337c6379e Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Tue, 5 Sep 2023 17:48:00 +0100
+Subject: [PATCH] Fix the Monkey's Audio decoder to work with current Monkey's
+ Audio (Fixes #33)
+
+Using g_utf8_to_utf16 doesn't work because current Monkey's Audio
+expects a different endianness of the multibyte character string.
+Using GetUTF16FromANSI works for compiling only if namedspaced
+correctly, and if namespaced correctly, it cannot link. Use a
+similar approach for building the correct multibyte string.
+
+Remove the DLLEXPORT define, to avoid a warning when including
+the MAC headers.
+
+Tested using the Monkey's Audio 10.20 SDK.
+---
+ src/decoder/dec_mac.cpp | 25 ++++++++++---------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index b007f74..6d4b658 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -27,14 +27,9 @@
+ #include <glib.h>
+ 
+ 
+-/* expand this to nothing so there's no error when including MACLib.h */
+-/* -- talkin' about cross-platform libraries? */
+-#define DLLEXPORT
+-
+ #include "../undef_ac_pkg.h"
+ #include <MAC/All.h>
+ #include <MAC/MACLib.h>
+-#include <MAC/CharacterHelper.h>
+ #include "../undef_ac_pkg.h"
+ #include <config.h>	/* re-establish undefined autoconf macros */
+ 
+@@ -48,7 +43,6 @@
+ 
+ extern size_t sample_size;
+ 
+-
+ #define BLOCKS_PER_READ 2048
+ 
+ 
+@@ -176,15 +170,16 @@ mac_decoder_open(decoder_t * dec, char * filename) {
+ 
+ 
+ 	int ret = 0;
+-#ifdef __OpenBSD__
+-        wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+-        pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+-        free(pUTF16);
+-#else
+-        gunichar2 * pUTF16 = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL);
+-        pdecompress = CreateIAPEDecompress((wchar_t *)pUTF16, &ret, FALSE, FALSE, FALSE);
+-        g_free(pUTF16);
+-#endif
++        int filename_len = strlen(filename);
++        int i;
++        APE::str_utfn * filename_utf16 = new APE::str_utfn [static_cast<size_t>(filename_len) + 1];
++
++        for (i = 0; i < filename_len; i++)
++            filename_utf16[i] = (APE::str_utfn)(APE::str_utf8)filename[i];
++        filename_utf16[i] = 0;
++
++        pdecompress = CreateIAPEDecompress(filename_utf16, &ret, FALSE, FALSE, FALSE);
++        delete [] filename_utf16;
+ 
+         if (!pdecompress || ret != ERROR_SUCCESS) {
+                 return DECODER_OPEN_BADLIB;
diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch b/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch
new file mode 100644
index 000000000000..59aee6432581
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch
@@ -0,0 +1,22 @@
+From 1c2a295a72e1e3abc6df40714d9753e311541550 Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Wed, 6 Sep 2023 09:02:31 +0100
+Subject: [PATCH] Remove now unnecessary glib include in mac decoder
+
+Pointed out by Daniel Pielmeier.
+---
+ src/decoder/dec_mac.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index 6d4b658..f89450d 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -24,7 +24,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <glib.h>
+ 
+ 
+ #include "../undef_ac_pkg.h"
diff --git a/media-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
index 66cfd45a7245..f18ef31c66c0 100644
--- a/media-sound/aqualung/metadata.xml
+++ b/media-sound/aqualung/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>billie@gentoo.org</email>
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index f555e57cd9b4..497da85e1998 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1 @@
-DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
+DIST Ardour-8.6.0.tar.bz2 17588463 BLAKE2B e8d3b603fecaf453eae9e0c2cac531a5c2d35850b282d27c25dbd22a930a6537fbbff3f1fa58f4dcc525dcc65ef8343172642d16ad473c8b80b0e373364a06cb SHA512 c4a3b6369fe1a1789ba2b5cbcfd23b6ac6b93f819b016aac2c071f1135e32826ca4f5bb99d4c3e4e1d8f91f82719ae17bcf2991eb29072c14e60f282545f934a
diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-8.6.ebuild
index bb8049a79cb9..365ac6ace241 100644
--- a/media-sound/ardour/ardour-6.5-r1.ebuild
+++ b/media-sound/ardour/ardour-8.6.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils xdg
+PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
+inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
@@ -14,30 +15,26 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
-SLOT="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+SLOT="8"
+IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
-	dev-cpp/glibmm
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/libsigc++:2
 	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
 	media-libs/aubio
-	media-libs/flac
+	media-libs/flac:=
 	media-libs/freetype:2
-	media-libs/libart_lgpl
 	media-libs/liblo
 	media-libs/liblrdf
 	media-libs/libsamplerate
@@ -47,6 +44,7 @@ RDEPEND="
 	media-libs/rubberband
 	media-libs/taglib
 	media-libs/vamp-plugin-sdk
+	net-libs/libwebsockets
 	net-misc/curl
 	sys-libs/readline:0=
 	sci-libs/fftw:3.0[threads]
@@ -55,11 +53,11 @@ RDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil
+	media-libs/suil[X,gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
@@ -68,9 +66,14 @@ DEPEND="${RDEPEND}
 	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
+	doc? ( app-text/doxygen[dot] )
 	jack? ( virtual/jack )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.patch"
+	"${FILESDIR}/${PN}-6.8-boost-1.85.patch"
+)
+
 pkg_pretend() {
 	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
 		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
@@ -85,9 +88,11 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	xdg_src_prepare
 
+	# delete optimization flags
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+
+	# handle arch
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
 	if use cpu_flags_x86_sse; then
@@ -99,7 +104,7 @@ src_prepare() {
 	fi
 	if use cpu_flags_x86_mmx; then
 		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
+			elog "You enabled mmx with i486 set as march! You have been warned!"
 		fi
 		OPTFLAGS="${OPTFLAGS} mmx"
 	fi
@@ -109,33 +114,46 @@ src_prepare() {
 	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
 		-i "${S}"/wscript || die
 	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+
+	# boost and shebang
 	append-flags "-lboost_system"
 	python_fix_shebang "${S}"/wscript
 	python_fix_shebang "${S}"/waf
+
+	# handle locales
 	my_lcmsg() {
 		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
 	}
-	l10n_for_each_disabled_locale_do my_lcmsg
+	plocale_for_each_disabled_locale my_lcmsg
 }
 
 src_configure() {
-	local backends="alsa"
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
+	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
 
 	tc-export CC CXX
-	mkdir -p "${D}"
 	local myconf=(
 		--configdir=/etc
 		--freedesktop
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
+			echo '' || echo "--no-fpu-optimization")
 		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
+		$(usex nls '' "--no-nls")
+		$(usex phonehome '' "--no-phone-home")
 		# not possible right now  --use-external-libs
+		# missing dependency: https://github.com/c4dm/qm-dsp
 	)
 
 	waf-utils_src_configure "${myconf[@]}"
@@ -158,6 +176,9 @@ src_install() {
 		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
 	done
 
+	# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
+	find "${D}/usr/share/icons/" -name ardour6.png -delete
+
 	sed -i \
 		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
 		-e 's/;AudioEditing;/;X-AudioEditing;/' \
@@ -166,9 +187,7 @@ src_install() {
 
 	insinto /usr/share/mime/packages
 	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
-	insinto /usr/share/metainfo
-	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
+	rm "${D}/usr/share/mime/packages/ardour.xml" || die
 }
 
 pkg_postinst() {
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 225b16116073..ffe4801efe13 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils xdg
+PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
+inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
@@ -14,30 +15,26 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
-SLOT="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+SLOT="8"
+IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
-	dev-cpp/glibmm
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/libsigc++:2
 	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
 	media-libs/aubio
-	media-libs/flac
+	media-libs/flac:=
 	media-libs/freetype:2
-	media-libs/libart_lgpl
 	media-libs/liblo
 	media-libs/liblrdf
 	media-libs/libsamplerate
@@ -47,6 +44,7 @@ RDEPEND="
 	media-libs/rubberband
 	media-libs/taglib
 	media-libs/vamp-plugin-sdk
+	net-libs/libwebsockets
 	net-misc/curl
 	sys-libs/readline:0=
 	sci-libs/fftw:3.0[threads]
@@ -55,11 +53,11 @@ RDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil
+	media-libs/suil[X,gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
@@ -68,9 +66,14 @@ DEPEND="${RDEPEND}
 	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
+	doc? ( app-text/doxygen[dot] )
 	jack? ( virtual/jack )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.patch"
+	"${FILESDIR}/${PN}-6.8-boost-1.85.patch"
+)
+
 pkg_pretend() {
 	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
 		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
@@ -85,9 +88,11 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	xdg_src_prepare
 
+	# delete optimization flags
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+
+	# handle arch
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
 	if use cpu_flags_x86_sse; then
@@ -99,7 +104,7 @@ src_prepare() {
 	fi
 	if use cpu_flags_x86_mmx; then
 		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
+			elog "You enabled mmx with i486 set as march! You have been warned!"
 		fi
 		OPTFLAGS="${OPTFLAGS} mmx"
 	fi
@@ -109,33 +114,46 @@ src_prepare() {
 	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
 		-i "${S}"/wscript || die
 	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+
+	# boost and shebang
 	append-flags "-lboost_system"
 	python_fix_shebang "${S}"/wscript
 	python_fix_shebang "${S}"/waf
+
+	# handle locales
 	my_lcmsg() {
 		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
 	}
-	l10n_for_each_disabled_locale_do my_lcmsg
+	plocale_for_each_disabled_locale my_lcmsg
 }
 
 src_configure() {
-	local backends="alsa"
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
+	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
 
 	tc-export CC CXX
-	mkdir -p "${D}"
 	local myconf=(
 		--configdir=/etc
 		--freedesktop
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
+			echo '' || echo "--no-fpu-optimization")
 		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
+		$(usex nls '' "--no-nls")
+		$(usex phonehome '' "--no-phone-home")
 		# not possible right now  --use-external-libs
+		# missing dependency: https://github.com/c4dm/qm-dsp
 	)
 
 	waf-utils_src_configure "${myconf[@]}"
@@ -158,6 +176,9 @@ src_install() {
 		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
 	done
 
+	# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
+	find "${D}/usr/share/icons/" -name ardour6.png -delete
+
 	sed -i \
 		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
 		-e 's/;AudioEditing;/;X-AudioEditing;/' \
@@ -166,9 +187,7 @@ src_install() {
 
 	insinto /usr/share/mime/packages
 	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
-	insinto /usr/share/metainfo
-	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
+	rm "${D}/usr/share/mime/packages/ardour.xml" || die
 }
 
 pkg_postinst() {
diff --git a/media-sound/ardour/files/ardour-6.8-boost-1.85.patch b/media-sound/ardour/files/ardour-6.8-boost-1.85.patch
new file mode 100644
index 000000000000..ffa8a6b092b6
--- /dev/null
+++ b/media-sound/ardour/files/ardour-6.8-boost-1.85.patch
@@ -0,0 +1,19 @@
+--- Ardour-8.6.0.orig/libs/surfaces/websockets/message.cc
++++ Ardour-8.6.0/libs/surfaces/websockets/message.cc
+@@ -58,14 +58,14 @@ NodeStateMessage::NodeStateMessage (void
+ 
+ 		_state = NodeState (root.get<std::string> ("node"));
+ 
+-		pt::ptree addr = root.get_child ("addr", pt::ptree ());
++		pt::ptree addr = root.get_child ("addr");
+ 
+ 		for (pt::ptree::iterator it = addr.begin (); it != addr.end (); ++it) {
+ 			// throws if datatype not uint32_t
+ 			_state.add_addr (boost::lexical_cast<uint32_t> (it->second.data ()));
+ 		}
+ 
+-		pt::ptree val = root.get_child ("val", pt::ptree ());
++		pt::ptree val = root.get_child ("val");
+ 
+ 		for (pt::ptree::iterator it = val.begin (); it != val.end (); ++it) {
+ 			std::string val = it->second.data ();
diff --git a/media-sound/ardour/files/ardour-6.8-metadata.patch b/media-sound/ardour/files/ardour-6.8-metadata.patch
new file mode 100644
index 000000000000..ea540b34df5f
--- /dev/null
+++ b/media-sound/ardour/files/ardour-6.8-metadata.patch
@@ -0,0 +1,11 @@
+--- a/gtk2_ardour/wscript
++++ b/gtk2_ardour/wscript
+@@ -943,7 +943,7 @@ def build(bld):
+         obj.chmod        = Utils.O644
+         obj.dict         = freedesktop_subst_dict
+         set_subst_dict(obj, freedesktop_subst_dict)
+-        bld.install_files (os.path.join (bld.env['PREFIX'], 'share/appdata'), obj.target)
++        bld.install_files (os.path.join (bld.env['PREFIX'], 'share/metadata'), obj.target)
+ 
+         # install desktop icon files
+         bld.install_as('${PREFIX}/share/icons/hicolor/16x16/apps/ardour6.png', 'resources/Ardour-icon_16px.png')
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
index 1f9044f06bed..e390d726702d 100644
--- a/media-sound/ardour/metadata.xml
+++ b/media-sound/ardour/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>proaudio@gentoo.org</email>
diff --git a/media-sound/ario/ario-1.6.ebuild b/media-sound/ario/ario-1.6.ebuild
index c67e1c768eb8..146a08529efc 100644
--- a/media-sound/ario/ario-1.6.ebuild
+++ b/media-sound/ario/ario-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit xdg-utils
 
 DESCRIPTION="GTK client for MPD inspired by Rhythmbox but much lighter and faster"
 HOMEPAGE="http://ario-player.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}-player/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
index 948969c65670..e634a6d419c0 100644
--- a/media-sound/ario/metadata.xml
+++ b/media-sound/ario/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mail@evilscientress.at</email>
 		<name>Jenny Danzmayr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/aseqview/aseqview-0.2.8.ebuild b/media-sound/aseqview/aseqview-0.2.8-r2.ebuild
index 202bcc67d40d..c4eb2a760776 100644
--- a/media-sound/aseqview/aseqview-0.2.8.ebuild
+++ b/media-sound/aseqview/aseqview-0.2.8-r2.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="ALSA sequencer event viewer/filter"
-HOMEPAGE="https://www.alsa-project.org/~iwai/alsa.html"
+HOMEPAGE="https://github.com/tiwai/aseqview"
 SRC_URI="https://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
 
-RDEPEND=">=media-libs/alsa-lib-0.9.0
-	x11-libs/gtk+:2
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	media-libs/alsa-lib
+	net-libs/libpcap
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
 
 src_configure() {
 	econf --disable-alsatest --disable-gtktest --enable-gtk2
diff --git a/media-sound/aseqview/files/aseqview-0.2.8-clang16.patch b/media-sound/aseqview/files/aseqview-0.2.8-clang16.patch
new file mode 100644
index 000000000000..2b73093a09c6
--- /dev/null
+++ b/media-sound/aseqview/files/aseqview-0.2.8-clang16.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/870436
+--- a/portlib.c
++++ b/portlib.c
+@@ -22,2 +22,3 @@
+ #include <string.h>
++#include <pthread.h>
+ #include "portlib.h"
diff --git a/media-sound/aseqview/metadata.xml b/media-sound/aseqview/metadata.xml
index c870d0eef0ab..66798d5c89e2 100644
--- a/media-sound/aseqview/metadata.xml
+++ b/media-sound/aseqview/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">tiwai/aseqview</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 450d6f6a0f01..8ae1afc3bce7 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,3 +1 @@
-DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
-DIST asunder-2.9.5.tar.bz2 273141 BLAKE2B 895f067bb867d5e82350cdb334551fcf2f408a0ceeaf02a453262661434b05813e184a325e6b27cdb3d3e47486e1395b539e07c4304eb5ec0940eff48649f96b SHA512 40e27877c8fa17465b13a7fa08df6f94dbcb893bd6d8d46a389ca18bce4f574e04e894f9ca19f52bc22e7d1ec0db67a79f236ae4037be459bc24fe95739771dc
-DIST asunder-2.9.6.tar.bz2 283568 BLAKE2B 320fe6984f23dd3998c29eea88d7adbb9f8201c5cb16b706fa272cd7c9dc97c3129c8a6357b61e9e0d6d3b60f130f5fe1664e7acab6fbe624fd2f90b44c18247 SHA512 336514c964c2b46bf93aea050d771b6954c0761c4d9ebd63627a97945ac0c6eb8389e49abb5b42fffe8c646adc281785c7fc3b937b8dbd97e65d6b5834477633
+DIST asunder-3.0.1.tar.bz2 301493 BLAKE2B 3333a76512d8ce61d81b7b24d2b9d5682651f1feea43411bc86a45b486aab0283339f81db13579108bd815cd615d446abe8ca88ca84637b1b9f0aa941056d849 SHA512 07b4caa80c35b39f407952276237787561100e1f546637b64119741f75385afe8db43a991cce364fb152ed5d20b9a9ac99a972b6cbb9616073dada2e2d048b74
diff --git a/media-sound/asunder/asunder-2.9.5.ebuild b/media-sound/asunder/asunder-2.9.5.ebuild
deleted file mode 100644
index df537f03bf42..000000000000
--- a/media-sound/asunder/asunder-2.9.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Graphical Audio CD ripper and encoder with support for many output formats"
-HOMEPAGE="http://littlesvr.ca/asunder/"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="flac mac mp3 musepack opus vorbis wavpack"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-DEPEND=">=media-libs/libcddb-0.9.5
-	media-sound/cdparanoia
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
-	mp3? ( media-sound/lame )
-	musepack? ( media-sound/musepack-tools )
-	opus? ( media-sound/opus-tools )
-	vorbis? ( media-sound/vorbis-tools )
-	wavpack? ( media-sound/wavpack )"
-
-src_prepare() {
-	default
-	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
-}
diff --git a/media-sound/asunder/asunder-2.9.6.ebuild b/media-sound/asunder/asunder-2.9.6.ebuild
deleted file mode 100644
index 011da5958768..000000000000
--- a/media-sound/asunder/asunder-2.9.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Graphical Audio CD ripper and encoder with support for many output formats"
-HOMEPAGE="http://littlesvr.ca/asunder/"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="flac mac mp3 musepack opus vorbis wavpack"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-DEPEND=">=media-libs/libcddb-0.9.5
-	media-sound/cdparanoia
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
-	mp3? ( media-sound/lame )
-	musepack? ( media-sound/musepack-tools )
-	opus? ( media-sound/opus-tools )
-	vorbis? ( media-sound/vorbis-tools )
-	wavpack? ( media-sound/wavpack )"
-
-src_prepare() {
-	default
-	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
-}
diff --git a/media-sound/asunder/asunder-2.9.3-r1.ebuild b/media-sound/asunder/asunder-3.0.1-r1.ebuild
index 971ae6837692..c1428808eb27 100644
--- a/media-sound/asunder/asunder-2.9.3-r1.ebuild
+++ b/media-sound/asunder/asunder-3.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg
 
@@ -18,18 +18,21 @@ BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
-DEPEND=">=media-libs/libcddb-0.9.5
+DEPEND="media-libs/libcddb
 	media-sound/cdparanoia
 	x11-libs/gtk+:2"
+# dlopen() deps
 RDEPEND="${DEPEND}
 	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
+	mac? ( <=media-sound/mac-4.12 )
 	mp3? ( media-sound/lame )
 	musepack? ( media-sound/musepack-tools )
 	opus? ( media-sound/opus-tools )
 	vorbis? ( media-sound/vorbis-tools )
 	wavpack? ( media-sound/wavpack )"
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-fix-tests.patch" )
+
 src_prepare() {
 	default
 	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
diff --git a/media-sound/asunder/files/asunder-3.0.1-fix-tests.patch b/media-sound/asunder/files/asunder-3.0.1-fix-tests.patch
new file mode 100644
index 000000000000..d5be02045bdd
--- /dev/null
+++ b/media-sound/asunder/files/asunder-3.0.1-fix-tests.patch
@@ -0,0 +1,11 @@
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -6,5 +6,6 @@ src/interface.c
+ src/prefs.c
+ src/support.c
+ src/threads.c
++src/upload.c
+ src/util.c
+-src/wrappers.c
+\ No newline at end of file
++src/wrappers.c
diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
index 243034768d61..7c1c1069607f 100644
--- a/media-sound/asunder/metadata.xml
+++ b/media-sound/asunder/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/aucatctl/Manifest b/media-sound/aucatctl/Manifest
new file mode 100644
index 000000000000..1a21d2e345fa
--- /dev/null
+++ b/media-sound/aucatctl/Manifest
@@ -0,0 +1 @@
+DIST aucatctl-0.1.tar.gz 4364 BLAKE2B b0ac47bdf03de82599d4ca1403d8937b70e9f10b18d3d37bc0ab022eebc31d7643943b7c4c8fef058cc9b09fcc95b24fb6373503a6ddced33a3f8c2253c30b95 SHA512 35ca3a3aec94fb0ed439925ac52d190ad0eebd4cfb124d5ad329d1d94c021c38b75bd4d4859c74756c861c0a82c5d22777ed0dccc950bc37c3156d6ca28a33df
diff --git a/media-sound/aucatctl/aucatctl-0.1.ebuild b/media-sound/aucatctl/aucatctl-0.1.ebuild
new file mode 100644
index 000000000000..a04a482f9d15
--- /dev/null
+++ b/media-sound/aucatctl/aucatctl-0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tool for controlling aucat and/or sndiod volume through MIDI"
+HOMEPAGE="http://www.sndio.org/"
+SRC_URI="http://www.sndio.org/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/libbsd
+	media-sound/sndio:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's?/usr/local?/usr?g' \
+		-e 's?man/man1?share/man/man1?g' \
+		-e 's?LDADD = -lsndio?LDADD = -lbsd -lsndio?' \
+		Makefile || die "Failed modifying Makefile"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/media-sound/aucatctl/metadata.xml b/media-sound/aucatctl/metadata.xml
new file mode 100644
index 000000000000..bf5592871976
--- /dev/null
+++ b/media-sound/aucatctl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/aucdtect/metadata.xml b/media-sound/aucdtect/metadata.xml
index 39626a990be5..cd1cfc033621 100644
--- a/media-sound/aucdtect/metadata.xml
+++ b/media-sound/aucdtect/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index b73a9242f3d7..d853f7ccc371 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,2 @@
-DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
-DIST audacious-4.0.5.tar.bz2 577422 BLAKE2B a65810baf0f733327a3e37e6efd2af3d35245b1e99936a4cd39d8068e0df06779ab3c08e839e4b3586f70bec2d16a605c62328f863f747247181851ac7c151c2 SHA512 4be7ebeee937f9b29931a28e1d80782b9df8beec70eab3917f5adccd0bf02aa6003a5b8361359b792edac2d2f31a257b853db43d59dd0674e5a3fbec7e7c1e46
+DIST audacious-4.3.1.tar.bz2 630820 BLAKE2B e8885d25cce4a480ac58c5ee1874a530f4b169f264eaafb13830be17ce7e25933a2fb491ed0b86220fdb2e916ea5d7b13bca8a5ac00695ffd06e1ad8b2a6ff67 SHA512 7662a1b136c6ced346ce160a3a6b71ea5941644860466e23248a44168179118202006e8892a5bbd1f6d77730846a4644b6cb4e008af38e1117588b9f4d1521f5
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
diff --git a/media-sound/audacious/audacious-3.10.1-r1.ebuild b/media-sound/audacious/audacious-3.10.1-r1.ebuild
deleted file mode 100644
index 14d88ac879a1..000000000000
--- a/media-sound/audacious/audacious-3.10.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	>=x11-libs/cairo-1.2.6
-	x11-libs/gtk+:2
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--disable-valgrind \
-		--enable-dbus \
-		--enable-gtk \
-		--disable-qt \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins -r "${WORKDIR}"/gentoo_ice/.
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-4.0.5.ebuild b/media-sound/audacious/audacious-4.3.1.ebuild
index 98cdf80db1ab..591c2b60ab94 100644
--- a/media-sound/audacious/audacious-4.0.5.ebuild
+++ b/media-sound/audacious/audacious-4.3.1.ebuild
@@ -1,23 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P="${P/_/-}"
 
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
 inherit xdg
 
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
+KEYWORDS="amd64 ~riscv x86"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="nls"
@@ -27,13 +22,10 @@ BDEPEND="
 	nls? ( dev-util/intltool )
 "
 DEPEND="
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
+	dev-libs/glib:2
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
 "
 RDEPEND="${DEPEND}"
@@ -41,17 +33,15 @@ PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	default
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-enum-backporting.patch
+)
 
 src_prepare() {
 	default
 	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # bug #512698
 	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
deleted file mode 100644
index 13924b39fcb0..000000000000
--- a/media-sound/audacious/audacious-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	local myeconfargs=(
-		--disable-valgrind
-		--disable-gtk
-		--enable-dbus
-		--enable-qt
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins -r "${WORKDIR}"/gentoo_ice/.
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/files/audacious-enum-backporting.patch b/media-sound/audacious/files/audacious-enum-backporting.patch
new file mode 100644
index 000000000000..66bb959f737e
--- /dev/null
+++ b/media-sound/audacious/files/audacious-enum-backporting.patch
@@ -0,0 +1,35 @@
+From 3989bafcb7a8843cef4e25875cd6c0e72680ad80 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Wed, 28 Jun 2023 15:42:37 +0200
+Subject: [PATCH] Add missing enum value.
+
+New versions of the clang compiler have strict checks for enum values.
+
+The value "-1" is returned as a last resort from to_vfs_seek_type() as a VFSSeekType.
+
+Replace usage of `-1` with the new enum name.
+---
+ src/libaudcore/vfs.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/libaudcore/vfs.h b/src/libaudcore/vfs.h
+index 33c5a65c97..f6a1dd3f23 100644
+--- a/src/libaudcore/vfs.h
++++ b/src/libaudcore/vfs.h
+@@ -51,6 +51,7 @@ enum VFSReadOptions
+ 
+ enum VFSSeekType
+ {
++    VFS_SEEK_INVALID = -1,
+     VFS_SEEK_SET = 0,
+     VFS_SEEK_CUR = 1,
+     VFS_SEEK_END = 2
+@@ -75,7 +76,7 @@ constexpr VFSSeekType to_vfs_seek_type(int whence)
+                ? VFS_SEEK_SET
+                : (whence == SEEK_CUR)
+                      ? VFS_SEEK_CUR
+-                     : (whence == SEEK_END) ? VFS_SEEK_END : (VFSSeekType)-1;
++                     : (whence == SEEK_END) ? VFS_SEEK_END : VFS_SEEK_INVALID;
+ }
+ 
+ #endif // WANT_VFS_STDIO_COMPAT
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 30869dd2bbde..93423219a5bc 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>asturm@gentoo.org</email>
-		<name>Andreas Sturmlechner</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 9c6a1401ae13..28fe9c10d805 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,2 +1,5 @@
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
+DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
+DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
+DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r3.ebuild
index 4c5130a8044f..1abe82ab11b8 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake flag-o-matic wxwidgets xdg
 MY_P="Audacity-${PV}"
 DOC_PV="${PV}"
 DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/"
+HOMEPAGE="https://www.audacityteam.org/"
 # wget doesn't seem to work on FossHub links, so we mirror
 SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
 	doc? ( https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
 	portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 
@@ -25,15 +25,15 @@ RESTRICT="test"
 
 RDEPEND="dev-libs/expat
 	media-libs/libsndfile
-	media-libs/libsoundtouch
+	media-libs/libsoundtouch:=
 	media-libs/portaudio[alsa?]
 	media-libs/soxr
 	>=media-sound/lame-3.100-r3
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	alsa? ( media-libs/alsa-lib )
 	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac[cxx] )
-	id3tag? ( media-libs/libid3tag )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	lv2? (
 		dev-libs/serd
@@ -95,7 +95,7 @@ src_configure() {
 		-Daudacity_use_pa_alsa=$(usex alsa)
 		-Daudacity_use_pa_jack=$(usex jack linked off)
 		-Daudacity_use_pa_oss=$(usex oss)
-		#-Daudacity_use_pch leaving it to the default behavior
+		-Daudacity_use_pch=OFF
 		-Daudacity_use_portaudio=local # only 'local' option is present
 		-Daudacity_use_portmixer=$(usex portmixer local off)
 		-Daudacity_use_portsmf=$(usex portsmf local off)
diff --git a/media-sound/audacity/audacity-2.4.2-r4.ebuild b/media-sound/audacity/audacity-2.4.2-r4.ebuild
new file mode 100644
index 000000000000..b29bbbcdba5e
--- /dev/null
+++ b/media-sound/audacity/audacity-2.4.2-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/"
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+	doc? ( https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
+	portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/portaudio[alsa?]
+	media-libs/soxr
+	>=media-sound/lame-3.100-r3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( <media-video/ffmpeg-5:= )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		>=media-libs/lilv-0.24.6-r2
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mad? ( >=media-libs/libmad-0.15.1b )
+	ogg? ( media-libs/libogg )
+	portmidi? ( media-libs/portmidi )
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="app-arch/unzip
+	|| ( dev-lang/nasm dev-lang/yasm )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="portmidi? ( portsmf )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+	"${FILESDIR}/${P}-fix-vertical-track-resizing.patch"
+	"${FILESDIR}/${P}-fix-gettimeofday.patch"
+	"${FILESDIR}/${P}-fix-metainfo.patch"
+	"${FILESDIR}/${P}-add-missing-include-limits.patch"
+	"${FILESDIR}/${P}-add-missing-include-portaudio.patch"
+	"${FILESDIR}/${P}-disable-ccache.patch"
+	"${FILESDIR}/${P}-fix-libflac-undefined-references.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	setup-wxwidgets
+	append-cxxflags -std=gnu++14
+
+	# * always use system libraries if possible
+	# * options listed in the order that cmake-gui lists them
+	local mycmakeargs=(
+#		--disable-dynamic-loading
+		-Daudacity_lib_preference=system
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_flac=$(usex flac system off)
+		-Daudacity_use_id3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_mad=$(usex mad system off)
+		-Daudacity_use_midi=$(usex portmidi system off)
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_ogg=$(usex ogg system off)
+		-Daudacity_use_pa_alsa=$(usex alsa)
+		-Daudacity_use_pa_jack=$(usex jack linked off)
+		-Daudacity_use_pa_oss=$(usex oss)
+		-Daudacity_use_pch=OFF
+		-Daudacity_use_portaudio=local # only 'local' option is present
+		-Daudacity_use_portmixer=$(usex portmixer local off)
+		-Daudacity_use_portsmf=$(usex portsmf local off)
+		-Daudacity_use_sbsms=$(usex sbsms local off) # no 'system' option in configuration?
+		-Daudacity_use_sndfile=system
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_vorbis=$(usex vorbis system off)
+		-Daudacity_use_vst=$(usex vst)
+		-Daudacity_use_wxwidgets=system
+	)
+
+	cmake_src_configure
+
+	# if git is not installed, this (empty) file is not being created and the compilation fails
+	# so we create it manually
+	touch "${BUILD_DIR}/src/private/RevisionIdent.h" || die "failed to create file"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove bad doc install
+	rm -r "${ED}"/usr/share/doc || die
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
+		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+	fi
+}
diff --git a/media-sound/audacity/audacity-3.3.3-r1.ebuild b/media-sound/audacity/audacity-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..82c770a5849d
--- /dev/null
+++ b/media-sound/audacity/audacity-3.3.3-r1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg virtualx
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/"
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	MY_P="Audacity-${PV}"
+	S="${WORKDIR}/${PN}-${MY_P}"
+	SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz"
+fi
+
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+	GPL-3
+	audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 +ogg
+	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+REQUIRED_USE="
+	mad? ( !mpg123 )
+	opus? ( ogg )
+	vorbis? ( ogg )
+"
+RESTRICT="!test? ( test )"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably not
+#   in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+#   This one has the interesting property of many versions being
+#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
+#   Current support grid:
+#   - Lavf - 5[789]
+#   - Lavc - 5[789]
+#   - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/glib:2
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/portaudio[alsa?]
+	media-libs/portmidi
+	media-libs/portsmf:=
+	media-libs/soxr
+	media-sound/lame
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	sys-apps/util-linux
+	alsa? ( media-libs/alsa-lib )
+	audiocom? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mad? ( media-libs/libmad )
+	mpg123? ( media-sound/mpg123-base )
+	ogg? ( media-libs/libogg )
+	opus? ( media-libs/opus )
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	audiocom? ( dev-libs/rapidjson )
+	x11-base/xorg-proto
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="app-arch/unzip
+	|| ( dev-lang/nasm dev-lang/yasm )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Equivalent to previous versions
+	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+	# From Debian
+	"${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+
+	# Disables some header-based detection
+	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+
+	# For has_networking
+	"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+	"${FILESDIR}/${PN}-3.3.3-upstream-fix-rapidjson.patch"
+
+	# Add Findlibmad.cmake
+	"${FILESDIR}/${PN}-3.3.3-Findlibmad.patch"
+
+	# Fix includes
+	"${FILESDIR}/${PN}-3.3.3-fix-includes.patch"
+
+	# gettext 0.22
+	"${FILESDIR}/${PN}-3.3.3-gettext-0.22.patch"
+
+	# Allows running tests without conan
+	"${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
+
+	# #920363
+	"${FILESDIR}/${PN}-3.4.2-audiocom-std-string.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	local header_subs="${S}/lib-src/header-substitutes"
+	cat <<-EOF >"${header_subs}/allegro.h" || die
+	/* Hack the allegro.h header substitute to use system headers.  */
+	#include <portsmf/allegro.h>
+	EOF
+
+	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
+	if use audiocom; then
+		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
+		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
+		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+	fi
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# Reportedly also -Werror=odr but I could not get that far.
+	# https://bugs.gentoo.org/915226
+	# https://github.com/audacity/audacity/issues/6096
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	setup-wxwidgets
+
+	# * always use system libraries if possible
+	# * options listed roughly in the order specified in
+	#   cmake-proxies/CMakeLists.txt
+	# * USE_VST was omitted, it appears to no longer have dependencies
+	#   (this is different from VST3)
+	local mycmakeargs=(
+		# Tell the CMake-based build system it's building a release.
+		-DAUDACITY_BUILD_LEVEL=2
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_pch=OFF
+		-Daudacity_use_portmixer=$(usex portmixer system off)
+		-Daudacity_use_soxr=system
+
+		-Daudacity_conan_enabled=OFF
+
+		-Daudacity_has_networking=$(usex audiocom on off)
+		# Not useful on Gentoo.
+		-Daudacity_has_updates_check=OFF
+		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
+
+		# The VST3 SDK is unpackaged, and it appears to be under a breed
+		# of a proprietary license and the GPL.
+		-Daudacity_has_vst3=OFF
+		-Daudacity_lib_preference=system
+		-Daudacity_obey_system_dependencies=ON
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_libid3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libmp3lame=system
+		-Daudacity_use_libmpg123=$(usex mpg123 system off)
+		-Daudacity_use_libmad=$(usex mad system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
+		-Daudacity_use_libogg=$(usex ogg system off)
+		-Daudacity_use_libflac=$(usex flac system off)
+		-Daudacity_use_libopus=$(usex opus system off)
+		-Daudacity_use_libsndfile=system
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_midi=system
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_portsmf=system
+		-Daudacity_use_sbsms=$(usex sbsms system off)
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		# See the allow-overriding-alsa-jack.patch patch
+		-DPA_HAS_ALSA=$(usex alsa on off)
+		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
+		## AFAICT it introduces no deps as-is, but that could change.
+		## Similar goes for PA_HAS_JACK.
+
+		-Daudacity_has_tests=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove bad doc install
+	rm -r "${ED}"/usr/share/doc || die
+}
diff --git a/media-sound/audacity/audacity-3.3.3.ebuild b/media-sound/audacity/audacity-3.3.3.ebuild
new file mode 100644
index 000000000000..2cba5da71a87
--- /dev/null
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg virtualx
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/"
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+	KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86"
+	MY_P="Audacity-${PV}"
+	S="${WORKDIR}/${PN}-${MY_P}"
+	SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz"
+fi
+
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+	GPL-3
+	audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+RESTRICT="!test? ( test )"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably not
+#   in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+#   This one has the interesting property of many versions being
+#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
+#   Current support grid:
+#   - Lavf - 5[789]
+#   - Lavc - 5[789]
+#   - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/glib:2
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/portaudio[alsa?]
+	media-libs/portmidi
+	media-libs/portsmf:=
+	media-libs/soxr
+	media-sound/lame
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	sys-apps/util-linux
+	alsa? ( media-libs/alsa-lib )
+	audiocom? (
+		dev-libs/rapidjson
+		net-misc/curl
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mad? ( media-libs/libmad )
+	mpg123? ( media-sound/mpg123 )
+	ogg? ( media-libs/libogg )
+	opus? ( media-libs/opus )
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="app-arch/unzip
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	mad? ( !mpg123 )
+"
+
+PATCHES=(
+	# Equivalent to previous versions
+	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+	# From Debian
+	"${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+
+	# Disables some header-based detection
+	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+
+	# For has_networking
+	"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+	"${FILESDIR}/${PN}-3.3.3-upstream-fix-rapidjson.patch"
+
+	# Add Findlibmad.cmake
+	"${FILESDIR}/${PN}-3.3.3-Findlibmad.patch"
+
+	# Fix includes
+	"${FILESDIR}/${PN}-3.3.3-fix-includes.patch"
+
+	# gettext 0.22
+	"${FILESDIR}/${PN}-3.3.3-gettext-0.22.patch"
+
+	# Allows running tests without conan
+	"${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	local header_subs="${S}/lib-src/header-substitutes"
+	cat <<-EOF >"${header_subs}/allegro.h" || die
+	/* Hack the allegro.h header substitute to use system headers.  */
+	#include <portsmf/allegro.h>
+	EOF
+
+	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
+	if use audiocom; then
+		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
+		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
+		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+	fi
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# Reportedly also -Werror=odr but I could not get that far.
+	# https://bugs.gentoo.org/915226
+	# https://github.com/audacity/audacity/issues/6096
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	setup-wxwidgets
+
+	# * always use system libraries if possible
+	# * options listed roughly in the order specified in
+	#   cmake-proxies/CMakeLists.txt
+	# * USE_VST was omitted, it appears to no longer have dependencies
+	#   (this is different from VST3)
+	local mycmakeargs=(
+		# Tell the CMake-based build system it's building a release.
+		-DAUDACITY_BUILD_LEVEL=2
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_pch=OFF
+		-Daudacity_use_portmixer=$(usex portmixer system off)
+		-Daudacity_use_soxr=system
+
+		-Daudacity_conan_enabled=OFF
+
+		-Daudacity_has_networking=$(usex audiocom on off)
+		# Not useful on Gentoo.
+		-Daudacity_has_updates_check=OFF
+		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
+
+		# The VST3 SDK is unpackaged, and it appears to be under a breed
+		# of a proprietary license and the GPL.
+		-Daudacity_has_vst3=OFF
+		-Daudacity_lib_preference=system
+		-Daudacity_obey_system_dependencies=ON
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_libid3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libmp3lame=system
+		-Daudacity_use_libmpg123=$(usex mpg123 system off)
+		-Daudacity_use_libmad=$(usex mad system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
+		-Daudacity_use_libogg=$(usex ogg system off)
+		-Daudacity_use_libflac=$(usex flac system off)
+		-Daudacity_use_libopus=$(usex flac system off)
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
+		-Daudacity_use_libsndfile=system
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_midi=system
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_portsmf=system
+		-Daudacity_use_sbsms=$(usex sbsms system off)
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		# See the allow-overriding-alsa-jack.patch patch
+		-DPA_HAS_ALSA=$(usex alsa on off)
+		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
+		## AFAICT it introduces no deps as-is, but that could change.
+		## Similar goes for PA_HAS_JACK.
+
+		-Daudacity_has_tests=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove bad doc install
+	rm -r "${ED}"/usr/share/doc || die
+}
diff --git a/media-sound/audacity/audacity-3.4.2-r1.ebuild b/media-sound/audacity/audacity-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..2b2306dcc356
--- /dev/null
+++ b/media-sound/audacity/audacity-3.4.2-r1.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets xdg virtualx
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/"
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	MY_P="Audacity-${PV}"
+	S="${WORKDIR}/${PN}-sources-${PV}"
+	SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
+fi
+
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+	GPL-3
+	audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg
+	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+REQUIRED_USE="
+	opus? ( ogg )
+	vorbis? ( ogg )
+"
+RESTRICT="!test? ( test )"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably not
+#   in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+#   This one has the interesting property of many versions being
+#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
+#   Current support grid:
+#   - Lavf - 5[789]
+#   - Lavc - 5[789]
+#   - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/glib:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/portaudio[alsa?]
+	media-libs/portmidi
+	media-libs/portsmf:=
+	media-libs/soxr
+	media-sound/lame
+	sys-apps/util-linux
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	alsa? ( media-libs/alsa-lib )
+	audiocom? (
+		net-misc/curl
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mpg123? ( media-sound/mpg123-base )
+	ogg? ( media-libs/libogg )
+	opus? (
+		media-libs/opus
+		media-libs/opusfile
+	)
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-libs/rapidjson
+	x11-base/xorg-proto
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="|| ( dev-lang/nasm dev-lang/yasm )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Equivalent to previous versions
+	"${FILESDIR}/audacity-3.2.3-disable-ccache.patch"
+	# From Debian
+	"${FILESDIR}/audacity-3.3.3-fix-rpaths.patch"
+
+	# Disables some header-based detection
+	"${FILESDIR}/audacity-3.2.3-allow-overriding-alsa-jack.patch"
+
+	# For has_networking
+	"${FILESDIR}/audacity-3.3.3-local-threadpool-libraries.patch"
+
+	# Allows running tests without conan
+	"${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
+
+	# #920363
+	"${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
+
+	# Fix build with USE="-lv2"
+	"${FILESDIR}/audacity-3.4.2-fix-build-with-use-lv2-off.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
+	if use audiocom; then
+		mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+		cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+		   "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
+	fi
+
+	# Remove documentation incorrect installations
+	sed -i -e \
+		'/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+		src/CMakeLists.txt || die
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	# * always use system libraries if possible
+	# * USE_VST was omitted, it appears to no longer have dependencies
+	#   (this is different from VST3)
+	local mycmakeargs=(
+		# Tell the CMake-based build system it's building a release.
+		-DAUDACITY_BUILD_LEVEL=2
+
+		-Daudacity_conan_enabled=off
+
+		-Daudacity_has_networking=$(usex audiocom on off)
+		# Not useful on Gentoo.
+		-Daudacity_has_updates_check=OFF
+		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		-Daudacity_has_tests=$(usex test on off)
+
+		# The VST3 SDK is unpackaged, and it appears to be under a breed
+		# of a proprietary license and the GPL.
+		-Daudacity_has_vst3=off
+
+		-Daudacity_lib_preference=system
+		-Daudacity_obey_system_dependencies=ON
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_libid3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libflac=$(usex flac system off)
+		-Daudacity_use_libmp3lame=system
+		-Daudacity_use_libmpg123=$(usex mpg123 system off)
+		-Daudacity_use_libogg=$(usex ogg system off)
+		-Daudacity_use_libopus=$(usex opus system off)
+		-Daudacity_use_libsndfile=system
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
+		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_midi=system
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_opusfile=$(usex opus system off)
+		-Daudacity_use_pch=off
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_portmixer=$(usex portmixer system off)
+		-Daudacity_use_portsmf=system
+		-Daudacity_use_rapidjson=system
+		-Daudacity_use_sbsms=$(usex sbsms system off)
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
+
+		# See the allow-overriding-alsa-jack.patch patch
+		-DPA_HAS_ALSA=$(usex alsa on off)
+		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
+		## AFAICT it introduces no deps as-is, but that could change.
+		## Similar goes for PA_HAS_JACK.
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/media-sound/audacity/audacity-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
new file mode 100644
index 000000000000..470b89e1cfce
--- /dev/null
+++ b/media-sound/audacity/audacity-9999.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg virtualx
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/"
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	MY_P="Audacity-${PV}"
+	S="${WORKDIR}/${PN}-sources-${PV}"
+	SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
+fi
+
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+	GPL-3
+	audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg
+	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+REQUIRED_USE="
+	opus? ( ogg )
+	vorbis? ( ogg )
+"
+RESTRICT="!test? ( test )"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably not
+#   in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+#   This one has the interesting property of many versions being
+#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
+#   Current support grid:
+#   - Lavf - 5[789]
+#   - Lavc - 5[789]
+#   - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/glib:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/portaudio[alsa?]
+	media-libs/portmidi
+	media-libs/portsmf:=
+	media-libs/soxr
+	media-sound/lame
+	sys-apps/util-linux
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	alsa? ( media-libs/alsa-lib )
+	audiocom? (
+		net-misc/curl
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mpg123? ( media-sound/mpg123-base )
+	ogg? ( media-libs/libogg )
+	opus? (
+		media-libs/opus
+		media-libs/opusfile
+	)
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-libs/rapidjson
+	x11-base/xorg-proto
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="|| ( dev-lang/nasm dev-lang/yasm )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Equivalent to previous versions
+	"${FILESDIR}/audacity-3.2.3-disable-ccache.patch"
+	# From Debian
+	"${FILESDIR}/audacity-3.3.3-fix-rpaths.patch"
+
+	# Disables some header-based detection
+	"${FILESDIR}/audacity-3.2.3-allow-overriding-alsa-jack.patch"
+
+	# For has_networking
+	"${FILESDIR}/audacity-3.3.3-local-threadpool-libraries.patch"
+
+	# Allows running tests without conan
+	"${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
+
+	# #920363
+	"${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
+	if use audiocom; then
+		mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+		cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+		   "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
+	fi
+
+	# Remove documentation incorrect installations
+	sed -i -e \
+		'/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+		src/CMakeLists.txt || die
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# Reportedly also -Werror=odr but I could not get that far.
+	# https://bugs.gentoo.org/915226
+	# https://github.com/audacity/audacity/issues/6096
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	setup-wxwidgets
+
+	# * always use system libraries if possible
+	# * USE_VST was omitted, it appears to no longer have dependencies
+	#   (this is different from VST3)
+	local mycmakeargs=(
+		# Tell the CMake-based build system it's building a release.
+		-DAUDACITY_BUILD_LEVEL=2
+
+		-Daudacity_conan_enabled=off
+
+		-Daudacity_has_networking=$(usex audiocom on off)
+		# Not useful on Gentoo.
+		-Daudacity_has_updates_check=OFF
+		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		-Daudacity_has_tests=$(usex test on off)
+
+		# The VST3 SDK is unpackaged, and it appears to be under a breed
+		# of a proprietary license and the GPL.
+		-Daudacity_has_vst3=off
+
+		-Daudacity_lib_preference=system
+		-Daudacity_obey_system_dependencies=ON
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_libid3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libflac=$(usex flac system off)
+		-Daudacity_use_libmp3lame=system
+		-Daudacity_use_libmpg123=$(usex mpg123 system off)
+		-Daudacity_use_libogg=$(usex ogg system off)
+		-Daudacity_use_libopus=$(usex opus system off)
+		-Daudacity_use_libsndfile=system
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
+		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_midi=system
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_opusfile=$(usex opus system off)
+		-Daudacity_use_pch=off
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_portmixer=$(usex portmixer system off)
+		-Daudacity_use_portsmf=system
+		-Daudacity_use_rapidjson=system
+		-Daudacity_use_sbsms=$(usex sbsms system off)
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
+
+		# See the allow-overriding-alsa-jack.patch patch
+		-DPA_HAS_ALSA=$(usex alsa on off)
+		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
+		## AFAICT it introduces no deps as-is, but that could change.
+		## Similar goes for PA_HAS_JACK.
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch
new file mode 100644
index 000000000000..09fb42ad2026
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch
@@ -0,0 +1,10 @@
+--- a/include/audacity/Types.h
++++ b/include/audacity/Types.h
+@@ -44,6 +44,7 @@
+ 
+ #include <algorithm>
+ #include <functional>
++#include <limits>
+ #include <type_traits>
+ #include <vector>
+ #include <wx/debug.h> // for wxASSERT
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch b/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch
new file mode 100644
index 000000000000..0500f7621e45
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch
@@ -0,0 +1,61 @@
+From be29286502be6c41b76e652b02862fe987c1f49b Mon Sep 17 00:00:00 2001
+From: Matthew White <mehw.is.me@inventati.org>
+Date: Sun, 14 Apr 2024 04:03:34 +0000
+Subject: [PATCH] libflac: fix undefined references when libflac is disabled
+
+In the upstream master branch:
+ - future commit 2fbfd3e0a5ab803e2072cbac1b2be685c3adcf05 disabled
+   ondemand (aka OD) in CMakeLists.txt.
+ - future commit cbf1bb558e094e24cbb54c3bbd2bd45a1abbfb2a expunged
+   ondemand fully.
+
+Closes: https://bugs.gentoo.org/741969
+Closes: https://bugs.gentoo.org/884747
+---
+ src/CMakeLists.txt         | 6 ++++--
+ src/ProjectFileManager.cpp | 4 +++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 93dc50c82..b2c4496ab 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -702,8 +702,10 @@ list( APPEND SOURCES
+       ondemand/ODComputeSummaryTask.h
+       ondemand/ODDecodeFFmpegTask.cpp
+       ondemand/ODDecodeFFmpegTask.h
+-      ondemand/ODDecodeFlacTask.cpp
+-      ondemand/ODDecodeFlacTask.h
++      $<$<BOOL:${USE_LIBFLAC}>:
++         ondemand/ODDecodeFlacTask.cpp
++         ondemand/ODDecodeFlacTask.h
++      >
+       ondemand/ODDecodeTask.cpp
+       ondemand/ODDecodeTask.h
+       ondemand/ODManager.cpp
+diff --git a/src/ProjectFileManager.cpp b/src/ProjectFileManager.cpp
+index de5eeee98..106c52c31 100644
+--- a/src/ProjectFileManager.cpp
++++ b/src/ProjectFileManager.cpp
+@@ -51,7 +51,9 @@ Paul Licameli split from AudacityProject.cpp
+ #include "import/ImportMIDI.h"
+ #include "commands/CommandContext.h"
+ #include "ondemand/ODComputeSummaryTask.h"
++#ifdef USE_LIBFLAC
+ #include "ondemand/ODDecodeFlacTask.h"
++#endif
+ #include "ondemand/ODManager.h"
+ #include "ondemand/ODTask.h"
+ #include "toolbars/SelectionBar.h"
+@@ -276,7 +278,7 @@ void ProjectFileManager::EnqueueODTasks()
+          while((odFlags|createdODTasks) != createdODTasks)
+          {
+             std::unique_ptr<ODTask> newTask;
+-#ifdef EXPERIMENTAL_OD_FLAC
++#if defined(EXPERIMENTAL_OD_FLAC) && defined(USE_LIBFLAC)
+             if(!(createdODTasks&ODTask::eODFLAC) && (odFlags & ODTask::eODFLAC)) {
+                newTask = std::make_unique<ODDecodeFlacTask>();
+                createdODTasks = createdODTasks | ODTask::eODFLAC;
+-- 
+2.44.0
+
diff --git a/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch b/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
new file mode 100644
index 000000000000..53ac8edc33fb
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
@@ -0,0 +1,48 @@
+From e46dbcb9763f4367705c66009703f15ff0ff5558 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Sat, 17 Dec 2022 21:13:56 +0100
+Subject: [PATCH] portmixer: Allow overriding PA_HAS_{ALSA,JACK}
+
+Not included for OSS as OSS is always included AFAICT.
+---
+ CMakeLists.txt                   | 3 +++
+ lib-src/portmixer/CMakeLists.txt | 9 ++++++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 42e765691..c18a939e6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -624,6 +624,9 @@ cmd_option( ${_OPT}use_portmixer "Build PortMixer support into Audacity" On)
+ if( ${_OPT}use_portmixer )
+    set(USE_PORTMIXER Yes)
+    add_subdirectory( "lib-src/portmixer" )
++else()
++  # Suppress bogus warnings about unused variables
++  set (unusedIgnore "${PA_HAS_ALSA}${PA_HAS_JACK}${PA_HAS_OSS}")
+ endif()
+ 
+ cmd_option( ${_OPT}use_nyquist "Build Nyquist support into Audacity" On)
+diff --git a/lib-src/portmixer/CMakeLists.txt b/lib-src/portmixer/CMakeLists.txt
+index 65a384fa0..1ddc8ed50 100644
+--- a/lib-src/portmixer/CMakeLists.txt
++++ b/lib-src/portmixer/CMakeLists.txt
+@@ -8,9 +8,12 @@ if (UNIX AND NOT APPLE)
+    include(CheckIncludeFile)
+    set(CMAKE_REQUIRED_LIBRARIES PortAudio::PortAudio)
+ 
+-   check_include_file( "pa_jack.h" PA_HAS_JACK )
+-
+-   check_include_file( "pa_linux_alsa.h" PA_HAS_ALSA )
++   if ( NOT DEFINED PA_HAS_JACK )
++     check_include_file( "pa_jack.h" PA_HAS_JACK )
++   endif()
++   if ( NOT DEFINED PA_HAS_ALSA )
++     check_include_file( "pa_linux_alsa.h" PA_HAS_ALSA )
++   endif()
+    if( PA_HAS_ALSA )
+       find_package( ALSA REQUIRED QUIET )
+    endif()
+-- 
+2.39.0
+
diff --git a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
new file mode 100644
index 000000000000..a40847bb941c
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
@@ -0,0 +1,33 @@
+From afd777fbcbaa9e9c14b80374c60ecd631eb537ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Fri, 16 Dec 2022 23:37:36 +0100
+Subject: [PATCH] Don't force enable ccache
+
+---
+Analogous to the similar patches in prior versions.
+
+CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c1c7baf2..42e765691 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,14 +142,6 @@ set( CMAKE_PREFIX_PATH
+ set( CMAKE_CXX_STANDARD 17 )
+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
+ 
+-# Use ccache if available
+-find_program( CCACHE_PROGRAM ccache )
+-mark_as_advanced( FORCE CCACHE_PROGRAM )
+-
+-if( CCACHE_PROGRAM )
+-   set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
+-endif()
+-
+ # Define option() prefix
+ set( _OPT "audacity_" )
+ 
+-- 
+2.39.0
+
diff --git a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
new file mode 100644
index 000000000000..7237614782b3
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
@@ -0,0 +1,55 @@
+https://github.com/audacity/audacity/pull/4916
+https://github.com/audacity/audacity/pull/4917
+
+From b42dfbe2be1994ccfeff449b5c5cbe49994ffb38 Mon Sep 17 00:00:00 2001
+From: Matthew White <mehw.is.me@inventati.org>
+Date: Fri, 14 Jul 2023 21:17:45 +0000
+Subject: [PATCH] Add missing Findlibmad.cmake file
+
+This fixes compiling against the system installed libmad.
+---
+ cmake-proxies/cmake-modules/Findlibmad.cmake | 35 ++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+ create mode 100644 cmake-proxies/cmake-modules/Findlibmad.cmake
+
+diff --git a/cmake-proxies/cmake-modules/Findlibmad.cmake b/cmake-proxies/cmake-modules/Findlibmad.cmake
+new file mode 100644
+index 000000000000..0858c2d93e24
+--- /dev/null
++++ b/cmake-proxies/cmake-modules/Findlibmad.cmake
+@@ -0,0 +1,35 @@
++#[[
++A module to look for libmad
++]]
++
++if( NOT libmad_FOUND )
++   find_path( libmad_INCLUDE_DIR mad.h )
++   find_library( libmad_LIBRARIES NAMES mad )
++
++   if( libmad_INCLUDE_DIR AND libmad_LIBRARIES )
++      set( libmad_FOUND Yes )
++   endif()
++
++   if( libmad_FOUND )
++      if( NOT libmad_FIND_QUIETLY )
++         message( STATUS "Found mad: \n\tlibmad_INCLUDE_DIR: ${libmad_INCLUDE_DIR}\n\tlibmad_LIBRARIES: ${libmad_LIBRARIES}" )
++      endif()
++
++      if( NOT TARGET libmad::libmad )
++         add_library( libmad::libmad INTERFACE IMPORTED GLOBAL)
++
++         target_include_directories( libmad::libmad INTERFACE ${libmad_INCLUDE_DIR} )
++         target_link_libraries( libmad::libmad INTERFACE ${libmad_LIBRARIES} )
++      endif()
++   else()
++      if( libmad_FIND_REQUIRED )
++         message( FATAL_ERROR "Could not find libmad")
++      endif()
++   endif()
++
++   mark_as_advanced(
++      libmad_FOUND
++      libmad_INCLUDE_DIR
++      libmad_LIBRARIES
++   )
++endif()
diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
new file mode 100644
index 000000000000..2e8685a09a3f
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
@@ -0,0 +1,55 @@
+From 78ef36996c348b1c47f75e9885a56ac46b0aeec1 Mon Sep 17 00:00:00 2001
+From: Matthew White <mehw.is.me@inventati.org>
+Date: Fri, 14 Jul 2023 21:08:52 +0000
+Subject: [PATCH] Fix ImportMP3_MAD and ImportQT include directives
+
+This fixes 'file not found' errors.
+---
+ src/import/ImportMP3_MAD.cpp | 6 +++---
+ src/import/ImportQT.cpp      | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/import/ImportMP3_MAD.cpp b/src/import/ImportMP3_MAD.cpp
+index fa26eaca49dd..9e6dfdf3a534 100644
+--- a/src/import/ImportMP3_MAD.cpp
++++ b/src/import/ImportMP3_MAD.cpp
+@@ -62,10 +62,10 @@ static Importer::RegisteredUnusableImportPlugin registered
+ #include <wx/file.h>
+ 
+ #include "Prefs.h"
+-#include "../Tags.h"
++#include "Tags.h"
+ #include "WaveTrack.h"
+-#include "../widgets/AudacityMessageBox.h"
+-#include "../widgets/ProgressDialog.h"
++#include "AudacityMessageBox.h"
++#include "ProgressDialog.h"
+ 
+ // PRL:  include these last,
+ // and correct some preprocessor namespace pollution from wxWidgets that
+diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp
+index f931b5a63fc1..5b49c1630b7f 100644
+--- a/src/import/ImportQT.cpp
++++ b/src/import/ImportQT.cpp
+@@ -17,8 +17,8 @@
+ 
+ #include "Import.h"
+ #include "ImportPlugin.h"
+-#include "../widgets/AudacityMessageBox.h"
+-#include "../widgets/ProgressDialog.h"
++#include "AudacityMessageBox.h"
++#include "ProgressDialog.h"
+ 
+ #define DESC XO("QuickTime files")
+ 
+@@ -76,8 +76,8 @@ static Importer::RegisteredUnusableImportPlugin registered{
+ // There's a name collision between our Track and QuickTime's...workaround it
+ #undef Track
+ 
+-#include "../Tags.h"
+-#include "../WaveTrack.h"
++#include "Tags.h"
++#include "WaveTrack.h"
+ 
+ #define kQTAudioPropertyID_MaxAudioSampleSize   'mssz'
+ 
diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
new file mode 100644
index 000000000000..b3fcdb85b022
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
@@ -0,0 +1,95 @@
+This is an adapted version of:
+
+From: Benjamin Drung <benjamin.drung@canonical.com>
+Date: Thu, 22 Sep 2022 19:52:43 +0200
+Subject: Fix rpath for private libraries on Linux
+
+Fixes: https://github.com/audacity/audacity/issues/3289
+Forwarded: https://github.com/audacity/audacity/pull/3671
+[1] https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#caveats
+
+diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2023-06-08 15:17:02.000000000 +0200
++++ b/CMakeLists.txt	2023-07-14 01:18:46.452163033 +0200
+@@ -412,6 +412,7 @@
+ set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" )
+ set( _DATADIR "${CMAKE_INSTALL_DATADIR}" )
+ set( _PKGLIB "${_LIBDIR}/audacity" )
++set( _PKGMODULE "${_PKGLIB}/modules" )
+ set( _PKGDATA "${_DATADIR}/audacity/" )
+ set( _MANDIR "${CMAKE_INSTALL_MANDIR}" )
+ set( _MODDIR "${_PKGLIB}/modules" )
+diff -Nuar a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
+--- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake	2023-06-08 15:17:02.000000000 +0200
++++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake	2023-07-14 01:23:42.025628702 +0200
+@@ -338,6 +338,17 @@
+    set( "${var}" "${node}" PARENT_SCOPE )
+ endfunction()
+ 
++# Call install(TARGETS...) only on Linux systems (i.e. exclude MacOS and Windows)
++macro( install_target_linux target destination )
++   if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
++      install( TARGETS "${target}" DESTINATION "${destination}" )
++   endif()
++endmacro()
++
++macro( install_audacity_module target )
++   install_target_linux( "${target}" "${_PKGMODULE}" )
++endmacro()
++
+ define_property(TARGET PROPERTY AUDACITY_GRAPH_DEPENDENCIES
+    BRIEF_DOCS
+       "Propagates information used in generating a target dependency diagram"
+@@ -420,6 +431,13 @@
+       list( APPEND GRAPH_EDGES "\"${TARGET}\" -> \"${IMPORT}\" ${attributes}" )
+    endforeach()
+    set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE )
++
++   # Note: Some modules set EXCLUDE_FROM_ALL afterwards to not be installed.
++   # Therefore only install libraries, but not modules here.
++   if( NOT REAL_LIBTYPE STREQUAL "MODULE" )
++      install_target_linux( "${TARGET}" "${_PKGLIB}" )
++   endif()
++
+ endfunction()
+ 
+ function ( make_interface_alias TARGET REAL_LIBTYTPE )
+@@ -487,6 +505,7 @@
+          PROPERTIES
+             PREFIX ""
+             FOLDER "modules" # for IDE organization
++            INSTALL_RPATH "$ORIGIN/.."
+       )
+ 
+       if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
+@@ -501,6 +520,7 @@
+          PROPERTIES
+             PREFIX ""
+             FOLDER "libraries" # for IDE organization
++            INSTALL_RPATH "$ORIGIN"
+       )
+ 
+       if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
+diff -Nuar a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt
+--- a/modules/mod-script-pipe/CMakeLists.txt	2023-06-08 15:17:02.000000000 +0200
++++ b/modules/mod-script-pipe/CMakeLists.txt	2023-07-14 01:25:10.730068564 +0200
+@@ -15,3 +15,4 @@
+ )
+ audacity_module( mod-script-pipe "${SOURCES}" "Audacity"
+    "${DEFINES}" "" )
++install_audacity_module( mod-script-pipe )
+diff -Nuar a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt	2023-06-08 15:17:02.000000000 +0200
++++ b/src/CMakeLists.txt	2023-07-14 01:26:23.098427419 +0200
+@@ -1557,11 +1557,6 @@
+                RUNTIME
+                RESOURCE DESTINATION "${_PKGDATA}" )
+ 
+-      install( DIRECTORY "${_DEST}/${_LIBDIR}/"
+-               DESTINATION "${_LIBDIR}"
+-               USE_SOURCE_PERMISSIONS
+-               FILES_MATCHING PATTERN "*.so*" )
+-
+       install( FILES "${_INTDIR}/audacity.desktop"
+                DESTINATION "${_DATADIR}/applications" )
+       install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.md"
diff --git a/media-sound/audacity/files/audacity-3.3.3-gettext-0.22.patch b/media-sound/audacity/files/audacity-3.3.3-gettext-0.22.patch
new file mode 100644
index 000000000000..9dad40d3e9e1
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-gettext-0.22.patch
@@ -0,0 +1,27 @@
+This is an adapted version of:
+
+https://bugs.gentoo.org/909201
+upstream fix: https://github.com/audacity/audacity/pull/4866
+
+--- a/locale/be.po
++++ b/locale/be.po
+@@ -3097,7 +3097,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "Памылка (магчыма, файл не запісаны): %hs"
++msgstr "Памылка (магчыма, файл не запісаны): %s"
+ 
+ #: src/FileFormats.cpp
+ #, fuzzy
+--- a/locale/fa.po
++++ b/locale/fa.po
+@@ -3053,7 +3053,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
++msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
+ 
+ #: src/FileFormats.cpp
+ msgid "&Copy uncompressed files into the project (safer)"
diff --git a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
new file mode 100644
index 000000000000..a3ef6cf3859d
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
@@ -0,0 +1,30 @@
+This is an adapted version of:
+
+From 7b5f56ec441fb472b61bae14e1efa353db4d7aca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Sun, 18 Dec 2022 13:37:35 +0100
+Subject: [PATCH] Allow using local dependency for threadpool
+
+diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/cmake-modules/DependenciesList.cmake
+--- a/cmake-proxies/cmake-modules/DependenciesList.cmake	2023-07-14 03:40:22.518292749 +0200
++++ b/cmake-proxies/cmake-modules/DependenciesList.cmake	2023-07-14 03:40:43.790398232 +0200
+@@ -56,7 +56,6 @@
+ audacity_find_package(PortAudio REQUIRED)
+ 
+ if( ${_OPT}has_networking )
+-   audacity_find_package(ThreadPool REQUIRED)
+    audacity_find_package(CURL REQUIRED CONAN_PACKAGE_NAME libcurl)
+ endif()
+ 
+diff -Nuar a/libraries/lib-network-manager/CMakeLists.txt b/libraries/lib-network-manager/CMakeLists.txt
+--- a/libraries/lib-network-manager/CMakeLists.txt	2023-07-14 03:38:42.061794613 +0200
++++ b/libraries/lib-network-manager/CMakeLists.txt	2023-07-14 03:38:27.913724456 +0200
+@@ -43,4 +43,8 @@
+ 
+ set ( DEFINES INTERFACE "HAS_NETWORKING" )
+ 
++add_library ( threadpool::threadpool INTERFACE IMPORTED GLOBAL )
++target_include_directories ( threadpool::threadpool INTERFACE
++  ${CMAKE_SOURCE_DIR}/lib-src/threadpool
++)
+ audacity_library( ${TARGET} "${SOURCES}" "${LIBRARIES}" "${DEFINES}" "" )
diff --git a/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
new file mode 100644
index 000000000000..63dd3b58f0f0
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/916258
+https://github.com/audacity/audacity/discussions/5841
+https://github.com/matoro/audacity/commit/270be88a9390eb25c2f4b16030f6897f08a6a685
+
+From 270be88a9390eb25c2f4b16030f6897f08a6a685 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Mon, 15 Jan 2024 20:21:08 -0500
+Subject: [PATCH] Remove dependency on conan for unit tests
+
+These run fine with catch2 installed from system package manager; there
+is no reason to enforce conan dependency.
+---
+ CMakeLists.txt | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cbe79a43b933..7b682c4e729d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -228,15 +228,11 @@ cmd_option( ${_OPT}has_url_schemes_support
+    "Build custom URL schemes support into Audacity"
+    Off)
+ 
+-include( CMakeDependentOption )
+-
+-cmake_dependent_option(
+-   ${_OPT}has_tests
++cmd_option( ${_OPT}has_tests
+    "Enables automated testing support"
+-   On
+-   "${_OPT}conan_enabled"
+-   Off
+-)
++   On)
++
++include( CMakeDependentOption )
+ 
+ cmake_dependent_option(
+    ${_OPT}has_audiocom_upload
diff --git a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
new file mode 100644
index 000000000000..c95676a18cfe
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
@@ -0,0 +1,63 @@
+https://github.com/audacity/audacity/commit/6edaa3f26b34adc65c109c1a5a85923e04330e2d
+https://github.com/audacity/audacity/pull/4918
+
+From 6edaa3f26b34adc65c109c1a5a85923e04330e2d Mon Sep 17 00:00:00 2001
+From: Dmitry Vedenko <dmitry@crsib.me>
+Date: Mon, 7 Aug 2023 17:12:49 +0300
+Subject: [PATCH] Fixes RapidJSON missing from Linux builds
+
+---
+ .../cmake-modules/dependencies/rapidjson.cmake    | 15 +++++++++++++--
+ linux/packages/arch/dependencies.sh               |  1 +
+ linux/packages/fedora34/dependencies.sh           |  1 +
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+index c44aad81b8e4..ba95962a6eb6 100644
+--- a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
++++ b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+@@ -1,7 +1,18 @@
+ # CCI pakage appears to set the wrong value for the `cmake_target_name`
+ 
+-if(${_OPT}use_rapidjson STREQUAL "local")
++if(NOT ${_OPT}use_rapidjson STREQUAL "off")
+    if(NOT TARGET rapidjson::rapidjson)
+-      add_library( rapidjson::rapidjson ALIAS rapidjson )
++      if(TARGET rapidjson)
++         add_library( rapidjson::rapidjson ALIAS rapidjson )
++      else()
++         # At least on Arch RapidJSONConfig.cmake does not define a target at all
++         # so we have to do it ourselves
++         add_library( rapidjson::rapidjson INTERFACE IMPORTED GLOBAL)
++         if (RAPIDJSON_INCLUDE_DIRS )
++            target_include_directories( rapidjson::rapidjson INTERFACE ${RAPIDJSON_INCLUDE_DIRS} )
++         elseif(RapidJSON_INCLUDE_DIR)
++            target_include_directories( rapidjson::rapidjson INTERFACE ${RapidJSON_INCLUDE_DIR} )
++         endif()
++      endif()
+    endif()
+ endif()
+diff --git a/linux/packages/arch/dependencies.sh b/linux/packages/arch/dependencies.sh
+index d34012442efd..8aa8792057d4 100755
+--- a/linux/packages/arch/dependencies.sh
++++ b/linux/packages/arch/dependencies.sh
+@@ -44,6 +44,7 @@ deps=(
+    wavpack
+    wxwidgets-gtk3
+    vst3sdk
++   rapidjson
+ )
+ 
+ pacman -Syu --noconfirm \
+diff --git a/linux/packages/fedora34/dependencies.sh b/linux/packages/fedora34/dependencies.sh
+index 8f6ce8ff2eb8..1e039612b095 100755
+--- a/linux/packages/fedora34/dependencies.sh
++++ b/linux/packages/fedora34/dependencies.sh
+@@ -54,6 +54,7 @@ deps=(
+    mesa-libEGL-devel
+    mpg123-devel
+    wavpack-devel
++   rapidjson
+ )
+ 
+ dnf install -y \
diff --git a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
new file mode 100644
index 000000000000..f06799030b4b
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
@@ -0,0 +1,30 @@
+From 23f1df0b13c46cef746674434640588864f8c453 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 18 Feb 2024 23:16:28 +0300
+Subject: [PATCH] Fix compilation with audiocom
+
+Fix error `OAuthService.h: error: field mAccessToken has incomplete type
+std::string {aka std::_cxx11::basic_string<char>}`
+
+See: https://bugs.gentoo.org/920363
+
+Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+---
+ libraries/lib-cloud-audiocom/OAuthService.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/lib-cloud-audiocom/OAuthService.h b/libraries/lib-cloud-audiocom/OAuthService.h
+index bd01f1656..18761df6d 100644
+--- a/libraries/lib-cloud-audiocom/OAuthService.h
++++ b/libraries/lib-cloud-audiocom/OAuthService.h
+@@ -12,6 +12,7 @@
+ 
+ #include <chrono>
+ #include <functional>
++#include <string>
+ #include <string_view>
+ #include <mutex>
+ 
+-- 
+2.43.0
+
diff --git a/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
new file mode 100644
index 000000000000..8c47ff8642d7
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
@@ -0,0 +1,36 @@
+From e10034c19ed1911b730637fbc722030eb3dfd04b Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Wed, 22 Nov 2023 19:29:05 +0000
+Subject: [PATCH] Fix build with -Daudacity_use_lv2=off
+
+libraries/lib-lv2/LV2Utils.h:18:10: fatal error: lilv/lilv.h: No such file or directory
+   18 | #include "lilv/lilv.h" // for lilv_free
+      |          ^~~~~~~~~~~~~
+compilation terminated.
+---
+ libraries/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index b1ebefa1b023..879cd948791d 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -50,7 +50,6 @@ set( LIBRARIES
+    lib-vst3
+    lib-snapping
+    lib-vst
+-   lib-lv2
+    lib-ladspa
+    lib-audio-unit
+    lib-playable-track
+@@ -63,6 +62,10 @@ set( LIBRARIES
+    lib-viewport
+ )
+ 
++if ( ${_OPT}use_lv2 )
++   list( APPEND LIBRARIES lib-lv2)
++endif()
++
+ if ( ${_OPT}has_networking )
+    list( APPEND LIBRARIES lib-network-manager)
+ endif()
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index 2457f6d4ce87..e17276dd00ed 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -1,23 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!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>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>richard@audacityteam.org</email>
     <name>Richard Ash</name>
     <description>Upstream - please CC on bugs that concerns upstream</description>
   </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>mehw.is.me@inventati.org</email>
+    <name>Matthew White</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">audacity/audacity</remote-id>
+  </upstream>
   <use>
+    <flag name="audiocom">Enable integrated uploading to audio.com</flag>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
     <flag name="lv2">Add support for Ladspa V2</flag>
-    <flag name="portmidi">Enable support for MIDI via media-libs/portmidi</flag>
+    <flag name="mpg123">Use <pkg>media-sound/mpg123-base</pkg> instead of
+      <pkg>media-libs/libmad</pkg> for MPEG decoding</flag>
+    <flag name="portmidi">Enable support for MIDI via <pkg>media-libs/portmidi</pkg></flag>
     <flag name="portmixer">Enable the internal portmixer feature</flag>
     <flag name="portsmf">Enable support for Portable Standard Midi File Library</flag>
-    <flag name="sbsms">Enables sbsms library support for slower, more accurate
-      pitch and tempo changing</flag>
+    <flag name="sbsms">Enables sbsms library support for slower, more
+      accurate pitch and tempo changing</flag>
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
     <flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag>
     <flag name="vst">Enable VST plugin support</flag>
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 84e81299edcb..b591449b4fe7 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1 +1,2 @@
-DIST audex-0.95_pre20190721.tar.gz 179903 BLAKE2B 4260130eba3b1b30e94b0af5535beed6ce73b2a1a46ff91fd808f7d224b363474e02ef6592ac6136361b871cd91a7a4371faad6769f1ab74bd21d1fd2d793876 SHA512 3eec37e3396408c0ce753ed4c315830e542f3ae17fc4000b3c790be22ed74208bc2a956da4248250932e5b7fceac11802d731cf4d65709c207521bcdbaed5957
+DIST audex-0.95_pre20220909-f94cd394.tar.gz 192286 BLAKE2B cbe2376aba03a5c575aead2ff3f105381150e370415433136128642e21c6481cd8db6ad44f7e9ca0e8e6ea00886a918582c232aec49023ca710d501a579f1a25 SHA512 b251a9d90f3d24ae3da75a2ad73654505ff6fc3bbc71ad65b5f37380cd2b6f04122c1f6246013f5078178982de6e37afe2bbea34c084221401e1f91fb9ff4ba1
+DIST audex-24.04.90.tar.xz 691664 BLAKE2B 780cde5ef0885ffbb3ef94dd6ca23ef8ee1b9137e7f4806d9aa002d87c272c9088d77400a4562ddff9d4ed4c26b7b5d0172bfa242b0a83669ca42dea919f14a4 SHA512 399746134b3552ac079390f9a2503fc887bfbe1d39031c7d52e9cb598665e4a69b75ba9f79e072209f55ea03b68d12545c7f1cf9d349dbe0ce8d9c43277bf7d6
diff --git a/media-sound/audex/audex-0.95_pre20190721.ebuild b/media-sound/audex/audex-0.95_pre20220909.ebuild
index 61100f1c3b6e..c4a6572fc313 100644
--- a/media-sound/audex/audex-0.95_pre20190721.ebuild
+++ b/media-sound/audex/audex-0.95_pre20220909.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-COMMIT="1389389e7341a749f95b313045f9d0cd809748b4"
+KDE_ORG_COMMIT="f94cd394db5d99e9024f47530cd7edf1a08a0cc1"
+KFMIN=5.82.0
+QTMIN=5.15.5
 inherit ecm kde.org
 
 DESCRIPTION="Tool for ripping compact discs"
 HOMEPAGE="https://userbase.kde.org/Audex"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="5"
@@ -25,7 +24,7 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkcddb-19.04.3:5
+	>=kde-apps/libkcddb-22.04.0:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -42,8 +41,4 @@ DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	media-sound/cdparanoia
 "
-RDEPEND="${DEPEND}
-	!media-sound/audex:4
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/audex/audex-24.04.90.ebuild b/media-sound/audex/audex-24.04.90.ebuild
new file mode 100644
index 000000000000..6ecb7bbb8826
--- /dev/null
+++ b/media-sound/audex/audex-24.04.90.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.0.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool for ripping compact discs"
+HOMEPAGE="https://apps.kde.org/audex/ https://userbase.kde.org/Audex"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/libkcddb-${PVCUT}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	dev-libs/libcdio:=
+	dev-libs/libcdio-paranoia:=
+"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/audex/metadata.xml b/media-sound/audex/metadata.xml
index 2fdbf33d963d..7fe628827b3e 100644
--- a/media-sound/audex/metadata.xml
+++ b/media-sound/audex/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">multimedia/audex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/audicle/Manifest b/media-sound/audicle/Manifest
deleted file mode 100644
index c42d3a9f490f..000000000000
--- a/media-sound/audicle/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST audicle-1.0.0.7.tgz 5561088 BLAKE2B 7056880aa6b902e15e7722d9532736b8d513c6e9135b2b5afb839783e3df83f4e1f29f8c73b0f652d920029f6eb12dd7af1a699cb487b9ad0f76229f6ebd6fae SHA512 c96506620e22e1f7846288cb4f34dc7efe59e14d845425673524d0a89712ea7d3dabed546eb921220e021d4e8526937990a4f5764fbf2bb90339b993f6703772
diff --git a/media-sound/audicle/audicle-1.0.0.7-r2.ebuild b/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
deleted file mode 100644
index 7ea60ba2f27f..000000000000
--- a/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality"
-HOMEPAGE="http://audicle.cs.princeton.edu/"
-SRC_URI="http://audicle.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa jack oss truetype"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-DEPEND="
-	app-eselect/eselect-audicle
-	media-libs/freeglut
-	media-libs/libsndfile
-	virtual/opengl
-	virtual/glu
-	x11-libs/gtk+:2
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	jack? ( virtual/jack )
-	truetype? (
-		media-fonts/corefonts
-		media-libs/ftgl
-	)
-"
-rDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack oss )"
-
-DOCS=( AUTHORS PROGRAMMER README THANKS TODO VERSIONS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0.6-font.patch"
-	"${FILESDIR}/${P}-hid-smc.patch"
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-const.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \
-		-e 's@../ftgl_lib/FTGL/mac/build@/usr/lib@' \
-		-e 's/gcc -o/$(CC) -o/' \
-		-e 's/-O3 -c/-c $(CFLAGS)/' \
-		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
-		src/makefile.{alsa,jack,oss} || die "sed failed"
-}
-
-compile_backend() {
-	local backend="$1"
-	local config
-	use truetype && config="USE_FREETYPE_LIBS=1"
-	einfo "Compiling against ${backend}"
-	cd "${S}/src"
-	emake -f "makefile.${backend}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LEX=flex \
-		YACC=bison ${config}
-	mv audicle{,-${backend}}
-	emake -f makefile clean
-}
-
-src_compile() {
-	# when compile with athlon or athlon-xp flags
-	# audicle 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
-	use oss && compile_backend oss
-}
-
-src_install() {
-	use jack && dobin src/audicle-jack
-	use alsa && dobin src/audicle-alsa
-	use oss && dobin src/audicle-oss
-	dodoc ${DOCS[@]}
-}
-
-pkg_postinst() {
-	elog "Audicle now can use many audio engines, so you can specify audio engine"
-	elog "with audicle-{jack,alsa,oss}"
-	elog "Or you can use 'eselect audicle' to set the audio engine"
-
-	einfo "Calling eselect audicle update..."
-	eselect audicle update --if-unset
-}
diff --git a/media-sound/audicle/files/audicle-1.0.0.6-font.patch b/media-sound/audicle/files/audicle-1.0.0.6-font.patch
deleted file mode 100644
index 9e2658df16c3..000000000000
--- a/media-sound/audicle/files/audicle-1.0.0.6-font.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ru audicle-1.0.0.6~/src/audicle_font.cpp audicle-1.0.0.6/src/audicle_font.cpp
---- audicle-1.0.0.6~/src/audicle_font.cpp	2008-03-30 00:29:37.000000000 +0100
-+++ audicle-1.0.0.6/src/audicle_font.cpp	2008-03-30 01:04:46.000000000 +0100
-@@ -201,13 +201,13 @@
- #ifdef __PLATFORM_WIN32__
- char fontpath[] = "C:\\WINDOWS\\FONTS\\";
- #else
--char fontpath[] = "/define/this/directory/";
-+char fontpath[] = "/usr/share/fonts/corefonts/";
- 
- #endif
- #endif
- 
--char kernedfontfile[] = "FTGL:verdana.TTF";
--char monospacedfontfile[] = "FTGL:LUCON.TTF";
-+char kernedfontfile[] = "FTGL:verdana.ttf";
-+char monospacedfontfile[] = "FTGL:couri.ttf";
- 
- 
- class AudicleFTGLFont : public AudicleFont { 
-@@ -301,13 +301,11 @@
- #endif
- 
-     // we should do a directory scan here...
--    AudicleFont::available_fonts().push_back( "FTGL:ARIAL.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:ARIBLK.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:BYTE.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:COUR.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:LUCON.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:TIMES.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:verdana.TTF" );
-+    AudicleFont::available_fonts().push_back( "FTGL:arial.ttf" );
-+    AudicleFont::available_fonts().push_back( "FTGL:ariblk.ttf" );
-+    AudicleFont::available_fonts().push_back( "FTGL:cour.ttf" );
-+    AudicleFont::available_fonts().push_back( "FTGL:times.ttf" );
-+    AudicleFont::available_fonts().push_back( "FTGL:verdana.ttf" );
- 
- }; 
- 
-diff -ru audicle-1.0.0.6~/src/audicle_ui_base.cpp audicle-1.0.0.6/src/audicle_ui_base.cpp
---- audicle-1.0.0.6~/src/audicle_ui_base.cpp	2008-03-30 00:29:37.000000000 +0100
-+++ audicle-1.0.0.6/src/audicle_ui_base.cpp	2008-03-30 00:30:32.000000000 +0100
-@@ -47,8 +47,8 @@
- void init_UI_Fonts() { 
-     if ( _ui_fonts_inited ) return;
- #ifdef _USE_FTGL_FONTS_
--    labelFont = AudicleFont::loadFont ( "FTGL:verdana.TTF" );
--    labelFontMono = AudicleFont::loadFont ( "FTGL:LUCON.TTF" );
-+    labelFont = AudicleFont::loadFont ( "FTGL:verdana.ttf" );
-+    labelFontMono = AudicleFont::loadFont ( "FTGL:couri.ttf" );
- #else
-     labelFont = AudicleFont::loadFont ( "OpenGL:variable" ); 
-     labelFontMono = AudicleFont::loadFont ( "OpenGL:variable" ); 
-diff -ru audicle-1.0.0.6~/src/audicle_ui_editor.cpp audicle-1.0.0.6/src/audicle_ui_editor.cpp
---- audicle-1.0.0.6~/src/audicle_ui_editor.cpp	2008-03-30 00:29:37.000000000 +0100
-+++ audicle-1.0.0.6/src/audicle_ui_editor.cpp	2008-03-30 00:30:32.000000000 +0100
-@@ -46,7 +46,7 @@
- 
- void init_Buffer_Font() { 
- #ifdef _USE_FTGL_FONTS_
--    bufferFont = AudicleFont::loadFont ( "FTGL:LUCON.TTF" );
-+    bufferFont = AudicleFont::loadFont ( "FTGL:couri.ttf" );
- #else
-     bufferFont = AudicleFont::loadFont ( "OpenGL:mono" );
- #endif
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-const.patch b/media-sound/audicle/files/audicle-1.0.0.7-const.patch
deleted file mode 100644
index 38acbf2f2ede..000000000000
--- a/media-sound/audicle/files/audicle-1.0.0.7-const.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru audicle-1.0.0.7.orig//src/audicle_font.cpp audicle-1.0.0.7/src/audicle_font.cpp
---- audicle-1.0.0.7.orig//src/audicle_font.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/src/audicle_font.cpp	2012-03-17 10:49:24.000000000 +0100
-@@ -215,7 +215,7 @@
- protected :
-     FTFont * m_font;
- public: 
--    AudicleFTGLFont( char * name ) { 
-+    AudicleFTGLFont( const char * name ) { 
-         
-         glEnable ( GL_TEXTURE_2D );
-         
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch b/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch
deleted file mode 100644
index f6fc08e7da47..000000000000
--- a/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/chuck_vm.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/chuck_vm.cpp
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/chuck_vm.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/chuck_vm.cpp	2012-03-17 10:27:23.000000000 +0100
-@@ -48,6 +48,7 @@
- #else
-   #include <unistd.h>
-   #include <pthread.h>
-+  #include <algorithm>
- #endif
- 
- 
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: chuck_vm.cpp.orig
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: rtaudio.cpp.orig
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: rtaudio.cpp.rej
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_stk.cpp.orig
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_stk.cpp.rej
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_xxx.cpp.orig
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_xxx.cpp.rej
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:27:23.000000000 +0100
-@@ -38,6 +38,7 @@
- #include <limits.h>
- #include <vector>
- #include <map>
-+#include <climits>
- 
- using namespace std;
- 
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_hid.cpp.orig
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_opsc.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_opsc.cpp
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_opsc.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_opsc.cpp	2012-03-17 10:27:23.000000000 +0100
-@@ -57,6 +57,7 @@
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <algorithm>
- #endif
- 
- #if defined(__MACOSX_CORE__)
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_opsc.cpp.orig
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_string.h audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_string.h
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_string.h	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_string.h	2012-03-17 10:27:23.000000000 +0100
-@@ -36,6 +36,7 @@
- #include "chuck_def.h"
- #include <string>
- #include <vector>
-+#include <cstdio>
- 
- 
- // itoa
-diff -ru audicle-1.0.0.7.orig//src/audicle_def.h audicle-1.0.0.7/src/audicle_def.h
---- audicle-1.0.0.7.orig//src/audicle_def.h	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/src/audicle_def.h	2012-03-17 10:28:40.000000000 +0100
-@@ -39,8 +39,9 @@
- 
- #include "chuck_def.h"
- 
--#include <stdio.h>
--#include <math.h>
-+#include <cstdio>
-+#include <cmath>
-+#include <algorithm>
- #include <assert.h>
- #ifndef __PLATFORM_WIN32__
-   #include <unistd.h>
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch b/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch
deleted file mode 100644
index d362ed06423a..000000000000
--- a/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:25:03.000000000 +0100
-@@ -7392,14 +7392,139 @@
- int WiiRemote_send( const HidMsg * msg ){ return -1; }
- const char * WiiRemote_name( int wr ){ return NULL; }
- 
-+#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position"
-+#define TILTSENSOR_BUF_LEN 32
-+
-+static struct t_TiltSensor_data
-+{
-+	union
-+	{
-+		struct t_macbook
-+		{
-+			int x;
-+			int y;
-+			int z;
-+		} macbook;
-+	} data;
-+	int dataType;
-+	int detected;
-+	int refcount;
-+
-+	t_TiltSensor_data()
-+	{
-+		refcount = 0;
-+		dataType = -1;
-+		detected = 0;
-+	}
-+
-+} TiltSensor_data;
-+enum
-+{
-+	linuxAppleSMCMacBookDataType
-+};
-+static int TiltSensor_detect()
-+{
-+	int fd;
-+
-+	fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+	if (fd > 0)
-+	{
-+		TiltSensor_data.dataType = linuxAppleSMCMacBookDataType;
-+		TiltSensor_data.detected = 1;
-+		close(fd);
-+		return 1;
-+	}
-+
-+	TiltSensor_data.detected = -1;
-+
-+	return 0;
-+}
-+
-+static int TiltSensor_do_read()
-+{
-+
-+	switch(TiltSensor_data.dataType)
-+	{
-+		case linuxAppleSMCMacBookDataType:
-+			char buf[TILTSENSOR_BUF_LEN];
-+			int ret, fd;
-+			fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+			if (fd < 0) {
-+				return -1;
-+			}
-+			ret = read(fd, buf, TILTSENSOR_BUF_LEN);
-+			if (ret < 0) {
-+				close(fd);
-+				return -1;
-+			}
-+			if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) {
-+				close(fd);
-+				return -1;
-+			}
-+			close(fd);
-+			break;
-+		default:
-+			return 0;
-+	}
-+	return 1;
-+}
- void TiltSensor_init(){}
- void TiltSensor_quit(){}
- void TiltSensor_probe(){}
--int TiltSensor_count(){ return 0; }
--int TiltSensor_open( int ts ){ return -1; }
--int TiltSensor_close( int ts ){ return -1; }
--int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; }
--const char * TiltSensor_name( int ts ){ return NULL; }
-+int TiltSensor_count()
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return 0;
-+	else if(TiltSensor_data.detected == 1)
-+		return 1;
-+
-+	return 0;
-+}
-+int TiltSensor_open( int ts )
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	TiltSensor_data.refcount++;
-+
-+	return 0;
-+}
-+int TiltSensor_close( int ts )
-+{
-+	TiltSensor_data.refcount--;
-+
-+	return 0;
-+}
-+int TiltSensor_read( int ts, int type, int num, HidMsg * msg )
-+{
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	if(!TiltSensor_do_read())
-+		return -1;
-+
-+	if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType)
-+	{
-+		msg->idata[0] = TiltSensor_data.data.macbook.x;
-+		msg->idata[1] = TiltSensor_data.data.macbook.y;
-+		msg->idata[2] = TiltSensor_data.data.macbook.z;
-+	}
-+
-+	return 0;
-+}
-+const char * TiltSensor_name( int ts )
-+{
-+	return "Apple Sudden Motion Sensor";
-+}
- 
- 
- #endif
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_hid.cpp.orig
diff --git a/media-sound/audicle/metadata.xml b/media-sound/audicle/metadata.xml
deleted file mode 100644
index 69313e7770a3..000000000000
--- a/media-sound/audicle/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		a potentially new type of audio programming environment that integrates
-		the programmability of the development environment with elements of the
-		runtime environment
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/audiocompress/audiocompress-2.0.ebuild b/media-sound/audiocompress/audiocompress-2.0.ebuild
index cf03513cb762..02fa126b6655 100644
--- a/media-sound/audiocompress/audiocompress-2.0.ebuild
+++ b/media-sound/audiocompress/audiocompress-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,15 +8,14 @@ inherit toolchain-funcs
 MY_P=AudioCompress-${PV}
 
 DESCRIPTION="Very gentle 1-band dynamic range compressor"
-HOMEPAGE="https://beesbuzz.biz/code/audiocompress.php"
+HOMEPAGE="https://github.com/fluffy-critter/audiocompress"
 SRC_URI="https://beesbuzz.biz/code/audiocompress/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 
-S=${WORKDIR}/${MY_P}
-
 src_compile() {
 	emake \
 		CFLAGS="${CFLAGS}" \
diff --git a/media-sound/audiocompress/metadata.xml b/media-sound/audiocompress/metadata.xml
index c870d0eef0ab..d94daae2aad0 100644
--- a/media-sound/audiocompress/metadata.xml
+++ b/media-sound/audiocompress/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">fluffy-critter/audiocompress</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/audiotag/Manifest b/media-sound/audiotag/Manifest
index e4f71ed26690..ef27a1756562 100644
--- a/media-sound/audiotag/Manifest
+++ b/media-sound/audiotag/Manifest
@@ -1 +1 @@
-DIST audiotag-0.19.tar.bz2 15016 BLAKE2B d650887a72242d1258fa2d60a876a6c5984369074d16e4f9028468f6520b38afad4a5cf92ba5c2a92f7f2a26b1aaf515998fa1a3fbd6d8d49d15074c68940c14 SHA512 a2e117deb78c3141ca1e17a12ee17033eb762fee822187d8aa708715ee4077b120ea2f7acf09d683d9dd292c0826e1152d09286830976b65d08738ced9a0529e
+DIST audiotag-0.19.tar.gz 15794 BLAKE2B 811630a7eb0888ccc1ce4a7e1dbdc6cc65d98a0c1ab8c4ddc5621cdd6221994098cc8cc48ee94d4ceb8a2e021c50e76ad83e9ba86bdbd07667f8c59c7f111dd2 SHA512 3d3719ed38b931791479846f552ba78e51b0e5f7b97b3f1bf3cce6a78f5fabc3a75d90f7f932a12480cc44f7b2065ea559b998b9daf0b5816847c0b3627bc80a
diff --git a/media-sound/audiotag/audiotag-0.19-r1.ebuild b/media-sound/audiotag/audiotag-0.19-r1.ebuild
index bffb56f6602f..2c09890dab55 100644
--- a/media-sound/audiotag/audiotag-0.19-r1.ebuild
+++ b/media-sound/audiotag/audiotag-0.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit optfeature
 
 DESCRIPTION="Command-line tool for mass tagging/renaming of audio files"
 HOMEPAGE="https://github.com/Daenyth/audiotag"
-SRC_URI="https://github.com/downloads/Daenyth/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/Daenyth/audiotag/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -21,7 +21,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "for m4a/mp4 support" media-video/atomicparsley media-video/atomicparsley-wez
+	optfeature "for m4a/mp4 support" media-video/atomicparsley
 	optfeature "for flac support" media-libs/flac
 	optfeature "for mp3 support" media-libs/id3lib
 	optfeature "for vorbis support" media-sound/vorbis-tools
diff --git a/media-sound/audiotag/metadata.xml b/media-sound/audiotag/metadata.xml
index 1992c4416bdf..81188466008d 100644
--- a/media-sound/audiotag/metadata.xml
+++ b/media-sound/audiotag/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/audiotools/audiotools-3.1.1.ebuild b/media-sound/audiotools/audiotools-3.1.1-r2.ebuild
index 24789992f77a..fb64c116d442 100644
--- a/media-sound/audiotools/audiotools-3.1.1.ebuild
+++ b/media-sound/audiotools/audiotools-3.1.1-r2.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
-DESCRIPTION="A collection of command line audio tools"
-HOMEPAGE="http://audiotools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+DESCRIPTION="Collection of command line audio tools"
+HOMEPAGE="https://audiotools.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="aac alsa cdda cdr cue dvda flac gui twolame mp3 opus pulseaudio vorbis wavpack"
 
 BDEPEND="virtual/pkgconfig"
@@ -27,7 +28,7 @@ DEPEND="
 		media-libs/opus
 		media-libs/opusfile
 	)
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
 "
@@ -81,6 +82,12 @@ python_compile_all() {
 	emake -C docs
 }
 
+python_compile() {
+	# setuptools is broken with parallel builds
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
+
 python_test() {
 	cd test || die
 	"${PYTHON}" test.py || die
diff --git a/media-sound/audiotools/metadata.xml b/media-sound/audiotools/metadata.xml
index 1e51d3f4604b..7e481b445bf8 100644
--- a/media-sound/audiotools/metadata.xml
+++ b/media-sound/audiotools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/aumix/metadata.xml b/media-sound/aumix/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/aumix/metadata.xml
+++ b/media-sound/aumix/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index 5aabbd1e7bef..f6516c06ed47 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -1 +1 @@
-DIST awesfx-0.5.1e.tar.bz2 307929 BLAKE2B a3bee0750ca44ab2e732f6bdb2c119104521330226e243be1b0ab9c19e2bfd87176ad2dc039f26b9552be621a7af2ef86852e2f31f8d0b9158b093712d2447e1 SHA512 f70e631b6ab6ec6dcbde7773c1da5cba72763d2198c2ac51f4bde0fee80f057f296cabc915aed805e744f7b2323b4e2b20b6d894c79cf5682457a3fc6a9be11d
+DIST awesfx-0.5.2.tar.gz 83611 BLAKE2B 7472f478bd1b228080a669d9df47b885d9953d363a06341cc2684af1723818a8938e31622aee9dd2ca6286c59db7715224c920e79cfa318cb3347b8833f67dc6 SHA512 f59f503c54de8bcccbd8a51c1f6a7afae98bd6b5ae4ad4ec467b4f29cece569b4f8e3185adf243816f786a0c2e92fe8d098d56f02d5704979ee8290ad61f46b6
diff --git a/media-sound/awesfx/awesfx-0.5.1e.ebuild b/media-sound/awesfx/awesfx-0.5.2.ebuild
index 47f55331e13c..4dc34b5e106d 100644
--- a/media-sound/awesfx/awesfx-0.5.1e.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.2.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="AWE32 Sound Driver Utility Programs"
-HOMEPAGE="http://ftp.suse.com/pub/people/tiwai/awesfx"
-SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/tiwai/awesfx"
+SRC_URI="https://github.com/tiwai/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
@@ -19,6 +21,11 @@ BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
 
 DOCS=( AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--with-sfpath=${BANK_LOC}
diff --git a/media-sound/awesfx/metadata.xml b/media-sound/awesfx/metadata.xml
index c870d0eef0ab..cad1b8aac746 100644
--- a/media-sound/awesfx/metadata.xml
+++ b/media-sound/awesfx/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">tiwai/awesfx</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/aylet/metadata.xml b/media-sound/aylet/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/aylet/metadata.xml
+++ b/media-sound/aylet/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/baudline/Manifest b/media-sound/baudline/Manifest
index 5351373bea82..f43d4333c9dd 100644
--- a/media-sound/baudline/Manifest
+++ b/media-sound/baudline/Manifest
@@ -1,4 +1,2 @@
 DIST baudline_1.08_linux_i686.tar.gz 1945014 BLAKE2B 01dfd3c03a7d5dab3f3d65d660239ec51ec157f9711aaebfa6a155a46ec353c5d2c6676bc88f4f4642bbdabc5adf89ad174b5fb7d229933962065b0c44383055 SHA512 eb53b0508316f156b4d8ee86b9280657260039e41b7ab946796d9780af2b105c7839fd2d7bfcee032a96e27a8bc87acc7ce564b8eeccbaf348af96b2f5828e16
-DIST baudline_1.08_linux_ppc.tar.gz 2369780 BLAKE2B 45bb73d76860f7cfb608ffb42e4ecf2c03bc8b32288a51e51ec02998085d7718f88047ec567a3960768003d3e201b0282cc80ac1bc6abc3a6c530690e1b8922d SHA512 7cb43cfec5cced3a6c051fcb56485b9a55d543a988f311f9130a41514d44a47fc0565415b5c9106cdd495283c62f03a137940afae4386fd4e87e3234fdece41f
-DIST baudline_1.08_linux_s390.tar.gz 459868 BLAKE2B 41cb33a5def0caacdf2850e04c3a348bb1181d010b5c2e06387c6a36c55473c44d99d3058614cdae104b04f2f94c0150c81a64c2ee509774ce15c82948fdb658 SHA512 636380e7b67b7885676ab9ae89a2ee97ac5a7934c1636f984ecbabc3bc78a3d1cd2b15a7e0572bb0f7a78d65a69df60550edad424dd102b5b85e244ae87ea5c7
 DIST baudline_1.08_linux_x86_64.tar.gz 2270546 BLAKE2B 722318b4d3a1e244c8e6c57555a29b9b1305c26a3f7711cd13deef3e2f57ed78bdd624947a9db1c10cda2f807c0248e14cd1a0fc28da0a7a0511e41d75fb84cc SHA512 d0cb5dc0e6cc3fd79dbc2a37e7a1b9bbb050c953d1d2893f24f87a45f301fbc69ba4ba3b2f32903caec391ed0ca6913d2c320ca82039bb41185b21e100a754c4
diff --git a/media-sound/baudline/baudline-1.08-r1.ebuild b/media-sound/baudline/baudline-1.08-r2.ebuild
index 54a34b12b4d5..b1acd9cd0f9e 100644
--- a/media-sound/baudline/baudline-1.08-r1.ebuild
+++ b/media-sound/baudline/baudline-1.08-r2.ebuild
@@ -1,33 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit eutils xdg
+inherit desktop xdg
 
 DESCRIPTION="A time-frequency browser designed for visualization of spectral domains"
-HOMEPAGE="http://www.baudline.com/"
-SRC_URI="amd64? ( http://www.baudline.com/${PN}_${PV}_linux_x86_64.tar.gz )
-	ppc? ( http://www.baudline.com/${PN}_${PV}_linux_ppc.tar.gz )
-	s390? ( http://www.baudline.com/${PN}_${PV}_linux_s390.tar.gz )
-	x86? ( http://www.baudline.com/baudline_1.08_linux_i686.tar.gz )"
+HOMEPAGE="https://www.baudline.com/"
+SRC_URI="
+	amd64? ( https://www.baudline.com/${PN}_${PV}_linux_x86_64.tar.gz )
+	x86? ( https://www.baudline.com/${PN}_${PV}_linux_i686.tar.gz )"
 
-LICENSE="${PN}"
+LICENSE="baudline"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="jack"
-
 RESTRICT="mirror bindist"
-QA_PREBUILT="/opt/baudline/baudline*"
 
-RDEPEND="media-fonts/font-adobe-75dpi
+RDEPEND="
+	media-fonts/font-adobe-75dpi
 	media-fonts/font-misc-misc
+	sys-libs/glibc
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
 
+QA_PREBUILT="opt/baudline/baudline*"
+
 src_unpack() {
 	default
 	# strip arch names from S
diff --git a/media-sound/baudline/metadata.xml b/media-sound/baudline/metadata.xml
index f9d9c0fca82e..39905fdba486 100644
--- a/media-sound/baudline/metadata.xml
+++ b/media-sound/baudline/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 <longdescription lang="en">
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 2385fe9f1b16..7939d4065748 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1 +1,2 @@
-DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
+DIST beets-1.6.0.tar.gz 1698333 BLAKE2B 7d3ded703524d5f8740a6adf3769a5752a1e47720ebf0653238f117e4ef6f97461abcd0c7a0d7f428c9848c95277070b5687f9007c04e47b07cdb22eca8c9cbf SHA512 b03759a2be7d3318b4f43cac09ada229cea6496774ba3dcdb1458427e41f6329a627241afc0bfaa9a91afb6818ba944ef6088e38c5635a3bfe730a6a8011a0dc
+DIST beets-1.7.0_pre20240501.gh.tar.gz 2247319 BLAKE2B e215c8a2a30a44d298746351be4fa2de1cebb7d6aec2bc7dfc679b133ea5eddefec20d038aa1aa1d734b176c09163b93f917c6c29ea5115c4c2349e090c8c5df SHA512 f397c72b481d7d8822db598ab37c99d0b9063ae45455c0d34116fab7b5a4cc683a3357bdfe436181b1dea46ee05192cc37faf355b5e093d63c2e440e523b92bc
diff --git a/media-sound/beets/beets-1.4.9-r2.ebuild b/media-sound/beets/beets-1.4.9-r2.ebuild
deleted file mode 100644
index 6fa58e40129d..000000000000
--- a/media-sound/beets/beets-1.4.9-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-
-RDEPEND="${DEPEND}"
-DEPEND="
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		badfiles? (
-			media-libs/flac
-			media-sound/mp3val
-		)
-		chromaprint? (
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-		)
-		discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg:0[encode] )
-		gstreamer? (
-			media-libs/gst-plugins-good:1.0
-			media-libs/gst-plugins-bad:1.0
-		)
-		icu? ( dev-db/sqlite[icu] )
-		lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
-		mpd? (
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		)
-		replaygain? (
-			gstreamer? (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
-			!gstreamer? ( media-sound/mp3gain )
-		)
-		thumbnail? (
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-				media-gfx/imagemagick
-			)
-		)
-		webserver? (
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
-		)
-	')"
-BDEPEND="dev-python/sphinx"
-
-DOCS=( README.rst docs/changelog.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	rm_use_plugins() {
-		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
-		local use=${1}
-		local plugins=${use}
-		use ${use} && return
-		einfo "no ${use}:"
-		[[ $# -gt 1 ]] && plugins="${@:2}"
-		for arg in ${plugins[@]}; do
-			einfo "  removing ${arg}"
-			if [[ -e "beetsplug/${arg}.py" ]]; then
-				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
-			fi
-			if [[ -d "beetsplug/${arg}" ]]; then
-				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
-			fi
-			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
-				die "Unable to disable ${arg} plugin "
-		done
-	}
-
-	rm_use_plugins chromaprint chroma
-	rm_use_plugins ffmpeg convert
-	rm_use_plugins icu loadext
-	rm_use_plugins lastfm lastgenre lastimport
-	rm_use_plugins mpd bpd mpdstats
-	rm_use_plugins webserver web
-	rm_use_plugins thumbnail thumbnails
-
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in badfiles discogs replaygain; do
-		rm_use_plugins ${flag}
-	done
-
-	if ! use mpd; then
-		rm test/test_player.py || die
-		rm test/test_mpdstats.py || die
-	fi
-	if ! use webserver; then
-		rm test/test_web.py || die "Failed to remove test_web.py"
-	fi
-	if use test; then
-		# Those test need network
-		rm test/test_art.py || die
-		rm test/test_discogs.py || die
-		rm test/test_embyupdate.py || die
-		rm test/test_lastgenre.py || die
-		rm test/test_spotify.py || die
-		# rm test/test_plexupdate.py
-		rm test/test_thumbnails.py || die
-		# Not working
-		rm test/test_replaygain.py || die
-		# Not working
-		rm test/test_convert.py || die
-		# Not working and dropped in master
-		rm test/test_mediafile.py || die
-	fi
-}
-
-python_compile_all() {
-	esetup.py build_sphinx -b man --build-dir=docs/build
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/build/man/*
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	einstalldocs
-
-	"${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
-	newbashcomp "${T}/beet.bashcomp" beet
-}
diff --git a/media-sound/beets/beets-1.6.0-r1.ebuild b/media-sound/beets/beets-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..05075184f5f8
--- /dev/null
+++ b/media-sound/beets/beets-1.6.0-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 bash-completion-r1 optfeature
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+else
+	inherit pypi
+	MY_PV=${PV/_beta/-beta.}
+	MY_P=${PN}-${MY_PV}
+	KEYWORDS="amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/musicbrainzngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
+	')"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+	)
+	$(python_gen_cond_dep '
+		test? (
+			dev-db/sqlite[icu]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/python3-discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd2[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_USEDEP}]
+				media-gfx/imagemagick
+			)
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			media-plugins/gst-plugins-libav:1.0
+			media-video/ffmpeg:0[encode]
+			app-shells/bash-completion
+		)
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-Remove-test_completion.patch"
+	"${FILESDIR}/${PV}-sphinx-6.patch"
+	"${FILESDIR}/${PV}-mediafile-test.patch"
+	"${FILESDIR}/${PV}-unicode-test.patch"
+)
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc ; then
+		sphinx-build -b html docs docs/build || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+
+	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	newbashcomp "${T}/beet.bash" beet
+	insinto /usr/share/zsh/site-functions
+	newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/python3-discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd2"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
+}
diff --git a/media-sound/beets/beets-1.7.0_pre20240501.ebuild b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
new file mode 100644
index 000000000000..07eece0e631c
--- /dev/null
+++ b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+# These envvars are used to treat github tarball builds differently
+# from pypi sources. Enable where required
+: ${IS_VCS_SOURCE="no"}
+: ${UPDATE_VERSION="no"}
+
+inherit distutils-r1 bash-completion-r1 multiprocessing optfeature
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+else
+	MY_COMMIT=c75f07a0da6c622d3cd0f5aad0a08edaea360dad
+	# This should be set to 1 if we're not sourcing tarballs from pypi; we need to generate mans.
+	IS_VCS_SOURCE="yes"
+	UPDATE_VERSION="yes"
+	SRC_URI="https://github.com/beetbox/beets/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+fi
+
+DESCRIPTION="Media library management system for obsessive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/musicbrainzngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
+	')"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+	)
+	$(python_gen_cond_dep '
+		test? (
+			dev-db/sqlite[icu]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/python3-discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd2[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_USEDEP}]
+				media-gfx/imagemagick
+			)
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			media-plugins/gst-plugins-libav:1.0
+			media-video/ffmpeg:0[encode]
+			app-shells/bash-completion
+		)
+	')"
+
+# Beets uses sphinx to generate manpages; these are not available
+# directly in VCS sources, only pypi tarballs, so handle the dependency
+# here automagically.
+if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
+	BDEPEND+="
+		dev-python/sphinx
+	"
+fi
+
+DOCS=( README.rst docs/changelog.rst )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# https://github.com/beetbox/beets/commit/8b4983fe7cae9397acd3e23602e419d8dc1041d4
+	# merged code coverage into standard test runs; since we disable coverage globally
+	# we need to sed out some 'addopts' for coverage in setup.cfg that cause tests to choke.
+	sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg"
+	# Update the version if we're not building from pypy; it's probably a _pre or live ebuild.
+	if  [[ ${PV} == "9999" ]] || [[ ${UPDATE_VERSION} == "yes" ]]; then
+		    sed -i -e "s/version=\".*\"/version=\"${PV}\"/" setup.py || die "Failed to update version in VCS sources"
+			sed -i -e "s/__version__ = \".*\"/__version__ = \"${PV}\"/" beets/__init__.py
+	fi
+	default
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc ; then
+		sphinx-build -b html docs docs/build || die
+	fi
+	# If building from VCS sources we need to generate manpages, then copy them to ${S}/man
+	# We could install mans from the sphinx build path, but to be consistent with pypi for src_install
+	# we'll instead generate them and copy to the same install location if building from VCS sources.
+	if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
+		einfo "Building man pages"
+		sphinx-build -b man docs docs/build/man || die "Failed to generate man pages"
+		mkdir "${S}/man" || die
+		cp docs/build/man/{beet.1,beetsconfig.5} "${S}/man" || die
+	fi
+}
+
+python_test() {
+	# https://github.com/beetbox/beets/issues/5243 testing bash completions is broken.
+	local EPYTEST_DESELECT=(
+		test/test_ui.py::CompletionTest::test_completion
+	)
+	epytest -n$(makeopts_jobs) -v
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+	# Generate the bash completions; we'll set PYTHONPATH for this invocation so that beets can start.
+	PYTHONPATH="${ED}/usr/lib/${PYTHON}:$PYTHONPATH" ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	newbashcomp "${T}/beet.bash" beet
+	insinto /usr/share/zsh/site-functions
+	newins "${S}/extra/_beet" _beet
+
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/python3-discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd2"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
+}
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 01d7ec3b1be1..4bb022d375b0 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -1,175 +1,170 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
-inherit distutils-r1 bash-completion-r1
+# These envvars are used to treat github tarball builds differently
+# from pypi sources. Enable where required
+: ${IS_VCS_SOURCE="no"}
+: ${UPDATE_VERSION="no"}
+
+inherit distutils-r1 bash-completion-r1 multiprocessing optfeature
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
 	inherit git-r3
 else
+	inherit pypi
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+DESCRIPTION="Media library management system for obsessive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="${DEPEND}"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/musicbrainzngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
+	')"
 DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+	)
 	$(python_gen_cond_dep '
 		test? (
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/confuse-1.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mediafile-0.2.0[${PYTHON_MULTI_USEDEP}]
-		badfiles? (
-			media-libs/flac
-			media-sound/mp3val
-		)
-		chromaprint? (
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-		)
-		discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg:0[encode] )
-		gstreamer? (
-			media-libs/gst-plugins-good:1.0
-			media-libs/gst-plugins-bad:1.0
-		)
-		icu? ( dev-db/sqlite[icu] )
-		lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
-		mpd? (
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		)
-		replaygain? (
-			gstreamer? (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
-			!gstreamer? ( media-sound/mp3gain )
-		)
-		thumbnail? (
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-db/sqlite[icu]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/python3-discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd2[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
 			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick
 			)
-		)
-		webserver? (
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			media-plugins/gst-plugins-libav:1.0
+			media-video/ffmpeg:0[encode]
+			app-shells/bash-completion
 		)
 	')"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-	')"
+
+# Beets uses sphinx to generate manpages; these are not available
+# directly in VCS sources, only pypi tarballs, so handle the dependency
+# here automagically.
+if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
+	BDEPEND+="
+		dev-python/sphinx
+	"
+fi
 
 DOCS=( README.rst docs/changelog.rst )
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
+src_prepare() {
+	# https://github.com/beetbox/beets/commit/8b4983fe7cae9397acd3e23602e419d8dc1041d4
+	# merged code coverage into standard test runs; since we disable coverage globally
+	# we need to sed out some 'addopts' for coverage in setup.cfg that cause tests to choke.
+	sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg"
+	# Update the version if we're not building from pypy; it's probably a _pre or live ebuild.
+	if  [[ ${PV} == "9999" ]] || [[ ${UPDATE_VERSION} == "yes" ]]; then
+		    sed -i -e "s/version=\".*\"/version=\"${PV}\"/" setup.py || die "Failed to update version in VCS sources"
+			sed -i -e "s/__version__ = \".*\"/__version__ = \"${PV}\"/" beets/__init__.py
+	fi
+	default
+}
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
+}
 
-	rm_use_plugins() {
-		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
-		local use=${1}
-		local plugins=${use}
-		use ${use} && return
-		einfo "no ${use}:"
-		[[ $# -gt 1 ]] && plugins="${@:2}"
-		for arg in ${plugins[@]}; do
-			einfo "  removing ${arg}"
-			if [[ -e "beetsplug/${arg}.py" ]]; then
-				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
-			fi
-			if [[ -d "beetsplug/${arg}" ]]; then
-				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
-			fi
-			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
-				die "Unable to disable ${arg} plugin "
-		done
-	}
-
-	rm_use_plugins chromaprint chroma
-	rm_use_plugins ffmpeg convert
-	rm_use_plugins icu loadext
-	rm_use_plugins lastfm lastgenre lastimport
-	rm_use_plugins mpd bpd mpdstats
-	rm_use_plugins webserver web
-	rm_use_plugins thumbnail thumbnails
-
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in badfiles discogs replaygain; do
-		rm_use_plugins ${flag}
-	done
-
-	if ! use mpd; then
-		rm test/test_player.py || die
-		rm test/test_mpdstats.py || die
-	fi
-	if ! use webserver; then
-		rm test/test_web.py || die "Failed to remove test_web.py"
+python_compile_all() {
+	if use doc ; then
+		sphinx-build -b html docs docs/build || die
 	fi
-	if use test; then
-		# Those test need network
-		rm test/test_art.py || die
-		rm test/test_discogs.py || die
-		rm test/test_embyupdate.py || die
-		rm test/test_lastgenre.py || die
-		rm test/test_spotify.py || die
-		# rm test/test_plexupdate.py
-		rm test/test_thumbnails.py || die
-		# Not working
-		rm test/test_replaygain.py || die
-		# Not working
-		rm test/test_convert.py || die
+	# If building from VCS sources we need to generate manpages, then copy them to ${S}/man
+	# We could install mans from the sphinx build path, but to be consistent with pypi for src_install
+	# we'll instead generate them and copy to the same install location if building from VCS sources.
+	if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
+		einfo "Building man pages"
+		sphinx-build -b man docs docs/build/man || die "Failed to generate man pages"
+		mkdir "${S}/man" || die
+		cp docs/build/man/{beet.1,beetsconfig.5} "${S}/man" || die
 	fi
 }
 
-python_compile_all() {
-	esetup.py build_sphinx -b man --build-dir=docs/build
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+python_test() {
+	# https://github.com/beetbox/beets/issues/5243 testing bash completions is broken.
+	local EPYTEST_DESELECT=(
+		test/test_ui.py::CompletionTest::test_completion
+	)
+	epytest -n$(makeopts_jobs) -v
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	doman docs/build/man/*
+	doman man/*
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
-
-	"${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
-	newbashcomp "${T}/beet.bashcomp" beet
+	# Generate the bash completions; we'll set PYTHONPATH for this invocation so that beets can start.
+	PYTHONPATH="${ED}/usr/lib/${PYTHON}:$PYTHONPATH" ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	newbashcomp "${T}/beet.bash" beet
+	insinto /usr/share/zsh/site-functions
+	newins "${S}/extra/_beet" _beet
+
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/python3-discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd2"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
 }
diff --git a/media-sound/beets/files/1.6.0-0001-Remove-test_completion.patch b/media-sound/beets/files/1.6.0-0001-Remove-test_completion.patch
new file mode 100644
index 000000000000..e51f31c380dc
--- /dev/null
+++ b/media-sound/beets/files/1.6.0-0001-Remove-test_completion.patch
@@ -0,0 +1,74 @@
+From 8e37acd04af1b6d0723bf9d1992da49ee0155758 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 21 Oct 2021 23:16:45 +0200
+Subject: [PATCH] Remove test_completion
+
+Known issue: https://github.com/beetbox/beets/issues/1876
+---
+ test/test_ui.py | 50 -------------------------------------------------
+ 1 file changed, 50 deletions(-)
+
+diff --git a/test/test_ui.py b/test/test_ui.py
+index 9804b0a1..5c321040 100644
+--- a/test/test_ui.py
++++ b/test/test_ui.py
+@@ -1208,56 +1208,6 @@ class PluginTest(_common.TestCase, TestHelper):
+         self.run_command('test', lib=None)
+ 
+ 
+-@_common.slow_test()
+-class CompletionTest(_common.TestCase, TestHelper):
+-    def test_completion(self):
+-        # Load plugin commands
+-        config['pluginpath'] = [_common.PLUGINPATH]
+-        config['plugins'] = ['test']
+-
+-        # Do not load any other bash completion scripts on the system.
+-        env = dict(os.environ)
+-        env['BASH_COMPLETION_DIR'] = os.devnull
+-        env['BASH_COMPLETION_COMPAT_DIR'] = os.devnull
+-
+-        # Open a `bash` process to run the tests in. We'll pipe in bash
+-        # commands via stdin.
+-        cmd = os.environ.get('BEETS_TEST_SHELL', '/bin/bash --norc').split()
+-        if not has_program(cmd[0]):
+-            self.skipTest('bash not available')
+-        tester = subprocess.Popen(cmd, stdin=subprocess.PIPE,
+-                                  stdout=subprocess.PIPE, env=env)
+-
+-        # Load bash_completion library.
+-        for path in commands.BASH_COMPLETION_PATHS:
+-            if os.path.exists(util.syspath(path)):
+-                bash_completion = path
+-                break
+-        else:
+-            self.skipTest('bash-completion script not found')
+-        try:
+-            with open(util.syspath(bash_completion), 'rb') as f:
+-                tester.stdin.writelines(f)
+-        except OSError:
+-            self.skipTest('could not read bash-completion script')
+-
+-        # Load completion script.
+-        self.io.install()
+-        self.run_command('completion', lib=None)
+-        completion_script = self.io.getoutput().encode('utf-8')
+-        self.io.restore()
+-        tester.stdin.writelines(completion_script.splitlines(True))
+-
+-        # Load test suite.
+-        test_script_name = os.path.join(_common.RSRC, b'test_completion.sh')
+-        with open(test_script_name, 'rb') as test_script_file:
+-            tester.stdin.writelines(test_script_file)
+-        out, err = tester.communicate()
+-        if tester.returncode != 0 or out != b'completion tests passed\n':
+-            print(out.decode('utf-8'))
+-            self.fail('test/test_completion.sh did not execute properly')
+-
+-
+ class CommonOptionsParserCliTest(unittest.TestCase, TestHelper):
+     """Test CommonOptionsParser and formatting LibModel formatting on 'list'
+     command.
+-- 
+2.32.0
+
diff --git a/media-sound/beets/files/1.6.0-mediafile-test.patch b/media-sound/beets/files/1.6.0-mediafile-test.patch
new file mode 100644
index 000000000000..0feb8be7c98d
--- /dev/null
+++ b/media-sound/beets/files/1.6.0-mediafile-test.patch
@@ -0,0 +1,41 @@
+used to work due to inconsistent mediafile implementation, but with
+https://github.com/beetbox/mediafile/pull/64 (in mediafile >= 0.11.0)
+list fields are None if non-existent, not the empty list
+
+Upstream-PR: https://github.com/beetbox/beets/pull/4593
+
+diff --git a/test/test_embedart.py b/test/test_embedart.py
+index 6b6d616..bc550a8 100644
+--- a/test/test_embedart.py
++++ b/test/test_embedart.py
+@@ -81,7 +81,7 @@ class EmbedartCliTest(_common.TestCase, TestHelper):
+         self.run_command('embedart', '-f', self.small_artpath)
+         mediafile = MediaFile(syspath(item.path))
+         # make sure that images array is empty (nothing embedded)
+-        self.assertEqual(len(mediafile.images), 0)
++        self.assertFalse(mediafile.images)
+ 
+     def test_embed_art_from_file(self):
+         self._setup_data()
+@@ -202,7 +202,7 @@ class EmbedartCliTest(_common.TestCase, TestHelper):
+         self.io.addinput('y')
+         self.run_command('clearart')
+         mediafile = MediaFile(syspath(item.path))
+-        self.assertEqual(len(mediafile.images), 0)
++        self.assertFalse(mediafile.images)
+ 
+     def test_clear_art_with_no_input(self):
+         self._setup_data()
+diff --git a/test/test_zero.py b/test/test_zero.py
+index c4c1769..b48367b 100644
+--- a/test/test_zero.py
++++ b/test/test_zero.py
+@@ -103,7 +103,7 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
+         item.write()
+ 
+         mf = MediaFile(syspath(path))
+-        self.assertEqual(0, len(mf.images))
++        self.assertFalse(mf.images)
+ 
+     def test_auto_false(self):
+         self.config['zero']['fields'] = ['year']
diff --git a/media-sound/beets/files/1.6.0-sphinx-6.patch b/media-sound/beets/files/1.6.0-sphinx-6.patch
new file mode 100644
index 000000000000..d946e93b76b8
--- /dev/null
+++ b/media-sound/beets/files/1.6.0-sphinx-6.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/889460
+https://github.com/beetbox/beets/commit/2106f471affd1dab35b4b26187b9c74d034528c5
+
+From 2106f471affd1dab35b4b26187b9c74d034528c5 Mon Sep 17 00:00:00 2001
+From: Jack Wilsdon <jack.wilsdon@gmail.com>
+Date: Sat, 31 Dec 2022 14:23:34 +0000
+Subject: [PATCH] Add missing placeholders to extlinks captions
+
+Sphinx 6.0.0 changed extlinks to always require placeholders in link
+captions. See https://github.com/sphinx-doc/sphinx/commit/93cf1a57d916a1ff96c8e8a0356d0256e40489ac
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -18,10 +18,10 @@
+ 
+ # External links to the bug tracker and other sites.
+ extlinks = {
+-    'bug': ('https://github.com/beetbox/beets/issues/%s', '#'),
+-    'user': ('https://github.com/%s', ''),
+-    'pypi': ('https://pypi.org/project/%s/', ''),
+-    'stdlib': ('https://docs.python.org/3/library/%s.html', ''),
++    'bug': ('https://github.com/beetbox/beets/issues/%s', '#%s'),
++    'user': ('https://github.com/%s', '%s'),
++    'pypi': ('https://pypi.org/project/%s/', '%s'),
++    'stdlib': ('https://docs.python.org/3/library/%s.html', '%s'),
+ }
+ 
+ linkcheck_ignore = [
+
diff --git a/media-sound/beets/files/1.6.0-unicode-test.patch b/media-sound/beets/files/1.6.0-unicode-test.patch
new file mode 100644
index 000000000000..8b69e09557c9
--- /dev/null
+++ b/media-sound/beets/files/1.6.0-unicode-test.patch
@@ -0,0 +1,47 @@
+Unidecode 1.3.5 (a yanked PyPI version) changed the behavior of
+Unidecode for some specific characters:
+
+> Remove trailing space in replacements for vulgar fractions.
+
+As luck would have it, our tests used the 1/2 character specifically to
+test the behavior when these characters decoded to contain slashes. We
+now pin a sufficiently recent version of Unidecode and adapt the tests
+to match the new behavior.
+
+Upstream-Commit: https://github.com/beetbox/beets/commit/5ae1e0f3c8d3a450cb39f7933aa49bb78c2bc0d9
+
+diff --git a/setup.py b/setup.py
+index 264bb2e..69eb987 100755
+--- a/setup.py
++++ b/setup.py
+@@ -85,7 +85,7 @@ setup(
+     },
+ 
+     install_requires=[
+-        'unidecode',
++        'unidecode>=1.3.6',
+         'musicbrainzngs>=0.4',
+         'pyyaml',
+         'mediafile>=0.2.0',
+diff --git a/test/test_library.py b/test/test_library.py
+index 667d92c..b1cb579 100644
+--- a/test/test_library.py
++++ b/test/test_library.py
+@@ -441,7 +441,7 @@ class DestinationTest(_common.TestCase):
+         self.lib.directory = b'lib'
+         self.lib.path_formats = [('default', '$title')]
+         self.i.title = 'ab\xa2\xbdd'
+-        self.assertEqual(self.i.destination(), np('lib/abC_ 1_2 d'))
++        self.assertEqual(self.i.destination(), np('lib/abC_ 1_2d'))
+ 
+     def test_destination_with_replacements(self):
+         self.lib.directory = b'base'
+@@ -637,7 +637,7 @@ class DestinationFunctionTest(_common.TestCase, PathFormattingMixin):
+ 
+     def test_asciify_variable(self):
+         self._setf('%asciify{ab\xa2\xbdd}')
+-        self._assert_dest(b'/base/abC_ 1_2 d')
++        self._assert_dest(b'/base/abC_ 1_2d')
+ 
+     def test_left_variable(self):
+         self._setf('%left{$title, 3}')
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 544682635755..5de446482bcd 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
@@ -18,31 +18,22 @@
 
         Because beets is designed as a library, it can do almost anything you can
         imagine for your music collection. Via plugins, beets becomes a panacea:
-        * Embed and extract album art from files’ tags.
+        * Embed and extract album art from files' tags.
         * Listen to your library with a music player that speaks the MPD protocol
         and works with a staggering variety of interfaces.
         * Fetch lyrics for all your songs from databases on the Web.
         * Manage your MusicBrainz music collection.
-        * Analyze music files’ metadata from the command line.
+        * Analyze music files' metadata from the command line.
         * Clean up crufty tags left behind by other, less-awesome tools.
         * Browse your music library graphically through a Web browser and play it
         in any browser that supports HTML5 Audio.
 
-        If beets doesn’t do what you want yet, writing your own plugin is
+        If beets doesn't do what you want yet, writing your own plugin is
         shockingly simple if you know a little Python.
   </longdescription>
-  <use>
-    <flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
-    <flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
-    <flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
-    <flag name="discogs">Enable support for the discogs API plugin</flag>
-    <flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
-    <flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
-    <flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
-    <flag name="thumbnail">Enable album thumbnails generation</flag>
-    <flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
-  </use>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">beets</remote-id>
+    <remote-id type="github">beetbox/beets</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/bempc/metadata.xml b/media-sound/bempc/metadata.xml
index 422952ab825a..115e9d64a669 100644
--- a/media-sound/bempc/metadata.xml
+++ b/media-sound/bempc/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  </pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/media-sound/bitmeter/metadata.xml b/media-sound/bitmeter/metadata.xml
index f79bb67acbd9..3fed8a8997c3 100644
--- a/media-sound/bitmeter/metadata.xml
+++ b/media-sound/bitmeter/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
diff --git a/media-sound/bladeenc/Manifest b/media-sound/bladeenc/Manifest
deleted file mode 100644
index 2058d503000f..000000000000
--- a/media-sound/bladeenc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bladeenc-0.94.2-src-stable.tar.gz 142949 BLAKE2B 3a939aa0a10d37b5f67e43c9b91936c05b7f6bd78142d6d781153eb29d7565debbebeb32a535990291d29766aa8eafe7fd98608e866b1cc3df46164b7c9a5e16 SHA512 570202a201c3582483078248fae7330d978d69018e4367d51322f84f26875cf84250de6c46527d11624cd6f19d4a98e30421447358b15ce9f256cade28e604ef
diff --git a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
deleted file mode 100644
index 62d668d243ac..000000000000
--- a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An mp3 encoder"
-SRC_URI="http://bladeenc.mp3.no/source/${P}-src-stable.tar.gz"
-HOMEPAGE="http://bladeenc.mp3.no/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-secfix.diff" )
diff --git a/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff b/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff
deleted file mode 100644
index 5a126f2ceedd..000000000000
--- a/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur bladeenc-0.94.2/bladeenc/samplein.c bladeenc-0.94.2-fixed/bladeenc/samplein.c
---- bladeenc-0.94.2/bladeenc/samplein.c	2001-05-08 14:11:53.000000000 +0200
-+++ bladeenc-0.94.2-fixed/bladeenc/samplein.c	2003-02-05 11:19:59.000000000 +0100
-@@ -616,6 +616,7 @@
- static int					myFseek (FILE *fp, int offset)
- {
- 	char					dummy[256];
-+	offset = abs(offset);
- 
- 	while (offset >= 256)
- 	{
diff --git a/media-sound/bladeenc/metadata.xml b/media-sound/bladeenc/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/bladeenc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index d44d76abd811..8cace7d0f186 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1 +1,3 @@
-DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
+DIST bluez-alsa-3.1.0.tar.gz 179984 BLAKE2B b0bd5008d1bcc972577d8626970834934cc9424b4dff5c9ede1b1bfb0ac6c62c50dd8a7b94bdaa8884354379fb4fe06d758f620b2f42207d85f68da5064b3499 SHA512 8b2644cb2114569cc896869f22352386a9362eeacae823423a63d9b21198f561d4af796700fcd3267556bb69ff2575569474a1da8e3a645b5a2e779882c27cbf
+DIST bluez-alsa-4.0.0.tar.gz 230879 BLAKE2B 998127cb4e03afc019679b80fc1ac7d56351aeb8274efe76a74d6c5600c4b8527d5463e864cc8f68c1fa82c1729ef38d8168e90e7092dfe5eaf5a7cf25ba4bfa SHA512 8a79e5a1189db2d39b2d772cb8f8cd51ebb96b9bd91489556195e83dfd16f40a581dce68c5ad9e886b66cec8a03ae7f959e8288bb4c5c87ea5a2bbd6aee9c5f0
+DIST bluez-alsa-4.1.1.tar.gz 284244 BLAKE2B a46d22cd86e6b7483f95e0f60c9f23421d2c48e0c4741e3107da3800180b16a47dcf897bfa579796cfb84ecc16812f545844dbb77c768f094c5cfd46e1101835 SHA512 5e43846af5c7c30a3d81a704514076a73b1d8994db5ee8925a59b1b328f684c15188d45caf9358f59e57a0c200d644dc673bd1c44f7d48a51452776e01f022f8
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild
index c8620648df98..2dbdfb8ee917 100644
--- a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib-minimal systemd
+inherit autotools bash-completion-r1 multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -12,12 +12,12 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
 else
 	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
 RESTRICT="!test? ( test )"
 
 # bluez-alsa does not directly link to upower but
@@ -30,6 +30,7 @@ RDEPEND="
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	aptx? ( media-libs/libopenaptx )
 	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
 	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
 	hcitop? (
@@ -45,7 +46,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
 BDEPEND="
 	virtual/pkgconfig
-	man? ( app-text/pandoc )
+	man? ( virtual/pandoc )
 "
 
 src_prepare() {
@@ -55,7 +56,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--enable-cli
 		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
 		$(use_enable aac)
 		$(use_enable debug)
 		$(use_enable lame mp3lame)
@@ -63,10 +66,12 @@ multilib_src_configure() {
 		$(use_enable mpg123)
 		$(use_enable static-libs static)
 		$(use_enable test)
+		$(multilib_native_use_enable aptx)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
 		$(multilib_native_use_enable ofono)
 		$(multilib_native_use_enable upower)
+		$(multilib_native_use_with aptx libopenaptx)
 		$(use_with unwind libunwind)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild
new file mode 100644
index 000000000000..0bea02fbc86b
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools bash-completion-r1 multilib-minimal systemd
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd test unwind upower"
+RESTRICT="!test? ( test )"
+
+# bluez-alsa does not directly link to upower but
+# is using the upower interface via dbus calls.
+RDEPEND="
+	>=dev-libs/glib-2.32[${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
+	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
+	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	aptx? ( media-libs/libopenaptx )
+	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
+	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	hcitop? (
+		dev-libs/libbsd
+		sys-libs/ncurses:0=
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )
+	ofono? ( net-misc/ofono )
+	systemd? ( sys-apps/systemd )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	upower? ( sys-power/upower )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/check
+		media-libs/libsndfile
+	)"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( virtual/pandoc )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-cli
+		--enable-faststream
+		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
+		$(use_enable aac)
+		$(use_enable debug)
+		$(use_enable lame mp3lame)
+		$(use_enable man manpages)
+		$(use_enable mpg123)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+		$(use_enable test)
+		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
+		$(multilib_native_use_enable aptx)
+		$(multilib_native_use_enable hcitop)
+		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable ofono)
+		$(multilib_native_use_enable upower)
+		$(multilib_native_use_with aptx libopenaptx)
+		$(use_with unwind libunwind)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+	#systemd_dounit "${FILESDIR}"/bluealsa.service
+
+	# Add config file to alsa datadir as well to preserve changes in /etc
+	insinto "/usr/share/alsa/alsa.conf.d/"
+	doins "src/asound/20-bluealsa.conf"
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/bluez-alsa-4.1.1-r1.ebuild b/media-sound/bluez-alsa/bluez-alsa-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..cb9a309aedd6
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-4.1.1-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools bash-completion-r1 multilib-minimal systemd
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd test unwind upower"
+RESTRICT="!test? ( test )"
+
+# bluez-alsa does not directly link to upower but
+# is using the upower interface via dbus calls.
+RDEPEND="
+	>=dev-libs/glib-2.32[${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
+	>=media-libs/sbc-1.5[${MULTILIB_USEDEP}]
+	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	aptx? ( media-libs/libopenaptx )
+	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
+	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	hcitop? (
+		dev-libs/libbsd
+		sys-libs/ncurses:0=
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )
+	ofono? ( net-misc/ofono )
+	systemd? ( sys-apps/systemd )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	upower? ( sys-power/upower )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/check
+		media-libs/libsndfile
+	)"
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	man? ( virtual/pandoc )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-cli
+		--enable-faststream
+		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
+		$(use_enable aac)
+		$(use_enable debug)
+		$(use_enable lame mp3lame)
+		$(use_enable man manpages)
+		$(use_enable mpg123)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+		$(use_enable test)
+		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
+		$(multilib_native_use_enable aptx)
+		$(multilib_native_use_enable hcitop)
+		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable ofono)
+		$(multilib_native_use_enable upower)
+		$(multilib_native_use_with aptx libopenaptx)
+		$(use_with unwind libunwind)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2-r1 bluealsa
+	#systemd_dounit "${FILESDIR}"/bluealsa.service
+
+	# Add config file to alsa datadir as well to preserve changes in /etc
+	insinto "/usr/share/alsa/alsa.conf.d/"
+	doins "src/asound/20-bluealsa.conf.in"
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index c8620648df98..0bea02fbc86b 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools multilib-minimal systemd
+EAPI=8
+inherit autotools bash-completion-r1 multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -12,24 +12,25 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
 else
 	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd test unwind upower"
 RESTRICT="!test? ( test )"
 
 # bluez-alsa does not directly link to upower but
 # is using the upower interface via dbus calls.
 RDEPEND="
-	>=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32[${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	aptx? ( media-libs/libopenaptx )
 	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
 	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
 	hcitop? (
@@ -38,14 +39,18 @@ RDEPEND="
 	)
 	ldac? ( >=media-libs/libldac-2.0.0 )
 	ofono? ( net-misc/ofono )
+	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	upower? ( sys-power/upower )
 "
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
+	test? (
+		dev-libs/check
+		media-libs/libsndfile
+	)"
 BDEPEND="
 	virtual/pkgconfig
-	man? ( app-text/pandoc )
+	man? ( virtual/pandoc )
 "
 
 src_prepare() {
@@ -55,18 +60,25 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--enable-cli
+		--enable-faststream
 		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
 		$(use_enable aac)
 		$(use_enable debug)
 		$(use_enable lame mp3lame)
 		$(use_enable man manpages)
 		$(use_enable mpg123)
 		$(use_enable static-libs static)
+		$(use_enable systemd)
 		$(use_enable test)
+		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
+		$(multilib_native_use_enable aptx)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
 		$(multilib_native_use_enable ofono)
 		$(multilib_native_use_enable upower)
+		$(multilib_native_use_with aptx libopenaptx)
 		$(use_with unwind libunwind)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -78,7 +90,7 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-	systemd_dounit "${FILESDIR}"/bluealsa.service
+	#systemd_dounit "${FILESDIR}"/bluealsa.service
 
 	# Add config file to alsa datadir as well to preserve changes in /etc
 	insinto "/usr/share/alsa/alsa.conf.d/"
diff --git a/media-sound/bluez-alsa/files/bluealsa-conf.d-2-r1 b/media-sound/bluez-alsa/files/bluealsa-conf.d-2-r1
new file mode 100644
index 000000000000..ff1dd4cb1cd9
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa-conf.d-2-r1
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/bluealsa
+
+# Allow additional options to be set
+BLUEALSA_CONF="-S -p a2dp-source -p a2dp-sink"
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index cf14e256b358..5533720929d0 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">Arkq/bluez-alsa</remote-id>
   </upstream>
   <use>
+    <flag name="aptx">aptX (HD) over Bluetooth (many Android compatible headphones)</flag>
     <flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
     <flag name="ldac">Enable support for AOSP <pkg>media-libs/libldac</pkg> dispatcher</flag>
-    <flag name="man">Generate (and install) man pages with <pkg>app-text/pandoc</pkg></flag>
     <flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
     <flag name="ofono">Enable ofono elephony support</flag>
   </use>
diff --git a/media-sound/bplay/metadata.xml b/media-sound/bplay/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/bplay/metadata.xml
+++ b/media-sound/bplay/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810-r1.ebuild
index 3f77ce8b3634..529bd2033449 100644
--- a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
+++ b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810-r1.ebuild
@@ -1,35 +1,38 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 COMMIT=b13aac15904c1f821b1739d00445f49432705387
-inherit cmake-utils vcs-snapshot
+inherit cmake
 
 DESCRIPTION="Automatic BPM detection utility"
 HOMEPAGE="https://github.com/Tatsh/bpmdetect"
 SRC_URI="https://github.com/Tatsh/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
-	media-libs/flac
+	media-libs/flac:=
 	media-libs/libmad
 	media-libs/libvorbis
 	media-libs/portaudio
 	media-libs/taglib
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${P}-gcc-11.patch )
+
 src_install() {
 	einstalldocs
 	dobin "${BUILD_DIR}"/src/${PN}
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch b/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch
new file mode 100644
index 000000000000..9264d92f8602
--- /dev/null
+++ b/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/740328
+https://github.com/Tatsh/bpmdetect/pull/2
+
+From 4dbca9ede5126da8d6ce2949cd8db53096fb03fe Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 9 May 2021 13:12:20 +0100
+Subject: [PATCH] src/trackmp3.cpp: fix build against gcc-11
+
+On gcc-11 build fails as:
+
+```
+../src/trackmp3.cpp: In member function 'int TrackMp3::findFrame(int)':
+../src/trackmp3.cpp:458:13: error:
+  ordered comparison of pointer with integer zero ('MadSeekFrameType*' and 'int')
+  458 |     if (temp>0) {
+      |         ~~~~^~
+```
+
+The fix changes pointer-to-int comparison to NULL comparison.
+
+Reported-by: Agostino Sarubbo
+Bug: https://bugs.gentoo.org/740328
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/trackmp3.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/trackmp3.cpp
++++ b/src/trackmp3.cpp
+@@ -455,7 +455,7 @@ int TrackMp3::findFrame(int pos) {
+             temp = m_qSeekList.at(--frameIdx);
+     }
+ 
+-    if (temp>0) {
++    if (temp) {
+         return temp->pos;
+     } else {
+         return 0;
+-- 
+2.31.1
+
diff --git a/media-sound/bpmdetect/metadata.xml b/media-sound/bpmdetect/metadata.xml
index 9a466099f162..270091526578 100644
--- a/media-sound/bpmdetect/metadata.xml
+++ b/media-sound/bpmdetect/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bpmdetect</remote-id>
+		<remote-id type="github">Tatsh/bpmdetect</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r2.ebuild
index a98b921d23de..72f327c4360d 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r2.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
 HOMEPAGE="https://sourceforge.net/projects/bristol"
-SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/bristol/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="alsa oss static-libs"
+IUSE="alsa oss"
 # osc : configure option but no code it seems...
 # jack: fails to build if disabled
 # pulseaudio: not fully supported
 
 BDEPEND="
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 RDEPEND="
 	virtual/jack
 	x11-libs/libX11
-	alsa? ( media-libs/alsa-lib )
-"
+	alsa? ( media-libs/alsa-lib )"
 # osc? ( >=media-libs/liblo-0.22 )
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cflags.patch
@@ -45,12 +40,14 @@ src_prepare() {
 }
 
 src_configure() {
-	add-flags -fcommon
+	tc-export PKG_CONFIG
+
+	append-cflags -fcommon
 	econf \
+		--disable-static \
 		--disable-version-check \
 		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable static-libs static)
+		$(use_enable oss)
 }
 
 src_compile() {
@@ -59,5 +56,7 @@ src_compile() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	dodoc HOWTO
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/bristol/bristol-0.60.11-r3.ebuild b/media-sound/bristol/bristol-0.60.11-r3.ebuild
new file mode 100644
index 000000000000..38296a84ca1d
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.11-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="https://sourceforge.net/projects/bristol"
+SRC_URI="https://downloads.sourceforge.net/bristol/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa oss"
+# osc : configure option but no code it seems...
+# jack: fails to build if disabled
+# pulseaudio: not fully supported
+
+BDEPEND="
+	virtual/pkgconfig"
+RDEPEND="
+	virtual/jack
+	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib )"
+# osc? ( >=media-libs/liblo-0.22 )
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-dontcompress.patch
+	"${FILESDIR}"/${P}-rm_alsa-iatomic.h.patch
+	"${FILESDIR}"/bristol-c99.patch
+	"${FILESDIR}"/0001-configure.ac-fix-various-erroneous-bashisms.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/860447
+	#
+	# Upstream is dead. The last release was in 2013 and the last maintainer
+	# comment on discussions was 2020.
+	filter-lto
+
+	tc-export PKG_CONFIG
+
+	append-cflags -fcommon
+	econf \
+		--disable-static \
+		--disable-version-check \
+		$(use_enable alsa) \
+		$(use_enable oss)
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	dodoc HOWTO
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/bristol/files/0001-configure.ac-fix-various-erroneous-bashisms.patch b/media-sound/bristol/files/0001-configure.ac-fix-various-erroneous-bashisms.patch
new file mode 100644
index 000000000000..c10ece7ea2d5
--- /dev/null
+++ b/media-sound/bristol/files/0001-configure.ac-fix-various-erroneous-bashisms.patch
@@ -0,0 +1,80 @@
+From 103c856f20b34cc315c5ae4d096b0b863aba046d Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 17 Mar 2024 20:31:15 -0400
+Subject: [PATCH] configure.ac: fix various erroneous bashisms
+
+double equals in shell scripts is ALWAYS wrong. POSIX sh uses single
+equals, and bash implements double equals as an exact alias of the
+single equals form.
+
+Using double equals accomplishes no purpose whatsoever, and for your
+troubles you end up with muscle memory telling you to use it in POSIX sh
+where it fails. Avoid at all costs.
+---
+ configure.ac | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c233743..de50709 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,9 +62,9 @@ AC_ARG_ENABLE(version_check, [  --disable-version-check	ignore preinstalled vers
+ if test "x$TRY_VC" = 'xyes'
+ then
+ 	which startBristol > /dev/null 2>&1
+-	if test $? == 0; then showErrMsg1; fi
++	if test $? = 0; then showErrMsg1; fi
+ 	which bristol > /dev/null 2>&1
+-	if test $? == 0; then showErrMsg1; fi
++	if test $? = 0; then showErrMsg1; fi
+ 	if test -f ${prefix}/bin/bristol; then showErrMsg1; fi
+ fi
+ 
+@@ -166,7 +166,7 @@ AC_SUBST(_BRISTOL_VOICES)
+ 
+ BRISTOL_LIN_ATTACK=-DBRISTOL_LIN_ATTACK
+ AC_ARG_ENABLE(exp-attack, [  --enable-exp-attack		enable exponential attack], USE_EXP_ATTACK=yes , USE_EXP_ATTACK=no )
+-if test "x$USE_EXP_ATTACK" == "xyes"
++if test "x$USE_EXP_ATTACK" = "xyes"
+ then
+ 	BRISTOL_LIN_ATTACK=
+ fi
+@@ -176,7 +176,7 @@ BRISTOL_SEM_OPEN=
+ BRISTOL_SEMAPHORE=
+ AC_ARG_ENABLE(semaphore, [  --enable-semaphore		enable engine semaphores ],
+ 			USE_SEMAPHORE=yes , USE_SEMAPHORE=no )
+-if test "x$USE_SEMAPHORE" == "xyes"
++if test "x$USE_SEMAPHORE" = "xyes"
+ then
+ 	BRISTOL_SEMAPHORE=-DBRISTOL_SEMAPHORE
+ 
+@@ -194,7 +194,7 @@ AC_SUBST(BRISTOL_SEMAPHORE)
+ BRISTOL_BARRIER=
+ AC_ARG_ENABLE(memory-barrier, [  --enable-memory-barrier	enable ringbuffer barrier],
+ 			USE_BARRIER=yes , USE_BARRIER=no )
+-if test "x$USE_BARRIER" == "xyes"
++if test "x$USE_BARRIER" = "xyes"
+ then
+ 	BRISTOL_BARRIER=-DUSE_MLOCK
+ fi
+@@ -427,7 +427,7 @@ echo \| Build with sem_open ............................ : true
+ fi
+ fi
+ 
+-if test $USE_BARRIER == "yes"; then
++if test $USE_BARRIER = "yes"; then
+ echo \| Build with jrb memory barrier .................. : true
+ fi
+ 
+@@ -454,7 +454,7 @@ echo \| Default voicecount ............................. : BRISTOL_VOICECOUNT=$_
+ if test $BRR != 10; then
+ echo \| Envelope max ramp time ......................... : $BRR seconds
+ fi
+-if test x$USE_EXP_ATTACK == "xyes"; then
++if test x$USE_EXP_ATTACK = "xyes"; then
+ echo \| Envelope attack type ........................... : exponential
+ fi
+ echo \| author ......................................... : Nick Copeland
+-- 
+2.43.2
+
diff --git a/media-sound/bristol/files/bristol-0.60.11-cflags.patch b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
index ebce6f444fbe..86bedd6c7993 100644
--- a/media-sound/bristol/files/bristol-0.60.11-cflags.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
@@ -1,5 +1,5 @@
---- bristol-0.60.11/bin/Makefile.am
-+++ bristol-0.60.11/bin/Makefile.am
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
 @@ -1,7 +1,7 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -9,8 +9,8 @@
  
  #bin_PROGRAMS = bristoljackstats bristolnotegen bristolNRPgen
  bin_PROGRAMS = bristoljackstats
---- bristol-0.60.11/brighton/Makefile.am
-+++ bristol-0.60.11/brighton/Makefile.am
+--- a/brighton/Makefile.am
++++ b/brighton/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -19,8 +19,8 @@
  
  bin_PROGRAMS = brighton
  brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg
---- bristol-0.60.11/bristol/Makefile.am
-+++ bristol-0.60.11/bristol/Makefile.am
+--- a/bristol/Makefile.am
++++ b/bristol/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -29,8 +29,8 @@
  
  bin_PROGRAMS = bristol
  #bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol -L../libbristolic
---- bristol-0.60.11/libbrighton/Makefile.am
-+++ bristol-0.60.11/libbrighton/Makefile.am
+--- a/libbrighton/Makefile.am
++++ b/libbrighton/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -39,8 +39,8 @@
  
  noinst_LIBRARIES = libbrighton.a
  #libbrighton_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@
---- bristol-0.60.11/libbrightonC11/Makefile.am
-+++ bristol-0.60.11/libbrightonC11/Makefile.am
+--- a/libbrightonC11/Makefile.am
++++ b/libbrightonC11/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -49,8 +49,8 @@
  
  #libC11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libC11_la_LIBADD=
---- bristol-0.60.11/libbrightonX11/Makefile.am
-+++ bristol-0.60.11/libbrightonX11/Makefile.am
+--- a/libbrightonX11/Makefile.am
++++ b/libbrightonX11/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -59,8 +59,8 @@
  
  #libB11_a_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libB11_a_LIBADD= -L/usr/X11R6/lib -lX11
---- bristol-0.60.11/libbristol/Makefile.am
-+++ bristol-0.60.11/libbristol/Makefile.am
+--- a/libbristol/Makefile.am
++++ b/libbristol/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -69,8 +69,8 @@
  #libbristol_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3
  #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la
  
---- bristol-0.60.11/libbristolaudio/Makefile.am
-+++ bristol-0.60.11/libbristolaudio/Makefile.am
+--- a/libbristolaudio/Makefile.am
++++ b/libbristolaudio/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -79,8 +79,8 @@
  
  #libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@
---- bristol-0.60.11/libbristolic/Makefile.am
-+++ bristol-0.60.11/libbristolic/Makefile.am
+--- a/libbristolic/Makefile.am
++++ b/libbristolic/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -89,8 +89,8 @@
  #libbristolic_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  
  noinst_LIBRARIES = libbristolic.a
---- bristol-0.60.11/libbristolmidi/Makefile.am
-+++ bristol-0.60.11/libbristolmidi/Makefile.am
+--- a/libbristolmidi/Makefile.am
++++ b/libbristolmidi/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -99,8 +99,8 @@
  libbristolmidi_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ -lm
  
---- bristol-0.60.11/libbvg/Makefile.am
-+++ bristol-0.60.11/libbvg/Makefile.am
+--- a/libbvg/Makefile.am
++++ b/libbvg/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
index 0b7cedc9e29d..dddcb4a45aea 100644
--- a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
@@ -1,5 +1,5 @@
---- a/Makefile.am	2012-01-12 18:23:23.000000000 +0100
-+++ b/Makefile.am	2018-10-04 01:22:03.656483227 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -9,9 +9,6 @@
  	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
  	$(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/
diff --git a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
index 4f3ba054cd9b..93b329f4b5a9 100644
--- a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
@@ -1,5 +1,5 @@
---- bristol-0.60.11/bristol/bristolmemorymoog.c
-+++ bristol-0.60.11/bristol/bristolmemorymoog.c
+--- a/bristol/bristolmemorymoog.c
++++ b/bristol/bristolmemorymoog.c
 @@ -33,6 +33,7 @@
  #include "bristolmemorymoog.h"
  
diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
index 9d11b4f7d99b..3ac88b13ab29 100644
--- a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
@@ -11,7 +11,6 @@ Reviewed-by: James Cowgill <jcowgill@debian.org>
 Bug-Debian: https://bugs.debian.org/834180
 Forwarded: no
 Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c
-===================================================================
 --- a/libbristolaudio/audioEngineJack.c
 +++ b/libbristolaudio/audioEngineJack.c
 @@ -38,9 +38,6 @@
diff --git a/media-sound/bristol/files/bristol-c99.patch b/media-sound/bristol/files/bristol-c99.patch
new file mode 100644
index 000000000000..f3986ba8a233
--- /dev/null
+++ b/media-sound/bristol/files/bristol-c99.patch
@@ -0,0 +1,268 @@
+Florian Weimer's Modern C porting patch: https://sourceforge.net/p/bristol/patches/3/
+
+Avoid implicit ints and implicit function declarations, to prevent
+build failures with future compilers which do not support them.
+
+diff --git a/bristol/bristolmemorymoog.c b/bristol/bristolmemorymoog.c
+index 6c58e4d92253a232..f51d684729f55b11 100644
+--- a/bristol/bristolmemorymoog.c
++++ b/bristol/bristolmemorymoog.c
+@@ -33,6 +33,7 @@
+ #include "bristolmemorymoog.h"
+ 
+ extern int buildCurrentTable(Baudio *, float);
++extern void doPitchWheel(Baudio *);
+ 
+ /*
+  * Use of these memorymoog global buffers will be an issue with use of multiple
+diff --git a/libbrightonC11/bRoutines.c b/libbrightonC11/bRoutines.c
+index 1983db220c0825ba..88d1e64a51a1e145 100644
+--- a/libbrightonC11/bRoutines.c
++++ b/libbrightonC11/bRoutines.c
+@@ -24,6 +24,7 @@
+ 
+ void *
+ brightonX11malloc(size)
++int size;
+ {
+ 	void *mem;
+ 
+diff --git a/libbrightonX11/bRoutines.c b/libbrightonX11/bRoutines.c
+index 87dab9a93223ef0f..647f57181cdf4692 100644
+--- a/libbrightonX11/bRoutines.c
++++ b/libbrightonX11/bRoutines.c
+@@ -25,6 +25,7 @@
+ 
+ void *
+ brightonX11malloc(size)
++int size;
+ {
+ 	void *mem;
+ 
+diff --git a/libbristol/bristolcdefs.c b/libbristol/bristolcdefs.c
+index a5f0638155fe40e3..45ccd11604ac37b8 100644
+--- a/libbristol/bristolcdefs.c
++++ b/libbristol/bristolcdefs.c
+@@ -25,6 +25,7 @@
+ 
+ void *
+ bristolmalloc(size)
++int size;
+ {
+ 	char *mem;
+ 
+@@ -39,6 +40,7 @@ bristolmalloc(size)
+ 
+ void *
+ bristolmalloc0(size)
++int size;
+ {
+ 	char *mem;
+ 
+diff --git a/libbristolaudio/audioEngine.c b/libbristolaudio/audioEngine.c
+index d6aeb4b8976a1a84..e0367fc427b5dbc6 100644
+--- a/libbristolaudio/audioEngine.c
++++ b/libbristolaudio/audioEngine.c
+@@ -85,6 +85,7 @@ int
+ initAudioDevice2(audioDev, devID, fragSize)
+ duplexDev *audioDev;
+ int devID;
++int fragSize;
+ {
+ 	/*
+ 	 * The device is basically just opened for the first call of this routine.
+@@ -118,6 +119,7 @@ int devID;
+ int
+ setAudioStart2(audioDev, devID)
+ duplexDev *audioDev;
++int devID;
+ {
+ 	int enable;
+ 
+@@ -162,6 +164,7 @@ duplexDev *audioDev;
+ int
+ setAudioStop2(audioDev, devID)
+ duplexDev *audioDev;
++int devID;
+ {
+ 	int enable;
+ 
+diff --git a/libbristolaudio/audioEngineOSS.c b/libbristolaudio/audioEngineOSS.c
+index 26d9f89923bc7fb0..984b30efd4af9c2c 100644
+--- a/libbristolaudio/audioEngineOSS.c
++++ b/libbristolaudio/audioEngineOSS.c
+@@ -49,6 +49,7 @@ int
+ ossAudioInit(audioDev, devID, fragSize)
+ duplexDev *audioDev;
+ int devID;
++int fragSize;
+ {
+ #if (BRISTOL_HAS_OSS == 1)
+ 	int results, data = 0, mode;
+diff --git a/libbristolaudio/audioGUI.c b/libbristolaudio/audioGUI.c
+index bd9410650b361101..bbdf5c68e6264569 100644
+--- a/libbristolaudio/audioGUI.c
++++ b/libbristolaudio/audioGUI.c
+@@ -161,6 +161,7 @@ duplexDev *audioDev;
+ char *
+ getControllerName(audioDev, controller)
+ duplexDev *audioDev;
++int controller;
+ {
+ #if (BRISTOL_HAS_ALSA == 1)
+ 	if ((audioDev->flags & AUDIO_ALSA) != 0)
+@@ -173,6 +174,8 @@ duplexDev *audioDev;
+ int
+ setRecordSource(audioDev, controller, position)
+ duplexDev *audioDev;
++int controller;
++int position;
+ {
+ #if (BRISTOL_HAS_ALSA == 1)
+ 	if ((audioDev->flags & AUDIO_ALSA) != 0)
+@@ -185,6 +188,7 @@ duplexDev *audioDev;
+ int
+ getRecordability(audioDev, controller)
+ duplexDev *audioDev;
++int controller;
+ {
+ #if (BRISTOL_HAS_ALSA == 1)
+ 	if ((audioDev->flags & AUDIO_ALSA) != 0)
+@@ -197,6 +201,7 @@ duplexDev *audioDev;
+ int
+ getMutability(audioDev, controller)
+ duplexDev *audioDev;
++int controller;
+ {
+ #if (BRISTOL_HAS_ALSA == 1)
+ 	if ((audioDev->flags & AUDIO_ALSA) != 0)
+@@ -211,6 +216,7 @@ duplexDev *audioDev;
+ int
+ getStereoStatus(audioDev, controller)
+ duplexDev *audioDev;
++int controller;
+ {
+ #if (BRISTOL_HAS_ALSA == 1)
+ 	if ((audioDev->flags & AUDIO_ALSA) != 0)
+@@ -222,6 +228,8 @@ duplexDev *audioDev;
+ int
+ getValue(audioDev, controller, side)
+ duplexDev *audioDev;
++int controller;
++int side;
+ {
+ #if (BRISTOL_HAS_ALSA == 1)
+ 	if ((audioDev->flags & AUDIO_ALSA) != 0)
+@@ -233,6 +241,9 @@ duplexDev *audioDev;
+ int
+ setAudioValue(audioDev, controller, side, value)
+ duplexDev *audioDev;
++int controller;
++int side;
++int value;
+ {
+ 	if (audioDev->cflags & SLAB_AUDIODBG)
+ 		printf("setAudioValue(%p, %i, %i, %i)\n", audioDev, controller, side, value); 
+@@ -251,6 +262,8 @@ duplexDev *audioDev;
+ int
+ setAudioMute(audioDev, controller, value)
+ duplexDev *audioDev;
++int controller;
++int value;
+ {
+ 	if (audioDev->cflags & SLAB_AUDIODBG)
+ 		printf("setAudioMute()\n");
+@@ -280,6 +293,7 @@ char *name;
+ int
+ getAudioCapability(audioDev, controller)
+ duplexDev *audioDev;
++int controller;
+ {
+ 	if (audioDev->cflags & SLAB_AUDIODBG)
+ 		printf("getAudioCapability(%s, %i)\n", audioDev->devName, controller);
+@@ -296,6 +310,7 @@ duplexDev *audioDev;
+ int
+ validDev(audioDev, index)
+ duplexDev *audioDev;
++int index;
+ {
+ #if (BRISTOL_HAS_ALSA == 1)
+ 	if ((audioDev->flags & AUDIO_ALSA) != 0)
+diff --git a/libbristolaudio/audioGUIOSS.c b/libbristolaudio/audioGUIOSS.c
+index d6e66d4ab7b72290..74dd973680d93fd0 100644
+--- a/libbristolaudio/audioGUIOSS.c
++++ b/libbristolaudio/audioGUIOSS.c
+@@ -91,7 +91,11 @@ short left, right;
+  */
+ static int
+ setAudioOSS(fd, audioDev, param, valueL, valueR)
++int fd;
+ duplexDev *audioDev;
++int param;
++int valueL;
++int valueR;
+ {
+ #if (BRISTOL_HAS_OSS == 1)
+ 	int value, command;
+@@ -259,6 +263,7 @@ char *name;
+ int
+ getOSSCapability(audioDev, controller)
+ duplexDev *audioDev;
++int controller;
+ {
+ 	if ((audioDev->stereoCaps | audioDev->monoCaps) & (1 << controller))
+ 		return controller;
+@@ -268,6 +273,7 @@ duplexDev *audioDev;
+ int
+ getOSSRecordability(audioDev, cont)
+ duplexDev *audioDev;
++int cont;
+ {
+ 	if (audioDev->cflags & SLAB_AUDIODBG)
+ 		printf("getOSSRecordability(%i, %i)\n", audioDev->devID, cont);
+diff --git a/libbristolmidi/inetClient.c b/libbristolmidi/inetClient.c
+index 17761c7588a9747e..06499763d28f8f2a 100644
+--- a/libbristolmidi/inetClient.c
++++ b/libbristolmidi/inetClient.c
+@@ -66,6 +66,7 @@ void	clientCheckSocket();
+ int
+ initControlPort(host, port)
+ char	*host;
++int	port;
+ {
+ struct	sockaddr_in	connect_socket_addr;
+ char				hostname[NAME_LENGTH];
+diff --git a/libbristolmidi/midiRoutines.c b/libbristolmidi/midiRoutines.c
+index 15a5835f09f28fbe..e4458a395fd94036 100644
+--- a/libbristolmidi/midiRoutines.c
++++ b/libbristolmidi/midiRoutines.c
+@@ -85,6 +85,7 @@ bristolMidiDevSanity(int dev)
+ 
+ void
+ bristolMidiPrintHandle(handle)
++int handle;
+ {
+ 	printf("	Handle:	 %i\n", bmidi.handle[handle].handle);
+ 	printf("	State:   %i\n", bmidi.handle[handle].state);
+@@ -103,6 +104,7 @@ bristolMidiPrintHandle(handle)
+ 
+ int
+ bristolMidiSanity(handle)
++int handle;
+ {
+ #ifdef DEBUG
+ 	printf("bristolMidiSanity(%i)\n", handle);
+diff --git a/libbristolmidi/socketToolKit.c b/libbristolmidi/socketToolKit.c
+index 7e4e5b1423905afe..f9b129fd577953c6 100644
+--- a/libbristolmidi/socketToolKit.c
++++ b/libbristolmidi/socketToolKit.c
+@@ -57,7 +57,9 @@ struct  sockaddr_un local_socket_addr;
+ int
+ open_remote_socket(name, port, listens, reqsig)
+ char		*name; /* service name, must be known */
++int		port;
+ int 		listens; /* Parameter for the number of connections accepted */
++int		reqsig;
+ {
+ 	struct	servent		*service, service_tmp;
+ 	struct  sockaddr_in remote_socket_addr;
diff --git a/media-sound/bristol/metadata.xml b/media-sound/bristol/metadata.xml
index 52e6ed1b7497..6d41f287cf9a 100644
--- a/media-sound/bristol/metadata.xml
+++ b/media-sound/bristol/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 85ef54b3efe6..4bddd2b593b5 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1 +1 @@
-DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
+DIST brutefir-1.0o.tar.gz 246504 BLAKE2B ab2b3c1d22e45422d01aa45a9e869770cbf017d85c1f7af54562a0972545df1f9ae5aa0d155baa02ee5aeef1c65eccf6bc9c9f75edce0f54882e4095ba2f1493 SHA512 e696948eeabb54a9cea8a9f2629c11c620fd37bc685cf32d3c21b1ea89ae7127f703c04a1f1775b073f5135b9268cc0a387c8087da5828cc2194295f850e8d1f
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0o.ebuild
index c0dbb7ac747e..50944dbbc9bf 100644
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ b/media-sound/brutefir/brutefir-1.0o.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Software convolution engine for applying long FIR filters"
-HOMEPAGE="https://www.ludd.ltu.se/~torger/brutefir.html"
-SRC_URI="https://www.ludd.ltu.se/~torger/files/${P}.tar.gz"
+HOMEPAGE="https://torger.se/anders/brutefir.html"
+SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,7 +19,9 @@ RDEPEND="
 	virtual/jack"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-ld.patch )
+PATCHES=(
+	"${FILESDIR}/${P}-ld.patch"
+)
 
 src_compile() {
 	tc-export AS CC
@@ -27,8 +29,7 @@ src_compile() {
 }
 
 src_install() {
-	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" \
-		install
+	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
 	dodoc CHANGES README
 
 	insinto /usr/share/${PN}
diff --git a/media-sound/brutefir/files/brutefir-1.0k-ld.patch b/media-sound/brutefir/files/brutefir-1.0k-ld.patch
deleted file mode 100644
index 6860b5f360b5..000000000000
--- a/media-sound/brutefir/files/brutefir-1.0k-ld.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-The problem is that it passes -fPIC to the linker, and it does not use gcc as
-frontend, it uses ld directly. The problem is that -f on ld that produces a
-DT_AUXILIARY rather than causing any PIC code production. Fix also DESTDIR
-handling and add LIBDIR variable for multilib systems.
-
-See, http://bugs.gentoo.org/252338
-
-diff -ur brutefir-1.0k.orig/Makefile brutefir-1.0k/Makefile
---- brutefir-1.0k.orig/Makefile	2009-03-31 22:36:20.000000000 +0300
-+++ brutefir-1.0k/Makefile	2009-06-21 05:44:03.000000000 +0300
-@@ -1,11 +1,13 @@
- ###################################
- # Where to install
--INSTALL_PREFIX	= $(DESTDIR)/usr/local
-+# PREFIX	= /usr/local
-+PREFIX		= /usr
-+LIBDIR		= $(PREFIX)/lib
- 
- ###################################
- # Where to find libraries, and their header files.
--LIBPATHS	= -L/usr/local/lib
--INCLUDE		= -I/usr/local/include
-+# LIBPATHS	= -L/usr/local/lib
-+# INCLUDE	= -I/usr/local/include
- ifdef FFTW_PATH
- LIBPATHS	+= -L$(FFTW_PATH)/lib
- INCLUDE		+= -I$(FFTW_PATH)/include
-@@ -17,19 +19,15 @@
- 
- ###################################
- # Binaries
--FLEX	= flex
--LD	= ld
--CC	= gcc
--AS	= as
-+FLEX	?= flex
-+CC	?= gcc
-+AS	?= as
- 
- ###################################
- # Flags
--CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
-+CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
- -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
--CC_FLAGS	= $(DEFINE) -O2
--CC_FPIC		= -fPIC
--LD_SHARED	= -shared
- 
- ###################################
- # Objects and libs for targets
-@@ -74,7 +72,7 @@
- BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
- endif
- BRUTEFIR_LIBS	+= -ldl
--LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
-+LINKFLAGS	= -fPIC -shared -Xlinker --allow-multiple-definition
- # assume that we have alsa, osss and jack
- LIB_TARGETS	+= alsa.bfio
- LIB_TARGETS	+= oss.bfio
-@@ -83,11 +81,11 @@
- 
- # Solaris
- ifeq ($(UNAME),SunOS)
--CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
-+CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
- -Wcast-qual -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs
- ifeq ($(UNAME_P),sparc)
--CC_FLAGS	+= -Wa,-xarch=v8plus
-+CFLAGS		+= -Wa,-xarch=v8plus
- endif
- BRUTEFIR_LIBS	+= -lrt -ldl
- endif
-@@ -112,43 +110,44 @@
- 	$(AS) -o $@			$<
- 
- %.fpic.o: %.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
-+	$(CC) -fPIC -shared -o $@	-c $(INCLUDE) $(CFLAGS) $<
- 
- %.o: %.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
-+	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
- 
- # special rule to avoid to get warnings from code generated by flex
- bfconf_lexical.o: bfconf_lexical.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_FLAGS) $<
-+	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
- 
- %.c: %.lex
- 	$(FLEX) -o$@ $<
- 
- brutefir: $(BRUTEFIR_OBJS)
--	$(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
-+	$(CC) $(LDFLAGS) $(LDMULTIPLEDEFS) $(CFLAGS) $(LIBPATHS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
- 
- alsa.bfio: $(BFIO_ALSA_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
- 
- oss.bfio: $(BFIO_OSS_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
- 
- jack.bfio: $(BFIO_JACK_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
- 
- file.bfio: $(BFIO_FILE_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
- 
- cli.bflogic: $(BFLOGIC_CLI_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
- 
- eq.bflogic: $(BFLOGIC_EQ_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
- 
- install: $(BIN_TARGETS) $(LIB_TARGETS)
--	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir
--	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
--	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install $(BIN_TARGETS) $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(LIBDIR)/brutefir
-+	install $(LIB_TARGETS) $(DESTDIR)$(LIBDIR)/brutefir
- 
- clean:
- 	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \
diff --git a/media-sound/brutefir/files/brutefir-1.0o-ld.patch b/media-sound/brutefir/files/brutefir-1.0o-ld.patch
new file mode 100644
index 000000000000..ddfd1a07e142
--- /dev/null
+++ b/media-sound/brutefir/files/brutefir-1.0o-ld.patch
@@ -0,0 +1,116 @@
+diff --git a/Makefile b/Makefile
+index a10cb89..752a112 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,12 +5,11 @@ LDFLAGS +=
+ 
+ ###################################
+ # Where to install
+-INSTALL_PREFIX	= $(DESTDIR)/usr/local
++PREFIX         = /usr
++LIBDIR         = $(PREFIX)/lib
+ 
+ ###################################
+ # Where to find libraries, and their header files.
+-LIBPATHS	= -L/usr/local/lib
+-INCLUDE		= -I/usr/local/include
+ ifdef FFTW_PATH
+ LIBPATHS	+= -L$(FFTW_PATH)/lib
+ INCLUDE		+= -I$(FFTW_PATH)/include
+@@ -22,19 +21,15 @@ FFTW_LIB	= -lfftw3 -lfftw3f
+ 
+ ###################################
+ # Binaries
+-FLEX	= flex
+-LD	= gcc
+-CC	= gcc
+-CHMOD	= chmod
++FLEX	?= flex
++CC	?= gcc
++CHMOD	?= chmod
+ 
+ ###################################
+ # Flags
+-CC_WARN		= -Wall -Wpointer-arith -Wshadow \
++CFLAGS		+= -Wall -Wpointer-arith -Wshadow \
+ -Wcast-align -Wwrite-strings -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
+-CC_FLAGS	= $(DEFINE) -O2 $(CFLAGS) $(CPPFLAGS)
+-CC_FPIC		= -fPIC
+-LD_SHARED	= -shared
+ CHMOD_REMOVEX	= -x
+ 
+ ###################################
+@@ -85,7 +80,7 @@ ifneq (,$(findstring sparc,$(UNAME_M)))
+ CC_FLAGS += -Wa,-xarch=v8plus
+ endif
+ BRUTEFIR_LIBS	+= -ldl
+-LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
++LINKFLAGS      = -fPIC -shared -Xlinker --allow-multiple-definition
+ # assume that we have oss and jack, alsa being linux-only
+ ifeq ($(UNAME),Linux)
+ LIB_TARGETS	+= alsa.bfio
+@@ -111,49 +106,50 @@ TARGETS		= $(BIN_TARGETS) $(LIB_TARGETS)
+ all: $(TARGETS)
+ 
+ %.fpic.o: %.c
+-	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
++	$(CC) -fPIC -shared -o $@       -c $(INCLUDE) $(CFLAGS) $<
+ 
+ %.o: %.c
+-	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
++	$(CC) -o $@                     -c $(INCLUDE) $(CFLAGS) $<
+ 
+ # special rule to avoid to get warnings from code generated by flex
+ bfconf_lexical.o: bfconf_lexical.c
+-	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_FLAGS) $<
++	$(CC) -o $@                     -c $(INCLUDE) $(CFLAGS) $<
+ 
+ %.c: %.lex
+ 	$(FLEX) -o$@ $<
+ 
+ brutefir: $(BRUTEFIR_OBJS)
+-	$(CC) $(LDFLAGS) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
++	$(CC) $(LDFLAGS) $(LDMULTIPLEDEFS) $(CFLAGS) $(LIBPATHS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
+ 
+ alsa.bfio: $(BFIO_ALSA_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ oss.bfio: $(BFIO_OSS_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ jack.bfio: $(BFIO_JACK_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ file.bfio: $(BFIO_FILE_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ cli.bflogic: $(BFLOGIC_CLI_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ eq.bflogic: $(BFLOGIC_EQ_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ install: $(BIN_TARGETS) $(LIB_TARGETS)
+-	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir
+-	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
+-	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install $(BIN_TARGETS) $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(LIBDIR)/brutefir
++	install $(LIB_TARGETS) $(DESTDIR)$(LIBDIR)/brutefir
+ 
+ clean:
+ 	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \
diff --git a/media-sound/brutefir/metadata.xml b/media-sound/brutefir/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/brutefir/metadata.xml
+++ b/media-sound/brutefir/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 4b62b9742a88..924b685f62f4 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1 +1 @@
-DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
+DIST cadence-0.9.2.tar.gz 2202164 BLAKE2B a5422e4d74618e2e45d9c6f275393a6e918783fc37d60a54142725aa54e691435c41f76dd0346fae7684c452988b07a18d817902abd917dbceaff5fb4aaa6c47 SHA512 d8a1b52c361e3e18a193d1c283bb69abe18ce667b554fc53cb9b752d92747269145144ae512895ffbb5df76efe8671cfc0782f29e59d0d7cd3d97c97240bdecf
diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.2-r1.ebuild
index 2a6b12a15332..45f90c398df0 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.2-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
-HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
+HOMEPAGE="https://kx.studio//Applications:Cadence"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -21,27 +21,31 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="a2jmidid -pulseaudio opengl"
+IUSE="a2jmidid pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
 	')
-	media-sound/jack2[dbus]
 	media-sound/jack_capture
+	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( media-sound/pulseaudio[jack] )
-"
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio-daemon[jack]
+			media-video/pipewire[jack-sdk]
+			<media-sound/pulseaudio-15.99.1[daemon(+),jack]
+		)
+	)"
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-clang.patch
-	"${FILESDIR}"/${P}-fix-qt5.15.patch
+	"${FILESDIR}"/${PN}-0.9.1-fix-clang.patch
 )
 
 src_prepare() {
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index b290c1617367..84dc5764486e 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
-HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
+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
@@ -20,28 +20,26 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-
-IUSE="a2jmidid -pulseaudio opengl"
+IUSE="a2jmidid pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-CDEPEND="
-	${PYTHON_DEPS}
+RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
 	')
-	media-sound/jack2[dbus]
 	media-sound/jack_capture
+	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( media-sound/pulseaudio[jack] )
+	pulseaudio? ( || (
+		media-video/pipewire[jack-sdk]
+		media-sound/pulseaudio-daemon[jack]
+	) )
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-fix-clang.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.9.1-fix-clang.patch )
 
 src_prepare() {
 	sed -i -e "s/python3/${EPYTHON}/" \
diff --git a/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch b/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch
deleted file mode 100644
index b9c52167e375..000000000000
--- a/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c167f35fbb76c4246c730b29262a59da73010412 Mon Sep 17 00:00:00 2001
-From: Alex Tsitsimpis <alex.tsitsimpis@gmail.com>
-Date: Thu, 4 Jun 2020 12:49:40 +0300
-Subject: [PATCH] Fix build with Qt 5.15+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Building with Qt 5.15 failed with the following error:
-
-../widgets/pixmapdial.cpp:231:26: error: aggregate ‘QPainterPath ballPath’ has incomplete type and cannot be defined
-  231 |             QPainterPath ballPath;
-      |                          ^~~~~~~~
-../widgets/pixmapdial.cpp:278:26: error: aggregate ‘QPainterPath ballPath’ has incomplete type and cannot be defined
-  278 |             QPainterPath ballPath;
-      |                          ^~~~~~~~
-
-Signed-off-by: Alex Tsitsimpis <alex.tsitsimpis@gmail.com>
----
- c++/widgets/pixmapdial.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/c++/widgets/pixmapdial.cpp b/c++/widgets/pixmapdial.cpp
-index 37dcffd..0b5e0f5 100644
---- a/c++/widgets/pixmapdial.cpp
-+++ b/c++/widgets/pixmapdial.cpp
-@@ -22,6 +22,7 @@
- #include <QtCore/QTimer>
- #include <QtGui/QPainter>
- #include <QtGui/QPaintEvent>
-+#include <QtGui/QPainterPath>
- 
- PixmapDial::PixmapDial(QWidget* parent)
-     : QDial(parent),
diff --git a/media-sound/cadence/metadata.xml b/media-sound/cadence/metadata.xml
index 914b94cd73eb..2545a82c827c 100644
--- a/media-sound/cadence/metadata.xml
+++ b/media-sound/cadence/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>fordfrog@gentoo.org</email>
-	<name>Miroslav Šulc</name>
-</maintainer>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
 	<name>Gentoo ProAudio Project</name>
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index d00b45ad1fc2..b546787031ac 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1 +1 @@
-DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
+DIST cantata-2.5.0.tar.bz2 2487031 BLAKE2B ad77987aae205695393a4fc782dc442a467ca392ce60251efdc68d12d29b3d2f24270f462a0dbfe0c375905f9356b8c649ff139021629ba58fd7de80819fdba0 SHA512 42f28321d01e0bc3a315030066b738dead8f8f8caed8c1115729a3d370d68d9d845f00576fc81ddba694bba6a4ae57c3f7de714b2e39874458548c3e5bb8b2d2
diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.5.0-r2.ebuild
index e9a9d73dcc34..334a2e24c048 100644
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ b/media-sound/cantata/cantata-2.5.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
-inherit cmake l10n qmake-utils xdg
+inherit cmake plocale xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
 HOMEPAGE="https://github.com/CDrummond/cantata"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )
@@ -23,10 +23,9 @@ REQUIRED_USE="
 	musicbrainz? ( || ( cdio cdda ) taglib )
 	replaygain? ( taglib )
 "
+# cantata has no tests
+RESTRICT="test"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -56,15 +55,13 @@ COMMON_DEPEND="
 	zeroconf? ( net-dns/avahi )
 "
 RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl[ithreads]
-	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+	|| ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] )
+	|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qtconcurrent:5
 "
-
-# cantata has no tests
-RESTRICT="test"
+BDEPEND="dev-qt/linguist-tools:5"
 
 PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
 
@@ -78,8 +75,8 @@ src_prepare() {
 	# Unbundle 3rd party libs
 	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
 
-	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do remove_locale
+	plocale_find_changes "translations" "${PN}_" ".ts"
+	plocale_for_each_disabled_locale remove_locale
 }
 
 src_configure() {
@@ -91,7 +88,6 @@ src_configure() {
 		-DENABLE_HTTP_SERVER=$(usex http-server)
 		-DENABLE_MTP=$(usex mtp)
 		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
 		-DENABLE_FFMPEG=$(usex replaygain)
 		-DENABLE_MPG123=$(usex replaygain)
 		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index 1bc1b0bb262c..a6c3a69db3a1 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
new file mode 100644
index 000000000000..06b58399e79c
--- /dev/null
+++ b/media-sound/cava/Manifest
@@ -0,0 +1,2 @@
+DIST cava-0.10.1.tar.gz 129520 BLAKE2B 181a511feb8b9a6806316264c27e963fe7827802d8e333c39d59a0e3f67dd57bea967b05aeb869455992b905afd9c6e3f568debb84155068cbef03621047da6b SHA512 8a71628bae6621ef925f5fed94659b07d9220e142c17514bed79e1105a9160494bf3978267c9de3ab6cd2126ece50419fb4245ccf190f3a299fc0cfb111be354
+DIST cava-0.10.2.tar.gz 130036 BLAKE2B 155a0152571a6b1b847340fe438389f58b963af047d4136595a8b2933a4ac5b1fff87600110765c7c1500072ebd8b730d971918b8701598526052d137465ac81 SHA512 c28ef5a89668b8f90a3b4cbf71b208dd067268d5ed9eca35ff3881bfab0fd7bf72efe2164f29af47ca7972637d8f1d6a86ff2b2e0c9c9221a1856d8dfa960065
diff --git a/media-sound/cava/cava-0.10.1.ebuild b/media-sound/cava/cava-0.10.1.ebuild
new file mode 100644
index 000000000000..7251e5fe1301
--- /dev/null
+++ b/media-sound/cava/cava-0.10.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Console-based Audio Visualizer for Alsa"
+HOMEPAGE="https://github.com/karlstav/cava/"
+SRC_URI="
+	https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT Unlicense"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="alsa jack +ncurses pipewire portaudio pulseaudio sdl sndio"
+
+RDEPEND="
+	dev-libs/iniparser:4
+	sci-libs/fftw:3.0=
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	ncurses? ( sys-libs/ncurses:= )
+	pipewire? ( media-video/pipewire:= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? (
+		media-libs/libglvnd
+		media-libs/libsdl2[opengl,video]
+	)
+	sndio? ( media-sound/sndio:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sdl? ( dev-build/autoconf-archive )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > version || die
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable alsa input-alsa)
+		$(use_enable jack input-jack)
+		$(use_enable pipewire input-pipewire)
+		$(use_enable portaudio input-portaudio)
+		$(use_enable pulseaudio input-pulse)
+		$(use_enable sndio input-sndio)
+
+		$(use_enable ncurses output-ncurses)
+		$(use_enable sdl output-sdl)
+		# note: not behind USE=opengl and sdl2[opengl?] given have not gotten
+		# normal output-sdl to work without USE=opengl on sdl either way
+		$(use_enable sdl output-sdl_glsl)
+
+		GENTOO_SYSROOT="${ESYSROOT}" # see iniparser4.patch
+	)
+
+	# autoconf-archive (currently) does not support -lOpenGL for libglvnd[-X]
+	use sdl && econfargs+=( GL_LIBS="$($(tc-getPKG_CONFIG) --libs opengl || die)" )
+
+	econf "${econfargs[@]}"
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS##* } ]]; then
+		elog "A default ~/.config/cava/config will be created after initial"
+		elog "use of ${PN}, see it and ${EROOT}/usr/share/doc/${PF}/README*"
+		elog "for configuring audio input and more."
+	elif ver_test ${REPLACING_VERSIONS##* } -lt 0.9; then
+		elog "If used, the noise_reduction config option in ~/.config/cava/config needs"
+		elog "to be updated from taking a float to integer (e.g. replace 0.77 with 77)."
+	fi
+}
diff --git a/media-sound/cava/cava-0.10.2.ebuild b/media-sound/cava/cava-0.10.2.ebuild
new file mode 100644
index 000000000000..cef1a79fa28c
--- /dev/null
+++ b/media-sound/cava/cava-0.10.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Console-based Audio Visualizer for Alsa"
+HOMEPAGE="https://github.com/karlstav/cava/"
+SRC_URI="
+	https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack +ncurses pipewire portaudio pulseaudio sdl sndio"
+
+RDEPEND="
+	dev-libs/iniparser:4
+	sci-libs/fftw:3.0=
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	ncurses? ( sys-libs/ncurses:= )
+	pipewire? ( media-video/pipewire:= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? (
+		media-libs/libglvnd
+		media-libs/libsdl2[opengl,video]
+	)
+	sndio? ( media-sound/sndio:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sdl? ( dev-build/autoconf-archive )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > version || die
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable alsa input-alsa)
+		$(use_enable jack input-jack)
+		$(use_enable pipewire input-pipewire)
+		$(use_enable portaudio input-portaudio)
+		$(use_enable pulseaudio input-pulse)
+		$(use_enable sndio input-sndio)
+
+		$(use_enable ncurses output-ncurses)
+		$(use_enable sdl output-sdl)
+		# note: not behind USE=opengl and sdl2[opengl?] given have not gotten
+		# normal output-sdl to work without USE=opengl on sdl either way
+		$(use_enable sdl output-sdl_glsl)
+
+		GENTOO_SYSROOT="${ESYSROOT}" # see iniparser4.patch
+	)
+
+	# autoconf-archive (currently) does not support -lOpenGL for libglvnd[-X]
+	use sdl && econfargs+=( GL_LIBS="$($(tc-getPKG_CONFIG) --libs opengl || die)" )
+
+	econf "${econfargs[@]}"
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS##* } ]]; then
+		elog "A default ~/.config/cava/config will be created after initial"
+		elog "use of ${PN}, see it and ${EROOT}/usr/share/doc/${PF}/README*"
+		elog "for configuring audio input and more."
+	elif ver_test ${REPLACING_VERSIONS##* } -lt 0.9; then
+		elog "If used, the noise_reduction config option in ~/.config/cava/config needs"
+		elog "to be updated from taking a float to integer (e.g. replace 0.77 with 77)."
+	fi
+}
diff --git a/media-sound/cava/files/cava-0.8.0-gentoo-iniparser4.patch b/media-sound/cava/files/cava-0.8.0-gentoo-iniparser4.patch
new file mode 100644
index 000000000000..3dcb060c2873
--- /dev/null
+++ b/media-sound/cava/files/cava-0.8.0-gentoo-iniparser4.patch
@@ -0,0 +1,15 @@
+Gentoo uses non-standard naming for slotted iniparser:4 and it
+does not have a pkg-config file (ideally should be unslotted).
+Cava can use iniparser:0 as well but <3.2 forces legacy mode.
+--- a/configure.ac
++++ b/configure.ac
+@@ -259,6 +259,6 @@
+ 
+-AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
++AC_CHECK_LIB(iniparser4,iniparser_load, have_iniparser=yes, have_iniparser=no)
+     if [[ $have_iniparser = "yes" ]] ; then
+-    LIBS="$LIBS -liniparser"
+-      CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
++    LIBS="$LIBS -liniparser4"
++      CPPFLAGS="$CPPFLAGS -I${GENTOO_SYSROOT}/usr/include/iniparser4"
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iniparser.h>]],
diff --git a/media-sound/cava/metadata.xml b/media-sound/cava/metadata.xml
new file mode 100644
index 000000000000..db875d2c1d7b
--- /dev/null
+++ b/media-sound/cava/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="pipewire">Enable support for the <pkg>media-video/pipewire</pkg> backend</flag>
+		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">karlstav/cava</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/cd-discid/cd-discid-1.4.ebuild b/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
index 66f0a297ba05..e92d35bd7102 100644
--- a/media-sound/cd-discid/cd-discid-1.4.ebuild
+++ b/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
 HOMEPAGE="https://github.com/taem/cd-discid"
-SRC_URI="https://github.com/taem/${PN}/archive/upstream/1.4.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/taem/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-upstream-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
-
-S=${WORKDIR}/${PN}-upstream-${PV}
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr STRIP=/bin/true install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr STRIP="${EPREFIX}"/bin/true install
 	dodoc changelog README
 }
diff --git a/media-sound/cd-discid/metadata.xml b/media-sound/cd-discid/metadata.xml
index b17a82602b7f..ab93a8d225ea 100644
--- a/media-sound/cd-discid/metadata.xml
+++ b/media-sound/cd-discid/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/cdcd/Manifest b/media-sound/cdcd/Manifest
deleted file mode 100644
index 57e1b3ee2260..000000000000
--- a/media-sound/cdcd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cdcd-0.6.6.tar.gz 246286 BLAKE2B 7f2f4ecbc0d50c441dc3933f222d5bda74246b1fd2e7716564adfb73fb373665bc175b2a501c67b6af6e01c881785f1736843845917d8c1c8e19b9929f457284 SHA512 841f2d7f85c81a8cc9e88bc13515959a911e22fe9cff7fd272bab63fccb3e6bbf44e9d66fc2524f1670da20568d6e10434de8143a5e94fc576c7193b4a68f418
diff --git a/media-sound/cdcd/cdcd-0.6.6-r2.ebuild b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
deleted file mode 100644
index 6f47ecb006f0..000000000000
--- a/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="a simple yet powerful command line cd player"
-HOMEPAGE="http://libcdaudio.sourceforge.net"
-SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=sys-libs/readline-4.2
-	>=media-libs/libcdaudio-0.99.4
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cp "${FILESDIR}"/${P}-acinclude.m4 "${S}"/acinclude.m4 || die
-	epatch "${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/media-sound/cdcd/files/cdcd-0.6.6-acinclude.m4 b/media-sound/cdcd/files/cdcd-0.6.6-acinclude.m4
deleted file mode 100644
index bce268a78c71..000000000000
--- a/media-sound/cdcd/files/cdcd-0.6.6-acinclude.m4
+++ /dev/null
@@ -1,405 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
-dnl gthread is specified in MODULES, pass to glib-config
-dnl
-AC_DEFUN(AM_PATH_GLIB,
-[dnl 
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
-            glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  if test x$glib_config_exec_prefix != x ; then
-     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-     fi
-  fi
-  if test x$glib_config_prefix != x ; then
-     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-     fi
-  fi
-
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             glib_config_args="$glib_config_args gmodule"
-         ;;
-         gthread) 
-             glib_config_args="$glib_config_args gthread"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-  min_glib_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-  no_glib=""
-  if test "$GLIB_CONFIG" = "no" ; then
-    no_glib=yes
-  else
-    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If glib-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GLIB_CONFIG" = "no" ; then
-       echo "*** The glib-config script installed by GLIB could not be found"
-       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-       echo "*** full path to glib-config."
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  rm -f conf.glibtest
-])
-
-# Configure paths for libcdaudio                -*- Autoconf -*-
-#
-# Derived from glib.m4 (Owen Taylor 97-11-3)
-#
-
-dnl AM_PATH_LIBCDAUDIO([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libcdaudio, and define LIBCDAUDIO_CFLAGS, LIBCDAUDIO_LIBS and
-dnl LIBCDAUDIO_LDADD
-dnl
-AC_DEFUN([AM_PATH_LIBCDAUDIO],
-[dnl 
-dnl Get the cflags and libraries from the libcdaudio-config script
-dnl
-AC_ARG_WITH(libcdaudio-prefix,
-            AS_HELP_STRING([--with-libcdaudio-prefix=PFX],
-                           [Prefix where libcdaudio is installed (optional)]),
-            [libcdaudio_config_prefix="$withval"], [libcdaudio_config_prefix=""])
-AC_ARG_WITH(libcdaudio-exec-prefix,
-            AS_HELP_STRING([--with-libcdaudio-exec-prefix=PFX],
-                           [Exec prefix where libcdaudio is installed (optional)]),
-            [libcdaudio_config_exec_prefix="$withval"],
-            [libcdaudio_config_exec_prefix=""])
-AC_ARG_ENABLE(libcdaudiotest,
-              AS_HELP_STRING([--disable-libcdaudiotest],
-	                     [Do not try to compile and run a test libcdaudio program]),,
-	      [enable_libcdaudiotest=yes])
-
-  if test "x$libcdaudio_config_exec_prefix" != x ; then
-     libcdaudio_config_args="$libcdaudio_config_args --exec-prefix=$libcdaudio_config_exec_prefix"
-     if test "x${LIBCDAUDIO_CONFIG+set}" != xset ; then
-        LIBCDAUDIO_CONFIG=$libcdaudio_config_exec_prefix/bin/libcdaudio-config
-     fi
-  fi
-  if test x$libcdaudio_config_prefix != x ; then
-     libcdaudio_config_args="$libcdaudio_config_args --prefix=$libcdaudio_config_prefix"
-     if test "x${LIBCDAUDIO_CONFIG+set}" != xset ; then
-        LIBCDAUDIO_CONFIG=$libcdaudio_config_prefix/bin/libcdaudio-config
-     fi
-  fi
-
-  AC_PATH_PROG(LIBCDAUDIO_CONFIG, libcdaudio-config, no)
-  min_libcdaudio_version=ifelse([$1], ,0.99.0,$1)
-  AC_MSG_CHECKING([for libcdaudio - version >= $min_libcdaudio_version])
-  no_libcdaudio=""
-  if test "$LIBCDAUDIO_CONFIG" = "no" ; then
-    no_libcdaudio=yes
-  else
-    LIBCDAUDIO_CFLAGS=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --cflags`
-    LIBCDAUDIO_LIBS=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --libs`
-    LIBCDAUDIO_LDADD=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --ldadd`
-    libcdaudio_config_major_version=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
-    libcdaudio_config_minor_version=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
-    libcdaudio_config_micro_version=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
-    if test "x$enable_libcdaudiotest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $LIBCDAUDIO_CFLAGS $LIBCDAUDIO_LDADD"
-      LIBS="$LIBCDAUDIO_LIBS $LIBS"
-dnl
-dnl Now check if the installed libcdaudio is sufficiently new. (Also sanity
-dnl checks the results of libcdaudio-config to some extent
-dnl
-      rm -f conf.cdaudiotest
-      AC_TRY_RUN([
-#include <cdaudio.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-char* my_strdup (char *str)
-{
-  char *new_str;
-
-  if (str) {
-    new_str = malloc ((strlen (str) + 1) * sizeof(char));
-    strcpy (new_str, str);
-  } else
-    new_str = NULL;
-
-  return new_str;
-}
-
-int main()
-{
-  int major,minor,micro;
-  int libcdaudio_major_version,libcdaudio_minor_version,libcdaudio_micro_version;
-  char *tmp_version;
-
-  system ("touch conf.cdaudiotest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_libcdaudio_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_libcdaudio_version");
-     exit(1);
-   }
-
-  libcdaudio_major_version=(cdaudio_getversion()>>16)&255;
-  libcdaudio_minor_version=(cdaudio_getversion()>> 8)&255;
-  libcdaudio_micro_version=(cdaudio_getversion()    )&255;
-
-  if ((libcdaudio_major_version != $libcdaudio_config_major_version) ||
-      (libcdaudio_minor_version != $libcdaudio_config_minor_version) ||
-      (libcdaudio_micro_version != $libcdaudio_config_micro_version))
-    {
-      printf("\n*** 'libcdaudio-config --version' returned %d.%d.%d, but libcdaudio (%d.%d.%d)\n", 
-             $libcdaudio_config_major_version, $libcdaudio_config_minor_version, $libcdaudio_config_micro_version,
-             libcdaudio_major_version, libcdaudio_minor_version, libcdaudio_micro_version);
-      printf ("*** was found! If libcdaudio-config was correct, then it is best\n");
-      printf ("*** to remove the old version of libcdaudio. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If libcdaudio-config was wrong, set the environment variable LIBCDAUDIO_CONFIG\n");
-      printf("*** to point to the correct copy of libcdaudio-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((libcdaudio_major_version != LIBCDAUDIO_VERSION_MAJOR) ||
-	   (libcdaudio_minor_version != LIBCDAUDIO_VERSION_MINOR) ||
-           (libcdaudio_micro_version != LIBCDAUDIO_VERSION_MICRO))
-    {
-      printf("*** libcdaudio header files (version %d.%d.%d) do not match\n",
-	     LIBCDAUDIO_VERSION_MAJOR, LIBCDAUDIO_VERSION_MINOR, LIBCDAUDIO_VERSION_MICRO);
-      printf("*** library (version %d.%d.%d)\n",
-	     libcdaudio_major_version, libcdaudio_minor_version, libcdaudio_micro_version);
-    }
-  else
-    {
-      if ((libcdaudio_major_version > major) ||
-        ((libcdaudio_major_version == major) && (libcdaudio_minor_version > minor)) ||
-        ((libcdaudio_major_version == major) && (libcdaudio_minor_version == minor) && (libcdaudio_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of libcdaudio (%d.%d.%d) was found.\n",
-               libcdaudio_major_version, libcdaudio_minor_version, libcdaudio_micro_version);
-        printf("*** You need a version of libcdaudio newer than %d.%d.%d.\n",
-	       major, minor, micro);
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the libcdaudio-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of libcdaudio, but you can also set the LIBCDAUDIO_CONFIG environment to point to the\n");
-        printf("*** correct copy of libcdaudio-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_libcdaudio=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_libcdaudio" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$LIBCDAUDIO_CONFIG" = "no" ; then
-       echo "*** The libcdaudio-config script installed by libcdaudio could not be found"
-       echo "*** If libcdaudio was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the LIBCDAUDIO_CONFIG environment variable to the"
-       echo "*** full path to libcdaudio-config."
-     else
-       if test -f conf.cdaudiotest ; then
-        :
-       else
-          echo "*** Could not run libcdaudio test program, checking why..."
-          CFLAGS="$CFLAGS $LIBCDAUDIO_CFLAGS"
-          LIBS="$LIBS $LIBCDAUDIO_LIBS"
-          AC_TRY_LINK([
-#include <cdaudio.h>
-#include <stdio.h>
-],      [ return (cdaudio_getversion()!=0); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding libcdaudio or finding the wrong"
-          echo "*** version of libcdaudio. If it is not finding libcdaudio, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location. Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means libcdaudio was incorrectly installed"
-          echo "*** or that you have moved libcdaudio since it was installed. In the latter case, you"
-          echo "*** may want to edit the libcdaudio-config script: $LIBCDAUDIO_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     LIBCDAUDIO_CFLAGS=""
-     LIBCDAUDIO_LIBS=""
-     LIBCDAUDIO_LDADD=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(LIBCDAUDIO_CFLAGS)
-  AC_SUBST(LIBCDAUDIO_LIBS)
-  AC_SUBST(LIBCDAUDIO_LDADD)
-  rm -f conf.cdaudiotest
-])
-
diff --git a/media-sound/cdcd/files/cdcd-0.6.6-configure.patch b/media-sound/cdcd/files/cdcd-0.6.6-configure.patch
deleted file mode 100644
index 6755dab4d39f..000000000000
--- a/media-sound/cdcd/files/cdcd-0.6.6-configure.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,8 +2,6 @@
- 
- SUBDIRS = doc
- 
--AUTOMAKE_OPTIONS = ansi2knr
--
- bin_PROGRAMS = cdcd
- man_MANS = cdcd.1
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,5 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_INIT(cdcd.c)
-+AC_INIT(cdcd, 0.6.6)
- 
- MAJOR_VERSION=0
- MINOR_VERSION=6
-@@ -8,29 +8,22 @@
- PACKAGE=cdcd
- VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
- 
--AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-+AM_INIT_AUTOMAKE
- AM_CONFIG_HEADER(config.h)
--AM_MAINTAINER_MODE
- 
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_CPP
--AM_C_PROTOTYPES
- AC_CANONICAL_HOST
- 
- dnl Checks for libraries.
--AC_CHECK_LIB(curses, tputs,,
--             [AC_MSG_ERROR([cannot find the curses library.
--Check the INSTALL file, maybe you can find how to solve the problem.])])
- AC_CHECK_LIB(readline, rl_completion_matches,,
--             [AC_MSG_ERROR([cannot find GNU libreadline 4.2 or higher.
--Check the INSTALL file, maybe you can find how to solve the problem.])])
-+             [AC_MSG_ERROR([cannot find GNU libreadline 4.2 or higher.])])
- AC_CHECK_LIB(socket, socket)dnl Needed for Solaris 2.9.
- 
--AM_PATH_LIBCDAUDIO(,,[AC_MSG_ERROR([cannot find libcdaudio.
--Check the INSTALL file, maybe you can find how to solve the problem.])])
-+AM_PATH_LIBCDAUDIO(,,[AC_MSG_ERROR([cannot find libcdaudio.])])
- 
- have_libcdaudio=0
- have_cdaudio=0
-@@ -40,6 +33,11 @@
-     default_device=/dev/unspecified
-     have_libcdaudio=1
-     ;;
-+   
-+  *freebsd[567]*)
-+    default_device=/dev/cd0
-+    have_cdaudio=1
-+    ;;
- 
-   *bsd*)
-     default_device=/dev/wcd0a
-@@ -69,8 +67,8 @@
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_FUNC_ALLOCA
--AC_CHECK_HEADERS([string.h strings.h sys/ptyvar.h])
--AC_CHECK_HEADERS([errno.h locale.h malloc.h stdlib.h \
-+AC_CHECK_HEADERS([string.h strings.h sys/ptyvar.h malloc.h])
-+AC_CHECK_HEADERS([errno.h locale.h stdlib.h \
- readline/readline.h readline/history.h sys/socket.h unistd.h],, \
- [AC_MSG_ERROR([missing header file.])])
- 
diff --git a/media-sound/cdcd/metadata.xml b/media-sound/cdcd/metadata.xml
deleted file mode 100644
index 6ca1fc91648d..000000000000
--- a/media-sound/cdcd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">libcdaudio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
index b0138601ccc8..4a5d130489a5 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
@@ -1,36 +1,39 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools libtool toolchain-funcs multilib-minimal
 
 MY_P="${PN}-III-$(ver_cut 2-3)"
 DESCRIPTION="An advanced CDDA reader with error correction"
 HOMEPAGE="https://www.xiph.org/paranoia"
-SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
-	https://dev.gentoo.org/~pacho/${PN}/${P}-patches.tar.xz"
+SRC_URI="
+	https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
+	https://dev.gentoo.org/~pacho/${PN}/${P}-patches.tar.xz
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="app-eselect/eselect-cdparanoia"
-DEPEND="${RDEPEND}"
-BDEPEND=""
+IDEPEND="app-eselect/eselect-cdparanoia"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	# Patches from previous patchset + Fedora + Debian
+	"${WORKDIR}"/patches
+	# bug #713740
+	"${FILESDIR}"/${PN}-missing-sys_types_h.patch
+	"${FILESDIR}"/cdparanoia-pkgconfig.patch
+)
 
 src_prepare() {
 	default
 
-	# Patches from previus patchset + Fedora + Debian
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply "${FILESDIR}"/${PN}-missing-sys_types_h.patch #713740
-
-	mv configure.guess config.guess
-	mv configure.sub config.sub
+	mv configure.guess config.guess || die
+	mv configure.sub config.sub || die
 
 	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
 
@@ -53,7 +56,7 @@ multilib_src_compile() {
 
 multilib_src_install_all() {
 	einstalldocs
-	mv "${ED}"/usr/bin/${PN}{,-paranoia}
+	mv "${ED}"/usr/bin/${PN}{,-paranoia} || die
 }
 
 pkg_postinst() {
diff --git a/media-sound/cdparanoia/files/cdparanoia-pkgconfig.patch b/media-sound/cdparanoia/files/cdparanoia-pkgconfig.patch
new file mode 100644
index 000000000000..422a5caf0374
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-pkgconfig.patch
@@ -0,0 +1,84 @@
+https://src.fedoraproject.org/rpms/cdparanoia/blob/rawhide/f/cdparanoia-10.2-add-pkgconfig.patch
+
+From 5beb3983942ce92ea18a2a0f2e15f84fb25c27d8 Mon Sep 17 00:00:00 2001
+From: xiphmont <xiphmont@0101bb08-14d6-0310-b084-bc0e0c8e3800>
+Date: Fri, 11 Jun 2010 15:42:00 +0000
+Subject: [PATCH] Add pkgconfig file to cdparanoia; closes Trac #1706
+
+git-svn-id: https://svn.xiph.org/trunk/cdparanoia@17289 0101bb08-14d6-0310-b084-bc0e0c8e3800
+diff --git a/Makefile.in b/Makefile.in
+index d03ef85..f8bb5f8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,7 @@
+ # DO NOT EDIT BELOW! ##########################################################
+ # (unless, of course, you know what you are doing :) ##########################
+ 
+-VERSION=10.2
++VERSION=@VERSION@
+ VPATH=@srcdir@
+ srcdir=@srcdir@
+ 
+@@ -23,6 +23,7 @@ BINDIR=@bindir@
+ MANDIR=@mandir@
+ INCLUDEDIR=@includedir@
+ LIBDIR=@libdir@
++PKGCONFIGDIR=@libdir@/pkgconfig
+ PWD = $(shell pwd)
+ 
+ OFILES = main.o report.o header.o buffering_write.o cachetest.o
+@@ -85,6 +86,8 @@ install:
+ 		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+ 		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(PKGCONFIGDIR)
++	$(INSTALL) -m 0644 $(srcdir)/cdparanoia-3.pc $(DESTDIR)$(PKGCONFIGDIR)
+ 
+ cdparanoia:	$(OFILES) $(LIBDEP)
+ 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
+@@ -104,6 +107,6 @@ distclean:
+ 	cd interface && $(MAKE) distclean
+ 	cd paranoia && $(MAKE) distclean
+ 	-rm -f cdparanoia *~ config.* *.o *.wav *.aifc *.raw test.file \
+-		Makefile verify_test core gmon.out
++		Makefile verify_test core gmon.out cdparanoia-3.pc
+ 
+ .PHONY: all debug test lib slib install clean distclean
+diff --git a/configure.in b/configure.in
+index 3ad98ca..37d7576 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,9 @@ AC_INIT(interface/interface.c)
+ cp $srcdir/configure.guess $srcdir/config.guess
+ cp $srcdir/configure.sub $srcdir/config.sub
+ 
++VERSION="10.2"
++AC_SUBST(VERSION)
++
+ AC_CANONICAL_HOST
+ 
+ if test -z "$CC"; then
+@@ -67,4 +70,4 @@ AC_SUBST(OPT)
+ AC_SUBST(DEBUG)
+ AC_SUBST(CC)
+ 
+-AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile)
++AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile cdparanoia-3.pc)
+diff --git a/cdparanoia-3.pc.in b/cdparanoia-3.pc.in
+new file mode 100644
+index 0000000..3a15099
+--- /dev/null
++++ b/cdparanoia-3.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: Cdparanoia III
++Description: Compact Disc Digital Audio (CDDA) Digital Audio Extraction (DAE) library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lcdda_interface -lcdda_paranoia
++Cflags: -I${includedir}
++
diff --git a/media-sound/cdparanoia/metadata.xml b/media-sound/cdparanoia/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/cdparanoia/metadata.xml
+++ b/media-sound/cdparanoia/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/cdplay/metadata.xml b/media-sound/cdplay/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/cdplay/metadata.xml
+++ b/media-sound/cdplay/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/cdstatus/cdstatus-0.97.03.ebuild b/media-sound/cdstatus/cdstatus-0.97.03.ebuild
index 5d7d361d54a8..e0fde579dd76 100644
--- a/media-sound/cdstatus/cdstatus-0.97.03.ebuild
+++ b/media-sound/cdstatus/cdstatus-0.97.03.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Tool for diagnosing cdrom drive and digital data (audio) extraction"
-HOMEPAGE="http://cdstatus.sourceforge.net"
-SRC_URI="mirror://sourceforge/cdstatus/${P}.tar.gz"
+HOMEPAGE="https://cdstatus.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/cdstatus/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/cdstatus/metadata.xml b/media-sound/cdstatus/metadata.xml
index a913f6e5561b..1d4596c04956 100644
--- a/media-sound/cdstatus/metadata.xml
+++ b/media-sound/cdstatus/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/cdtool/metadata.xml b/media-sound/cdtool/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/cdtool/metadata.xml
+++ b/media-sound/cdtool/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/chordii/chordii-4.5.3.ebuild b/media-sound/chordii/chordii-4.5.3.ebuild
index 1b9c9f3d7f9b..11ae427fb255 100644
--- a/media-sound/chordii/chordii-4.5.3.ebuild
+++ b/media-sound/chordii/chordii-4.5.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="A guitar music typesetter"
-HOMEPAGE="http://chordii.sourceforge.net/"
+DESCRIPTION="Guitar music typesetter"
+HOMEPAGE="https://chordii.sourceforge.net/"
 SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/user_guide-${PV}.pdf )"
+	https://downloads.sourceforge.net/${PN}/${P}.tar.gz
+	doc? ( https://downloads.sourceforge.net/${PN}/user_guide-${PV}.pdf )"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
diff --git a/media-sound/chordii/metadata.xml b/media-sound/chordii/metadata.xml
index 0a7ee796fdd3..632bcbed44b8 100644
--- a/media-sound/chordii/metadata.xml
+++ b/media-sound/chordii/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index c2bbff525de1..9b7723431dea 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1 +1 @@
-DIST chuck-1.4.0.1.tgz 14689073 BLAKE2B 408e2512f07a33fc86db80b05005ea65351257036f663153845038a0edeef95054dac9878d37eb22cc122035a6d1f80d008e151811277d4ee9d24ba3d79ad26b SHA512 92da0569349c900e633e8e3e544a0e5ec7df7b41a8508d2a99c825dfe490f00208b50b883298ce091b46f4e9274dabe0ec8bcfd80d094dd006b3c342f74bd202
+DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360
diff --git a/media-sound/chuck/chuck-1.4.0.1.ebuild b/media-sound/chuck/chuck-1.4.1.1.ebuild
index cddaef76f39b..bb23fdb89930 100644
--- a/media-sound/chuck/chuck-1.4.0.1.ebuild
+++ b/media-sound/chuck/chuck-1.4.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -20,19 +20,19 @@ RDEPEND="app-eselect/eselect-chuck
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )"
 DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
+	app-alternatives/yacc
+	app-alternatives/lex"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
-	"${FILESDIR}"/${PN}-1.4.0.0-makefile.patch
+	"${FILESDIR}"/${P}-makefile.patch
 )
 
 compile_backend() {
 	backend=$1
 	pushd "${S}/src" &>/dev/null || die
 	einfo "Compiling against ${backend}"
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" linux-${backend}
 	mv chuck{,-${backend}} || die
 	emake clean
 	popd &>/dev/null || die
@@ -55,7 +55,6 @@ src_install() {
 
 	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
 	if use examples; then
-		docinto /usr/share/doc/${PF}/
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch b/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
deleted file mode 100644
index f8c6561a8141..000000000000
--- a/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- chuck-1.4.0.0/src/makefile
-+++ chuck-1.4.0.0/src/makefile
-@@ -40,8 +40,6 @@
- 
- ifneq ($(CHUCK_DEBUG),)
- CFLAGS+= -g
--else
--CFLAGS+= -O3
- endif
- 
- ifneq ($(USE_64_BIT_SAMPLE),)
---- chuck-1.4.0.0/src/core/makefile.x/makefile.alsa
-+++ chuck-1.4.0.0/src/core/makefile.x/makefile.alsa
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
- LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
- 
---- chuck-1.4.0.0/src/core/makefile.x/makefile.jack
-+++ chuck-1.4.0.0/src/core/makefile.x/makefile.jack
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
- LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
- 
diff --git a/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
new file mode 100644
index 000000000000..98147cf9a81f
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
@@ -0,0 +1,50 @@
+diff --git a/src/core/makefile.x/makefile.alsa b/src/core/makefile.x/makefile.alsa
+index 5694257..577dd91 100644
+--- a/src/core/makefile.x/makefile.alsa
++++ b/src/core/makefile.x/makefile.alsa
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
+ LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
+ 
+diff --git a/src/core/makefile.x/makefile.jack b/src/core/makefile.x/makefile.jack
+index 86b2511..442708b 100644
+--- a/src/core/makefile.x/makefile.jack
++++ b/src/core/makefile.x/makefile.jack
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
+ LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
+ 
+diff --git a/src/makefile b/src/makefile
+index f52f0c2..310991a 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -76,11 +76,11 @@ CK_VERSION=1.4.1.1
+ 
+ 
+ ########################### COMPILATION TOOLS ##################################
+-LEX=flex
+-YACC=bison
+-CC=gcc
+-CXX=g++
+-LD=g++
++LEX?=flex
++YACC?=bison
++CC?=gcc
++CXX?=g++
++LD?=g++
+ 
+ 
+ ############################# COMPILER FLAGS ###################################
+@@ -92,8 +92,6 @@ endif
+ 
+ ifneq ($(CHUCK_DEBUG),)
+ CFLAGS+= -g
+-else
+-CFLAGS+= -O3
+ endif
+ 
+ ifneq ($(USE_64_BIT_SAMPLE),)
diff --git a/media-sound/chuck/metadata.xml b/media-sound/chuck/metadata.xml
index 2be677dfc4d0..0ddc4409544d 100644
--- a/media-sound/chuck/metadata.xml
+++ b/media-sound/chuck/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>proaudio@gentoo.org</email>
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 8f8f85717952..9d094a2ce96c 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1 +1 @@
-DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
+DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
index a11ddaa0a213..e692aae14938 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
@@ -1,36 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 
 PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
-inherit cmake flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic plocale virtualx xdg
 
-MY_P="${P/_}"
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
-	S="${WORKDIR}/${P/_}"
-	SRC_URI_BASE="https://github.com/clementine-player/${PN^}"
-	COMMIT=""
-	if [[ -n "${COMMIT}" ]] ; then
-		SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN^}-${COMMIT}"
-	elif [[ $(ver_cut 3) -gt 90 ]] ; then
-		SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	else
-		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm64 x86"
+	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Clementine-${PV/_}"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -38,22 +29,10 @@ REQUIRED_USE="
 	wiimote? ( dbus )
 "
 
-BDEPEND="
-	>=dev-cpp/gtest-1.8.0
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/crypto++:=
+	dev-cpp/abseil-cpp:=
+	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -61,57 +40,69 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
 	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
-	virtual/glu
 	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib )
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
 	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
+	moodbar? ( sci-libs/fftw:3.0= )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0:=
+		>=media-libs/libprojectm-3.1.12:0=
 		virtual/opengl
 	)
+	pulseaudio? ( media-libs/libpulse )
 "
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-soup:1.0
 	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
 	mtp? ( gnome-base/gvfs[mtp] )
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
+	dev-libs/libxml2
 	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
+	virtual/glu
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
 "
-
-RESTRICT="test"
-
-DOCS=( Changelog README.md )
+BDEPEND="
+	>=dev-cpp/gtest-1.8.0
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
 
 PATCHES=(
-	"${FILESDIR}/${P}-QPainterPath_include.patch" #725678
+	"${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch"
 )
 
+DOCS=( Changelog README.md )
+
 src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
+	plocale_find_changes "src/translations" "" ".po"
 
 	cmake_src_prepare
 	# some tests fail or hang
@@ -131,19 +122,16 @@ src_configure() {
 	# spotify is not in portage
 	local mycmakeargs=(
 		-DBUILD_WERROR=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="cryptopp"
-		-DCRYPTOPP_FOUND=ON
 		# avoid automagically enabling of ccache (bug #611010)
 		-DCCACHE_EXECUTABLE=OFF
 		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_DEVICEKIT=OFF
 		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY=OFF
 		-DENABLE_SPOTIFY_BLOB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
 		-DUSE_SYSTEM_PROJECTM=ON
 		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(l10n_get_locales)"
+		-DLINGUAS="$(plocale_get_locales)"
 		-DENABLE_BOX="$(usex box)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
@@ -159,6 +147,8 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		"$(cmake_use_find_package alsa ALSA)"
+		-DGENTOO_FIX_ABSL_LIBS="$(test-flags-CCLD -labsl_log_internal_check_op -labsl_log_internal_message)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
@@ -168,7 +158,7 @@ src_configure() {
 
 src_test() {
 	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
+	virtx cmake_build clementine_test
 }
 
 pkg_postinst() {
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index edb23f4f60da..0636103d29fd 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,36 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 
 PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
-inherit cmake flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic plocale virtualx xdg
 
-MY_P="${P/_}"
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
-	S="${WORKDIR}/${P/_}"
-	SRC_URI_BASE="https://github.com/clementine-player/${PN^}"
-	COMMIT=""
-	if [[ -n "${COMMIT}" ]] ; then
-		SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN^}-${COMMIT}"
-	elif [[ $(ver_cut 3) -gt 90 ]] ; then
-		SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	else
-		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
-	fi
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Clementine-${PV/_}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -38,22 +29,10 @@ REQUIRED_USE="
 	wiimote? ( dbus )
 "
 
-BDEPEND="
-	>=dev-cpp/gtest-1.8.0
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/crypto++:=
+	dev-cpp/abseil-cpp:=
+	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -61,51 +40,68 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
 	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
-	virtual/glu
 	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib )
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
 	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
+	moodbar? ( sci-libs/fftw:3.0= )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0:=
+		>=media-libs/libprojectm-3.1.12:0=
 		virtual/opengl
 	)
+	pulseaudio? ( media-libs/libpulse )
 "
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-soup:1.0
 	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
 	mtp? ( gnome-base/gvfs[mtp] )
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
+	dev-libs/libxml2
 	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
+	virtual/glu
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
 "
+BDEPEND="
+	>=dev-cpp/gtest-1.8.0
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch"
+)
 
 DOCS=( Changelog README.md )
 
 src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
+	plocale_find_changes "src/translations" "" ".po"
 
 	cmake_src_prepare
 	# some tests fail or hang
@@ -118,26 +114,20 @@ src_prepare() {
 		cmake_comment_add_subdirectory tests
 	fi
 
-	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
+	rm -r 3rdparty/{libmygpo-qt5,taglib} || die
 }
 
 src_configure() {
-	# spotify is not in portage
 	local mycmakeargs=(
 		-DBUILD_WERROR=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="cryptopp"
-		-DCRYPTOPP_FOUND=ON
 		# avoid automagically enabling of ccache (bug #611010)
 		-DCCACHE_EXECUTABLE=OFF
 		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_DEVICEKIT=OFF
 		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY_BLOB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
 		-DUSE_SYSTEM_PROJECTM=ON
 		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(l10n_get_locales)"
+		-DLINGUAS="$(plocale_get_locales)"
 		-DENABLE_BOX="$(usex box)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
@@ -153,6 +143,8 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		"$(cmake_use_find_package alsa ALSA)"
+		-DGENTOO_FIX_ABSL_LIBS="$(test-flags-CCLD -labsl_log_internal_check_op -labsl_log_internal_message)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
@@ -162,7 +154,7 @@ src_configure() {
 
 src_test() {
 	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
+	virtx cmake_build clementine_test
 }
 
 pkg_postinst() {
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch b/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch
deleted file mode 100644
index 3a441412ba26..000000000000
--- a/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7715ae5c01528213a97369e14d5461efd264cc27 Mon Sep 17 00:00:00 2001
-From: SDNick484 <SDNick484@gmail.com>
-Date: Thu, 28 May 2020 10:34:31 +0200
-Subject: [PATCH] Adds missing QPainterPath include
-
----
- src/widgets/freespacebar.cpp | 1 +
- src/widgets/osdpretty.cpp    | 1 +
- src/widgets/sliderwidget.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
-index 3067f722b..c9789d353 100644
---- a/src/widgets/freespacebar.cpp
-+++ b/src/widgets/freespacebar.cpp
-@@ -20,6 +20,7 @@
- 
- #include <QLinearGradient>
- #include <QPainter>
-+#include <QPainterPath>
- 
- const int FreeSpaceBar::kBarHeight = 20;
- const int FreeSpaceBar::kBarBorderRadius = 8;
-diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
-index 9d95716d8..30cef7dae 100644
---- a/src/widgets/osdpretty.cpp
-+++ b/src/widgets/osdpretty.cpp
-@@ -26,6 +26,7 @@
- #include <QLayout>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
-diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
-index 581a0de7b..96bbc0e5e 100644
---- a/src/widgets/sliderwidget.cpp
-+++ b/src/widgets/sliderwidget.cpp
-@@ -27,6 +27,7 @@
- #include <QSize>
- #include <QTimer>
- #include <QStyle>
-+#include <QtGui>
- #include <QMenu>
- #include <QWheelEvent>
- #include <QMouseEvent>
--- 
-2.27.0.rc2
-
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
new file mode 100644
index 000000000000..60c2adff3689
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
@@ -0,0 +1,15 @@
+Fix build
+
+https://bugs.gentoo.org/912853
+
+--- a/ext/libclementine-tagreader/CMakeLists.txt
++++ b/ext/libclementine-tagreader/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library(libclementine-tagreader STATIC
+ )
+ 
+ target_link_libraries(libclementine-tagreader
+-  ${PROTOBUF_LIBRARY}
+   libclementine-common
++  ${PROTOBUF_LIBRARY} ${GENTOO_FIX_ABSL_LIBS}
+ )
+ 
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch
new file mode 100644
index 000000000000..3121b1e15bf0
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch
@@ -0,0 +1,67 @@
+Fix build
+
+https://bugs.gentoo.org/912853
+
+--- a/3rdparty/libprojectm/CMakeLists.txt
++++ b/3rdparty/libprojectm/CMakeLists.txt
+@@ -24,7 +24,7 @@ set(BUILD_PROJECTM_STATIC ON)
+ set(DISABLE_NATIVE_PRESETS ON)
+ set(DISABLE_MILKDROP_PRESETS OFF)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ 
+ pkg_check_modules(GLEW glew)
+ 
+--- a/3rdparty/qtsingleapplication/CMakeLists.txt
++++ b/3rdparty/qtsingleapplication/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.0.0)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+ 
+ set(SINGLEAPP-SOURCES
+     qtlocalpeer.cpp
+--- a/ext/libclementine-common/CMakeLists.txt
++++ b/ext/libclementine-common/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+ 
+ set(SOURCES
+   core/closure.cpp
+--- a/ext/libclementine-remote/CMakeLists.txt
++++ b/ext/libclementine-remote/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include_directories(${PROTOBUF_INCLUDE_DIRS})
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+ 
+ set(MESSAGES
+   remotecontrolmessages.proto
+--- a/ext/libclementine-tagreader/CMakeLists.txt
++++ b/ext/libclementine-tagreader/CMakeLists.txt
+@@ -3,7 +3,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+ 
+ set(MESSAGES
+   tagreadermessages.proto
+--- a/gst/moodbar/CMakeLists.txt
++++ b/gst/moodbar/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.0.0)
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++17")
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ 
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch
new file mode 100644
index 000000000000..a33f07d5a5f9
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch
@@ -0,0 +1,33 @@
+https://github.com/clementine-player/Clementine/pull/7238
+https://bugs.gentoo.org/887105
+
+--- a/3rdparty/qtiocompressor/CMakeLists.txt
++++ b/3rdparty/qtiocompressor/CMakeLists.txt
+@@ -15,4 +15,4 @@ ADD_LIBRARY(qtiocompressor STATIC
+     ${IOCOMPRESSOR-SOURCES-MOC}
+ )
+ 
+-target_link_libraries(qtiocompressor Qt5::Core)
++target_link_libraries(qtiocompressor Qt5::Core ${ZLIB_LIBRARIES})
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,9 +78,7 @@ pkg_check_modules(LIBXML libxml-2.0)
+ pkg_check_modules(LIBSPOTIFY libspotify>=12.1.45)
+ pkg_check_modules(TAGLIB taglib)
+ 
+-if (WIN32)
+   find_package(ZLIB REQUIRED)
+-endif (WIN32)
+ 
+ find_library(LASTFM5_LIBRARIES lastfm5)
+ find_path(LASTFM5_INCLUDE_DIRS lastfm5/ws.h)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1303,7 +1303,6 @@ target_link_libraries(clementine_lib
+   ${SQLITE_LIBRARIES}
+ 
+   Qocoa
+-  z
+ )
+ 
+ link_directories(
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch
new file mode 100644
index 000000000000..8f92766193d6
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch
@@ -0,0 +1,53 @@
+Read visualisations from subdirs
+
+https://bugs.gentoo.org/917064
+https://github.com/clementine-player/Clementine/issues/7151
+
+--- a/src/visualisations/projectmpresetmodel.cpp
++++ b/src/visualisations/projectmpresetmodel.cpp
+@@ -27,22 +27,26 @@
+ #endif
+ 
+ #include <QDir>
++#include <QDirIterator>
+ #include <QtDebug>
++#include <set>
+ 
+ ProjectMPresetModel::ProjectMPresetModel(ProjectMVisualisation* vis,
+                                          QObject* parent)
+     : QAbstractItemModel(parent), vis_(vis) {
+   // Find presets
+-  QDir preset_dir(vis_->preset_url());
+-  QStringList presets(
+-      preset_dir.entryList(QStringList() << "*.milk"
+-                                         << "*.prjm",
++  QDirIterator it(vis_->preset_url(),
++                  QStringList() << "*.milk" << "*.prjm",
+                            QDir::Files | QDir::NoDotAndDotDot | QDir::Readable,
+-                           QDir::Name | QDir::IgnoreCase));
++                           QDirIterator::Subdirectories);
++  std::set<std::pair<QString, QString>> files;
++  while (it.hasNext()) {
++    it.next();
++    files.insert({it.filePath(), it.fileName()});
++  }
+ 
+-  for (const QString& filename : presets) {
+-    all_presets_ << Preset(preset_dir.absoluteFilePath(filename), filename,
+-                           false);
++  for (const auto& [filePath, fileName] : files) {
++    all_presets_ << Preset(filePath, fileName, false);
+   }
+ }
+ 
+--- a/src/visualisations/projectmvisualisation.cpp
++++ b/src/visualisations/projectmvisualisation.cpp
+@@ -93,7 +93,7 @@ void ProjectMVisualisation::InitProjectM() {
+     if (!QFile::exists(path)) continue;
+ 
+     // Don't use empty directories
+-    if (QDir(path).entryList(QDir::Files | QDir::NoDotAndDotDot).isEmpty())
++    if (QDir(path).entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot).isEmpty())
+       continue;
+ 
+     preset_path = path;
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 26591e879c53..e87e946c4d6e 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6-r1.ebuild
index 1dc7e4ab02a2..91ce5c26b941 100644
--- a/media-sound/cmix/cmix-1.6.ebuild
+++ b/media-sound/cmix/cmix-1.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/media-sound/cmix/metadata.xml b/media-sound/cmix/metadata.xml
index fb16954db726..01c7de242623 100644
--- a/media-sound/cmix/metadata.xml
+++ b/media-sound/cmix/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index fc1c5f74b189..7863daabbfbc 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1 +1,2 @@
-DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
+DIST cmus-2.10.0.tar.gz 324121 BLAKE2B 7a9b17b04f9461b5375f51584f1dce35dcb6863d57eb9b28391cbfb6abb4eae1f541ee6f10cbbf4c7048c08fd77307647700fd08e41eb56bbad89b67657dd876 SHA512 c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c
+DIST cmus-2.11.0.tar.gz 335367 BLAKE2B 69584b929afcf82e540e8a4382bc3b3ee4a24dc00fe27d0956941ceb0d446395f824068405c52732c4f684d7b32b5436b246cf7b97c73ba9ebbabbb479e2326f SHA512 370c8eea6e67b328befb24d98ef3945fabc65b33d0bb9ae09cedd1c453b18a307061c042b2119f37f3684a4a39b86b3535efaa2c955e58c8e680628ef0a03452
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.10.0-r1.ebuild
index 1cc9fb01d880..3679ab233896 100644
--- a/media-sound/cmus/cmus-2.8.0.ebuild
+++ b/media-sound/cmus/cmus-2.10.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1 toolchain-funcs
 
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
@@ -19,37 +19,41 @@ HOMEPAGE="https://cmus.github.io/"
 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 systemd tremor +unicode
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio sndio systemd tremor +unicode
 	+vorbis wavpack"
-
-REQUIRED_USE="?? ( elogind systemd )"
+# 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:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	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 )
+	flac? ( media-libs/flac:= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( >=media-libs/libmad-0.14 )
+	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	mp4? ( >=media-libs/libmp4v2-1.9:0 )
-	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( media-libs/libmodplug )
+	mp4? ( media-libs/libmp4v2:0 )
+	musepack? ( media-sound/musepack-tools )
 	opus? ( media-libs/opusfile )
 	pulseaudio? ( media-sound/pulseaudio )
+	sndio? ( media-sound/sndio )
 	systemd? ( sys-apps/systemd )
 	tremor? ( media-libs/tremor )
-	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
+	!tremor? ( vorbis? ( media-libs/libvorbis ) )
 	wavpack? ( media-sound/wavpack )
 "
 RDEPEND="${DEPEND}
@@ -59,20 +63,14 @@ RDEPEND="${DEPEND}
 	)
 "
 
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )
-	mp4? ( aac )" # enabling mp4 adds -lfaad
-
 DOCS=( AUTHORS README.md )
 
+S="${WORKDIR}/${P/_/-}"
+
 PATCHES=(
-	"${FILESDIR}/${P}-elogind.patch"
-	"${FILESDIR}/${P}-ffmpeg-deprecations.patch"
-	"${FILESDIR}/${P}-opus.patch"
+	"${FILESDIR}/${PN}-2.9.1-atomic.patch"
 )
 
-S="${WORKDIR}/${P/_/-}"
-
 src_configure() {
 	my_config() {
 		local value
@@ -110,6 +108,7 @@ src_configure() {
 	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
diff --git a/media-sound/cmus/cmus-2.11.0.ebuild b/media-sound/cmus/cmus-2.11.0.ebuild
new file mode 100644
index 000000000000..78b2cf8d7a3c
--- /dev/null
+++ b/media-sound/cmus/cmus-2.11.0.ebuild
@@ -0,0 +1,151 @@
+# 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/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index dc3b1a64b34e..78b2cf8d7a3c 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1 toolchain-funcs
 
@@ -10,46 +10,53 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	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 systemd tremor +unicode
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio sndio systemd tremor +unicode
 	+vorbis wavpack"
 
-REQUIRED_USE="?? ( elogind systemd )"
+# 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:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	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 )
+	flac? ( media-libs/flac:= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( >=media-libs/libmad-0.14 )
+	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	mp4? ( >=media-libs/libmp4v2-1.9:0 )
-	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( media-libs/libmodplug )
+	mp4? ( media-libs/libmp4v2:0 )
+	musepack? ( media-sound/musepack-tools )
 	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio )
 	systemd? ( sys-apps/systemd )
 	tremor? ( media-libs/tremor )
-	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
+	!tremor? ( vorbis? ( media-libs/libvorbis ) )
 	wavpack? ( media-sound/wavpack )
 "
 RDEPEND="${DEPEND}
@@ -59,13 +66,11 @@ RDEPEND="${DEPEND}
 	)
 "
 
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )
-	mp4? ( aac )" # enabling mp4 adds -lfaad
-
 DOCS=( AUTHORS README.md )
 
-S="${WORKDIR}/${P/_/-}"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.9.1-atomic.patch"
+)
 
 src_configure() {
 	my_config() {
@@ -104,6 +109,7 @@ src_configure() {
 	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
diff --git a/media-sound/cmus/files/cmus-2.8.0-elogind.patch b/media-sound/cmus/files/cmus-2.8.0-elogind.patch
deleted file mode 100644
index e1309c78911d..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-elogind.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 483d1862ed023c3e00f2c8c4e71da40022af2f78 Mon Sep 17 00:00:00 2001
-From: Shiba <3816409+shibotto@users.noreply.github.com>
-Date: Tue, 12 Feb 2019 15:29:43 +0100
-Subject: [PATCH] Add support for elogind (#846)
-
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 1f46c30a..4627126e 100755
---- a/configure
-+++ b/configure
-@@ -289,7 +289,7 @@ check_vorbis()
- 
- check_libsystemd()
- {
--	pkg_config LIBSYSTEMD "libsystemd"
-+	pkg_config LIBSYSTEMD "libsystemd" || pkg_config LIBSYSTEMD "libelogind >= 239.3"
- 	return $?
- }
- 
diff --git a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch b/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch
deleted file mode 100644
index 941f47e3d499..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 9877eb02381fd4c57059f9c77be03127c28d8f88 Mon Sep 17 00:00:00 2001
-From: Niko E <nefthy@users.noreply.github.com>
-Date: Mon, 11 Feb 2019 09:09:21 +0100
-Subject: [PATCH] Fixes ffmpeg deprecations (#861)
-
-- av_register_all is no longer needed since 4.0
-- AVStream::codec is deprecated since 3.1
-- avcodec_decode_audio4 is deprecated since 3.1
----
- ip/ffmpeg.c | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
-index eaad5c4f..418a37f8 100644
---- a/ip/ffmpeg.c
-+++ b/ip/ffmpeg.c
-@@ -128,9 +128,11 @@ static void ffmpeg_init(void)
- 
- 	av_log_set_level(AV_LOG_QUIET);
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 18, 100)
- 	/* We could register decoders explicitly to save memory, but we have to
- 	 * be careful about compatibility. */
- 	av_register_all();
-+#endif
- }
- 
- static int ffmpeg_open(struct input_plugin_data *ip_data)
-@@ -143,6 +145,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 	AVCodec *codec;
- 	AVCodecContext *cc = NULL;
- 	AVFormatContext *ic = NULL;
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+	AVCodecParameters *cp = NULL;
-+#endif
- 	SwrContext *swr = NULL;
- 
- 	ffmpeg_init();
-@@ -162,11 +167,20 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 		}
- 
- 		for (i = 0; i < ic->nb_streams; i++) {
-+
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+			cp = ic->streams[i]->codecpar;
-+			if (cp->codec_type == AVMEDIA_TYPE_AUDIO) {
-+				stream_index = i;
-+				break;
-+			}
-+#else
- 			cc = ic->streams[i]->codec;
- 			if (cc->codec_type == AVMEDIA_TYPE_AUDIO) {
- 				stream_index = i;
- 				break;
- 			}
-+#endif
- 		}
- 
- 		if (stream_index == -1) {
-@@ -175,7 +189,13 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 			break;
- 		}
- 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+		codec = avcodec_find_decoder(cp->codec_id);
-+		cc = avcodec_alloc_context3(codec);
-+		avcodec_parameters_to_context(cc, cp);
-+#else
- 		codec = avcodec_find_decoder(cc->codec_id);
-+#endif
- 		if (!codec) {
- 			d_print("codec not found: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id));
- 			err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
-@@ -196,6 +216,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 
- 	if (err < 0) {
- 		/* Clean up.  cc is never opened at this point.  (See above assumption.) */
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+		avcodec_free_context(&cc);
-+#endif
- 		avformat_close_input(&ic);
- 		return err;
- 	}
-@@ -207,6 +230,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 	priv->input = ffmpeg_input_create();
- 	if (priv->input == NULL) {
- 		avcodec_close(cc);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+		avcodec_free_context(&cc);
-+#endif
- 		avformat_close_input(&ic);
- 		free(priv);
- 		return -IP_ERROR_INTERNAL;
-@@ -252,6 +278,9 @@ static int ffmpeg_close(struct input_plugin_data *ip_data)
- 	struct ffmpeg_private *priv = ip_data->private;
- 
- 	avcodec_close(priv->codec_context);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+	avcodec_free_context(&priv->codec_context);
-+#endif
- 	avformat_close_input(&priv->input_context);
- 	swr_free(&priv->swr);
- 	ffmpeg_input_free(priv->input);
-@@ -305,7 +334,20 @@ static int ffmpeg_fill_buffer(AVFormatContext *ic, AVCodecContext *cc, struct ff
- 			AVPacket avpkt;
- 			av_new_packet(&avpkt, input->curr_pkt_size);
- 			memcpy(avpkt.data, input->curr_pkt_buf, input->curr_pkt_size);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+			if (avcodec_send_packet(cc, &avpkt) == 0) {
-+				got_frame = !avcodec_receive_frame(cc, frame);
-+				if (got_frame)
-+					len = input->curr_pkt_size;
-+				else
-+					len = 0;
-+			} else {
-+				got_frame = 0;
-+				len = 0;
-+			}
-+#else
- 			len = avcodec_decode_audio4(cc, frame, &got_frame, &avpkt);
-+#endif
- #if LIBAVCODEC_VERSION_MAJOR >= 56
- 			av_packet_unref(&avpkt);
- #else
diff --git a/media-sound/cmus/files/cmus-2.8.0-opus.patch b/media-sound/cmus/files/cmus-2.8.0-opus.patch
deleted file mode 100644
index ea95fa8536ce..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-opus.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0be981476e019e9fddb5529a73aadf004e94656b Mon Sep 17 00:00:00 2001
-From: tomty89 <tom.ty89@gmail.com>
-Date: Tue, 12 Feb 2019 18:55:09 +0800
-Subject: [PATCH] ip/ffmpeg: enable opus support (#865)
-
----
- ip/ffmpeg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
-index 04b916cc..427257c7 100644
---- a/ip/ffmpeg.c
-+++ b/ip/ffmpeg.c
-@@ -519,7 +519,7 @@ const int ip_priority = 30;
- const char *const ip_extensions[] = {
- 	"aa", "aac", "ac3", "aif", "aifc", "aiff", "ape", "au", "fla", "flac",
- 	"m4a", "m4b", "mka", "mkv", "mp+", "mp2", "mp3", "mp4", "mpc", "mpp",
--	"ogg", "shn", "tak", "tta", "wav", "webm", "wma", "wv",
-+	"ogg", "opus", "shn", "tak", "tta", "wav", "webm", "wma", "wv",
- #ifdef USE_FALLBACK_IP
- 	"*",
- #endif
diff --git a/media-sound/cmus/files/cmus-2.9.1-atomic.patch b/media-sound/cmus/files/cmus-2.9.1-atomic.patch
new file mode 100644
index 000000000000..41941a31b785
--- /dev/null
+++ b/media-sound/cmus/files/cmus-2.9.1-atomic.patch
@@ -0,0 +1,11 @@
+--- cmus-2.8.0/Makefile	2019-01-29 09:09:08.000000000 +0000
++++ cmus-2.8.0.new/Makefile	2019-06-12 14:34:13.000000000 +0000
+@@ -21,7 +21,7 @@
+ FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample)
+ FFMPEG_LIBS += $(shell pkg-config --libs libswresample)
+ 
+-CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
++CMUS_LIBS = -latomic $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
+ 			-lm $(COMPAT_LIBS) $(LIBSYSTEMD_LIBS)
+ 
+ command_mode.o input.o main.o ui_curses.o op/pulse.lo: .version
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index 671a05ce3c84..ec0ba5eef581 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -10,6 +10,7 @@
 		<flag name="discid">Enable reading the ID of the inserted CD</flag>
 		<flag name="elogind">Enable MPRIS support via <pkg>sys-auth/elogind</pkg></flag>
 		<flag name="pidgin">Install support script for <pkg>net-im/pidgin</pkg></flag>
+		<flag name="sndio">Add support for <pkg>media-sound/sndio</pkg></flag>
 		<flag name="systemd">Enable MPRIS support via <pkg>sys-apps/systemd</pkg></flag>
 		<flag name="tremor">Use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
 	</use>
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
index ea606266f132..4547e0724d9e 100644
--- a/media-sound/cmusfm/Manifest
+++ b/media-sound/cmusfm/Manifest
@@ -1 +1 @@
-DIST cmusfm-0.3.3.tar.gz 37553 BLAKE2B f266d83edbed960d8c466cba80ce57d645c5c9cdfceac27c29d0ef424c8135f22377dc0490462d3107dfcfd32ac9d15fa6142269b453c8a80818da9bd10a28fd SHA512 6537905bdf09d04f09783237997536a1ee231ee4e589826d87f435c0dd7542dbd7d97167990bf949d2a9eb73c4a9a4da1bab17888de0aecedb2a63deaa873f39
+DIST cmusfm-0.5.0.tar.gz 43491 BLAKE2B 591aab46e98419fb767069786a3423c6190f2adc51884dc85e36560d9a01fc87d9f244953bcdec59ddad48d2e2c449a8afa0a8f1cc63cce686ae2154824aafdf SHA512 497ba0c9f776b8d2f11934a5dbc2ea4b4971511f3c3c4df602d1742ba5fcaf4c0f91d5f8a1ebe849e184718e7090fcf146560445398e85f97722bb62c0976fd3
diff --git a/media-sound/cmusfm/cmusfm-0.3.3.ebuild b/media-sound/cmusfm/cmusfm-0.5.0.ebuild
index 3a2f2d2e87bf..dc6b6dd12e30 100644
--- a/media-sound/cmusfm/cmusfm-0.3.3.ebuild
+++ b/media-sound/cmusfm/cmusfm-0.5.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools readme.gentoo-r1
 
 DESCRIPTION="Last.fm scrobbler for cmus music player"
@@ -10,21 +11,26 @@ SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="libnotify"
 
-CDEPEND="net-misc/curl
+DEPEND="
+	net-misc/curl
 	dev-libs/openssl:0=
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	media-sound/cmus"
+	libnotify? ( x11-libs/libnotify )
+"
+RDEPEND="
+	${DEPEND}
+	media-sound/cmus
+"
+BDEPEND="virtual/pkgconfig"
+
+DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
 
 src_prepare() {
 	default
+
 	eautoreconf
-	DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
 }
 
 src_configure() {
diff --git a/media-sound/cmusfm/metadata.xml b/media-sound/cmusfm/metadata.xml
index d288df6549bf..b770d9b541a5 100644
--- a/media-sound/cmusfm/metadata.xml
+++ b/media-sound/cmusfm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
deleted file mode 100644
index 6974e43cf260..000000000000
--- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch"
-HOMEPAGE="http://panteltje.com/panteltje/dvd/"
-SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( CHANGES README combine_wave.man )
-
-PATCHES=( "${FILESDIR}/${P}-overflow.patch" )
-
-src_prepare() {
-	default
-	# fix makefile
-	sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \
-		-e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile || die "sed Makefile failed"
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin combine_wave
-	einstalldocs
-}
diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..cb9d1a4bdea1
--- /dev/null
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch"
+HOMEPAGE="https://www.panteltje.nl/panteltje/dvd/index.html"
+SRC_URI="https://www.panteltje.nl/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin combine_wave
+
+	einstalldocs
+	dodoc combine_wave.man
+}
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
new file mode 100644
index 000000000000..591d56ad1867
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,16 +3,13 @@
+ #CC  = /usr/local/bin/g++
+ #CC  = /usr/bin/g++
+ 
+-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+-
+-.c.o:
+-	gcc $(CFLAGS) -c $<
++CFLAGS += -Wall
++CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ OBJECT =\
+ combine_wave.o
+ 
+-a.out : $(OBJECT)
+-	gcc -o combine_wave  $(OBJECT)
++all: combine_wave
+ 		
+ # DEPENDENCIES
+ combine_wave.o : combine_wave.c combine_wave.h wave_header.h
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch
new file mode 100644
index 000000000000..3d6a3c938ba1
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch
@@ -0,0 +1,14 @@
+--- a/combine_wave.h
++++ b/combine_wave.h
+@@ -12,9 +12,10 @@
+ #include <float.h>
+ #include <math.h>
+ #include <linux/soundcard.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include "stdint.h"
+ #include <sys/ioctl.h>
++#include <sys/select.h>
+ #include <string.h> 
+ 
+ 
diff --git a/media-sound/combine_wave/metadata.xml b/media-sound/combine_wave/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/combine_wave/metadata.xml
+++ b/media-sound/combine_wave/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/coquillo/metadata.xml b/media-sound/coquillo/metadata.xml
index 39626a990be5..cd1cfc033621 100644
--- a/media-sound/coquillo/metadata.xml
+++ b/media-sound/coquillo/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index dbe4c2256bf2..9eb23bde8e3e 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,3 @@
-DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
-DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
-DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
+DIST Csound6.17.0_manual_html.zip 25897263 BLAKE2B 3148a60a398d49d6932864d84b2ee37ddf86d5389b91c99443b2c64f7c3b270d040b83ac88b80ebc772c198223682452da1618391fcc8963fe63151b7837037e SHA512 ff2098828e51e78aa80b10736ea162d90c0b1bef3265e469951a5df63250d283e852490cb2a6599dcb1b8a5c185cf4f0b9534f501e4cb755b9da67ecfb1f4ba6
+DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9 SHA512 bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6
+DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61 SHA512 b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa
diff --git a/media-sound/csound/csound-6.15.0.ebuild b/media-sound/csound/csound-6.15.0.ebuild
deleted file mode 100644
index da75681bf4b4..000000000000
--- a/media-sound/csound/csound-6.15.0.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit cmake python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	DOC_P="Csound${PV}"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-		doc? (
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-		)"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, see src_configure
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-#	java? ( cxx )
-
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	python? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#	java? ( virtual/jdk:* )
-CDEPEND="
-	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
-	image? ( media-libs/libpng:0= )
-	jack? ( virtual/jack )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua:0 )
-	)
-	mp3? ( >=media-sound/lame-3.100-r3 )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	dev-libs/boost
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-	"${FILESDIR}/${PN}-6.15.0-lame.patch"
-)
-
-pkg_setup() {
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_COUNTER_OPCODES=ON
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FAUST_OPCODES=OFF
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=OFF
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
-		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_RELEASE=ON
-		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
-
-		-DFAIL_MISSING=ON
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DREQUIRE_PTHREADS=$(usex threads)
-
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
-		-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
-		-DUSE_CURL=$(usex curl)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
-		-DUSE_GETTEXT=$(usex nls)
-		-DUSE_GIT_COMMIT=ON
-		-DUSE_IPMIDI=ON
-		-DUSE_JACK=$(usex jack)
-		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
-		-DUSE_LRINT=ON
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
-	)
-
-	#use java && mycmakeargs+=(
-		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
-		#-DJAVA_AWT_LIBRARY="?"
-		#-DJAVA_JVM_LIBRARY="?"
-		#-DJAVA_INCLUDE_PATH2="?"
-		#-DJAVA_AWT_INCLUDE_PATH="?"
-	#)
-
-	# set the library that we want to use
-	if use lua ; then
-		local libdir
-		local libname
-
-		if use luajit ; then
-			libdir=$(pkg-config --variable=libdir luajit)
-			libname=$(pkg-config --variable=libname luajit)
-		else
-			libdir=$(pkg-config --variable=libdir lua)
-			libname=$(pkg-config --variable=libname lua)
-			[[ -z "${libname}" ]] && libname="lua"
-		fi
-
-		mycmakeargs+=(
-			-DLUA_LIBRARY="${libdir}/lib${libname}.so"
-		)
-	fi
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-6.15.0-r100.ebuild b/media-sound/csound/csound-6.17.0-r1.ebuild
index 93b965bc7303..cf13e4203d7f 100644
--- a/media-sound/csound/csound-6.15.0-r100.ebuild
+++ b/media-sound/csound/csound-6.17.0-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
 # we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
 # Reference: https://github.com/csound/csound/issues/1148
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit cmake lua-single python-single-r1 toolchain-funcs
+inherit cmake lua-single python-single-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/csound/csound.git"
@@ -22,46 +22,39 @@ else
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
 		)"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
+HOMEPAGE="https://csound.com/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, see src_configure
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
+IUSE="+alsa beats curl +cxx debug doc double-precision dssi examples jack java lua nls osc portaudio
+portaudio portmidi pulseaudio samples static-libs test +threads +utils vim-syntax"
 
 REQUIRED_USE="
-	linear? ( double-precision )
+	${PYTHON_REQUIRED_USE}
+	alsa? ( threads )
+	java? ( cxx )
 	lua? ( ${LUA_REQUIRED_USE} cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
-#	java? ( cxx )
 
 BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
+	app-alternatives/yacc
+	app-alternatives/lex
+	app-alternatives/yacc
+	doc? ( media-libs/libpng )
 	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
 	nls? ( sys-devel/gettext )
 	test? (
 		dev-util/cunit
 		${PYTHON_DEPS}
 	)
 "
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#	java? ( virtual/jdk:* )
 CDEPEND="
 	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
+	media-libs/libsndfile
 	media-libs/libsamplerate
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -70,25 +63,20 @@ CDEPEND="
 		media-libs/dssi
 		media-libs/ladspa-sdk
 	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
-	image? ( media-libs/libpng:0= )
 	jack? ( virtual/jack )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
+	java? ( >=virtual/jdk-1.8:* )
 	lua? ( ${LUA_DEPS} )
-	mp3? ( >=media-sound/lame-3.100-r3 )
 	osc? ( media-libs/liblo )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
 	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
+	vim-syntax? ( !app-vim/csound-syntax )
+"
+RDEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
 "
-RDEPEND="${CDEPEND}"
 DEPEND="
 	${CDEPEND}
 	dev-libs/boost
@@ -103,15 +91,12 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-	"${FILESDIR}/${PN}-6.15.0-lame.patch"
 )
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -120,55 +105,33 @@ src_prepare() {
 	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
 		-e '/-O3/d' \
 		-i CMakeLists.txt || die
+
+	if use doc; then
+		local png="${WORKDIR}/html/images/delayk.png"
+		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_COUNTER_OPCODES=ON
 		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
 		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DEPRECATED_OPCODES=ON
 		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FAUST_OPCODES=OFF
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
 		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=OFF
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
 		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
 		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
 		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
 		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
 		-DBUILD_RELEASE=ON
 		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
 		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
 
 		-DFAIL_MISSING=ON
 		-DNEW_PARSER_DEBUG=$(usex debug)
@@ -176,12 +139,9 @@ src_configure() {
 
 		-DUSE_ALSA=$(usex alsa)
 		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
 		-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
 		-DUSE_CURL=$(usex curl)
 		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
 		-DUSE_GETTEXT=$(usex nls)
 		-DUSE_GIT_COMMIT=ON
 		-DUSE_IPMIDI=ON
@@ -191,16 +151,12 @@ src_configure() {
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
+		-DUSE_VCPKG=OFF
 	)
 
-	#use java && mycmakeargs+=(
-		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
-		#-DJAVA_AWT_LIBRARY="?"
-		#-DJAVA_JVM_LIBRARY="?"
-		#-DJAVA_INCLUDE_PATH2="?"
-		#-DJAVA_AWT_INCLUDE_PATH="?"
-	#)
+	use java && mycmakeargs+=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
 
 	use lua && mycmakeargs+=(
 		-DLUA_H_PATH="$(lua_get_include_dir)"
@@ -209,10 +165,6 @@ src_configure() {
 		# so it must NOT be installed into cmod_dir.
 	)
 
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
 	cmake_src_configure
 }
 
@@ -225,9 +177,6 @@ src_install() {
 		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
 		CSSTRNGS="${EPREFIX}/usr/share/locale"
 	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
 	doenvd "${T}"/62${PN}
 
 	if use examples ; then
@@ -247,7 +196,9 @@ src_install() {
 	# rename extract to csound_extract (bug #247394)
 	mv "${ED}"/usr/bin/{,csound_}extract || die
 
-	use python && python_optimize
+	python_optimize
+
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
 
 	# install docs
 	if [[ ${PV} != "9999" ]] && use doc ; then
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 93b965bc7303..2f6048b164b7 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
 # we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
 # Reference: https://github.com/csound/csound/issues/1148
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit cmake lua-single python-single-r1 toolchain-funcs
+inherit cmake lua-single python-single-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/csound/csound.git"
@@ -26,42 +26,35 @@ else
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
+HOMEPAGE="https://csound.com/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, see src_configure
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
+IUSE="+alsa beats curl +cxx debug doc double-precision dssi examples jack java lua nls osc portaudio
+portaudio portmidi pulseaudio samples static-libs test +threads +utils vim-syntax"
 
 REQUIRED_USE="
-	linear? ( double-precision )
+	${PYTHON_REQUIRED_USE}
+	alsa? ( threads )
+	java? ( cxx )
 	lua? ( ${LUA_REQUIRED_USE} cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
-#	java? ( cxx )
 
 BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
+	app-alternatives/yacc
+	app-alternatives/lex
+	app-alternatives/yacc
+	doc? ( media-libs/libpng )
 	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
 	nls? ( sys-devel/gettext )
 	test? (
 		dev-util/cunit
 		${PYTHON_DEPS}
 	)
 "
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#	java? ( virtual/jdk:* )
 CDEPEND="
 	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
+	media-libs/libsndfile
 	media-libs/libsamplerate
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -70,25 +63,20 @@ CDEPEND="
 		media-libs/dssi
 		media-libs/ladspa-sdk
 	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
-	image? ( media-libs/libpng:0= )
 	jack? ( virtual/jack )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
+	java? ( >=virtual/jdk-1.8:* )
 	lua? ( ${LUA_DEPS} )
-	mp3? ( >=media-sound/lame-3.100-r3 )
 	osc? ( media-libs/liblo )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
+	pulseaudio? ( media-libs/libpulse )
 	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
+	vim-syntax? ( !app-vim/csound-syntax )
+"
+RDEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
 "
-RDEPEND="${CDEPEND}"
 DEPEND="
 	${CDEPEND}
 	dev-libs/boost
@@ -103,15 +91,12 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-	"${FILESDIR}/${PN}-6.15.0-lame.patch"
 )
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -125,50 +110,21 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_COUNTER_OPCODES=ON
 		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
 		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DEPRECATED_OPCODES=ON
 		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FAUST_OPCODES=OFF
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
 		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=OFF
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
 		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
 		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
 		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
 		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
 		-DBUILD_RELEASE=ON
 		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
 		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
 
 		-DFAIL_MISSING=ON
 		-DNEW_PARSER_DEBUG=$(usex debug)
@@ -176,12 +132,9 @@ src_configure() {
 
 		-DUSE_ALSA=$(usex alsa)
 		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
 		-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
 		-DUSE_CURL=$(usex curl)
 		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
 		-DUSE_GETTEXT=$(usex nls)
 		-DUSE_GIT_COMMIT=ON
 		-DUSE_IPMIDI=ON
@@ -191,16 +144,12 @@ src_configure() {
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
+		-DUSE_VCPKG=OFF
 	)
 
-	#use java && mycmakeargs+=(
-		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
-		#-DJAVA_AWT_LIBRARY="?"
-		#-DJAVA_JVM_LIBRARY="?"
-		#-DJAVA_INCLUDE_PATH2="?"
-		#-DJAVA_AWT_INCLUDE_PATH="?"
-	#)
+	use java && mycmakeargs+=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
 
 	use lua && mycmakeargs+=(
 		-DLUA_H_PATH="$(lua_get_include_dir)"
@@ -209,10 +158,6 @@ src_configure() {
 		# so it must NOT be installed into cmod_dir.
 	)
 
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
 	cmake_src_configure
 }
 
@@ -225,9 +170,6 @@ src_install() {
 		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
 		CSSTRNGS="${EPREFIX}/usr/share/locale"
 	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
 	doenvd "${T}"/62${PN}
 
 	if use examples ; then
@@ -247,7 +189,9 @@ src_install() {
 	# rename extract to csound_extract (bug #247394)
 	mv "${ED}"/usr/bin/{,csound_}extract || die
 
-	use python && python_optimize
+	python_optimize
+
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
 
 	# install docs
 	if [[ ${PV} != "9999" ]] && use doc ; then
diff --git a/media-sound/csound/files/csound-6.15.0-lame.patch b/media-sound/csound/files/csound-6.15.0-lame.patch
deleted file mode 100644
index 800ec4fd0f46..000000000000
--- a/media-sound/csound/files/csound-6.15.0-lame.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt
-index af39138..ec48294 100644
---- a/Opcodes/CMakeLists.txt
-+++ b/Opcodes/CMakeLists.txt
-@@ -41,7 +41,7 @@ check_include_file(wiiuse.h WIIUSE_H)
- find_library(WIIUSE_LIB wiiuse)
- check_include_file(p5glove.h P5GLOVE_H)
- find_library(P5GLOVE_LIB p5glove)
--check_include_file(lame.h LAME_HEADER)
-+check_include_file(lame/lame.h LAME_HEADER)
- find_library(LAME_LIB mp3lame)
- 
- ## OPCODE LIBS WITH NO EXTERNAL DEPENDENCIES ##
-diff --git a/Opcodes/lame.c b/Opcodes/lame.c
-index a951f47..0c1c3e6 100644
---- a/Opcodes/lame.c
-+++ b/Opcodes/lame.c
-@@ -22,7 +22,7 @@
- */
- 
- #include "csdl.h"
--#include "lame.h"
-+#include "lame/lame.h"
- 
- typedef struct _mp3out {
-   OPDS              h;
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index c5216b6e38c5..1ef132084374 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
@@ -7,18 +7,11 @@
 	</maintainer>
 	<use>
 		<flag name="beats">Build the beats score frontend</flag>
-		<flag name="chua">Build the chua opcodes</flag>
 		<flag name="double-precision">Use double-precision floating point for audio samples</flag>
 		<flag name="dssi">Build the DSSI opcodes</flag>
-		<flag name="fluidsynth">Build the fluidsynth opcodes</flag>
-		<flag name="image">Build the image opcodes</flag>
-		<flag name="keyboard">Build Virtual MIDI keyboard</flag>
-		<flag name="linear">Build the linear algebra Opcodes</flag>
 		<flag name="portmidi">Build the PortMIDI I/O module</flag>
 		<flag name="samples">Install the HRTF datafiles for use with hrtfmove, hrtfmove2, hrtfstat, hrtfearly, and hrtfreverb</flag>
-		<flag name="stk">Build the stk opcodes</flag>
 		<flag name="utils">Build stand-alone executables for utilities that can also be used via `csound -U`</flag>
-		<flag name="websocket">Build the websocket opcode</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">csound</remote-id>
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r2.ebuild
index a1d1238c92c2..ce4f80a57ce1 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r2.ebuild
@@ -1,36 +1,40 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 MY_P="${P/_/}"
 
 DESCRIPTION="Console based speech recognition system"
-HOMEPAGE="http://www.kiecza.net/daniel/linux"
+HOMEPAGE="http://www.kiecza.net/daniel/linux/"
 SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
-S="${WORKDIR}/${MY_P}"
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo-2.patch
 	"${FILESDIR}"/${P}-tinfo.patch #64716
 	# Handle documentation with HTML_DOCS instead
 	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
 	default
-	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
 src_install() {
-	HTML_DOCS=( cvoicecontrol/docs/en/*.html )
+	local HTML_DOCS=( cvoicecontrol/docs/en/*.html )
+
 	default
 }
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-clang16.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-clang16.patch
new file mode 100644
index 000000000000..c6dce9df0bc6
--- /dev/null
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-clang16.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/871159
+--- a/cvoicecontrol/mixer.h
++++ b/cvoicecontrol/mixer.h
+@@ -29,2 +29,3 @@
+ int  mixerOK();
++int  mixerHasIGain();
+ const char *getMixer();
diff --git a/media-sound/cvoicecontrol/metadata.xml b/media-sound/cvoicecontrol/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/cvoicecontrol/metadata.xml
+++ b/media-sound/cvoicecontrol/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/dagrab/dagrab-0.513-r1.ebuild b/media-sound/dagrab/dagrab-0.513-r2.ebuild
index e288a0d2df40..3ffa49eab889 100644
--- a/media-sound/dagrab/dagrab-0.513-r1.ebuild
+++ b/media-sound/dagrab/dagrab-0.513-r2.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic
+inherit toolchain-funcs
 
 MY_P="${PN}-S${PV}"
+
 DESCRIPTION="fixed point cd ripper"
 HOMEPAGE="http://vertigo.fme.vutbr.cz/~stibor/dagrab.html"
 SRC_URI="http://ashtray.jz.gts.cz/~smsti/archiv/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-S=${WORKDIR}/${MY_P}
 PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-freedb.patch"
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-freedb.patch
+	"${FILESDIR}"/${P}-C99-inline.patch
+	"${FILESDIR}"/${P}-fd_set.patch
 )
 
-src_prepare() {
-	# fix #570732 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	default
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin dagrab
+
 	dodoc BUGS CHANGES FAQ grab TODO
 	doman dagrab.1
 }
diff --git a/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch b/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch
new file mode 100644
index 000000000000..fa5e0793e4d9
--- /dev/null
+++ b/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch
@@ -0,0 +1,30 @@
+--- a/dagrab.c
++++ b/dagrab.c
+@@ -416,7 +416,7 @@
+ 	return 0;
+ }
+ 
+-inline void cd_track_name(char *name, cd_trk_list * tl, int tn,
++void cd_track_name(char *name, cd_trk_list * tl, int tn,
+ 			  char *trackname)
+ {
+ 	if (opt_cddb)
+--- a/err.c
++++ b/err.c
+@@ -35,7 +35,7 @@
+ "\n%s: error writing wave file %s\n"			/* ERR_WRITING */
+ };
+ 
+-inline void die(int n, char *p)
++void die(int n, char *p)
+ {
+ 	fprintf(stderr, errs[n], PROGNAME, p);
+ 	exit(1);
+--- a/err.h
++++ b/err.h
+@@ -6,4 +6,4 @@
+ #define ERR_CHMOD	5
+ #define ERR_WRITING	6
+ 
+-inline void die(int n, char *p);
++void die(int n, char *p);
diff --git a/media-sound/dagrab/files/dagrab-0.513-build.patch b/media-sound/dagrab/files/dagrab-0.513-build.patch
index 43408d56b374..1c85aecd0986 100644
--- a/media-sound/dagrab/files/dagrab-0.513-build.patch
+++ b/media-sound/dagrab/files/dagrab-0.513-build.patch
@@ -1,5 +1,5 @@
---- dagrab-S0.513/dagrab.c
-+++ dagrab-S0.513/dagrab.c
+--- a/dagrab.c
++++ b/dagrab.c
 @@ -776,6 +776,7 @@
  		thread_save(NULL);
  #endif
@@ -8,8 +8,8 @@
  	}
  	/****************************************************************
  	 * Close output file 						*
---- dagrab-S0.513/jit_in.c
-+++ dagrab-S0.513/jit_in.c
+--- a/jit_in.c
++++ b/jit_in.c
 @@ -74,5 +74,6 @@
  			*p = (*(p + SSIZE) + *(p - SSIZE)) / 2;
  			view_status(ID_JITTER, NULL);
@@ -17,9 +17,9 @@
 +			;
  		}
  }
---- dagrab-S0.513/Makefile
-+++ dagrab-S0.513/Makefile
-@@ -3,14 +3,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,23 +3,15 @@
  # Note: PTHREAD support is optional, you can comment it out
  ################################################################################
  
@@ -31,20 +31,26 @@
 -ifneq ($(wildcard /usr/include/linux/ucdrom.h),)
 -       CFLAGS +=-DUSE_UCDROM
 -endif
-+CC ?= gcc
-+CFLAGS ?= -O
 +CFLAGS += -W -Wall -DPTHREAD
-+LDFLAGS ?= -O
 +LIBS = -lpthread
  
  all:	dagrab
  
-@@ -28,7 +26,7 @@
+ SOURCES=cddb.c dagrab.c jitter.c jit_in.c print.c err.c
+ OBJ= 	$(SOURCES:.c=.o)
+ 
+-%.o:	%.c
+-	$(CC) $(CFLAGS) -c $< -o $@
+-
+ cddb.o:		main.h const.h version.h dagrab.h
+ dagrab.o:	main.h const.h jit_in.h jitter.h cddb.h print.h err.c Makefile
+ jitter.o:	main.h dagrab.h print.h const.h
+@@ -28,7 +20,7 @@
  err.o:		dagrab.h main.h
  
  dagrab:	$(OBJ) Makefile
 -	$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o dagrab
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o dagrab
++	$(CC) $(CFLAGS) $(LDFLAGS) -o dagrab $(OBJ) $(LIBS)
  
  clean:
  	rm -f dagrab *.o *.wav *.mp[23] *.ogg .*swp *~ gmon.out tags
diff --git a/media-sound/dagrab/files/dagrab-0.513-fd_set.patch b/media-sound/dagrab/files/dagrab-0.513-fd_set.patch
new file mode 100644
index 000000000000..2b039f5c6b31
--- /dev/null
+++ b/media-sound/dagrab/files/dagrab-0.513-fd_set.patch
@@ -0,0 +1,10 @@
+--- a/cddb.c
++++ b/cddb.c
+@@ -29,6 +29,7 @@
+ 
+ #include <netdb.h>
+ #include <netinet/in.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #include <pwd.h>
+ #include <dirent.h>
diff --git a/media-sound/dagrab/metadata.xml b/media-sound/dagrab/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/dagrab/metadata.xml
+++ b/media-sound/dagrab/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/darkice/darkice-1.4.ebuild b/media-sound/darkice/darkice-1.4-r1.ebuild
index b471a55018dc..f369c85d6659 100644
--- a/media-sound/darkice/darkice-1.4.ebuild
+++ b/media-sound/darkice/darkice-1.4-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit flag-o-matic
+
 DESCRIPTION="A live audio streamer"
 HOMEPAGE="http://www.darkice.org/"
 SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz"
@@ -10,21 +12,20 @@ SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc sparc x86"
-IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
+IUSE="aac alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
-	aacplus? ( media-libs/libaacplus )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
 	mp3? ( media-sound/lame )
 	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	twolame? ( media-sound/twolame )
 	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
+REQUIRED_USE="|| ( aac mp3 opus twolame vorbis )
 		|| ( alsa jack pulseaudio )"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README TODO )
@@ -34,10 +35,13 @@ PATCHES=(
 )
 
 src_configure() {
+	# bug #787161
+	append-cxxflags -std=c++14
+
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_with aac faac)
-		$(use_with aacplus)
+		--without-aacplus
 		$(use_with alsa)
 		$(use_with jack)
 		$(use_with libsamplerate samplerate)
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index ca82233e961f..12ca22f989d4 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="aacplus">AAC+ encoding via media-libs/libaacplus</flag>
 		<flag name="twolame">Build with twolame support</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">rafael2k/darkice</remote-id>
 		<remote-id type="google-code">darkice</remote-id>
 		<remote-id type="sourceforge">darkice</remote-id>
 	</upstream>
diff --git a/media-sound/darksnow/darksnow-0.7.1.ebuild b/media-sound/darksnow/darksnow-0.7.1.ebuild
index 1a877cebfda6..c3fb853f1770 100644
--- a/media-sound/darksnow/darksnow-0.7.1.ebuild
+++ b/media-sound/darksnow/darksnow-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,10 +6,10 @@ EAPI=7
 inherit autotools desktop xdg
 
 DESCRIPTION="Streaming GTK+ Front-End based on Darkice Ice Streamer"
-HOMEPAGE="http://darksnow.radiolivre.org"
-SRC_URI="http://darksnow.radiolivre.org/pacotes/${P}.tar.gz"
+HOMEPAGE="https://darksnow.radiolivre.org"
+SRC_URI="https://darksnow.radiolivre.org/pacotes/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
diff --git a/media-sound/darksnow/metadata.xml b/media-sound/darksnow/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/darksnow/metadata.xml
+++ b/media-sound/darksnow/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/daudio/Manifest b/media-sound/daudio/Manifest
deleted file mode 100644
index 533e9b99b184..000000000000
--- a/media-sound/daudio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST daudio-0.3.tar.gz 76683 BLAKE2B da8c674be38224153af26b6a690a0fe23c4d24e90422260799657ff80242d2c8baaa2de85603d68e8daf6e880335fe84dc7467f10571590814b647aa65f88e9b SHA512 63266348c8235b09efb6958646b003a5e7ae1cfd7d97aeff928ed8e7b9ffc71666c0bcd93ee89db6c28cae5019056748631e9fef850ebf6ead7aefecc3037e3c
diff --git a/media-sound/daudio/daudio-0.3-r1.ebuild b/media-sound/daudio/daudio-0.3-r1.ebuild
deleted file mode 100644
index 9acf3de2df18..000000000000
--- a/media-sound/daudio/daudio-0.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Distributed audio on the local network"
-HOMEPAGE="http://daudio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc: 0.3: static audio on local daemon. No audio when client connects to amd64 daemon
-KEYWORDS="amd64 ~ppc -sparc x86"
-
-IUSE=""
-DEPEND=">=media-libs/libmad-0.15.0b-r1"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
-)
-
-src_prepare() {
-	# fix #570582 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	tc-export CC
-	default
-}
-
-src_compile() {
-	emake -C client
-	emake -C server
-	emake -C streamer
-}
-
-src_install() {
-	dobin client/daudioc server/daudiod streamer/dstreamer
-	newinitd "${FILESDIR}"/daudio.rc daudio
-	dodoc doc/*
-}
diff --git a/media-sound/daudio/files/daudio-0.3-makefile.patch b/media-sound/daudio/files/daudio-0.3-makefile.patch
deleted file mode 100644
index 28f1215f7c94..000000000000
--- a/media-sound/daudio/files/daudio-0.3-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: daudio-0.3/client/Makefile
-===================================================================
---- daudio-0.3.orig/client/Makefile
-+++ daudio-0.3/client/Makefile
-@@ -13,10 +13,10 @@ install: $(PROG)
- 	install -c -m755 --owner=0 --group=0 -b -D daudioc $(PREFIX)/bin/daudioc
- 
- debug: $(SRCS)
--	gcc $(DEFINES) -DDEBUG $(INCLUDES) $(LIBS) -o $(PROG) $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -DDEBUG $(INCLUDES) -o $(PROG) $^ $(LIBS)
- 
- $(PROG): $(SRCS)
--	gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS)
- 
- clean:
- 	rm -f $(PROG)
-Index: daudio-0.3/server/Makefile
-===================================================================
---- daudio-0.3.orig/server/Makefile
-+++ daudio-0.3/server/Makefile
-@@ -10,13 +10,13 @@ PREFIX = /usr/local
- all: $(SBINS)
- 
- debug: $(SRCS)
--	gcc -g $(DEFINES) $(INCLUDES) $(LIBS) -o daudiod $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o daudiod $^ $(LIBS)
- 
- install: $(SBINS)
- 	install -c -m755 --owner=0 --group=0 -b -D daudiod $(PREFIX)/bin/daudiod
- 
- $(SBINS): $(SRCS)
--	gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS)
- 
- clean:
- 	rm -f $(SBINS)
-Index: daudio-0.3/streamer/Makefile
-===================================================================
---- daudio-0.3.orig/streamer/Makefile
-+++ daudio-0.3/streamer/Makefile
-@@ -12,7 +12,7 @@ install: $(SBINS)
- 	install -c -m755 --owner=0 --group=0 -b -D dstreamer $(PREFIX)/bin/dstreamer
- 
- $(SBINS): $(SRCS)
--	gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS)
- 
- clean:
- 	rm -f $(SBINS)
diff --git a/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch b/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch
deleted file mode 100644
index d60be6f64e68..000000000000
--- a/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Fix implicit declarations, such as:
-
-main.c: In function ‘main’:
-main.c:45:2: warning: incompatible implicit declaration of built-in function ‘exit’
-  exit(1);
-  ^
---- daudio-0.3/client/main.c
-+++ daudio-0.3/client/main.c
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <sched.h>
-+#include <stdlib.h>
- 
- int main(int argc, char **argv) {
-     int s;
-@@ -50,7 +51,7 @@
-     
-     /* drop priveledges */
-     uid = getuid();
--    seteuid(uid);
-+    if(seteuid(uid)){};
- 
-     set_default_options(void);
- 
---- daudio-0.3/client/net.c
-+++ daudio-0.3/client/net.c
-@@ -27,6 +27,7 @@
- #include <asm/unistd.h>
- #include <mad.h>
- #include <pthread.h>
-+#include <stdlib.h>
- 
- #include "net.h"
- #include "../common/frame.h"
---- daudio-0.3/server/local.c
-+++ daudio-0.3/server/local.c
-@@ -25,6 +25,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <netinet/in.h>
-+#include <stdlib.h>
- 
- #include "timer.h"
- #include "data.h"
-@@ -71,7 +72,7 @@
-     
-     /* drop priveleges */
-     uid = getuid();
--    seteuid(uid);
-+    if(seteuid(uid)){};
-     
-     current = bigbuf.buffer;
- 
---- daudio-0.3/server/main.c
-+++ daudio-0.3/server/main.c
-@@ -25,6 +25,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <stdlib.h>
- 
- int main () {
-     int r;
-@@ -40,19 +41,19 @@
-     uid = getuid();
-     r = d_init();
-     if(r == -1) {
--	seteuid(uid);
-+	if(seteuid(uid)){};
- 	perror("d_init failed");
- 	exit(1);
-     }
-     r = b_init();
-     if(r == -1) {
--	seteuid(uid);
-+	if(seteuid(uid)){};
- 	perror("b_init failed");
- 	exit(1);
-     }
-     r = t_init();
-     /* drop priveleges */
--    seteuid(uid);
-+    if(seteuid(uid)){};
-     if(r == -1) {
- 	perror("t_init failed");
- 	exit(1);
---- daudio-0.3/server/timer.c
-+++ daudio-0.3/server/timer.c
-@@ -124,7 +124,7 @@
-     
-     /* drop priveleges */
-     uid = getuid();
--    seteuid(uid);
-+    if(seteuid(uid)){};
-     
-     mytimer.it_value.tv_sec = 0;
-     mytimer.it_value.tv_usec = 0;
diff --git a/media-sound/daudio/files/daudio.rc b/media-sound/daudio/files/daudio.rc
deleted file mode 100644
index 5f934107051a..000000000000
--- a/media-sound/daudio/files/daudio.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting daudio"
-	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/daudio.pid --exec /usr/bin/daudiod
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping daudio"
-	start-stop-daemon --stop --quiet --pidfile /var/run/daudio.pid
-	eend $?
-}
diff --git a/media-sound/daudio/metadata.xml b/media-sound/daudio/metadata.xml
deleted file mode 100644
index 377486ca9df4..000000000000
--- a/media-sound/daudio/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">daudio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/dbmeasure/metadata.xml b/media-sound/dbmeasure/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/media-sound/dbmeasure/metadata.xml
+++ b/media-sound/dbmeasure/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-sound/dcadec/dcadec-0.2.0.ebuild b/media-sound/dcadec/dcadec-0.2.0-r1.ebuild
index 68303aac6077..25cacefab500 100644
--- a/media-sound/dcadec/dcadec-0.2.0.ebuild
+++ b/media-sound/dcadec/dcadec-0.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs multilib-minimal
+inherit toolchain-funcs
 
 DESCRIPTION="DTS Coherent Acoustics decoder with support for HD extensions"
 HOMEPAGE="https://github.com/foo86/dcadec"
@@ -15,30 +15,22 @@ KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 
 PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
 
-multilib_src_configure() {
+src_configure() {
 	tc-export AR CC
 
 	# Build shared libs
 	echo 'CONFIG_SHARED=1' >> .config || die
 }
 
-multilib_src_compile() {
-	local target=all
-	multilib_is_native_abi || target=lib
-
+src_compile() {
 	PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
-		emake -f "${S}"/Makefile ${target}
+		emake -f "${S}"/Makefile all
 }
 
-multilib_src_install() {
-	local target=install
-	multilib_is_native_abi || target=install-lib
-
+src_install() {
 	PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
-		emake -f "${S}"/Makefile DESTDIR="${D}" ${target}
-}
+		emake -f "${S}"/Makefile DESTDIR="${D}" install
 
-multilib_src_install_all() {
 	# Rename the executable since it conflicts with libdca.
 	mv "${ED}"/usr/bin/dcadec{,-new} || die
 
diff --git a/media-sound/dcadec/metadata.xml b/media-sound/dcadec/metadata.xml
index 7294e2a4987a..98fac9d56b66 100644
--- a/media-sound/dcadec/metadata.xml
+++ b/media-sound/dcadec/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/dcaenc/Manifest b/media-sound/dcaenc/Manifest
index b6779e315f17..9b2ed52efb1f 100644
--- a/media-sound/dcaenc/Manifest
+++ b/media-sound/dcaenc/Manifest
@@ -1 +1,2 @@
 DIST dcaenc-2.tar.gz 351199 BLAKE2B 28e0dae58650fcbd9f68823ca0aa2dde121b2376b488067c0977863a22fb83d5b60d04f907cd6b564824a25cb45f25180034d4f9fead12b57805b1c997133443 SHA512 0029f7c3b06199fb8100ce933827013fdc58e5fddf984ddf1744849e5d6cc24ce76e09b868eef19a49e1036a142419c3304c1822492f64301ed4feaa6bea4910
+DIST dcaenc-v3.tar.bz2 48501 BLAKE2B f232225600a22cb018083449dbcef5c7a7f6d12c1edc412098ea07382a2d9dcb553377bd68934d96a91759b32572a6a064b00c583f767e74c1b4940e4253b285 SHA512 032793933da8c100d4e48555605287ca0d6c287aa948635aae6c6b584d902390ca3d02cc5623b59244234183bc3f5a747d48084cf70174903e5ac410dc305700
diff --git a/media-sound/dcaenc/dcaenc-2-r1.ebuild b/media-sound/dcaenc/dcaenc-2-r1.ebuild
deleted file mode 100644
index 18cb16497e2a..000000000000
--- a/media-sound/dcaenc/dcaenc-2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999* ]]; then
-AUTOTOOLS_AUTORECONF=1
-EGIT_REPO_URI="git://gitorious.org/dtsenc/dtsenc.git"
-else
-SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools autotools-multilib
-
-[[ ${PV} == 9999* ]] && inherit git-r3
-
-DESCRIPTION="DTS Coherent Acoustics audio encoder"
-HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="alsa"
-
-RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-sound/dcaenc/dcaenc-2-r2.ebuild b/media-sound/dcaenc/dcaenc-2-r2.ebuild
new file mode 100644
index 000000000000..03cb57ac54c9
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="DTS Coherent Acoustics audio encoder"
+HOMEPAGE="https://aepatrakov.narod.ru/index/0-2
+https://gitlab.com/patrakov/dcaenc"
+SRC_URI="https://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable alsa)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-sound/dcaenc/dcaenc-3-r1.ebuild b/media-sound/dcaenc/dcaenc-3-r1.ebuild
new file mode 100644
index 000000000000..bcf40e35a754
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="DTS Coherent Acoustics audio encoder"
+HOMEPAGE="https://gitlab.com/patrakov/dcaenc"
+SRC_URI="https://gitlab.com/patrakov/dcaenc/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable alsa)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+	if use alsa; then
+		dosym ../../../usr/share/alsa/pcm/dca.conf \
+				/etc/alsa/conf.d/dca.conf
+	fi
+}
diff --git a/media-sound/dcaenc/dcaenc-9999.ebuild b/media-sound/dcaenc/dcaenc-9999.ebuild
deleted file mode 100644
index 18cb16497e2a..000000000000
--- a/media-sound/dcaenc/dcaenc-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999* ]]; then
-AUTOTOOLS_AUTORECONF=1
-EGIT_REPO_URI="git://gitorious.org/dtsenc/dtsenc.git"
-else
-SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools autotools-multilib
-
-[[ ${PV} == 9999* ]] && inherit git-r3
-
-DESCRIPTION="DTS Coherent Acoustics audio encoder"
-HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="alsa"
-
-RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-sound/dcaenc/metadata.xml b/media-sound/dcaenc/metadata.xml
index 39626a990be5..f54a86bbf0b7 100644
--- a/media-sound/dcaenc/metadata.xml
+++ b/media-sound/dcaenc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="gitlab">patrakov/dcaenc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/dcd/metadata.xml b/media-sound/dcd/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/dcd/metadata.xml
+++ b/media-sound/dcd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/deadbeef-mpris2-plugin/Manifest b/media-sound/deadbeef-mpris2-plugin/Manifest
new file mode 100644
index 000000000000..00e20ecb118c
--- /dev/null
+++ b/media-sound/deadbeef-mpris2-plugin/Manifest
@@ -0,0 +1 @@
+DIST deadbeef-mpris2-plugin-1.16.tar.gz 17556 BLAKE2B bb58930c0f9cc641806c347425c3c898c00bc6128275fcdbc7312ee72f65a3f6ab40c9ce067293721337a7db600be4d5955446757e3c525ac6449316587e426f SHA512 8ec83fee300005a9c4df8762bad09e991d3adadeda4437e29a21b74f4d6146acdd055bed5696535ea03358789b75eced1c9df664132367e79aa65a126e2d975f
diff --git a/media-sound/deadbeef-mpris2-plugin/deadbeef-mpris2-plugin-1.16.ebuild b/media-sound/deadbeef-mpris2-plugin/deadbeef-mpris2-plugin-1.16.ebuild
new file mode 100644
index 000000000000..1e0022116113
--- /dev/null
+++ b/media-sound/deadbeef-mpris2-plugin/deadbeef-mpris2-plugin-1.16.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="MPRISv2 plugin for the DeaDBeeF music player"
+HOMEPAGE="https://github.com/DeaDBeeF-Player/deadbeef-mpris2-plugin"
+SRC_URI="https://github.com/DeaDBeeF-Player/deadbeef-mpris2-plugin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="debug"
+
+DEPEND="
+	dev-libs/glib:2
+	>=media-sound/deadbeef-1.8.0[cover]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	default
+
+	# Remove static library
+	find "${ED}" -name \*.la -delete || die
+}
diff --git a/media-sound/deadbeef-mpris2-plugin/metadata.xml b/media-sound/deadbeef-mpris2-plugin/metadata.xml
new file mode 100644
index 000000000000..992514c64ded
--- /dev/null
+++ b/media-sound/deadbeef-mpris2-plugin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">DeaDBeeF-Player/deadbeef-mpris2-plugin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index ceae2920f59c..ad732eded48d 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1 +1 @@
-DIST deadbeef-1.8.4.tar.gz 13049446 BLAKE2B a6c052b3b0aa1f74b49cf29be94e235d3dfd3d3f07ed9e1d05a4fc32036e591633eaff4ab59329cf6895828c9a674eec86b62e4818784db5f8e47eed089c80eb SHA512 18c54ae2c7931419ea06f3eb581cc8e704fa6eb87d330fc09f7295f4a8ef6e88b6f8c314223c34c321cd2a54f14cb6911add41602250c39c1b1c1edbf64d63b7
+DIST deadbeef-1.9.6.tar.bz2 5182123 BLAKE2B 2cf515dbc3175e04319075462e88d18ee2fae06e8b317d1cc0c958ac23498217bb0a02e0201f47a39dfd4c0092ba568b8aebe4c37c99b439d2dcc18a7848ba2e SHA512 6e507399f7452a66c5591e09d4309f2aab676992d048625c9b4d801ea40af6ce79862fb497e8c94efdf3a13572c964dca717b42f1c946f5ec4695dc38c1db572
diff --git a/media-sound/deadbeef/deadbeef-1.8.4.ebuild b/media-sound/deadbeef/deadbeef-1.9.6-r1.ebuild
index 2df08a6243f2..685c774b15c0 100644
--- a/media-sound/deadbeef/deadbeef-1.8.4.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.6-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools xdg l10n
+inherit autotools xdg flag-o-matic toolchain-funcs plocale
 
 DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
 HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="https://github.com/DeaDBeeF-Player/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/travis/linux/${PV}/deadbeef-${PV}.tar.bz2/download
+	-> ${P}.tar.bz2"
 
 LICENSE="
 	GPL-2
@@ -15,49 +16,64 @@ LICENSE="
 	wavpack? ( BSD )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libretro libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio pipewire sc68 shellexec +supereq vorbis wavpack zip"
 
 REQUIRED_USE="
-	|| ( alsa oss pulseaudio nullout )
+	|| ( alsa oss pulseaudio pipewire nullout )
 "
 
 DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/libdispatch
+	net-misc/curl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
-	net-misc/curl:0=
-	dev-libs/jansson
+	x11-libs/libX11
+	x11-libs/pango
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
 	cdda? (
-		dev-libs/libcdio:0=
+		dev-libs/libcdio:=
 		media-libs/libcddb
-		dev-libs/libcdio-paranoia:0=
+		media-sound/cdparanoia
 	)
 	cover? ( media-libs/imlib2[jpeg,png] )
 	dts? ( media-libs/libdca )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? (
-		media-libs/flac
+		media-libs/flac:=
 		media-libs/libogg
 	)
-	mp3? ( media-sound/mpg123 )
+	libsamplerate? ( media-libs/libsamplerate )
+	mp3? ( media-sound/mpg123-base )
 	musepack? ( media-sound/musepack-tools )
 	nls? ( virtual/libintl )
 	notify? ( sys-apps/dbus )
-	opus? ( media-libs/opusfile	)
-	pulseaudio? ( media-sound/pulseaudio )
+	opus? ( media-libs/opusfile )
+	pulseaudio? ( media-libs/libpulse )
+	pipewire? ( media-video/pipewire:= )
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
+	zip? ( dev-libs/libzip:= )
 "
 
 RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-util/intltool
-	sys-devel/gettext
+	sys-devel/clang
+	>=sys-devel/gettext-0.21
+	sys-devel/llvm
+	virtual/pkgconfig
 "
 
 PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+	"${FILESDIR}"/${PN}-1.9.6-drop-Werror.patch
+	"${FILESDIR}"/${PN}-1.9.6-update-gettext.patch
+	"${FILESDIR}"/${PN}-1.9.6-fix-desktop-launcher.patch
 )
 
 src_prepare() {
@@ -68,34 +84,48 @@ src_prepare() {
 	}
 
 	drop_and_stub() {
-		rm -rf "${1}"
-		mkdir "${1}"
-		cat > "${1}/Makefile.in" <<-EOF
+		einfo drop_and_stub "${1}"
+		rm -r "${1}" || die
+		mkdir "${1}" || die
+		cat > "${1}/Makefile.in" <<-EOF || die
 			all: nothing
 			install: nothing
 			nothing:
 		EOF
 	}
 
-	l10n_for_each_disabled_locale_do drop_from_linguas || die
+	plocale_for_each_disabled_locale drop_from_linguas || die
 
 	eautopoint --force
 	eautoreconf
 
-	# Get rid of bundled gettext.
+	# Get rid of bundled gettext. (Avoid build failures with musl)
 	drop_and_stub "${S}/intl"
 
 	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
-	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
+	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
 		drop_and_stub "${S}/plugins/${i}"
 	done
 
-	rm -rf "${S}/plugins/rg_scanner/ebur128"
+	rm -r "${S}/plugins/rg_scanner/ebur128" || die
 }
 
 src_configure () {
+	if ! tc-is-clang; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
 	local myconf=(
-		"--disable-static"
 		"--disable-staticlink"
 		"--disable-portable"
 		"--disable-rpath"
@@ -112,14 +142,11 @@ src_configure () {
 		"--disable-mono2stereo"
 		"--disable-psf"
 		"--disable-rgscanner"
-		"--disable-sc68"
 		"--disable-shn"
 		"--disable-sid"
 		"--disable-sndfile"
 		"--disable-soundtouch"
-		"--disable-src"
 		"--disable-tta"
-		"--disable-vfs-zip"
 		"--disable-vtx"
 		"--disable-wildmidi"
 		"--disable-wma"
@@ -131,14 +158,12 @@ src_configure () {
 		"$(use_enable mp3 libmpg123)"
 		"$(use_enable nls)"
 		"$(use_enable vorbis)"
-		"$(use_enable threads)"
 		"$(use_enable flac)"
 		"$(use_enable supereq)"
 		"$(use_enable cdda)"
 		"$(use_enable cdda cdda-paranoia)"
 		"$(use_enable aac)"
 		"$(use_enable cover artwork)"
-		"$(use_enable cover artwork-imlib2)"
 		"$(use_enable cover artwork-network)"
 		"$(use_enable dts dca)"
 		"$(use_enable ffmpeg)"
@@ -148,10 +173,15 @@ src_configure () {
 		"$(use_enable nullout)"
 		"$(use_enable opus)"
 		"$(use_enable pulseaudio pulse)"
+		"$(use_enable pipewire)"
+		"$(use_enable sc68)"
 		"$(use_enable shellexec)"
 		"$(use_enable shellexec shellexecui)"
 		"$(use_enable lastfm lfm)"
+		"$(use_enable libretro)"
+		"$(use_enable libsamplerate src)"
 		"$(use_enable wavpack)"
+		"$(use_enable zip vfs-zip)"
 
 		"--enable-gtk3"
 		"--enable-vfs-curl"
@@ -167,4 +197,7 @@ src_install() {
 	default
 
 	find "${ED}" -name '*.la' -delete || die
+
+	# if compressed, help doesn't work
+	docompress -x /usr/share/doc/${PF}
 }
diff --git a/media-sound/deadbeef/files/deadbeef-1.9.6-drop-Werror.patch b/media-sound/deadbeef/files/deadbeef-1.9.6-drop-Werror.patch
new file mode 100644
index 000000000000..f31e079d942b
--- /dev/null
+++ b/media-sound/deadbeef/files/deadbeef-1.9.6-drop-Werror.patch
@@ -0,0 +1,35 @@
+Remove -Werror 
+
+See also: https://devmanual.gentoo.org/ebuild-writing/common-mistakes/index.html#-werror-compiler-flag-not-removed
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -337,7 +337,7 @@ AS_IF([test "${have_iconv}" = "yes"], [
+     AC_DEFINE(HAVE_LIBICONV,1,[Use libiconv instead of glibc iconv])
+ ])
+ 
+-AX_CHECK_COMPILER_FLAGS(-msse2, HAVE_SSE2=1, [], -Werror)
++AX_CHECK_COMPILER_FLAGS(-msse2, HAVE_SSE2=1, [])
+ AS_IF([test "${HAVE_SSE2}"], [
+     AC_DEFINE(HAVE_SSE2,1,[Support SSE2 instructions])
+ ])
+--- a/plugins/gtkui/Makefile.am
++++ b/plugins/gtkui/Makefile.am
+@@ -94,7 +94,7 @@
+ 
+ ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.la ../../shared/libtrkpropertiesutil.la ../../shared/libeqpreset.la ../../shared/libdeletefromdisk.la ../../shared/libtftintutil.la ../../shared/analyzer/libanalyzer.la ../../shared/scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
+ 
+-ddb_gui_GTK2_la_CFLAGS = -std=c99 -Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
++ddb_gui_GTK2_la_CFLAGS = -std=c99 -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+ 
+ endif
+ 
+@@ -105,7 +105,7 @@
+ 
+ ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
+ ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.la ../../shared/libtrkpropertiesutil.la ../../shared/libeqpreset.la ../../shared/libdeletefromdisk.la ../../shared/libtftintutil.la ../../shared/analyzer/libanalyzer.la ../../shared/scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
+-ddb_gui_GTK3_la_CFLAGS = -std=c99 -Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
++ddb_gui_GTK3_la_CFLAGS = -std=c99 -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+ ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS)
+ 
+ nodist_ddb_gui_GTK3_la_SOURCES = gtkui-gresources.c
diff --git a/media-sound/deadbeef/files/deadbeef-1.9.6-fix-desktop-launcher.patch b/media-sound/deadbeef/files/deadbeef-1.9.6-fix-desktop-launcher.patch
new file mode 100644
index 000000000000..235f5d5935de
--- /dev/null
+++ b/media-sound/deadbeef/files/deadbeef-1.9.6-fix-desktop-launcher.patch
@@ -0,0 +1,32 @@
+Fix QA issue about malformed desktop launcher.
+
+ * QA Notice: This package installs one or more .desktop files that do not
+ * pass validation.
+ *
+ * 	/usr/share/applications/deadbeef.desktop: error: action group "Desktop Action Next" exists, but there is no matching action "Next"
+ * 	/usr/share/applications/deadbeef.desktop: error: action group "Desktop Action Prev" exists, but there is no matching action "Prev"
+ * 	/usr/share/applications/deadbeef.desktop: error: action group "Desktop Action Stop" exists, but there is no matching action "Stop"
+ * 	/usr/share/applications/deadbeef.desktop: error: file contains group "Desktop Action Toggle Pause", which has an invalid action identifier, only alphanumeric characters and '-' are allowed
+ * 	/usr/share/applications/deadbeef.desktop: error: value "Play;Pause;Toggle Pause;Stop;Next;Prev;" for key "Actions" in group "Desktop Entry" contains invalid action identifier "Toggle Pause", only alphanumeric characters and '-' are allowed
+ *
+
+--- a/deadbeef.desktop.in
++++ b/deadbeef.desktop.in
+@@ -14,7 +14,7 @@
+ Icon=deadbeef
+ Exec=deadbeef %F
+ Terminal=false
+-Actions=Play;Pause;Toggle Pause;Stop;Next;Prev;
++Actions=Play;Pause;Toggle-Pause;Stop;Next;Prev;
+ MimeType=application/ogg;audio/x-vorbis+ogg;application/x-ogg;audio/mp3;audio/prs.sid;audio/x-flac;audio/mpeg;audio/x-mpeg;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm;audio/x-mpegurl;audio/x-scpls;application/x-cue;
+ Categories=Audio;AudioVideo;Player;GTK;
+ Keywords=Sound;Music;Audio;Player;Musicplayer;MP3;
+@@ -35,7 +35,7 @@
+ Name[zh_TW]=暫停
+ Exec=deadbeef --pause
+ 
+-[Desktop Action Toggle Pause]
++[Desktop Action Toggle-Pause]
+ Name=Toggle Pause
+ Name[zh_CN]=播放/暂停
+ Name[zh_TW]=播放/暫停
diff --git a/media-sound/deadbeef/files/deadbeef-1.9.6-update-gettext.patch b/media-sound/deadbeef/files/deadbeef-1.9.6-update-gettext.patch
new file mode 100644
index 000000000000..48c0f0433eac
--- /dev/null
+++ b/media-sound/deadbeef/files/deadbeef-1.9.6-update-gettext.patch
@@ -0,0 +1,17 @@
+Update to a newer gettext to fix clang issues
+
+See also: https://bugs.gentoo.org/908414
+See also: https://github.com/gentoo/gentoo/pull/32491
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,8 +17,8 @@ AC_SYS_LARGEFILE
+ dnl AC_PROG_LIBTOOL
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_C_BIGENDIAN
+-AM_GNU_GETTEXT
+-AM_GNU_GETTEXT_VERSION([0.18])
++AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
+ PKG_PROG_PKG_CONFIG
+ AM_PROG_CC_C_O
+ AM_ICONV
diff --git a/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch b/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch
deleted file mode 100644
index 82a979a5c179..000000000000
--- a/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index da137069a..43cdcb301 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -75,7 +75,7 @@
- static DB_decoder_t plugin;
- static DB_functions_t *deadbeef;
- 
--#define DEFAULT_EXTS "aa3;oma;ac3;vqf;amr;tak;dsf;dff;wma;3gp;mp4;m4a"
-+#define DEFAULT_EXTS "aa3;oma;ac3;vqf;amr;tak;dsf;dff;wma;3gp;mp4;m4a;ape"
- #define UNPOPULATED_EXTS_BY_FFMPEG \
-     "aif,aiff,afc,aifc,amr,asf," \
-     "wmv,wma,au,caf,webm," \
diff --git a/media-sound/deadbeef/metadata.xml b/media-sound/deadbeef/metadata.xml
index a0345ca21308..202ef7ecef3f 100644
--- a/media-sound/deadbeef/metadata.xml
+++ b/media-sound/deadbeef/metadata.xml
@@ -1,21 +1,26 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
+		<email>ceamac@gentoo.org</email>
+		<name>Viorel Munteanu</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">DeaDBeeF-Player/deadbeef</remote-id>
+		<remote-id type="sourceforge">deadbeef</remote-id>
 	</upstream>
 	<use>
-		<flag name='converter'>File format converter</flag>
-		<flag name='cover'>Support for cover art</flag>
-		<flag name='hotkeys'>Keyboard shortcuts support</flag>
-		<flag name='lastfm'>last.fm/AudioScrobbler protocol support</flag>
-		<flag name='notify'>Desktop notifications support</flag>
-		<flag name='nullout'>Dummy output driver</flag>
-		<flag name='shellexec'>Define custom shell commands that can be called on tracks</flag>
-		<flag name='supereq'>Enable equalizer</flag>
+		<flag name="converter">File format converter</flag>
+		<flag name="cover">Support for cover art</flag>
+		<flag name="hotkeys">Keyboard shortcuts support</flag>
+		<flag name="lastfm">last.fm/AudioScrobbler protocol support</flag>
+		<flag name="libretro">libretro resampling plugin</flag>
+		<flag name="libsamplerate">Support the Secret Rabbit Code resampler</flag>
+		<flag name="notify">Desktop notifications support</flag>
+		<flag name="nullout">Dummy output driver</flag>
+		<flag name="pipewire">Pipewire output plugin</flag>
+		<flag name="sc68">Atari ST and Amiga music player</flag>
+		<flag name="shellexec">Define custom shell commands that can be called on tracks</flag>
+		<flag name="supereq">Enable equalizer</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/declick/metadata.xml b/media-sound/declick/metadata.xml
index ac844abfd21d..f103e4cebc4d 100644
--- a/media-sound/declick/metadata.xml
+++ b/media-sound/declick/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
diff --git a/media-sound/deinvert/deinvert-9999.ebuild b/media-sound/deinvert/deinvert-9999.ebuild
deleted file mode 100644
index 8f9dfb0b0b80..000000000000
--- a/media-sound/deinvert/deinvert-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit git-r3 autotools
-
-DESCRIPTION="A voice inversion descrambler"
-HOMEPAGE="https://github.com/windytan/deinvert"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/windytan/deinvert.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="+liquid +wav"
-
-DEPEND="liquid? ( net-libs/liquid-dsp )
-		wav? ( media-libs/libsndfile )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with liquid) \
-		$(use_with wav sndfile)
-}
diff --git a/media-sound/deinvert/metadata.xml b/media-sound/deinvert/metadata.xml
deleted file mode 100644
index a075d9becd13..000000000000
--- a/media-sound/deinvert/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="liquid">improve sound quality using <pkg>net-libs/liquid-dsp</pkg></flag>
-		<flag name="wav">wav file support using <pkg>media-libs/libsndfile</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 325037566a5e..50ee3bf2b402 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1 +1 @@
-DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
+DIST denemo-2.6.0.tar.gz 17620623 BLAKE2B 55d142954834332a4bd5ca89125411181521d53f1a552b1397b16bbc51803cac3bc4eb0ffb309ababe2ad1b554e293d23102383aba95cde1cbb18cc96f9c6203 SHA512 9069c973624f05b53c62e5d8a9db5c2b4835ce3465402544d6a9f2a7d3bd617d79ac35c83940b37842a7a147bc2ee44ef33202bf7c107e739bfa303ffcf19738
diff --git a/media-sound/denemo/denemo-2.3.0-r1.ebuild b/media-sound/denemo/denemo-2.6.0-r2.ebuild
index 4924eed28572..509d71f6be38 100644
--- a/media-sound/denemo/denemo-2.3.0-r1.ebuild
+++ b/media-sound/denemo/denemo-2.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools xdg
+inherit autotools eapi8-dosym font xdg
 
 DESCRIPTION="A music notation editor"
 HOMEPAGE="http://www.denemo.org/"
@@ -11,61 +11,59 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # configure options currently not used:
 # --enable-mem(no) memory debugging: needs Electric fence (efence), which
 #		is not available in portage. See https://github.com/boundarydevices/efence
 # --enable-gtk-doc-pdf(no) doesn't work
-IUSE="alsa +aubio debug jack +fluidsynth gtk-doc nls +portaudio +portmidi
+# fluidsynth currently broken. See https://savannah.gnu.org/bugs/index.php?62202
+IUSE="alsa +aubio debug jack gtk-doc nls +portaudio +portmidi
 	+rubberband test"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-text/evince-3.22.1-r1:=
+	dev-libs/glib:2
 	dev-libs/libxml2:2
 	>=dev-scheme/guile-2:12=
 	gnome-base/librsvg:2
 	media-libs/fontconfig:1.0
 	>=media-libs/libsmf-1.3
 	>=media-libs/libsndfile-1.0.28-r1
-	>=media-sound/lilypond-2.19.54[guile2(+)]
+	>=media-sound/fluidsynth-1.1.6-r1:=
+	>=media-sound/lilypond-2.19.54
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/gtksourceview:3.0=
+	x11-libs/pango
 	alsa? ( >=media-libs/alsa-lib-1.1.2 )
 	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= )
 	jack? ( virtual/jack )
 	portaudio? (
 		>=media-libs/portaudio-19_pre20140130
 		sci-libs/fftw:3.0=
 	)
-	portmidi? ( >=media-libs/portmidi-217-r1 )
+	portmidi? ( media-libs/portmidi )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
 "
-
 DEPEND="${RDEPEND}"
-
 BDEPEND="
-	>=dev-util/gtk-doc-am-1.25-r1
+	>=dev-build/gtk-doc-am-1.25-r1
 	>=dev-util/intltool-0.51.0-r1
-	>=sys-devel/flex-2.6.1
+	app-alternatives/lex
 	virtual/pkgconfig
-	virtual/yacc
+	app-alternatives/yacc
 	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
 	nls? ( >=sys-devel/gettext-0.19.8.1 )
 "
 
 DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
 
-PATCHES=(
-	"${FILESDIR}/${P}-0001-configure.ac-patch-to-find-guile-2.2.patch"
-	"${FILESDIR}/${P}-0002-Fix-issues-with-gcc10-fno-common-flag.patch"
-)
-
 src_prepare() {
-	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die
+	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/org.denemo.Denemo.desktop || die
 	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
 		-i Makefile.am || die
 	default
@@ -81,22 +79,24 @@ src_configure() {
 		--disable-rpath
 		--disable-static
 		--enable-evince
+		--enable-fluidsynth
 		--enable-gtk3
 		--enable-x11
 		$(use_enable alsa)
 		$(use_enable aubio)
+		$(use_enable debug)
 		# --enable-doc does nothing for itself
 		# basic html documentation is always being installed in the
 		# /usr/share/denemo/manual directory
 		$(use_enable gtk-doc doc)
 		$(use_enable gtk-doc gtk-doc)
 		$(use_enable gtk-doc gtk-doc-html)
-		$(use_enable fluidsynth)
 		$(use_enable jack)
 		$(use_enable nls)
 		$(use_enable portaudio)
 		$(use_enable portmidi)
 		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -113,6 +113,16 @@ src_install() {
 	dodir /usr/share/doc/${PF}/html
 	local f
 	for f in denemo-manual.html denemo.css images; do
-		dosym ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+		dosym8 -r /usr/share/denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
 	done
 }
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/media-sound/denemo/denemo-2.6.0-r3.ebuild b/media-sound/denemo/denemo-2.6.0-r3.ebuild
new file mode 100644
index 000000000000..6ccfd2164e34
--- /dev/null
+++ b/media-sound/denemo/denemo-2.6.0-r3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools font xdg
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ OFL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# configure options currently not used:
+# --enable-mem(no) memory debugging: needs Electric fence (efence), which
+#		is not available in portage. See https://github.com/boundarydevices/efence
+# --enable-gtk-doc-pdf(no) doesn't work
+# fluidsynth currently broken. See https://savannah.gnu.org/bugs/index.php?62202
+IUSE="alsa +aubio debug jack gtk-doc nls +portaudio +portmidi
+	+rubberband test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/evince-3.22.1-r1:=
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-2:12=
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	>=media-libs/libsndfile-1.0.28-r1
+	>=media-sound/fluidsynth-1.1.6-r1:=
+	>=media-sound/lilypond-2.19.54
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0=
+	x11-libs/pango
+	alsa? ( >=media-libs/alsa-lib-1.1.2 )
+	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
+	jack? ( virtual/jack )
+	portaudio? (
+		>=media-libs/portaudio-19_pre20140130
+		sci-libs/fftw:3.0=
+	)
+	portmidi? ( media-libs/portmidi )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-build/gtk-doc-am-1.25-r1
+	>=dev-util/intltool-0.51.0-r1
+	app-alternatives/lex
+	virtual/pkgconfig
+	app-alternatives/yacc
+	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	nls? ( >=sys-devel/gettext-0.19.8.1 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.0-respect-user-CFLAGS.patch )
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/org.denemo.Denemo.desktop || die
+	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
+		-i Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--disable-gtk-doc-pdf
+		--disable-gtk2
+		--disable-installed-tests
+		--disable-mem
+		--disable-rpath
+		--disable-static
+		--enable-evince
+		--enable-fluidsynth
+		--enable-gtk3
+		--enable-x11
+		$(use_enable alsa)
+		$(use_enable aubio)
+		$(use_enable debug)
+		# --enable-doc does nothing for itself
+		# basic html documentation is always being installed in the
+		# /usr/share/denemo/manual directory
+		$(use_enable gtk-doc doc)
+		$(use_enable gtk-doc gtk-doc)
+		$(use_enable gtk-doc gtk-doc-html)
+		$(use_enable jack)
+		$(use_enable nls)
+		$(use_enable portaudio)
+		$(use_enable portmidi)
+		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# make check fails if used with parallel builds
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	# link html documentation installed in /usr/share/denemo/manual
+	dodir /usr/share/doc/${PF}/html
+	local f
+	for f in denemo-manual.html denemo.css images; do
+		dosym -r /usr/share/denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+	done
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
deleted file mode 100644
index 982ccfade868..000000000000
--- a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 9a515060df9024ef64bce2055fd3f2ceada5efa8 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 14 Aug 2019 13:51:32 +0200
-Subject: [PATCH] configure.ac: patch to find guile-2.2
-
-The patch uses the GUILE_PKG command to find any installed
-version of guile instead of explicitly checking for guile-1.8
-and guile-2.0 but missing guile-2.2.
-This patch was already provided to upstream with denemo-2.2, but
-didn't yet get accepted due to not being able to compile the
-Windows version with this patch (cf. http://savannah.gnu.org/bugs/?54821)
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- configure.ac | 41 +++--------------------------------------
- 1 file changed, 3 insertions(+), 38 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f85b74e..1fc0af0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,10 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_YACC
- AM_PROG_LEX
-+GUILE_PKG
- GUILE_FLAGS
-+CFLAGS="$CFLAGS $GUILE_CFLAGS"
-+LIBS="$LIBS $GUILE_LIBS"
- 
- AC_PROG_LIBTOOL
- 
-@@ -63,44 +66,6 @@ AS_COMPILER_FLAG([-fdiagnostics-color=auto],
- 
- AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"])
- 
--AC_ARG_ENABLE(
--  guile_1_8,
--  AS_HELP_STRING([--enable-guile_1_8], [use GUILE_1_8 @<:@default=no@:>@]),
--  [
--    if test "x$enableval" != "xno"; then
--      useguile_1_8=yes
--      PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
--      LIBS="$LIBS $GUILE_1_8_LIBS"
--      CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
--    fi
--  ], [ useguile_1_8=no ])
--
--AC_ARG_ENABLE(
--  guile_2_0,
--  AS_HELP_STRING([--enable-guile_2_0], [use GUILE_2_0 @<:@default=no@:>@]),
--  [
--    if test "x$enableval" != "xno"; then
--      useguile_2_0=yes
--      PKG_CHECK_MODULES(GUILE_2, guile-2.0 >= 2.0)
--      LIBS="$LIBS $GUILE_2_LIBS"
--      CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
--    fi
--  ], [ useguile_2_0=no ])
--
--if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"]; then
--  PKG_CHECK_MODULES([GUILE_2], [guile-2.0], useguile_2_0=yes, useguile_2_0=no)
--  LIBS="$LIBS $GUILE_2_LIBS"
--  CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
--  if test "x$useguile_2_0" = "xno"; then
--    PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
--    LIBS="$LIBS $GUILE_1_8_LIBS"
--    CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
--    useguile_1_8=yes
--  else
--    useguile_2_0=yes
--  fi
--fi
--
- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30])
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
--- 
-2.22.0
-
diff --git a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch b/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
deleted file mode 100644
index 425662e042c9..000000000000
--- a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 54075086a5b7acceef6dff41e19148778e285475 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 20 Mar 2020 21:03:02 +0100
-Subject: [PATCH] Fix issues with gcc10 -fno-common flag
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- include/denemo/denemo_types.h | 7 ++++---
- src/export/print.h            | 6 +++---
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/include/denemo/denemo_types.h b/include/denemo/denemo_types.h
-index 1d67827..936892b 100644
---- a/include/denemo/denemo_types.h
-+++ b/include/denemo/denemo_types.h
-@@ -430,7 +430,7 @@ typedef enum{
- } SCRIPT_TYPE;
- 
- //index of columns in the keymap command list store FIXME if you add columns you must add them in allocate_keymap !!!!
--enum
-+typedef enum
- {
-   COL_TYPE = 0,
-   COL_NAME,
-@@ -1167,7 +1167,7 @@ struct cs_callback
-  * The (singleton) root object for the program
-  *
-  */
--struct DenemoRoot
-+typedef struct DenemoRoot
- {
-   gboolean non_interactive; /* if TRUE denemo should not display project, receive or send sounds etc*/
-   gchar *scheme_file;/* filename for scheme code to run on startup */
-@@ -1258,6 +1258,7 @@ struct DenemoRoot
-   gboolean *silent; /** Don't log any message */
-   gboolean *verbose; /** Display every messages */
-   guint pending_layout_id;//Non zero when the current layout being created will be renamed to have this id 
--}  Denemo; /**< The root object. */
-+};
-+extern struct DenemoRoot Denemo; /**< The root object. */
- 
- #endif
-diff --git a/src/export/print.h b/src/export/print.h
-index db0c8f1..64a3a8d 100644
---- a/src/export/print.h
-+++ b/src/export/print.h
-@@ -108,9 +108,9 @@ typedef struct WysiwygInfo
-   GtkWidget *dialog;            //an info dialog to tell the user what to do next...
- } WysiwygInfo;
- 
--gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
--GError *lily_err;
--GPid previewerpid;
-+extern gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
-+extern GError *lily_err;
-+extern GPid previewerpid;
- 
- WysiwygInfo* get_wysiwyg_info();
- void initialize_print_status (void);
--- 
-2.25.1
-
diff --git a/media-sound/denemo/files/denemo-2.6.0-respect-user-CFLAGS.patch b/media-sound/denemo/files/denemo-2.6.0-respect-user-CFLAGS.patch
new file mode 100644
index 000000000000..e57be9c57bee
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.6.0-respect-user-CFLAGS.patch
@@ -0,0 +1,22 @@
+From c4eff03fb11d7085035892a688ed5d29e2faefe9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 27 Mar 2023 19:44:28 +0200
+Subject: [PATCH] respect user CFLAGS
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,8 +42,8 @@ AC_ARG_ENABLE(
+   [
+     if test "x$enableval" != "xno"; then
+       build_debug=yes
+-      CFLAGS="-O0 -DDEBUG -g -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-compare"
+-      CXXFLAGS="-O0 -DDEBUG -g -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-compare"
++      CFLAGS="$CFLAGS -DDEBUG -g -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-compare"
++      CXXFLAGS="$CFLAGS -DDEBUG -g -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-compare"
+     fi
+   ])
+ 
+-- 
+2.40.0
+
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index 01f6188337b1..cc1aae0b753a 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -1,43 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>waebbl@gmail.com</email>
-	<name>Bernd Waibel</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>
-	Denemo is a music notation editor which uses
-	<pkg>media-sound/lilypond</pkg> to typeset music notation with LaTeX.
-</longdescription>
-<use>
-	<flag name="alsa">
-		Enable alsa support through <pkg>media-libs/alsa-lib</pkg>
-	</flag>
-	<flag name="aubio">
-		Enable <pkg>media-libs/aubio</pkg> support
-	</flag>
-	<flag name="fluidsynth">
-		Enable Fluidsynth MIDI software synthesis using
-		<pkg>media-sound/fluidsynth</pkg>
-	</flag>
-	<flag name="jack">
-		Enable jack support through <pkg>virtual/jack</pkg>
-	</flag>
-	<flag name="portaudio">
-		Enable support for <pkg>media-libs/portaudio</pkg>
-	</flag>
-	<flag name="portmidi">
-		Enable support for the <pkg>media-libs/portmidi</pkg> backend
-	</flag>
-	<flag name="rubberband">
-		Enable support for <pkg>media-libs/rubberband</pkg>
-	</flag>
-</use>
-<upstream>
-	<bugs-to>https://savannah.gnu.org/bugs/?group=denemo&amp;func=additem</bugs-to>
-</upstream>
+  <maintainer type="person" proxied="yes">
+    <email>waebbl-gentoo@posteo.net</email>
+    <name>Bernd Waibel</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+  Denemo is a music notation editor which uses
+  <pkg>media-sound/lilypond</pkg> to typeset music notation with LaTeX.
+  </longdescription>
+  <use>
+    <flag name="alsa">
+      Enable alsa support through <pkg>media-libs/alsa-lib</pkg>
+    </flag>
+    <flag name="aubio">
+      Enable <pkg>media-libs/aubio</pkg> support
+    </flag>
+    <flag name="jack">
+      Enable jack support through <pkg>virtual/jack</pkg>
+    </flag>
+    <flag name="portaudio">
+      Enable support for <pkg>media-libs/portaudio</pkg>
+    </flag>
+    <flag name="portmidi">
+      Enable support for the <pkg>media-libs/portmidi</pkg> backend
+    </flag>
+    <flag name="rubberband">
+      Enable support for <pkg>media-libs/rubberband</pkg>
+    </flag>
+  </use>
+  <upstream>
+    <bugs-to>https://savannah.gnu.org/bugs/?group=denemo&amp;func=additem</bugs-to>
+    <remote-id type="savannah">denemo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/denonavr-cli/Manifest b/media-sound/denonavr-cli/Manifest
new file mode 100644
index 000000000000..f6518dafeea9
--- /dev/null
+++ b/media-sound/denonavr-cli/Manifest
@@ -0,0 +1 @@
+DIST denonavr-cli-3.gh.tar.gz 7508 BLAKE2B 4084cbc87363858cb0132847b88c486795332ae28d1c24efb46c22a8985711aa18dfe6b2634f6457ea3108789bb4812ffba17a50edb429fb64a29ca90bbeedaa SHA512 f2bdf442fd3bec788d9ac684d93314da6c7750d946fc563ceb71a52ef1663e1fe06c62653d4e5ff69625749f1eefacc41c92ebcfdf0f6ff7fdf7c7b703d7408d
diff --git a/media-sound/denonavr-cli/denonavr-cli-3.ebuild b/media-sound/denonavr-cli/denonavr-cli-3.ebuild
new file mode 100644
index 000000000000..f41e9cfeafd6
--- /dev/null
+++ b/media-sound/denonavr-cli/denonavr-cli-3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple CLI for Denon AV receivers"
+HOMEPAGE="
+	https://github.com/projg2/denonavr-cli/
+	https://pypi.org/project/denonavr-cli/
+"
+SRC_URI="
+	https://github.com/projg2/denonavr-cli/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/denonavr[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/media-sound/denonavr-cli/metadata.xml b/media-sound/denonavr-cli/metadata.xml
new file mode 100644
index 000000000000..22b441b574ec
--- /dev/null
+++ b/media-sound/denonavr-cli/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">projg2/denonavr-cli</remote-id>
+		<remote-id type="pypi">denonavr-cli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 86a6b2542ccf..f2e4b939c224 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1 +1 @@
-DIST din-49.1.tar.gz 3677087 BLAKE2B 7b696597327493d354c5efd31df243c70f23ec8d68514892c79212b9d3d398c7debb28ad95b6ccb04dc76ac0a9b01ee57d8245260dd4af99cd3f3b27bc2ecbcf SHA512 8f72fd1dce7197135e174bc8c4fb5325e7755e656d7817bbd82c964083ca48b0b5cc939472acf3464fd0404631767bbea1f20b7dea073b6829582e76d2879e04
+DIST din-58.1.tar.gz 3689591 BLAKE2B 2ccb48fed8aa16edb53cf6643b63a842c28cd700621d2273a94913ab7a6ae8b50da72c3509a8b9b6189fcd4beaa5afbfa3a92430acb18c4cc9a7cfb057209c29 SHA512 ee2d63309347167af3b4e41a0ad3ce1faad727a4e079cd9e63d402b680144aed81dbee9d38bc517acbb30a1c9af18b726841d0c94d96cbfb2b1581da98af21c1
diff --git a/media-sound/din/din-49.1.ebuild b/media-sound/din/din-58.1.ebuild
index 6872627e7dcb..4b371d0f6e8d 100644
--- a/media-sound/din/din-49.1.ebuild
+++ b/media-sound/din/din-58.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools eutils xdg
+inherit autotools edos2unix flag-o-matic xdg
 
 DESCRIPTION="a software musical instrument and audio synthesizer"
 HOMEPAGE="https://dinisnoise.org/"
@@ -33,7 +33,7 @@ BDEPEND="
 REQUIRED_USE="|| ( alsa jack )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${PN}-58.1-makefile.patch"
 	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
 )
 
@@ -48,6 +48,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860513
+	# No upstream bugtracker. I believe upstream prefers emails,
+	# so I have emailed the author directly.
+	filter-lto
+
 	# Jack takes over alsa.
 	local sound_engine
 
diff --git a/media-sound/din/files/din-48-fix-random-constants.patch b/media-sound/din/files/din-48-fix-random-constants.patch
index 8e60204ad429..aef491fe5709 100644
--- a/media-sound/din/files/din-48-fix-random-constants.patch
+++ b/media-sound/din/files/din-48-fix-random-constants.patch
@@ -1,5 +1,3 @@
-diff --git a/src/random.h b/src/random.h
-index d5a2bc6..38f0d14 100644
 --- a/src/random.h
 +++ b/src/random.h
 @@ -16,8 +16,8 @@
diff --git a/media-sound/din/files/din-49.1-makefile.patch b/media-sound/din/files/din-49.1-makefile.patch
deleted file mode 100644
index 0a96d894c2c0..000000000000
--- a/media-sound/din/files/din-49.1-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c7cc5ce..2b07a9b 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
- #dinincludedir = $(pkgsrcdir)
- 
--AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
--LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- bin_PROGRAMS = din
- din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drone.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp
diff --git a/media-sound/din/files/din-58.1-makefile.patch b/media-sound/din/files/din-58.1-makefile.patch
new file mode 100644
index 000000000000..37e24b966eec
--- /dev/null
+++ b/media-sound/din/files/din-58.1-makefile.patch
@@ -0,0 +1,12 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ #dinincludedir = $(pkgsrcdir)
+ 
+-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\"
+-LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\"
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ bin_PROGRAMS = din
+ 
diff --git a/media-sound/din/metadata.xml b/media-sound/din/metadata.xml
index f79bb67acbd9..3fed8a8997c3 100644
--- a/media-sound/din/metadata.xml
+++ b/media-sound/din/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r2.ebuild
index d20c747e08d1..0445569da3d7 100644
--- a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-single-r1
 
@@ -20,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=media-libs/mutagen-1.11[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.11[${PYTHON_USEDEP}]
 	')
 	media-sound/vorbis-tools[ogg123]
 	aac? ( || (
@@ -30,7 +31,7 @@ RDEPEND="${DEPEND}
 		media-libs/flac
 		media-video/mplayer ) )
 	mac? ( || (
-		media-sound/mac
+		<=media-sound/mac-4.12
 		media-video/mplayer ) )
 	mp3? ( || (
 		media-sound/mpg123
diff --git a/media-sound/dir2ogg/metadata.xml b/media-sound/dir2ogg/metadata.xml
index c64e4b75686a..ecd408ba4052 100644
--- a/media-sound/dir2ogg/metadata.xml
+++ b/media-sound/dir2ogg/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index ed207917b60d..f5a620127206 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,2 +1 @@
-DIST drumstick-1.1.3.tar.gz 1358468 BLAKE2B af4cc923d380a1da66c835a6302e47e31c17ff90ba9277fe6063e6029c3d4d087e85905487a4dae657cdbfb743d2ac6e6c5a30c0905c9bc736d8666105e52099 SHA512 41990c269c41dc011e14c9bf008b983cd3722ea52429ec7eabaa5689a6f69b1760fc766604378c30bb1dfab537b77f7522a13377b873308835a0e7701d24448e
-DIST drumstick-2.0.0.tar.gz 1865424 BLAKE2B ee87dd222add121c8a6faaac5b8a755e2d6f7b257db890f6bbdbf5380d9771dc5b65a73d716f0cfd343a46c4227adcd2d85e4a359fcaa445b2291dc1ac188cfe SHA512 aacb4ca5a3354da6380ba146ee7ba57e646d19fe6a5d083e00b795221453a87d1baf25965784e7c8a97b9b00a3dda643bce144f62b6a27118f081c681089381a
+DIST drumstick-2.6.1.tar.gz 1922869 BLAKE2B 5f1b9413c60d80ecb87f28f9a9eccd5cc418444664bdbd0fe9d47f698effc12956a3ddd2f45ae9e734486e94006883ed7264f8421a5989ce0b025ad85239e10b SHA512 ab858ee17aa957fe1c68935e2419798c50d4253b14dd0f31cafb46e087869986702c8a0d3ac1333d67b17618e7d5d75894aeb0e0f5bffb77762d0a56c242a811
diff --git a/media-sound/drumstick/drumstick-1.1.3.ebuild b/media-sound/drumstick/drumstick-1.1.3.ebuild
deleted file mode 100644
index fbb7e14743ec..000000000000
--- a/media-sound/drumstick/drumstick-1.1.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth pulseaudio"
-
-BDEPEND="
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-RESTRICT="test"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use fluidsynth ; then
-		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
-			library/rt/CMakeLists.txt \
-			library/rt-backends/CMakeLists.txt \
-			utils/vpiano/CMakeLists.txt || die
-	fi
-
-	if ! use pulseaudio ; then
-		sed -i -e "/pkg_check_modules(PULSE/d" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		$(cmake_use_find_package doc Doxygen)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doxygen
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc ; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-}
diff --git a/media-sound/drumstick/drumstick-2.0.0.ebuild b/media-sound/drumstick/drumstick-2.6.1-r1.ebuild
index 041eadd01f12..4e0747a1ddeb 100644
--- a/media-sound/drumstick/drumstick-2.0.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.6.1-r1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="https://drumstick.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fluidsynth pulseaudio"
+KEYWORDS="amd64 x86"
+IUSE="doc fluidsynth network pulseaudio"
+
+RESTRICT="test"
 
 BDEPEND="
 	dev-libs/libxslt
@@ -20,7 +22,7 @@ BDEPEND="
 	virtual/pkgconfig
 	x11-misc/shared-mime-info
 	doc? (
-		app-doc/doxygen[dot]
+		app-text/doxygen[dot]
 		app-text/docbook-xsl-stylesheets
 	)
 "
@@ -29,42 +31,26 @@ DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
 	fluidsynth? ( media-sound/fluidsynth )
-	pulseaudio? ( media-sound/pulseaudio )
+	network? ( dev-qt/qtnetwork:5 )
+	pulseaudio? ( media-libs/libpulse )
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-RESTRICT="test"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use doc ; then
-		sed -e "/find_package(Doxygen/s/^/# disabled by -doc/" \
-			-i CMakeLists.txt || die
-	fi
-
-	if ! use fluidsynth ; then
-		sed -e "/pkg_check_modules(FLUIDSYNTH/s/^/# disabled by -fluidsynth/" \
-			-i library/rt-backends/CMakeLists.txt || die
-	fi
-
-	if ! use pulseaudio ; then
-		sed -e "/pkg_check_modules(PULSE/s/^/# disabled by -pulseaudio/" \
-			-i CMakeLists.txt || die
-	fi
-}
+DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=OFF
 		-DUSE_DBUS=ON
+		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_NETWORK=$(usex network)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DUSE_QT=5 # bug 919682
+		-DBUILD_DOCS=$(usex doc)
 	)
 	cmake_src_configure
 }
diff --git a/media-sound/drumstick/metadata.xml b/media-sound/drumstick/metadata.xml
index ffb8a67c8158..b1a40764f549 100644
--- a/media-sound/drumstick/metadata.xml
+++ b/media-sound/drumstick/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="fluidsynth">Enable support for <pkg>media-sound/fluidsynth</pkg></flag>
+		<flag name="network">Build Network RT backend</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">drumstick</remote-id>
diff --git a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
index 811fbf5d248c..fafbe7bebd55 100644
--- a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
+++ b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Author a DVD-Audio DVD"
-HOMEPAGE="http://dvd-audio.sourceforge.net"
-SRC_URI="mirror://sourceforge/dvd-audio/${P}-300.tar.gz"
+HOMEPAGE="https://dvd-audio.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/dvd-audio/${P}-300.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -15,10 +15,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
+	media-libs/flac:=[ogg]
 	media-sound/sox[png]
-	media-libs/flac[ogg]"
+"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/libtool"
+BDEPEND="dev-build/libtool"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fno-common.patch
@@ -42,6 +43,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/860516
+	#
+	# Upstream on sourceforge is inactive for several years now. No bug filed.
+	filter-lto
+
 	econf \
 		--with-config="${EPREFIX}/etc" \
 		$(use_with debug debug full)
diff --git a/media-sound/dvda-author/metadata.xml b/media-sound/dvda-author/metadata.xml
index b262e0967672..ea6654056b47 100644
--- a/media-sound/dvda-author/metadata.xml
+++ b/media-sound/dvda-author/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
new file mode 100644
index 000000000000..4daae661bb0f
--- /dev/null
+++ b/media-sound/easyeffects/Manifest
@@ -0,0 +1,3 @@
+DIST easyeffects-7.0.7.tar.gz 3359508 BLAKE2B 16c4fd322eefcd16bb8a83a5443e482689b2f4665556f306e11c072b869f9929d5c7b781f7adbba7faacb71a07c0bdd2b61efb6584131e61e2bfa6dedcdf3c8d SHA512 3ceadf6c8acff64a98cf6c0e2c5386aa7b6d4649d49a9879574415bb7959b9c7243870bc30ea38bb3de3ee5b4d9ab9892eb8809069c08b2a50ab7f2342f6a1e4
+DIST easyeffects-7.1.3.tar.gz 3426093 BLAKE2B 62ff40388df2a3452d23968881ab7d247c5504abc4524564e919cc520700e64978914248f00fb8b3ae251b895850d9a4dee763576baf2c43af3cd1105d2b62d5 SHA512 9e277b0c432f5015b33d4ac6961d5eec4cbf498dd2e947d231a9c13d8c7b7680f7ded7bf3d55d2c72ebf46de94308447a0b1e3b8cbbb13ce96c3a79bf027ffa3
+DIST easyeffects-7.1.6.tar.gz 3505689 BLAKE2B fbb1dd05b2e5f8e3224653ddebf49175af1d6b39d034d6446750e780ec0f8f8a4d58b085c019767a121641d8b5176f0a6a0d828c3537aa2c3803223015fe6826 SHA512 7c70aeb66fc2242011c96d44b4a007cdec4733c968195089ec62968ee1dcb96ec6460ac67a2eb8baa104120bc13798792236fb677ac3f56557bfb05109b43f02
diff --git a/media-sound/easyeffects/easyeffects-7.0.7.ebuild b/media-sound/easyeffects/easyeffects-7.0.7.ebuild
new file mode 100644
index 000000000000..0e8515fc94de
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-7.0.7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson toolchain-funcs
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf +doc mda-lv2 zamaudio"
+
+COMMON="dev-cpp/nlohmann_json
+	dev-cpp/tbb
+	>=dev-libs/glib-2.56:2
+	dev-libs/libfmt
+	>=dev-libs/libsigc++-3.0.6:3
+	>=gui-libs/gtk-4.10.0:4
+	>=gui-libs/libadwaita-1.2.0:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/gsl:=
+	sci-libs/fftw:3.0"
+# Only header files are used from libsamplerate
+DEPEND="${COMMON}
+	media-libs/libsamplerate"
+RDEPEND="${COMMON}
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	zamaudio? ( media-plugins/zam-plugins )"
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! tc-is-gcc; then
+			if ! tc-is-clang || [[ $(clang-major-version) -lt 16 ]]; then
+				die "${PN} can only be built with GCC or >=Clang-16 due to required level of C++20 support"
+			fi
+		elif [[ $(gcc-major-version) -lt 11 ]] ; then
+			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/easyeffects/easyeffects-7.1.3-r1.ebuild b/media-sound/easyeffects/easyeffects-7.1.3-r1.ebuild
new file mode 100644
index 000000000000..941aab00f2ea
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-7.1.3-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson toolchain-funcs
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf +doc mda-lv2 zamaudio"
+
+COMMON="dev-cpp/nlohmann_json
+	dev-cpp/tbb
+	>=dev-libs/glib-2.56:2
+	dev-libs/libfmt
+	>=dev-libs/libsigc++-3.0.6:3
+	>=gui-libs/gtk-4.10.0:4
+	>=gui-libs/libadwaita-1.2.0:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/gsl:=
+	sci-libs/fftw:3.0"
+# Only header files are used from these two
+DEPEND="${COMMON}
+	media-libs/ladspa-sdk
+	media-libs/libsamplerate"
+RDEPEND="${COMMON}
+	>=media-libs/lsp-plugins-1.2.10[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	zamaudio? ( media-plugins/zam-plugins )"
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! tc-is-gcc; then
+			if ! tc-is-clang || [[ $(clang-major-version) -lt 16 ]]; then
+				die "${PN} can only be built with GCC or >=Clang-16 due to required level of C++20 support"
+			fi
+		elif [[ $(gcc-major-version) -lt 11 ]] ; then
+			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/easyeffects/easyeffects-7.1.6.ebuild b/media-sound/easyeffects/easyeffects-7.1.6.ebuild
new file mode 100644
index 000000000000..c6811aa7529c
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-7.1.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson toolchain-funcs
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf +doc mda-lv2 zamaudio"
+
+COMMON="dev-cpp/nlohmann_json
+	dev-cpp/tbb
+	>=dev-libs/glib-2.56:2
+	dev-libs/libfmt
+	>=dev-libs/libsigc++-3.0.6:3
+	>=gui-libs/gtk-4.10.0:4
+	>=gui-libs/libadwaita-1.2.0:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/gsl:=
+	sci-libs/fftw:3.0"
+# Only header files are used from these two
+DEPEND="${COMMON}
+	media-libs/ladspa-sdk
+	media-libs/libsamplerate"
+RDEPEND="${COMMON}
+	>=media-libs/lsp-plugins-1.2.10[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	zamaudio? ( media-plugins/zam-plugins )"
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! tc-is-gcc; then
+			if ! tc-is-clang || [[ $(clang-major-version) -lt 16 ]]; then
+				die "${PN} can only be built with GCC or >=Clang-16 due to required level of C++20 support"
+			fi
+		elif [[ $(gcc-major-version) -lt 11 ]] ; then
+			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
new file mode 100644
index 000000000000..0291ee33b45a
--- /dev/null
+++ b/media-sound/easyeffects/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
+		<flag name="doc">Install packages needed to display built-in user documentation</flag>
+		<flag name="mda-lv2">Enable use of <pkg>media-plugins/mda-lv2</pkg> for the loudness FX</flag>
+		<flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">wwmm/easyeffects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/easytag/easytag-2.4.3-r1.ebuild b/media-sound/easytag/easytag-2.4.3-r4.ebuild
index 67e1b072a47b..c13294c50ecf 100644
--- a/media-sound/easytag/easytag-2.4.3-r1.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r4.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-GNOME2_LA_PUNT="yes"
 inherit gnome2
 
 DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
@@ -11,23 +10,21 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	opus? ( vorbis )
-	speex? ( vorbis )
-"
+	speex? ( vorbis )"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
 	media-libs/libcanberra[gtk3]
 	>=x11-libs/gtk+-3.10:3
-	flac? ( >=media-libs/flac-1.3 )
+	flac? ( >=media-libs/flac-1.3:= )
 	mp3? (
 		>=media-libs/id3lib-3.8.3-r8
-		>=media-libs/libid3tag-0.15.1b-r4
+		>=media-libs/libid3tag-0.15.1b-r4:=
 	)
 	mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] )
 	nautilus? ( gnome-base/nautilus )
@@ -40,9 +37,9 @@ RDEPEND="
 		>=media-libs/libogg-1.3.1
 		>=media-libs/libvorbis-1.3.4
 	)
-	wavpack? ( >=media-sound/wavpack-4.70 )
-"
-DEPEND="${RDEPEND}
+	wavpack? ( >=media-sound/wavpack-4.70 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.4
 	app-text/yelp-tools
 	dev-util/glib-utils
@@ -54,10 +51,9 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-libs/appstream-glib
 		>=dev-util/desktop-file-utils-0.22
-	)
-"
+	)"
 
-PATCHES=( "${FILESDIR}/${P}-ogg-corruption.patch" )
+PATCHES=( "${FILESDIR}"/${P}-ogg-corruption.patch )
 
 src_configure() {
 	gnome2_src_configure \
diff --git a/media-sound/easytag/easytag-2.4.3-r5.ebuild b/media-sound/easytag/easytag-2.4.3-r5.ebuild
new file mode 100644
index 000000000000..e61c1d3e4ef8
--- /dev/null
+++ b/media-sound/easytag/easytag-2.4.3-r5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
+HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
+# Disable nautilus support until https://gitlab.gnome.org/GNOME/easytag/-/issues/78
+# is solved
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	opus? ( vorbis )
+	speex? ( vorbis )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	media-libs/libcanberra[gtk3]
+	>=x11-libs/gtk+-3.10:3
+	flac? ( >=media-libs/flac-1.3:= )
+	mp3? (
+		>=media-libs/id3lib-3.8.3-r8
+		>=media-libs/libid3tag-0.15.1b-r4:=
+	)
+	mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] )
+	opus? (
+		>=media-libs/opus-1.1
+		>=media-libs/opusfile-0.4
+	)
+	speex? ( >=media-libs/speex-1.2_rc1 )
+	vorbis? (
+		>=media-libs/libogg-1.3.1
+		>=media-libs/libvorbis-1.3.4
+	)
+	wavpack? ( >=media-sound/wavpack-4.70 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.4
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.18.3.2
+	virtual/pkgconfig
+	test? (
+		dev-libs/appstream-glib
+		>=dev-util/desktop-file-utils-0.22
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-ogg-corruption.patch )
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-Werror \
+		--disable-nautilus-actions \
+		$(use_enable test appdata-validate) \
+		$(use_enable test tests) \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3v23) \
+		$(use_enable vorbis ogg) \
+		$(use_enable opus) \
+		$(use_enable speex) \
+		$(use_enable flac) \
+		$(use_enable mp4) \
+		$(use_enable wavpack)
+}
+
+src_install() {
+	gnome2_src_install
+	# https://gitlab.gnome.org/GNOME/easytag/-/issues/82
+	mv "${ED}"/usr/share/{appdata,metainfo}
+}
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index 1c503c1ab663..d31fc8785b2d 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/ecasound/ecasound-2.9.3.ebuild b/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
index 88ce55e0de90..3c6ad32445db 100644
--- a/media-sound/ecasound/ecasound-2.9.3.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit autotools eutils python-single-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="a package for multitrack audio processing"
 HOMEPAGE="https://ecasound.seul.org/ecasound/"
@@ -24,7 +24,7 @@ RDEPEND="sys-libs/readline:0=
 	audiofile? ( media-libs/audiofile:= )
 	jack? ( virtual/jack:= )
 	libsamplerate? ( media-libs/libsamplerate:= )
-	lv2? ( >=media-libs/lilv-0.5.0:= )
+	lv2? ( media-libs/lilv:= )
 	media-libs/ladspa-sdk
 	mikmod? ( media-libs/libmikmod:0= )
 	ncurses? ( sys-libs/ncurses:0= )
@@ -35,6 +35,7 @@ RDEPEND="sys-libs/readline:0=
 	sndfile? ( media-libs/libsndfile:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+BDEPEND="sys-apps/ed"
 PATCHES=(
 	"${FILESDIR}"/${P}-ldflags.patch
 	"${FILESDIR}"/${PN}-2.9.1-tinfo.patch
@@ -47,10 +48,9 @@ pkg_setup() {
 src_prepare() {
 	default
 
-#	if use python ; then
-#		sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
-#			pyecasound/Makefile.am || die "sed failed"
-#	fi
+	# https://bugs.gentoo.org/787620
+	printf '%s\n' H '/^EXTRACXXFLAGS="-std=c++98"$/s/98/11/' w q |
+		ed -s configure.ac || die "Couldn't patch EXTRACXXFLAGS in configure.ac"
 
 	eautoreconf
 }
diff --git a/media-sound/ecasound/metadata.xml b/media-sound/ecasound/metadata.xml
index 7a9880111e68..4dc38d44a244 100644
--- a/media-sound/ecasound/metadata.xml
+++ b/media-sound/ecasound/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
@@ -20,4 +20,7 @@
 	<flag name="oil">Use <pkg>dev-libs/liboil</pkg> for inner loop optimizations</flag>
 	<flag name="lv2">Add support for Ladspa V2</flag>
 </use>
+<upstream>
+	<remote-id type="github">kaivehmanen/ecasound</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index c6fab29e95db..114f2570bb23 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,2 +1,2 @@
-DIST elisa-20.08.3.tar.xz 1635656 BLAKE2B 74b28f7acb8561918aa57f2aaa3a0fde9c041c5dded88fa4d134391288c7b545e058e347d42d3247586ee3a3451e3c072adc3b4367d3bf7fced37d2e33a17f66 SHA512 0ac2c8bb5e4a1df4259b10361acd4094ff32e00f340e4c2418483d8c8538fb439d8205f52af1ca3f31fbc7c129ac1f8e1e3edcbcb96e85f9c8cf270ec8ce081a
-DIST elisa-20.12.1.tar.xz 1660660 BLAKE2B 2c4b71d820c302899ff4ad4071e8c2a4025fab0f9383a7ec60c6297e407c452cadc5682a040d013ceaf6f5e3606e76ca760f609ef41f15dbc6d24d0870cf6ea7 SHA512 8e565956dd896fcac8d55696c12f7646a935c38f498ce8a78adddb36a8fd2bae4823d558835a70256ea1cbc04d2af920db3ff5209abcac65ada593e45cda85da
+DIST elisa-23.08.5.tar.xz 1814776 BLAKE2B b3c59fbb84d6f4bdf6a45d41f6c8d97e8ed898fd3be5b7c6274218baeaf4e3cf63ede6077515ecff14c83cc8599e1fb8013ab7d5d3ffcb7da7eebf43d627fc62 SHA512 f0ab10b9e4d57b3331220a9ae2f8a240d7259ce7e381957cc12fc73b3bf23cdf32affde2e8dc09c8e5fbd05da74401f274c522bb44cd652feb7c1fb75e64cba8
+DIST elisa-24.04.90.tar.xz 2079960 BLAKE2B 1d589bb631bf29652a5b84b6a9286bad17b4aea1f3740835abe4ffad2ffb91f777c9080873e0565464351fcad7ac1c11e14d7fa7e9c9c5ca199d4ff3a4990d83 SHA512 c138ac462d94079dedbdf9aea6d3c62461df0d844201bd7e13a2f7b8eec00bd57c656b5c78d7eecde85b8290b9228c371ae38f61461c04fda4d057d03ea4bbbc
diff --git a/media-sound/elisa/elisa-20.12.1.ebuild b/media-sound/elisa/elisa-20.12.1.ebuild
deleted file mode 100644
index bd521419ba33..000000000000
--- a/media-sound/elisa/elisa-20.12.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KDE_RELEASE_SERVICE="true"
-KFMIN=5.75.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/en/elisa"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="mpris semantic-desktop +vlc"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	mpris? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	vlc? ( media-video/vlc:= )
-	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package mpris KF5DBusAddons)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-sound/elisa/elisa-20.08.3.ebuild b/media-sound/elisa/elisa-23.08.5.ebuild
index 9d44e8467a23..22dc1d81ca4c 100644
--- a/media-sound/elisa/elisa-20.08.3.ebuild
+++ b/media-sound/elisa/elisa-23.08.5.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KDE_RELEASE_SERVICE="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
 
 DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/en/elisa"
+HOMEPAGE="https://apps.kde.org/elisa/"
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="mpris semantic-desktop +vlc"
 
+RESTRICT="test"
+
 BDEPEND="sys-devel/gettext"
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
@@ -29,7 +30,6 @@ DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -50,8 +50,6 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
-RESTRICT+=" test"
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package mpris KF5DBusAddons)
diff --git a/media-sound/elisa/elisa-24.04.90.ebuild b/media-sound/elisa/elisa-24.04.90.ebuild
new file mode 100644
index 000000000000..799a8d08a37f
--- /dev/null
+++ b/media-sound/elisa/elisa-24.04.90.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.0.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Simple music player by KDE"
+HOMEPAGE="https://apps.kde.org/elisa/"
+
+LICENSE="LGPL-3+"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="mpris vlc"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-libs/kirigami-addons-0.11.76:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,sql,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6[taglib]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	mpris? (
+		>=dev-qt/qtbase-${QTMIN}:6[dbus]
+		>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	)
+	vlc? ( media-video/vlc:= )
+	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package mpris KF6DBusAddons)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-sound/elisa/metadata.xml b/media-sound/elisa/metadata.xml
index 2f9a4280caf9..a4dc8ce0b991 100644
--- a/media-sound/elisa/metadata.xml
+++ b/media-sound/elisa/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+	</upstream>
 	<use>
 		<flag name="mpris">Enable MPRIS support</flag>
 		<flag name="vlc">Use <pkg>media-video/vlc</pkg> for output rather than <pkg>dev-qt/qtmultimedia</pkg></flag>
diff --git a/media-sound/entagged-tageditor/Manifest b/media-sound/entagged-tageditor/Manifest
deleted file mode 100644
index 3555bdfbeae5..000000000000
--- a/media-sound/entagged-tageditor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entagged-tageditor-0.35.tar.gz 4606721 BLAKE2B c7013ed9bbef046bc46897f59e6bf668f835dd80ece83d19ef9ea83f089461cb677cd55a98554310734c36bb97945db7db13eb00cd7ae06e82c0f3ea00e928ae SHA512 cefebce7381d489ccd821933c3a1d330713d4de6cf9366aa699f5017939620589c95a2ee162aabc7bfa6d42d56b5986f4ecaa2f1f77ec586cda5f6780f0a06f3
diff --git a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
deleted file mode 100644
index 1113fa708d1e..000000000000
--- a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2 java-ant-2
-
-DESCRIPTION="Open-source audiofile tagger"
-HOMEPAGE="http://entagged.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/squareness-jlf:0
-	dev-db/hsqldb:0"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-db/hsqldb:0"
-
-EANT_BUILD_XML="entagged/build.xml"
-EANT_BUILD_TARGET="build"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p test/entagged/junit || die
-	mv entagged/entagged/junit test/entagged || die
-	rm entagged/*.jar || die
-	java-pkg_jarfrom hsqldb hsqldb.jar entagged/hsqldb.jar
-	cd entagged || die
-	eapply "${FILESDIR}"/${P}-buildfixes.patch
-}
-
-src_install() {
-	cd entagged || die
-	java-pkg_newjar ${P}.jar ${PN}.jar
-	java-pkg_register-dependency squareness-jlf
-	java-pkg_dolauncher ${PN} --main entagged.tageditor.TagEditorFrameSplash
-	newicon entagged/tageditor/resources/icons/entagged-icon.png ${PN}.png
-	make_desktop_entry ${PN} "Entagged Tag Editor" ${PN}
-}
diff --git a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
deleted file mode 100644
index 709b16b32a58..000000000000
--- a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/build.xml	2007-03-23 16:25:25.000000000 +0200
-+++ b/build.xml	2007-09-01 09:20:44.000000000 +0300
-@@ -30,7 +30,7 @@
- 	<property name="entagged_dir" location="."/>

- 	<property name="entagged_base_dir" location=".."/>

- 	<property name="tageditor_dir" location="tageditor"/>

--	<property name="tageditor_version" value="0.21"/>

-+	<property name="tageditor_version" value="0.35"/>

- 	<property name="tageditor_jar" value="entagged-tageditor-${tageditor_version}.jar"/>

- 	<property name="tageditor_zip" value="entagged-tageditor-${tageditor_version}.zip"/>

- 	<property name="tageditor_tar" value="entagged-tageditor-${tageditor_version}.tar"/>

-@@ -52,7 +52,7 @@
- 	

- 	<!-- Compile the sources -->

-     <target name="compile" depends="clean">

--		<javac srcdir="${entagged_dir}" classpath="${entagged_base_dir}" excludes="entagged/junit/*" source="1.4"/>

-+		<javac srcdir="${entagged_dir}" classpath="hsqldb.jar" excludes="entagged/junit/*"/>

- <echo>

- Entagged Tag editor is now fully compiled.

- You can use either:

-@@ -71,9 +71,8 @@
- 	<!-- Prepares the classes to be packaged -->

- 	<target name="build" depends="compile">

- 		<!-- Jar the classes files  -->

--		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/*" excludes="**/*.java" >

-+		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}/entagged" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/* miage/**/*.class" excludes="**/*.java" >

- 			<manifest>

--				<attribute name="Class-Path" value="${tageditor_jar_classpath}"/>

- 				<attribute name="Main-Class" value="${tageditor_jar_mainclass}"/>

- 			</manifest>

- 		</jar>

diff --git a/media-sound/entagged-tageditor/metadata.xml b/media-sound/entagged-tageditor/metadata.xml
deleted file mode 100644
index 4d2b70e37efa..000000000000
--- a/media-sound/entagged-tageditor/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">entagged</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/erec/metadata.xml b/media-sound/erec/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/erec/metadata.xml
+++ b/media-sound/erec/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
deleted file mode 100644
index b91cb78d9a0d..000000000000
--- a/media-sound/exaile/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST exaile-4.1.0alpha1.tar.gz 3605803 BLAKE2B ea4862581aa4d95c1944967e1d30979284538353e7d95ef345e6dddf1702be98e4c7c21918bf9a8cb277f339c812fd6671d84e695d6e5b179a2f65358e0e75f0 SHA512 56e73f7cc4d250fbc30870170b50f65f0f99d27e97a8f28dd043af9eb93c919a8de3ed790cbd6c441133232afb3c405fa830cb62c8c33bb0a6e4d97b79d5b54d
diff --git a/media-sound/exaile/exaile-4.1.0_alpha1.ebuild b/media-sound/exaile/exaile-4.1.0_alpha1.ebuild
deleted file mode 100644
index ea8a80d4a9e1..000000000000
--- a/media-sound/exaile/exaile-4.1.0_alpha1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 xdg
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
-HOMEPAGE="https://www.exaile.org/"
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-# IUSE+=cddb if have dev-python/cddb-py
-IUSE="libnotify nls scrobbler"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	>=media-libs/gst-plugins-base-1.6:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-	media-plugins/gst-plugins-meta:1.0
-	>=x11-libs/gtk+-3.10:3[introspection]
-	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-
-RESTRICT="test" #315589
-
-PATCHES=(
-	"${FILESDIR}/${P}-metainfo.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	use nls && emake locale
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/usr/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	python_optimize "${D}/usr/$(get_libdir)/${PN}"
-	python_optimize "${D}/usr/share/${PN}"
-}
diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild
deleted file mode 100644
index 48f583a4ba0a..000000000000
--- a/media-sound/exaile/exaile-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 xdg
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
-HOMEPAGE="https://www.exaile.org/"
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-# IUSE+=cddb if have dev-python/cddb-py
-IUSE="libnotify nls scrobbler"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	>=media-libs/gst-plugins-base-1.6:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-	media-plugins/gst-plugins-meta:1.0
-	>=x11-libs/gtk+-3.10:3[introspection]
-	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-
-RESTRICT="test" #315589
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0_alpha1-metainfo.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	use nls && emake locale
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/usr/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	python_optimize "${D}/usr/$(get_libdir)/${PN}"
-	python_optimize "${D}/usr/share/${PN}"
-}
diff --git a/media-sound/exaile/files/exaile-4.1.0_alpha1-metainfo.patch b/media-sound/exaile/files/exaile-4.1.0_alpha1-metainfo.patch
deleted file mode 100644
index 11e80706bd8e..000000000000
--- a/media-sound/exaile/files/exaile-4.1.0_alpha1-metainfo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- exaile-4.1.0-alpha1_orig/Makefile	2020-03-09 01:54:13.000000000 +0100

-+++ exaile-4.1.0-alpha1/Makefile	2020-08-03 10:14:23.498153577 +0200

-@@ -81,7 +81,7 @@

- 	install -d -m 755 $(EXAILESHAREDIR)/data/ui/preferences/widgets

- 	install -d -m 755 $(EXAILESHAREDIR)/data/ui/widgets

- 	install -d -m 755 $(DESTDIR)$(DATADIR)/pixmaps

--	install -d -m 755 $(DESTDIR)$(DATADIR)/appdata

-+	install -d -m 755 $(DESTDIR)$(DATADIR)/metainfo

- 	install -d -m 755 $(DESTDIR)$(DATADIR)/applications

- 	install -d -m 755 $(DESTDIR)$(DATADIR)/dbus-1/services

- 	install -d -m 755 $(EXAILEMANDIR)/man1

-@@ -96,7 +96,7 @@

- 	rm -rf $(EXAILECONFDIR)

- 	rm -f $(DESTDIR)$(DATADIR)/applications/exaile.desktop

- 	rm -f $(DESTDIR)$(DATADIR)/pixmaps/exaile.png

--	rm -f $(DESTDIR)$(DATADIR)/appdata/exaile.appdata.xml

-+	rm -f $(DESTDIR)$(DATADIR)/metainfo/exaile.metainfo.xml

- 	rm -f $(DESTDIR)$(DATADIR)/dbus-1/services/org.exaile.Exaile.service

- 	rm -f $(EXAILEMANDIR)/man1/exaile.1.gz

- 	rm -f $(DESTDIR)$(BASHCOMPDIR)/exaile

-@@ -154,7 +154,7 @@

- 	install -m 644 data/exaile.desktop \

- 		$(DESTDIR)$(DATADIR)/applications/

- 	install -m 644 data/exaile.appdata.xml \

--		$(DESTDIR)$(DATADIR)/appdata/

-+		$(DESTDIR)$(DATADIR)/metainfo/exaile.metainfo.xml

- 	-install -m 644 build/exaile.1.gz $(EXAILEMANDIR)/man1/

- 	-install -m 644 build/exaile.bash-completion $(DESTDIR)$(BASHCOMPDIR)/exaile

- 	-install -m 644 build/exaile.fish-completion $(DESTDIR)$(FISHCOMPDIR)/exaile.fish

diff --git a/media-sound/exaile/metadata.xml b/media-sound/exaile/metadata.xml
deleted file mode 100644
index 56d330882f09..000000000000
--- a/media-sound/exaile/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">exaile</remote-id>
-		<remote-id type="github">exaile/exaile</remote-id>
-	</upstream>
-	<use>
-		<flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild b/media-sound/ezstream/ezstream-0.6.0-r2.ebuild
index 665c2a35883f..d9cb6fb09888 100644
--- a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
+++ b/media-sound/ezstream/ezstream-0.6.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A command line source client for Icecast media streaming servers"
 HOMEPAGE="https://www.icecast.org/ezstream/"
@@ -12,19 +12,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="taglib"
 
-COMMON_DEPEND="dev-libs/libxml2
+DEPEND="
+	dev-libs/libxml2
 	>=media-libs/libshout-2.2
 	!taglib? ( media-libs/libvorbis )
 	taglib? ( media-libs/taglib )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	net-misc/icecast"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
 		--enable-examplesdir='$(docdir)/examples' \
-		$(use_with taglib taglib "/usr")
+		$(use_with taglib taglib "${ESYSROOT}"/usr)
 }
 
 src_install() {
@@ -33,5 +34,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
-	rm -f "${D%/}"/usr/share/doc/${PF}/COPYING
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
diff --git a/media-sound/ezstream/metadata.xml b/media-sound/ezstream/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/ezstream/metadata.xml
+++ b/media-sound/ezstream/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
index 58335aca73cc..40e9945e6785 100644
--- a/media-sound/fapg/Manifest
+++ b/media-sound/fapg/Manifest
@@ -1,2 +1 @@
-DIST fapg-0.42.tar.gz 94920 BLAKE2B b7da3a9df4b3f61022d237fe2b94238d56ceee456de54843062a887710f8faea17cfc6198487317797d9b16b006ccf311eb8e0f9e9e55a2e5d0aed173758457f SHA512 e3bbef35b9c845d80bcd1ee1116e4eb99b98e9d84cff034f2a49bbfcaa7664ab48b9453fb680fe7274fa74e9e0126950fbb15deb793eb95362f74c11151f8731
-DIST fapg-0.43.tar.gz 95025 BLAKE2B 33ef8e895ad998fc2d6a1f13c377805d0fdaf55b74adb78e4396f6084be531dc228da59f1a97329cb27cd5eafaad91822b27ad97f72f2f9c75deee7454bd22a8 SHA512 e290db42437a6345b6b1ee5348e95fc611c29ceffdc32baafb2e7aecde87b41e4584e9a06c1cf4c2ca938b3fe2359ba2f8bc4ad7c42923cfb3eef8e9737da64a
+DIST fapg-0.44.tar.gz 95423 BLAKE2B 7ceb0bada49092b491daa553786a88c193489b702b898638d118f0616738a746973a2d7982ec6a95376bd27a7c8c6ac531a546688c2d1f1079a2e7255f5a64d5 SHA512 ffb7e95c6060b0afeffc820c74f8cf619aff3b8876212a94106184d1b61201896626806a9334722fe856203cc09b01c0a1cd10a40cba62ad6f6709f3663fd933
diff --git a/media-sound/fapg/fapg-0.43.ebuild b/media-sound/fapg/fapg-0.43.ebuild
deleted file mode 100644
index e50690223847..000000000000
--- a/media-sound/fapg/fapg-0.43.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast Audio Playlist Generator"
-HOMEPAGE="http://royale.zerezo.com/fapg/"
-SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="xspf"
-
-DEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf=""
-	use xspf || myconf="${myconf} --disable-xspf"
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/media-sound/fapg/fapg-0.42.ebuild b/media-sound/fapg/fapg-0.44.ebuild
index b6e485692da9..78949f7b5ed8 100644
--- a/media-sound/fapg/fapg-0.42.ebuild
+++ b/media-sound/fapg/fapg-0.44.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Fast Audio Playlist Generator"
 HOMEPAGE="http://royale.zerezo.com/fapg/"
diff --git a/media-sound/fapg/metadata.xml b/media-sound/fapg/metadata.xml
index 1de4614839c0..d2d19bf4ff88 100644
--- a/media-sound/fapg/metadata.xml
+++ b/media-sound/fapg/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/flac-image/flac-image-1.00.ebuild b/media-sound/flac-image/flac-image-1.00-r2.ebuild
index 78ea6acddc74..210ef0e32715 100644
--- a/media-sound/flac-image/flac-image-1.00.ebuild
+++ b/media-sound/flac-image/flac-image-1.00-r2.ebuild
@@ -1,35 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Utility for adding image files (e.g. album cover art) to metadata of FLAC files"
 HOMEPAGE="http://www.singingtree.com/software/"
-SRC_URI="http://www.singingtree.com/software/${PN}.tar.gz -> ${P}.tar.gz"
 # FIXME: no version in tarball, but also no updates for a long time. So it's ok.
+SRC_URI="http://www.singingtree.com/software/${PN}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/flac"
+DEPEND="media-libs/flac:="
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.00-add-missing-string-include.patch
 	"${FILESDIR}"/${PN}-1.00-fix-build-system.patch
 )
 
 src_configure() {
+	tc-export CC
+
 	# remove pre-compiled binary
 	rm -f "${PN}" || die
-
-	tc-export CC
 }
 
 src_install() {
diff --git a/media-sound/flac-image/metadata.xml b/media-sound/flac-image/metadata.xml
index fedce680ca10..c0272514c086 100644
--- a/media-sound/flac-image/metadata.xml
+++ b/media-sound/flac-image/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/flac123/Manifest b/media-sound/flac123/Manifest
index cbfd9991cc3a..3290b5ce6c14 100644
--- a/media-sound/flac123/Manifest
+++ b/media-sound/flac123/Manifest
@@ -1 +1 @@
-DIST flac123-0.0.12-release.tar.gz 129795 BLAKE2B 6c73cdcb350de6431d15af846af4aefc8beafdf9137a31144a7869acca0f5383aeae110ef81165c98a188af7580fff5ad27836955cd9729deca14a4465aa8b0e SHA512 4bfabecae86cf11a13bd45025d7fbdee189918e0cd4eee0128856897710b44afd19df5675cae9426d30e9d8cd09b358333438cd05701fa0a7a00a8493a77e1f7
+DIST flac123-2.1.1.tar.gz 132039 BLAKE2B 7e95538a560aea2c09741713d7554659d536862e7800b56c8cc81234199feab76221af99baee270e46ea5abeb725065e1477e8304e3bef920c44c1466ad5b09d SHA512 bdcf6ce573535b9282a87f17b9f0e8221303800444dbf430d980232fd0419680d83c74c7c3d8a4c1ce764f5a4752dca7483802d48a38bdb3ef50520e901cc2e5
diff --git a/media-sound/flac123/flac123-0.0.12.ebuild b/media-sound/flac123/flac123-0.0.12.ebuild
deleted file mode 100644
index 93b3c7f825e8..000000000000
--- a/media-sound/flac123/flac123-0.0.12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="console app for playing FLAC audio files"
-HOMEPAGE="http://flac-tools.sourceforge.net"
-SRC_URI="mirror://sourceforge/flac-tools/${P}-release.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/popt:=
-	media-libs/flac:=
-	media-libs/libao:=
-	media-libs/libogg"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-sound/flac123/flac123-2.1.1.ebuild b/media-sound/flac123/flac123-2.1.1.ebuild
new file mode 100644
index 000000000000..36fb9a8c7096
--- /dev/null
+++ b/media-sound/flac123/flac123-2.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Console app for playing FLAC audio files"
+HOMEPAGE="https://github.com/flac123/flac123"
+SRC_URI="https://github.com/flac123/flac123/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
+
+RDEPEND="
+	dev-libs/popt
+	media-libs/flac:=[ogg]
+	media-libs/libao"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/media-sound/flac123/metadata.xml b/media-sound/flac123/metadata.xml
index c45796b63777..e5c97246dc0a 100644
--- a/media-sound/flac123/metadata.xml
+++ b/media-sound/flac123/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">flac-tools</remote-id>
+		<remote-id type="github">flac123/flac123</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/flack/flack-2.0.6.ebuild b/media-sound/flack/flack-2.0.6.ebuild
index 41d8ac316e8d..75276ea09c4d 100644
--- a/media-sound/flack/flack-2.0.6.ebuild
+++ b/media-sound/flack/flack-2.0.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="edit FLAC tags from command line"
 HOMEPAGE="https://sourceforge.net/projects/flack/"
@@ -10,9 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND=">=app-shells/bash-3.2
 	>=media-libs/flac-1.2.1"
 
diff --git a/media-sound/flack/metadata.xml b/media-sound/flack/metadata.xml
index 4584a72f1a0a..4e68d9569915 100644
--- a/media-sound/flack/metadata.xml
+++ b/media-sound/flack/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 481e306c2b87..4639c85ac650 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1 +1,2 @@
-DIST flacon-5.5.1.tar.gz 2336502 BLAKE2B 524fe5fa28126f56452515ca1ce1572343dad8b06c28fc8e3a22a11e9ad8f3a51a25b3c19ddd29a7e3c658f1d7fb3316a2554a12a4ba3dd22370fc1394d38022 SHA512 36900b011135b61cf3cc1f05d94f852fc7e127972f3fed09e0fb7e66fec944ed1c3bfc61307494aff87c2fe24e16479605043a79e0634bc23940d01fc337c6c1
+DIST flacon-10.0.0.tar.gz 3802889 BLAKE2B e99be9ad2da98e84455426df853bb38cecb91a6c66cb3f532459637adee97078fb034d3c5b5cc905b74756adbf6c11276f589d450c1506fba2dace264efe8b9c SHA512 55744b3ef46f298e8082ab172b8e0b5ad428ec3c965ae69befe7f9abb4e87417cf2373385240000471c92391d243ef3b33f25ae565c8e9497021d3b619a5ac1a
+DIST flacon-11.3.0.tar.gz 4081613 BLAKE2B 791628fe40f49548d65b2a49f259d4ffaf42ba97f9674649669ceded7073fb805f277fefca1d3fffaae86438f9d7cff443dccbb6c8bef5e40f0eb60554c11db9 SHA512 e4b4f3876f4f647dafa21118c13482678c2766dce94b650142d7b2b21897d6e8f1f85601877b388c7f8554d5e57778de9a6db82ae38c1f089e7c2f88b1c497b8
diff --git a/media-sound/flacon/files/flacon-11.3.0-no-man-compress.patch b/media-sound/flacon/files/flacon-11.3.0-no-man-compress.patch
new file mode 100644
index 000000000000..9c06e2d8c4b7
--- /dev/null
+++ b/media-sound/flacon/files/flacon-11.3.0-no-man-compress.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -308,7 +308,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+     set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon")
+     install(TARGETS ${PROJECT_NAME} RUNTIME                 DESTINATION Flacon.app/Contents/MacOS)
+     install(FILES   ${QM_FILES}                             DESTINATION Flacon.app/Contents/translations)
+-    install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION Flacon.app/Contents/Resources)
++    install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION Flacon.app/Contents/Resources)
+     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/Info.plist  DESTINATION Flacon.app/Contents)
+     install(FILES   images/mainicon/Flacon.icns             DESTINATION Flacon.app/Contents/Resources)
+ 
+@@ -337,7 +337,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ else()
+     install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+     install(FILES   ${QM_FILES}             DESTINATION ${TRANSLATIONS_DIR})
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION share/man/man1)
+ 
+     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop        DESTINATION "share/applications")
+     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metainfo.xml DESTINATION "share/metainfo")
diff --git a/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch b/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch
deleted file mode 100644
index 358e0464c80c..000000000000
--- a/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bc6346175db9f89777141b6d17b52143b3caafeb Mon Sep 17 00:00:00 2001
-From: Alexander Sokolov <sokoloff.a@gmail.com>
-Date: Mon, 21 Oct 2019 22:08:18 +0300
-Subject: [PATCH] Fixed issue #104. Correct CMake policy CMP0058 warnings.
-
----
- CMakeLists.txt                     | 10 +++++++++-
- translations/translatorsinfo.cmake | 10 ++--------
- 2 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fbbca2..95f25cd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,7 +244,15 @@ include(FindPkgConfig)
- pkg_search_module(UCHARDET REQUIRED uchardet)
- 
- include(translations/translatorsinfo.cmake)
--create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations)
-+add_custom_target("translators")
-+add_custom_command(
-+    TARGET "translators"
-+    PRE_BUILD
-+    BYPRODUCTS ${TRANSLATORS_INFO_FILE}
-+    COMMAND create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations)
-+)
-+
-+
- set(LIBRARIES ${LIBRARIES} ${UCHARDET_LIBRARIES})
- include_directories(${UCHARDET_INCLUDE_DIRS})
- link_directories(${UCHARDET_LIBRARY_DIRS})
-diff --git a/translations/translatorsinfo.cmake b/translations/translatorsinfo.cmake
-index b439a05..650174b 100644
---- a/translations/translatorsinfo.cmake
-+++ b/translations/translatorsinfo.cmake
-@@ -23,13 +23,11 @@
-  #
-  # END_COMMON_COPYRIGHT_HEADER
- 
-+set(TRANSLATORS_INFO_FILE ${CMAKE_CURRENT_BINARY_DIR}/translators.info)
- 
- FUNCTION(create_translatorsinfo_qrc _qrcFile _DIR)
-     get_filename_component(srcDir ${_DIR}/ ABSOLUTE)
- 
--
--    set(TRANSLATORS_INFO_FILE ${CMAKE_CURRENT_BINARY_DIR}/translators.info)
--
-     file(GLOB IN_FILES ${srcDir}/translators_*.info)
-     file(WRITE ${TRANSLATORS_INFO_FILE} "")
- 
-@@ -42,11 +40,7 @@ FUNCTION(create_translatorsinfo_qrc _qrcFile _DIR)
- 
-     configure_file(${srcDir}/translatorsinfo.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc)
- 
--    if(USE_QT4)
--        qt4_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc)
--    else()
--        qt5_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc)
--    endif()
-+    qt5_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc)
- 
-     set(${_qrcFile} ${__qrcFile} PARENT_SCOPE)
- ENDFUNCTION()
diff --git a/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch b/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch
deleted file mode 100644
index 191d863fb310..000000000000
--- a/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt	2019-12-07 15:55:24.155414989 +0100
-+++ b/CMakeLists.txt	2019-12-07 15:56:38.266998439 +0100
-@@ -341,11 +341,6 @@
-     @ONLY
- )
- 
--add_custom_command(TARGET ${PROJECT_NAME}
--    COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz
--)
--
--
- if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-     set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon")
-     install(TARGETS ${PROJECT_NAME} RUNTIME                 DESTINATION Flacon.app/Contents/MacOS)
-@@ -357,7 +352,7 @@
- else()
-     install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-     install(FILES   ${QM_FILES}             DESTINATION ${TRANSLATIONS_DIR})
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION share/man/man1)
- 
-     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop        DESTINATION "share/applications")
-     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metadata.xml DESTINATION "share/metainfo")
diff --git a/media-sound/flacon/files/flacon-9.0.0-no-man-compress.patch b/media-sound/flacon/files/flacon-9.0.0-no-man-compress.patch
new file mode 100644
index 000000000000..6ceff9bda276
--- /dev/null
+++ b/media-sound/flacon/files/flacon-9.0.0-no-man-compress.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt.oirg b/CMakeLists.txt
+index f143d91..fd16a9b 100644
+--- a/CMakeLists.txt.oirg
++++ b/CMakeLists.txt
+@@ -302,14 +302,14 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+     set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon")
+     install(TARGETS ${PROJECT_NAME} RUNTIME                 DESTINATION Flacon.app/Contents/MacOS)
+     install(FILES   ${QM_FILES}                             DESTINATION Flacon.app/Contents/translations)
+-    install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION Flacon.app/Contents/Resources)
++    install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION Flacon.app/Contents/Resources)
+     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/Info.plist  DESTINATION Flacon.app/Contents)
+     install(FILES   images/mainicon/Flacon.icns             DESTINATION Flacon.app/Contents/Resources)
+ 
+ else()
+     install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+     install(FILES   ${QM_FILES}             DESTINATION ${TRANSLATIONS_DIR})
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION share/man/man1)
+ 
+     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop        DESTINATION "share/applications")
+     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metainfo.xml DESTINATION "share/metainfo")
diff --git a/media-sound/flacon/flacon-5.5.1.ebuild b/media-sound/flacon/flacon-10.0.0-r1.ebuild
index 30810280078e..654d494065c9 100644
--- a/media-sound/flacon/flacon-5.5.1.ebuild
+++ b/media-sound/flacon/flacon-10.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Tests require lots of disk space
 CHECKREQS_DISK_BUILD=10G
@@ -17,8 +17,8 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 
 BDEPEND="
-	virtual/pkgconfig
 	dev-qt/linguist-tools:5
+	virtual/pkgconfig
 "
 RDEPEND="
 	app-i18n/uchardet
@@ -26,26 +26,26 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
+	media-libs/taglib
 "
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 	test? (
 		dev-qt/qttest:5
 		media-libs/flac
-		media-sound/mac
+		<=media-sound/mac-4.12
 		media-sound/shntool
 		media-sound/ttaenc
 		media-sound/wavpack
 	)
 "
 
-RESTRICT="!test? ( test )"
-
 PATCHES=(
-	"${FILESDIR}/${P}-no-man-compress.patch"
-	"${FILESDIR}/${P}-ninja-warning.patch" # git master
+	"${FILESDIR}"/${PN}-9.0.0-no-man-compress.patch
 )
 
+RESTRICT="!test? ( test )"
+
 pkg_pretend() {
 	use test && check-reqs_pkg_pretend
 }
@@ -62,22 +62,24 @@ src_configure() {
 }
 
 src_test() {
-	virtx "${BUILD_DIR}/tests/${PN}_test"
+	# All tests fail with enabled sandbox
+	# TODO: Get all tests to pass
+	# See bug: #831592
+	local -x SANDBOX_ON=0
+
+	virtx "${BUILD_DIR}/tests/${PN}_test" || die
 }
 
 pkg_postinst() {
-	elog "${PN} optionally supports formats listed below."
-	elog "(List will be empty if all extra packages are installed.)"
-	elog "Please install the required packages and restart ${PN}."
+	optfeature_header "${PN} optionally supports formats listed below."
 	optfeature 'FLAC input and output support' media-libs/flac
 	optfeature 'WavPack input and output support' media-sound/wavpack
 	optfeature 'APE input support' media-sound/mac
+	optfeature 'ALAC output support' media-sound/alac_decoder
 	optfeature 'TTA input support' media-sound/ttaenc
 	optfeature 'AAC output support' media-libs/faac
 	optfeature 'MP3 output support' media-sound/lame
 	optfeature 'Vorbis output support' media-sound/vorbis-tools
-	optfeature 'MP3 Replay Gain support' media-sound/mp3gain
-	optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain
 
 	xdg_icon_cache_update
 	xdg_desktop_database_update
diff --git a/media-sound/flacon/flacon-11.3.0.ebuild b/media-sound/flacon/flacon-11.3.0.ebuild
new file mode 100644
index 000000000000..5ac03f87c718
--- /dev/null
+++ b/media-sound/flacon/flacon-11.3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests require lots of disk space
+CHECKREQS_DISK_BUILD=10G
+inherit check-reqs cmake optfeature virtualx xdg-utils
+
+DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-i18n/uchardet
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg]
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/taglib
+	media-sound/sox[flac,wavpack]
+	media-video/mediainfo
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? (
+		dev-cpp/yaml-cpp
+		dev-qt/qttest:5
+		media-libs/faac
+		media-libs/flac
+		media-sound/alacenc
+		media-sound/alac_decoder
+		media-sound/lame
+		<=media-sound/mac-4.12
+		media-sound/opus-tools
+		media-sound/shntool
+		media-sound/ttaenc
+		media-sound/vorbis-tools
+		media-sound/wavpack
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-man-compress.patch
+)
+
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# All tests fail with enabled sandbox
+	# TODO: Get all tests to pass
+	# See bug: #831592
+	local -x SANDBOX_ON=0
+
+	virtx "${BUILD_DIR}/tests/${PN}_test" || die
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} optionally supports formats listed below."
+	optfeature 'FLAC input and output support' media-libs/flac
+	optfeature 'WavPack input and output support' media-sound/wavpack
+	optfeature 'APE input support' media-sound/mac
+	optfeature 'ALAC input support' media-sound/alacenc
+	optfeature 'ALAC output support' media-sound/alac_decoder
+	optfeature 'TTA input support' media-sound/ttaenc
+	optfeature 'AAC output support' media-libs/faac
+	optfeature 'MP3 output support' media-sound/lame
+	optfeature 'Vorbis output support' media-sound/vorbis-tools
+	optfeature 'Opus input/output support' media-sound/opus-tools
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index ef795ca97504..0c5a1c0fb135 100644
--- a/media-sound/flacon/metadata.xml
+++ b/media-sound/flacon/metadata.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">flacon/flacon</remote-id>
 	</upstream>
diff --git a/media-sound/flake/flake-0.11.ebuild b/media-sound/flake/flake-0.11.ebuild
index caa19b932b0e..177b54723d9a 100644
--- a/media-sound/flake/flake-0.11.ebuild
+++ b/media-sound/flake/flake-0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="An alternative to the FLAC reference encoder"
 HOMEPAGE="http://flake-enc.sourceforge.net"
-SRC_URI="mirror://sourceforge/flake-enc/${P}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/flake-enc/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/media-sound/flake/metadata.xml b/media-sound/flake/metadata.xml
index 25b01102769c..9ecdf65cc8a0 100644
--- a/media-sound/flake/metadata.xml
+++ b/media-sound/flake/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
index a26b6e9316c2..0efa6093f371 100644
--- a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
+++ b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="timidity"
 
 RDEPEND="timidity? ( app-eselect/eselect-timidity )"
diff --git a/media-sound/fluid-soundfont/metadata.xml b/media-sound/fluid-soundfont/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/media-sound/fluid-soundfont/metadata.xml
+++ b/media-sound/fluid-soundfont/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 3c85efd51332..7436af626a1a 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,3 +1 @@
-DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
-DIST fluidsynth-2.1.4.tar.gz 1363975 BLAKE2B 068a8a1722036a5a409331b1bdcf566cb9a1e7b4a27c78adec51c6d82f7c53cba9178c87013f1a9c0ef62d26b1ba876fad567e4c8bb41b8d478632699876e41d SHA512 22e8d2f8b144f96a334aff1f7d183b91e6c5418482bd61553028ff571836b0ca13fff89e7e3cc1c2d08e106a430331d179e607d78b00e218baec433b6d140190
-DIST fluidsynth-2.1.5.tar.gz 1364924 BLAKE2B f5669f49db481ded6d953ee2cdaa8c59bb751f79210d993b69967cca1b71dce12b50fbf258512c144b1578441e78cc5299d96004da5fed44a40fc33858254bc0 SHA512 171ee6b1983ab9636086fb414ae464508f7a9a412cd2c1e7800a19a84d3dff21bbd86d1971f9bb5985e977f808b60e0d0cfbde4551b85fcc4aae4928a1abadbc
+DIST fluidsynth-2.3.5.tar.gz 1775448 BLAKE2B 11f04d2a508f54c4bd03c867e81528f36eeb5698ad017d7fe778349b5ab91dc9e518d426d2394e748344795b8c1bf86eeaee97294ad66974db07587d0a80797a SHA512 35eaea8c1709ebbd5dee8f3946ab59c39afe31d92b972a44013fa23987aa48936f7d1326d5bda81c6e66f02bf988e48601367d49276a4dd78dbca7a2571f5e57
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
deleted file mode 100644
index ad79a07d4339..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild
deleted file mode 100644
index d5fdde4142d4..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.5.ebuild
index d5fdde4142d4..936c864a0e52 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.3.5.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
+inherit cmake-multilib multibuild systemd toolchain-funcs
 
 DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
+HOMEPAGE="https://www.fluidsynth.org"
 SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
+IUSE="alsa dbus debug doc ipv6 jack ladspa lash network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
 	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		dev-libs/libxslt
+	)
 "
 DEPEND="
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -30,8 +33,11 @@ DEPEND="
 		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
 		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
 	)
+	pipewire? (
+		media-video/pipewire:0=[${MULTILIB_USEDEP}]
+	)
 	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
@@ -40,29 +46,35 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
 
+src_prepare() {
+	# https://bugs.gentoo.org/833979#c17
+	sed -i "/CONFIGURE_COMMAND/{n;s/$/ -DCMAKE_C_COMPILER=$(tc-getBUILD_CC)/}" \
+		src/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-Denable-alsa=$(usex alsa)
 		-Denable-aufile=ON
 		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
 		-Denable-dsound=OFF # Windows
 		-Denable-floats=OFF # loat instead of double for DSP samples
 		-Denable-fpe-check=$(usex debug)
 		-Denable-ipv6=$(usex ipv6)
 		-Denable-jack=$(usex jack)
 		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-libinstpatch=OFF # https://github.com/swami/libinstpatch
 		-Denable-midishare=OFF # http://midishare.sourceforge.net/
 		-Denable-network=$(usex network)
 		-Denable-opensles=OFF
 		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
 		-Denable-oss=$(usex oss)
 		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
 		-Denable-portaudio=$(usex portaudio)
 		-Denable-profiling=$(usex debug)
 		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-pipewire=$(usex pipewire)
 		-Denable-readline=$(usex readline)
 		-Denable-sdl2=$(usex sdl)
 		-Denable-systemd=$(usex systemd)
@@ -71,6 +83,7 @@ src_configure() {
 		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
 		-Denable-waveout=OFF # Windows
 		-Denable-winmidi=OFF # Windows
+		$(cmake_use_find_package doc Doxygen)
 	)
 
 	if use alsa; then
@@ -86,6 +99,22 @@ src_configure() {
 	cmake-multilib_src_configure
 }
 
+compile_doxygen_doc() {
+	multilib_is_native_abi && cmake_build doxygen
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	use doc && multilib_foreach_abi compile_doxygen_doc
+}
+
+install_doxygen_doc() {
+	if multilib_is_native_abi; then
+		docinto .
+		dodoc -r "${BUILD_DIR}/doc/api/html"
+	fi
+}
+
 install_systemd_files() {
 	if multilib_is_native_abi; then
 		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
@@ -94,17 +123,22 @@ install_systemd_files() {
 	fi
 }
 
+multilib_src_test() {
+	eninja check
+}
+
 src_install() {
 	cmake-multilib_src_install
 
 	docinto pdf
 	dodoc doc/*.pdf
 
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
+	docinto examples
+	dodoc doc/examples/*.c
 
+	if use doc; then
+		multilib_foreach_abi install_doxygen_doc
+	fi
 	if use systemd; then
 		multilib_foreach_abi install_systemd_files
 
diff --git a/media-sound/fluidsynth/metadata.xml b/media-sound/fluidsynth/metadata.xml
index d337d3746e33..91cd5f273915 100644
--- a/media-sound/fluidsynth/metadata.xml
+++ b/media-sound/fluidsynth/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -10,5 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="network">enable network support (requires BSD sockets)</flag>
+		<flag name="pipewire">enable <pkg>media-video/pipewire</pkg> support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/fmdrv/metadata.xml b/media-sound/fmdrv/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/fmdrv/metadata.xml
+++ b/media-sound/fmdrv/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/fmit/fmit-1.0.15-r3.ebuild b/media-sound/fmit/fmit-1.0.15-r3.ebuild
index 1d322a86d482..5ca73642751a 100644
--- a/media-sound/fmit/fmit-1.0.15-r3.ebuild
+++ b/media-sound/fmit/fmit-1.0.15-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils
 
@@ -27,21 +27,20 @@ RDEPEND="
 	jack? ( virtual/jack )
 	portaudio? ( media-libs/portaudio )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
 	# Fix the path to readme file to prevent errors on start up
 	sed -i "/QFile readmefile/c\QFile readmefile \
 		(\"/usr/share/doc/${PF}/README.txt\");" \
-		src/main.cpp || die "README sed failed"
+		src/main.cpp || die
 	# Fix the PREFIX location, insert real path.
 	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
-		src/main.cpp || die "PREFIX fix sed failed"
+		src/main.cpp || die
 	# Fix the PREFIX location, insert real path.
 	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
-		src/modules/MicrotonalView.cpp || die "PREFIX fix sed failed"
+		src/modules/MicrotonalView.cpp || die
 	default
 }
 
@@ -51,8 +50,11 @@ src_configure() {
 		use ${flag} && config+=" acs_${flag}"
 	done
 
-	"$(qt5_get_bindir)"/lrelease fmit.pro || die "Running lrelease failed"
+	"$(qt5_get_bindir)"/lrelease fmit.pro || die
+
+	eqmake5 CONFIG+="${config}" PREFIX=/usr fmit.pro
+}
 
-	eqmake5 CONFIG+="${config}" fmit.pro PREFIX="${D}"/usr \
-		PREFIXSHORTCUT="${D}"/usr DISTDIR=/usr
+src_install() {
+	emake install INSTALL_ROOT="${D}"
 }
diff --git a/media-sound/fmit/metadata.xml b/media-sound/fmit/metadata.xml
index e375cff00290..2a752e0cf111 100644
--- a/media-sound/fmit/metadata.xml
+++ b/media-sound/fmit/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/media-sound/fmtools/metadata.xml b/media-sound/fmtools/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/fmtools/metadata.xml
+++ b/media-sound/fmtools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index 6456dba02209..27a4db4dfd7d 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1 +1 @@
-DIST frescobaldi-3.1.1.tar.gz 6244496 BLAKE2B 0687a608c773d3295197ea7ef117fa099acc2dfcd2de0f7e7ed69ff6ab643007d631f9e3abc1509163503473cc2d95f7cfe7ca87a5d636a796490af8479b8db0 SHA512 b4f65bdbcb5ed1c9837b84f9721b166dbac3d5ed12d03521d91d9f4660ff61af951209071ceae07158da3ad9f7c7152924a4f5ce87deedc8d90decf4b4efa86d
+DIST frescobaldi-3.3.0.tar.gz 9196964 BLAKE2B 52e0c39e3a9fd70f5e450dd45cd0c0c0683b8c0af243d568e765f351500da138c0e527a579245c3d72e628d6a940003c62e1d70b6cff8ecb55d7214b7def8093 SHA512 0dc851cb2ab001f366d20d3c27159087a643cbb5661cc7388b9ec5209c03d4d47dc9114f378dab0562a1a4cb84c2a67eddd8b1981ceaa057e5ac79f8c277ad05
diff --git a/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild b/media-sound/frescobaldi/frescobaldi-3.3.0.ebuild
index 5d7706e5c5f6..bda72123c1cb 100644
--- a/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.3.0.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1 xdg-utils
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 xdg
 
 DESCRIPTION="A LilyPond sheet music text editor"
 HOMEPAGE="https://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/frescobaldi/frescobaldi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
 	dev-python/PyQt5[gui,network,printsupport,svg,widgets,${PYTHON_USEDEP}]
 	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
+	dev-python/python-ly[${PYTHON_USEDEP}]
 	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2"
+	dev-python/qpageview[${PYTHON_USEDEP}]
+	media-sound/lilypond"
 RDEPEND="${DEPEND}
 	x11-themes/tango-icon-theme
 "
@@ -28,14 +30,6 @@ RDEPEND="${DEPEND}
 python_prepare_all() {
 	rm -r frescobaldi_app/icons/Tango || die "failed to remove tango icon theme"
 	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
+	emake -C i18n
+	emake -C linux
 }
diff --git a/media-sound/frescobaldi/metadata.xml b/media-sound/frescobaldi/metadata.xml
index 468c931f9c42..e70342c0f856 100644
--- a/media-sound/frescobaldi/metadata.xml
+++ b/media-sound/frescobaldi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/gbsplay/Manifest b/media-sound/gbsplay/Manifest
index f97c835a02fa..cca4a146bc18 100644
--- a/media-sound/gbsplay/Manifest
+++ b/media-sound/gbsplay/Manifest
@@ -1 +1 @@
-DIST gbsplay-0.0.91.tar.gz 61071 BLAKE2B b1c5c0f7f852961a082a686eb992caa835480fc0a6c15f509ec637c016a64b830f7d6aaa337f204c78213ea5c95bac0e12649023780f38a84dddab97f5efe448 SHA512 94a5acd892740f2443fbc5455a190cba2aefddf3608a6f59213175bb8985d21d4f2cb4011e332756ae2bf977432e03be53014f203d7b9edc572048e2a6124f08
+DIST gbsplay-0.0.94.tar.gz 136589 BLAKE2B 688fefc51fe693ab1da41f258bd6d7daccedadac31ecd80ba25488c11c6cfa6e823aeef5f97c1c9210b32aa02382845d312d077117df5781f5c2e2d165a352cc SHA512 36d545d658b57a86f31477911b29c0a9150e67a75b18a0b3897f47f58bec25588cda34c235ff10393f1767e3321bb9bd63debf0c30d3031e192b4df759053c1a
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch b/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch
deleted file mode 100644
index 82089f9553a5..000000000000
--- a/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix linking failure due to different GCC5 inline semantics
-https://bugs.gentoo.org/show_bug.cgi?id=571000
-
-In addition, fix QA warnings caused by passing
-an unformatted string to printf().
-
---- gbsplay-0.0.91/Makefile
-+++ gbsplay-0.0.91/Makefile
-@@ -35,7 +35,7 @@
- 	-predboolothers \
- 	-shiftnegative \
- 	-shiftimplementation
--GBSCFLAGS  := -Wall -fsigned-char -D_FORTIFY_SOURCE=2
-+GBSCFLAGS  := -Wall -fsigned-char -std=gnu89
- GBSLDFLAGS := -Wl,-O1 -lm
- GBSPLAYLDFLAGS :=
- 
---- gbsplay-0.0.91/plugout.c
-+++ gbsplay-0.0.91/plugout.c
-@@ -55,10 +55,10 @@
- {
- 	long idx;
- 
--	printf(_("Available output plugins:\n\n"));
-+	fputs(_("Available output plugins:\n\n"), stdout);
- 
- 	if (plugouts[0] == NULL) {
--		printf(_("No output plugins available.\n\n"));
-+		fputs(_("No output plugins available.\n\n"), stdout);
- 		return;
- 	}
- 
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-1.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-1.patch
new file mode 100644
index 000000000000..87c9a660792d
--- /dev/null
+++ b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-1.patch
@@ -0,0 +1,71 @@
+From 89134a5847bc143ce0c7acf1ca860861b4639a6b Mon Sep 17 00:00:00 2001
+From: ranma <ranma+github@tdiedrich.de>
+Date: Wed, 4 Nov 2020 10:20:08 +0100
+Subject: [PATCH] Avoid running depend.sh before config.mk is included
+
+Should fix "./depend.sh: line 27: exec: : not found"
+---
+ Makefile  | 9 ++++++++-
+ configure | 1 +
+ depend.sh | 2 +-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 26aa20b..de4e761 100644
+--- a/Makefile
++++ b/Makefile
+@@ -50,6 +50,7 @@ SPLINTFLAGS := \
+ 	-shiftnegative \
+ 	-shiftimplementation
+ 
++configured := no
+ ifneq ($(noincludes),yes)
+ -include config.mk
+ endif
+@@ -247,15 +248,21 @@ endif
+ # include the rules for each subdir
+ include $(shell find . -type f -name "subdir.mk")
+ 
++ifeq ($(configured),yes)
+ default: config.mk $(objs) $(dsts) $(mans) $(EXTRA_ALL) $(TEST_TARGETS)
++else
++default: config.mk
++endif
+ 
+ # include the dependency files
+ 
+ ifneq ($(noincludes),yes)
++ifeq ($(configured),yes)
+ deps := $(patsubst %.o,%.d,$(filter %.o,$(objs)))
+ deps += $(patsubst %.lo,%.d,$(filter %.lo,$(objs)))
+ -include $(deps)
+ endif
++endif
+ 
+ distclean: clean
+ 	find . -regex ".*\.d" -exec rm -f "{}" \;
+diff --git a/configure b/configure
+index 455e5a0..e5882dc 100755
+--- a/configure
++++ b/configure
+@@ -1046,6 +1046,7 @@ __EOF__
+     echo plugout_nas := $use_nas
+     echo plugout_pulse := $use_pulse
+     echo plugout_stdout := $use_stdout
++    echo configured := yes
+ ) > config.mk
+ 
+ (
+diff --git a/depend.sh b/depend.sh
+index 09a2cb7..29ac15b 100755
+--- a/depend.sh
++++ b/depend.sh
+@@ -24,7 +24,7 @@ if [ -f "${DIR}subdir.mk" ]; then
+ 	SUBMK=" ${DIR}subdir.mk"
+ fi
+ 
+-exec "$CC" -M $GBSCFLAGS "$FILE" |
++exec "$BUILDCC" -M $GBSCFLAGS "$FILE" |
+ 	sed -n -e "
+ 		s@^\\(.*\\)\\.o:@$DIR\\1.d $DIR\\1.o $DIR\\1.lo: depend.sh Makefile$SUBMK$EXTRADEP@
+ 		s@/usr/[^	 ]*@@g
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-2.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-2.patch
new file mode 100644
index 000000000000..a55e665f5090
--- /dev/null
+++ b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-2.patch
@@ -0,0 +1,107 @@
+From a4290411d7f7c1482b3073a4ef9e7e2d0ccdd019 Mon Sep 17 00:00:00 2001
+From: ranma <ranma+github@tdiedrich.de>
+Date: Wed, 4 Nov 2020 22:18:12 +0100
+Subject: [PATCH] Avoid running depend.sh before config.mk is included
+
+Should fix:
+   "./depend.sh: line 27: exec: : not found"
+and also avoid the
+  "fatal error: impulse.h: No such file or directory"
+warning.
+---
+ Makefile  | 33 ++++++++++++++++++++-------------
+ depend.sh |  2 +-
+ 2 files changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index de4e761..8c2d70f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,6 +16,7 @@ all: default
+ 
+ noincludes  := $(patsubst distclean,yes,$(MAKECMDGOALS))
+ 
++# Defaults, overridden by config.mk below once configure has run
+ prefix      := /usr/local
+ exec_prefix := $(prefix)
+ 
+@@ -55,9 +56,19 @@ ifneq ($(noincludes),yes)
+ -include config.mk
+ endif
+ 
++generatedeps := no
++ifneq ($(noincludes),yes)
++ifeq ($(configured),yes)
++ifeq ($(wildcard impulse.h),impulse.h)
++generatedeps := yes
++endif
++endif
++endif
++
+ XMMSPREFIX  :=
+ DESTDIR     :=
+ 
++# Update paths with user-provided DESTDIR
+ prefix      := $(DESTDIR)$(prefix)
+ exec_prefix := $(DESTDIR)$(exec_prefix)
+ bindir      := $(DESTDIR)$(bindir)
+@@ -248,20 +259,17 @@ endif
+ # include the rules for each subdir
+ include $(shell find . -type f -name "subdir.mk")
+ 
+-ifeq ($(configured),yes)
+-default: config.mk $(objs) $(dsts) $(mans) $(EXTRA_ALL) $(TEST_TARGETS)
+-else
+-default: config.mk
+-endif
+-
+-# include the dependency files
++ifeq ($(generatedeps),yes)
++# Ready to build deps and everything else
++default: config.mk impulse.h $(objs) $(dsts) $(mans) $(EXTRA_ALL) $(TEST_TARGETS)
+ 
+-ifneq ($(noincludes),yes)
+-ifeq ($(configured),yes)
++# Generate & include the dependency files
+ deps := $(patsubst %.o,%.d,$(filter %.o,$(objs)))
+ deps += $(patsubst %.lo,%.d,$(filter %.lo,$(objs)))
+ -include $(deps)
+-endif
++else
++# Configure still needs to be run and/or impulse.h is not generated yet
++default: config.mk impulse.h
+ endif
+ 
+ distclean: clean
+@@ -400,8 +408,7 @@ $(gen_impulse_h_bin): $(objs_gen_impulse_h)
+ 	$(HOSTCC) -o $(gen_impulse_h_bin) $(objs_gen_impulse_h) -lm
+ impulse.h: $(gen_impulse_h_bin)
+ 	$(Q)./$(gen_impulse_h_bin) > $@
+-gbhw.o: impulse.h
+-gbhw.lo: impulse.h
++	$(Q)$(MAKE)
+ 
+ libgbspic.a: $(objs_libgbspic)
+ 	$(AR) r $@ $+
+@@ -450,7 +457,7 @@ config.mk: configure
+ 
+ %.d: %.c config.mk
+ 	@echo DEP $< -o $@
+-	$(Q)./depend.sh $< config.mk > $@ || rm -f $@
++	$(Q)CC=$(BUILDCC) ./depend.sh $< config.mk > $@ || rm -f $@
+ 
+ %.1: %.in.1 config.sed
+ 	sed -f config.sed $< > $@
+diff --git a/depend.sh b/depend.sh
+index 29ac15b..09a2cb7 100755
+--- a/depend.sh
++++ b/depend.sh
+@@ -24,7 +24,7 @@ if [ -f "${DIR}subdir.mk" ]; then
+ 	SUBMK=" ${DIR}subdir.mk"
+ fi
+ 
+-exec "$BUILDCC" -M $GBSCFLAGS "$FILE" |
++exec "$CC" -M $GBSCFLAGS "$FILE" |
+ 	sed -n -e "
+ 		s@^\\(.*\\)\\.o:@$DIR\\1.d $DIR\\1.o $DIR\\1.lo: depend.sh Makefile$SUBMK$EXTRADEP@
+ 		s@/usr/[^	 ]*@@g
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-fix-off-by-one-err.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-off-by-one-err.patch
new file mode 100644
index 000000000000..5b9b076ed2cd
--- /dev/null
+++ b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-off-by-one-err.patch
@@ -0,0 +1,24 @@
+From e9ef7a872ac7f7201b195c961b64f6ce33a5b110 Mon Sep 17 00:00:00 2001
+From: Sanqui <me@sanqui.net>
+Date: Thu, 23 Jul 2020 21:41:16 +0300
+Subject: [PATCH] Fix off-by-one error in gbhw_io_peek
+
+This bug made e.g. WAVE display when verbose incorrect, as the
+last byte of the waveform would always be given as FF.
+---
+ gbhw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gbhw.c b/gbhw.c
+index 931c79d..dd60066 100644
+--- a/gbhw.c
++++ b/gbhw.c
+@@ -1000,7 +1000,7 @@ regparm void gbhw_io_put(uint16_t addr, uint8_t val) {
+ /* unmasked peek used by gbsplay.c to print regs */
+ regparm uint8_t gbhw_io_peek(uint16_t addr)
+ {
+-	if (addr >= 0xff10 && addr <= 0xff3e) {
++	if (addr >= 0xff10 && addr <= 0xff3f) {
+ 		return ioregs[addr & 0x7f];
+ 	}
+ 	return 0xff;
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-fix-sharedlib-build.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-sharedlib-build.patch
new file mode 100644
index 000000000000..31f001596161
--- /dev/null
+++ b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-sharedlib-build.patch
@@ -0,0 +1,36 @@
+From 1b14c65c60da03c3a51fd62aa6dcbf9847453834 Mon Sep 17 00:00:00 2001
+From: Tobias Diedrich <ranma+openocd@tdiedrich.de>
+Date: Sat, 27 Jun 2020 21:49:03 +0200
+Subject: [PATCH] Fix broken compilation with shared libgbs
+
+From 8bf4d3b484bc39986a7db7dd759ebda8602048e9 Mon Sep 17 00:00:00 2001
+From: Tobias Diedrich <ranma+openocd@tdiedrich.de>
+Date: Sat, 27 Jun 2020 21:51:49 +0200
+Subject: [PATCH] Fix broken compilation with shared libgbs try 2
+
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f629d37..5535c8e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -77,6 +77,8 @@ DISTDIR := gbsplay-$(VERSION)
+ 
+ GBSCFLAGS  := $(EXTRA_CFLAGS)
+ GBSLDFLAGS := $(EXTRA_LDFLAGS)
++comma := ,
++GBSLIBLDFLAGS := -lm $(subst -pie,,$(subst -Wl$(comma)-pie,,$(EXTRA_LDFLAGS)))
+ # Additional ldflags for the gbsplay executable
+ GBSPLAYLDFLAGS :=
+ 
+@@ -207,7 +209,7 @@ uninstall-libgbs.so.1:
+ 
+ 
+ libgbs.so.1: $(objs_libgbspic) libgbs.so.1.ver
+-	$(BUILDCC) -fpic -shared -Wl,-soname=$@ -Wl,--version-script,$@.ver -o $@ $(objs_libgbspic) -lm
++	$(BUILDCC) -fpic -shared -Wl,-soname=$@ -Wl,--version-script,$@.ver -o $@ $(objs_libgbspic) $(GBSLIBLDFLAGS)
+ 	ln -fs $@ libgbs.so
+ 
+ libgbs: libgbs.so.1
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-no-install-desktop-mime.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-no-install-desktop-mime.patch
new file mode 100644
index 000000000000..39d156cd0a21
--- /dev/null
+++ b/media-sound/gbsplay/files/gbsplay-0.0.94-no-install-desktop-mime.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index 28f2c55..8753496 100644
+--- a/Makefile
++++ b/Makefile
+@@ -282,9 +282,5 @@ install-default:
+ 	install -m 644 man/gbsplay.1 man/gbsinfo.1 $(man1dir)
+ 	install -m 644 man/gbsplayrc.5 $(man5dir)
+-	install -m 644 mime/gbsplay.xml $(mimedir)/packages
+-	-update-mime-database $(mimedir)
+-	install -m 644 desktop/gbsplay.desktop $(appdir)
+-	-update-desktop-database $(appdir)
+ 	install -m 644 $(docs) $(docdir)
+ 	install -m 644 $(examples) $(exampledir)
+ 	for i in $(mos); do \
diff --git a/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild b/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
deleted file mode 100644
index 7738a213805d..000000000000
--- a/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="de en"
-inherit l10n toolchain-funcs
-
-DESCRIPTION="Nintendo Gameboy sound player for GBS format"
-HOMEPAGE="https://www.cgarbs.de/gbsplay.en.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa nas nls oss"
-
-RDEPEND="alsa? ( media-libs/alsa-lib:0 )
-	nas? ( media-libs/nas:0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext:0 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-)
-
-src_configure() {
-	tc-export AR CC
-
-	# No econf, because "unknown option '--build=x86_64-pc-linux-gnu'"
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		--without-xmmsplugin \
-		--without-test \
-		$(use_enable nls i18n) \
-		$(use_enable oss devdsp) \
-		$(use_enable alsa) \
-		$(use_enable nas) || die "Configure failed."
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" SPLINT="true"
-}
-
-remove_disabled_locale() {
-	rm -r "${D}"/usr/share/locale/$1 || die
-}
-
-src_install() {
-	default
-
-	l10n_for_each_disabled_locale_do remove_disabled_locale
-}
diff --git a/media-sound/gbsplay/gbsplay-0.0.94-r1.ebuild b/media-sound/gbsplay/gbsplay-0.0.94-r1.ebuild
new file mode 100644
index 000000000000..db3b94923d8c
--- /dev/null
+++ b/media-sound/gbsplay/gbsplay-0.0.94-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="de en"
+inherit edo plocale toolchain-funcs
+
+DESCRIPTION="Nintendo Gameboy sound player for GBS format"
+HOMEPAGE="https://www.cgarbs.de/gbsplay.en.html"
+SRC_URI="https://github.com/mmitch/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa nas nls oss pulseaudio"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib:0 )
+	nas? ( media-libs/nas:0 )
+	pulseaudio? ( media-libs/libpulse )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext:0 )"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${P}-fix-sharedlib-build.patch"
+	"${FILESDIR}/${P}-fix-off-by-one-err.patch"
+	"${FILESDIR}/${P}-fix-buildsys-1.patch"
+	"${FILESDIR}/${P}-fix-buildsys-2.patch"
+	# downstream
+	"${FILESDIR}/${P}-no-install-desktop-mime.patch"
+)
+
+src_prepare() {
+	default
+
+	# Don't clobber toolchain defaults
+	sed -i -e 's:-D_FORTIFY_SOURCE=2::' configure || die
+}
+
+src_configure() {
+	tc-export AR CC
+
+	local myconfargs=(
+		--prefix=/usr
+		--mandir=/usr/share/man
+		--docdir=/usr/share/doc/${PF}
+		--disable-hardening
+		--without-xmmsplugin
+		--without-test
+		$(use_enable alsa)
+		$(use_enable nas)
+		$(use_enable nls i18n)
+		$(use_enable oss devdsp)
+		$(use_enable pulseaudio pulse)
+	)
+
+	# No econf, because "unknown option '--libdir=/usr/lib64"
+	edo ./configure "${myconfargs[@]}"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SPLINT="true" V=1
+}
+
+src_install() {
+	remove_disabled_locale() {
+		rm -r "${D}"/usr/share/locale/$1 || die
+	}
+	default
+
+	plocale_for_each_disabled_locale remove_disabled_locale
+}
diff --git a/media-sound/gbsplay/metadata.xml b/media-sound/gbsplay/metadata.xml
index ee7258ac28eb..678e48727127 100644
--- a/media-sound/gbsplay/metadata.xml
+++ b/media-sound/gbsplay/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">mmitch/gbsplay</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 792c3d0bc999..fdc6638f3faa 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1 +1 @@
-DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964
+DIST gigedit-1.2.1.tar.bz2 935868 BLAKE2B b448650a6200fd0f87d636518a61ef5a98601c0a6627e4a2cfd8658ad67c5f4f17b64f1913bb7b77d59874018ca24aceb590862dfc0b343a7111f50f357557b2 SHA512 f70b1887ea66acc26e8a1becabb424e66ee2dcdc726805b0e2f42fa28b5ff1a54e7b6bab8808ce84a02bcf8ea1aea13ab2cd891848d9bcc711944dcd312509b2
diff --git a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
deleted file mode 100644
index 966ad8a9da59..000000000000
--- a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils desktop xdg
-
-DESCRIPTION="An instrument editor for gig files"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-CDEPEND="
-	dev-cpp/gtkmm:2.4
-	>=media-libs/libgig-3.3.0
-	>=media-libs/libsndfile-1.0.2
-	>=media-sound/linuxsampler-0.5.1
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	default
-
-	# docdir is not propagated there
-	sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/linuxsampler"
-}
-
-src_install() {
-	default
-
-	einfo "Removing static libs..."
-	find "${D}" -name "*.la" -delete || die "Failed to remove static libs"
-
-	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
-}
diff --git a/media-sound/gigedit/gigedit-1.2.1.ebuild b/media-sound/gigedit/gigedit-1.2.1.ebuild
new file mode 100644
index 000000000000..c6ed06ab1936
--- /dev/null
+++ b/media-sound/gigedit/gigedit-1.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic xdg
+
+DESCRIPTION="An instrument editor for gig files"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	media-libs/libgig
+	media-libs/libsndfile
+	>=media-sound/linuxsampler-2.3.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# docdir is not propagated there
+	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
+	# file missing in pot file
+	echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
+	econf --disable-static
+}
+
+src_install() {
+	default
+	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/gigedit/gigedit-9999.ebuild b/media-sound/gigedit/gigedit-9999.ebuild
index cba33cb715bb..c0a4eac99d9d 100644
--- a/media-sound/gigedit/gigedit-9999.ebuild
+++ b/media-sound/gigedit/gigedit-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools eutils desktop xdg subversion
+EAPI=8
+
+inherit autotools desktop flag-o-matic xdg subversion
 
 DESCRIPTION="An instrument editor for gig files"
 HOMEPAGE="http://www.linuxsampler.org/"
@@ -10,44 +11,35 @@ ESVN_REPO_URI="https://svn.linuxsampler.org/svn/gigedit/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	media-libs/libgig
+	media-libs/libsndfile
+	media-sound/linuxsampler"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/gettext
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-CDEPEND="
-	dev-cpp/gtkmm:2.4
-	>=media-libs/libgig-3.3.0
-	>=media-libs/libsndfile-1.0.2
-	>=media-sound/linuxsampler-0.5.1
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${CDEPEND}"
+	dev-util/intltool
+	virtual/pkgconfig"
 
 src_prepare() {
 	default
-
 	# docdir is not propagated there
-	sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die
+	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
+	# file missing in pot file
+	echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die
 	eautoreconf
 }
 
 src_configure() {
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
 	econf --disable-static
 }
 
-src_compile() {
-	emake LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/linuxsampler"
-}
-
 src_install() {
 	default
-
-	einfo "Removing static libs..."
-	find "${D}" -name "*.la" -delete || die "Failed to remove static libs"
-
 	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/gigedit/metadata.xml b/media-sound/gigedit/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/gigedit/metadata.xml
+++ b/media-sound/gigedit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/gimmix/metadata.xml b/media-sound/gimmix/metadata.xml
index 3ff229a3f43d..7c72aebc5d0a 100644
--- a/media-sound/gimmix/metadata.xml
+++ b/media-sound/gimmix/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/glurp/glurp-0.12.3.ebuild b/media-sound/glurp/glurp-0.12.3.ebuild
index 61c10412e28c..51453b95bad7 100644
--- a/media-sound/glurp/glurp-0.12.3.ebuild
+++ b/media-sound/glurp/glurp-0.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit desktop
 
 DESCRIPTION="Glurp is a GTK2 based graphical client for the Music Player Daemon"
 HOMEPAGE="https://sourceforge.net/projects/glurp/"
-SRC_URI="mirror://sourceforge/glurp/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/glurp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/glurp/metadata.xml b/media-sound/glurp/metadata.xml
index 136eaa84846f..dc11f71e7d11 100644
--- a/media-sound/glurp/metadata.xml
+++ b/media-sound/glurp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch b/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch
new file mode 100644
index 000000000000..2571757244fb
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch
@@ -0,0 +1,182 @@
+Bug: https://bugs.gentoo.org/896430
+--- a/src/GMorgan.h
++++ b/src/GMorgan.h
+@@ -41,7 +41,7 @@ using namespace std;
+ #define MAGIC_TRACK 0x4d54726b
+ 
+ extern int Pexitprogram, espera, programa, vum, vumvum, tum, cambialo;
+-extern int vavi, pr, pr1, count, ulcount, canaledit, notplaying;
++extern int vavi, pr, pr1, count_t, ulcount, canaledit, notplaying;
+ extern int veloplus[65];
+ extern const char *FilePreset;
+ extern const char *FileDrums;
+--- a/src/NotGenerated.cxx
++++ b/src/NotGenerated.cxx
+@@ -9105,7 +9105,7 @@ GMORGAN::cb_PtBro_i (Fl_Browser *, void *)
+       else
+ 	{
+ 	  gmo->sposi = 0;
+-	  count = 1;
++	  count_t = 1;
+ 	  gmo->negra = 0;
+ 	  gmo->semi = 0;
+ 	  gmo->ncompas = 0;
+@@ -24432,7 +24432,7 @@ GMORGAN::preparast ()
+   gmo->nfundi = 0;
+   gmo->ya = 0;
+   gmo->anticipa = 0;
+-  count = 1;
++  count_t = 1;
+   gmo->negra = 0;
+   ulcount = 0;
+   N1->value (0);
+@@ -24792,7 +24792,7 @@ GMORGAN::PutStyle (int i)
+   else
+     {
+       gmo->sposi = 0;
+-      count = 1;
++      count_t = 1;
+       gmo->negra = 0;
+       gmo->semi = 1;
+       gmo->ncompas = 0;
+@@ -26772,7 +26772,7 @@ GMORGAN::ActualizaEntrada ()
+ 	  else
+ 	    {
+ 	      gmo->sposi = 0;
+-	      count = 1;
++	      count_t = 1;
+ 	      gmo->negra = 0;
+ 	      gmo->semi = 1;
+ 	      gmo->ncompas = 0;
+--- a/src/Stk.cpp
++++ b/src/Stk.cpp
+@@ -123,7 +123,7 @@ void Stk :: setRawwavePath( std::string path )
+ 
+ void Stk :: swap16(unsigned char *ptr)
+ {
+-  register unsigned char val;
++  unsigned char val;
+ 
+   // Swap 1st and 2nd bytes
+   val = *(ptr);
+@@ -133,7 +133,7 @@ void Stk :: swap16(unsigned char *ptr)
+ 
+ void Stk :: swap32(unsigned char *ptr)
+ {
+-  register unsigned char val;
++  unsigned char val;
+ 
+   // Swap 1st and 4th bytes
+   val = *(ptr);
+@@ -149,7 +149,7 @@ void Stk :: swap32(unsigned char *ptr)
+ 
+ void Stk :: swap64(unsigned char *ptr)
+ {
+-  register unsigned char val;
++  unsigned char val;
+ 
+   // Swap 1st and 8th bytes
+   val = *(ptr);
+--- a/src/gmorgan.C
++++ b/src/gmorgan.C
+@@ -88,7 +88,7 @@ int
+   splashcounter,
+   clicksplash;
+ int
+-  count,
++  count_t,
+   ulcount,
+   ponfin;
+ int
+@@ -184,7 +184,7 @@ GMO::GMO ()
+   tick = 0;
+   negra = 0;
+   ncompas = 0;
+-  count = 0;
++  count_t = 0;
+   queue_id = 0;
+   elbar = 1;
+   HMode = 0;
+@@ -608,7 +608,7 @@ GMO::GMO ()
+       if (strlen (temp) > 2)
+ 	for (i = 0; i <= (int) strlen (temp) - 2; i++)
+ 	  HelpFilename[i] = temp[i];
+-	cout << "helpfile: " << HelpFilename << endl;
++	  std::cout << "helpfile: " << HelpFilename << endl;
+       bzero (temp, sizeof (temp));
+       fgets (temp, sizeof temp, fs);
+       if (strlen (temp) > 2)
+@@ -712,14 +712,14 @@ GMO::organo ()
+ 	{
+ 	  semi = 1;
+ 	  negra++;
+-	  count++;
+-	  if (count >= Rt[sp].blackn + 1)
++	  count_t++;
++	  if (count_t >= Rt[sp].blackn + 1)
+ 	    {
+ 	      elbar++;
+ 	      if (elbar > Rt[sp].bars)
+ 		elbar = 1;
+ 	      negra = 0;
+-	      count = 1;
++	      count_t = 1;
+ 	      ncompas++;
+ 	      sprintf (elbart, "%d", ncompas + 1);
+ // 
+@@ -1246,7 +1246,7 @@ GMO::GeneraChord ()
+ 
+   if (bplay)
+     {
+-      switch (count)
++      switch (count_t)
+ 	{
+ 	case 1:
+ 	  strcpy (elacorde, S[nb].ch1);
+--- a/src/gmorgan.MIDIExport.C
++++ b/src/gmorgan.MIDIExport.C
+@@ -306,18 +306,18 @@ GMO::generatracks ()
+ 	}
+       for (neg = 1; neg <= SNomi; neg++)
+ 	{
+-	  count = neg;
++	  count_t = neg;
+ 	  if (MTempo)
+ 	    MiraCambioTempoM (tcompas, neg);
+ 	  GeneraChord ();
+ 	  for (sem = 1; sem <= 4; sem++)
+ 	    {
+-	      if ((S[nb].ar8 == 1) && (count == SNomi) && (sem == 3))
++	      if ((S[nb].ar8 == 1) && (count_t == SNomi) && (sem == 3))
+ 		{
+ 		  anticipa = 1;
+ 		  GeneraChord ();
+ 		}
+-	      if ((S[nb].ar16 == 1) && (count == SNomi) && (sem == 4))
++	      if ((S[nb].ar16 == 1) && (count_t == SNomi) && (sem == 4))
+ 		{
+ 		  anticipa = 1;
+ 		  GeneraChord ();
+--- a/src/main.C
++++ b/src/main.C
+@@ -195,9 +195,9 @@ LastBar = 1;
+      }
+ 
+  if (vumvum != vum) gmoUI->VUI1->value(vum);
+-  if ((gmo.stst) && (ulcount != count))
++  if ((gmo.stst) && (ulcount != count_t))
+      {
+-      ulcount = count;
++      ulcount = count_t;
+       int rvtempo = gmoUI->CTEMPO->value();
+ 	if (gmo.bplay != 1)
+ 	{
+@@ -219,7 +219,7 @@ LastBar = 1;
+  	 gmoUI->LightIt(nbar);
+          }
+ 	if (nbar > 127) nbar = 127;	
+-      switch(count)
++      switch(count_t)
+       {
+          case 1:
+                 gmoUI->N1->setonly();
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
index 5a076a7ba2a8..430159271b65 100644
--- a/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
@@ -5,22 +5,18 @@ Subject: [PATCH 1/3] Remove useless gettext version check
 
 Fixes following error:
 autopoint: *** Missing version: please specify in configure.ac through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
 
-diff --git a/configure.ac b/configure.ac
-index ed48b6f..f6ba2af 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -16,7 +16,6 @@ AC_HEADER_STDC
+@@ -16,9 +16,8 @@
  AC_FUNC_SELECT_ARGTYPES
  AC_CHECK_FUNCS([bzero memset select strdup])
  AM_GNU_GETTEXT([external]) 
 -AM_GNU_GETTEXT_VERSION
- LIBS="`fltk-config --use-images --ldflags` -lasound"
- CXXFLAGS="-g `fltk-config --use-images --cxxflags`"
+-LIBS="`fltk-config --use-images --ldflags` -lasound"
+-CXXFLAGS="-g `fltk-config --use-images --cxxflags`"
++LIBS="$(fltk-config --use-images --ldflags) -lasound ${LIBS}"
++CXXFLAGS="$(fltk-config --use-images --cxxflags) ${CXXFLAGS}"
  AC_CHECK_HEADERS([unistd.h])
--- 
-2.12.0
-
+ AC_CHECK_HEADER(alsa/asoundlib.h, true, AC_MSG_ERROR([Alsa is required]))
+ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
diff --git a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild
index 54db2b24697d..c89a4bf0972a 100644
--- a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Opensource software rhythm station"
-HOMEPAGE="http://gmorgan.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
+HOMEPAGE="https://gmorgan.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/gmorgan/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND="media-libs/alsa-lib
+RDEPEND="
+	media-libs/alsa-lib
 	x11-libs/fltk:1"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-remove-gettext-version-check.patch
@@ -26,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-remove-old-docs.patch
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
@@ -35,11 +37,10 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
 	default
-	doman man/${PN}.1
+	doman man/gmorgan.1
 }
diff --git a/media-sound/gmorgan/metadata.xml b/media-sound/gmorgan/metadata.xml
index 3732aacbac32..2ee126ff6e26 100644
--- a/media-sound/gmorgan/metadata.xml
+++ b/media-sound/gmorgan/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
deleted file mode 100644
index d1d6e9e4e833..000000000000
--- a/media-sound/gmpc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gmpc-11.8.16.tar.gz 7082909 BLAKE2B 913b7b55029f6fe78dcae7355bd571f4d6e95c4d1891e12251717b7fe846a69b52ba9cf2c65042a36295830dbec65128d0aa119d8503c934a3f09b86b42a0409 SHA512 4e5c8112edc016ac6c472b0099347a4fcd0336022e15be8d76fae449d30e533df92a4379aa98e389e624b9910ff3f528afb682f64901ea53f09e00d3d5678623
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch b/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch
deleted file mode 100644
index 336891716b1e..000000000000
--- a/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,7 +14,7 @@
- 
- 
- 
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE
- 
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-icons.patch b/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
deleted file mode 100644
index ea37effa9f74..000000000000
--- a/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/glade/playlist3.ui b/glade/playlist3.ui
-index fedb627..452f3ec 100644
---- a/glade/playlist3.ui
-+++ b/glade/playlist3.ui
-@@ -436,16 +436,17 @@
-                                 <child>
-                                   <object class="GtkButton" id="button_previous">
-                                     <property name="visible">True</property>
-+                                    <property name="use_action_appearance">False</property>
-                                     <property name="related-action">MPDPrevious</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="receives_default">False</property>
-                                     <property name="relief">none</property>
-                                     <property name="use_action_appearance">False</property>
-                                     <child>
--                                      <object class="GtkImage" id="image10">
-+                                        <object class="GtkImage" id="button_previous_image">
-                                         <property name="visible">True</property>
-                                         <property name="stock">gtk-media-previous</property>
--                                      </object>
-+                                        </object>
-                                     </child>
-                                   </object>
-                                   <packing>
-@@ -455,18 +456,18 @@
-                                   </packing>
-                                 </child>
-                                 <child>
--                                  <object class="GtkButton" id="top_button">
-+                                  <object class="GtkButton" id="stop_button">
-                                     <property name="visible">True</property>
-+                                    <property name="use_action_appearance">False</property>
-                                     <property name="related-action">MPDStop</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="receives_default">True</property>
-                                     <property name="relief">none</property>
--                                    <property name="use_action_appearance">False</property>
-                                     <child>
--                                      <object class="GtkImage" id="stop_button_image">
-+                                        <object class="GtkImage" id="button_stop_image">
-                                         <property name="visible">True</property>
-                                         <property name="stock">gtk-media-stop</property>
--                                      </object>
-+                                        </object>
-                                     </child>
-                                   </object>
-                                   <packing>
-@@ -478,15 +479,16 @@
-                                 <child>
-                                   <object class="GtkButton" id="play_button">
-                                     <property name="visible">True</property>
-+                                    <property name="use_action_appearance">False</property>
-                                     <property name="related-action">MPDPlayPause</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="receives_default">False</property>
-                                     <property name="relief">none</property>
-                                     <child>
--                                      <object class="GtkImage" id="play_button_image">
-+                                        <object class="GtkImage" id="play_button_image">
-                                         <property name="visible">True</property>
-                                         <property name="stock">gtk-media-play</property>
--                                      </object>
-+                                        </object>
-                                     </child>
-                                   </object>
-                                   <packing>
-@@ -498,13 +500,13 @@
-                                 <child>
-                                   <object class="GtkButton" id="next_button">
-                                     <property name="visible">True</property>
-+                                    <property name="use_action_appearance">False</property>
-                                     <property name="related-action">MPDNext</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="receives_default">False</property>
--                                    <property name="use_action_appearance">False</property>
-                                     <property name="relief">none</property>
-                                     <child>
--                                      <object class="GtkImage" id="image11">
-+                                      <object class="GtkImage" id="next_button_image">
-                                         <property name="visible">True</property>
-                                         <property name="stock">gtk-media-next</property>
-                                       </object>
-diff --git a/src/playlist3.c b/src/playlist3.c
-index 72b4ef7..3dac409 100644
---- a/src/playlist3.c
-+++ b/src/playlist3.c
-@@ -1632,7 +1632,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
-                 gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-pause");
-                 gtk_image_set_from_stock(GTK_IMAGE
-                     (gtk_builder_get_object
--                    (pl3_xml, "play_button_image")), "gtk-media-pause", GTK_ICON_SIZE_BUTTON);
-+                    (pl3_xml, "play_button_image")), "gtk-media-pause",
-+					GTK_ICON_SIZE_MENU);
- 
-                 /**
-                  * Update window title
-@@ -1669,8 +1670,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
-                 gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-play");
-                 gtk_image_set_from_stock(GTK_IMAGE
-                     (gtk_builder_get_object
--                    (pl3_xml, "play_button_image")), "gtk-media-play", GTK_ICON_SIZE_BUTTON);
--
-+                    (pl3_xml, "play_button_image")), "gtk-media-play",
-+					GTK_ICON_SIZE_MENU);
-                 /**
-                  * Set paused in Window string
-                  */
-@@ -1704,8 +1705,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
- 
-                 gtk_image_set_from_stock(GTK_IMAGE
-                     (gtk_builder_get_object
--                    (pl3_xml, "play_button_image")), "gtk-media-play", GTK_ICON_SIZE_BUTTON);
--
-+                    (pl3_xml, "play_button_image")), "gtk-media-play",
-+					GTK_ICON_SIZE_MENU);
-                 if (gmpc_profiles_get_number_of_profiles(gmpc_profiles) > 1)
-                 {
-                     gchar *id = gmpc_profiles_get_current(gmpc_profiles);
--- 
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch b/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch
deleted file mode 100644
index e6cf1ef9f05d..000000000000
--- a/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 497194b..84c31f0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -174,7 +174,8 @@ LIBS= \
- 	@libxml2_LIBS@\
- 	@libx11_LIBS@\
- 	@sqlite3_LIBS@\
--	-lz
-+	-lz\
-+	-lm
- 
- 
- if HAVE_UNIQUE
diff --git a/media-sound/gmpc/gmpc-11.8.16-r1.ebuild b/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
deleted file mode 100644
index 0fcbc8fbc67f..000000000000
--- a/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools vala xdg
-
-DESCRIPTION="A GTK+2 client for the Music Player Daemon"
-HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls +unique xspf"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	dev-libs/glib:2
-	dev-libs/libxml2:2=
-	media-libs/libmpd:=
-	net-libs/libsoup:2.4=
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-themes/hicolor-icon-theme
-	unique? ( dev-libs/libunique:1= )
-	xspf? ( media-libs/libxspf:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	app-text/gnome-doc-utils
-	dev-util/gob
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-icons.patch
-	"${FILESDIR}"/${P}-AM_CONFIG_HEADER.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-	vala_src_prepare
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-libspiff \
-		--disable-appindicator \
-		--enable-mmkeys \
-		$(use_enable nls) \
-		$(use_enable unique) \
-		$(use_enable xspf libxspf)
-}
diff --git a/media-sound/gmpc/metadata.xml b/media-sound/gmpc/metadata.xml
deleted file mode 100644
index 24b5ad9a282a..000000000000
--- a/media-sound/gmpc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<use>
-	<flag name="unique">Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
-	<flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
-</use>
-</pkgmetadata>
diff --git a/media-sound/gmtp/gmtp-1.3.11-r1.ebuild b/media-sound/gmtp/gmtp-1.3.11-r3.ebuild
index 9dc541fb70fd..f4663a59f7bc 100644
--- a/media-sound/gmtp/gmtp-1.3.11-r1.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.11-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit gnome2-utils
+inherit gnome2-utils xdg
 
-DESCRIPTION="A simple MTP client for MP3 players"
-HOMEPAGE="http://gmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+DESCRIPTION="Simple MTP client for MP3 players"
+HOMEPAGE="https://gmtp.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libmtp
+	media-libs/flac:=
+	media-libs/libid3tag:=
+	media-libs/libmtp:=
 	media-libs/libvorbis
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}"
@@ -32,16 +32,16 @@ src_configure() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
 	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 	gnome2_schemas_update
 }
diff --git a/media-sound/gmtp/metadata.xml b/media-sound/gmtp/metadata.xml
index ed33917d6fc7..0af8da418f9a 100644
--- a/media-sound/gmtp/metadata.xml
+++ b/media-sound/gmtp/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
   <longdescription lang="en">
-gMTP is a graphical frontend to libmtp. It allows to transfer files to mtp devices like mp3 players or android tablets.
-</longdescription>
+  gMTP is a graphical frontend to libmtp. It allows to transfer files to mtp devices like mp3 players or android tablets.
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">gmtp</remote-id>
   </upstream>
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
deleted file mode 100644
index c9e7ccd87d9d..000000000000
--- a/media-sound/gmusicbrowser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
deleted file mode 100644
index ae1b59c0d9a5..000000000000
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils gnome2-utils xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-else
-	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
-	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-fi
-
-DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
-HOMEPAGE="https://gmusicbrowser.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus doc extras gstreamer libnotify mplayer"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Gtk2
-	virtual/perl-MIME-Base64
-	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? ( dev-perl/Glib-Object-Introspection )
-	mplayer? ( || ( media-video/mplayer media-video/mpv ) )
-	!gstreamer? ( !mplayer? (
-			media-sound/alsa-utils
-			media-sound/flac123
-			|| ( media-sound/mpg123 media-sound/mpg321 )
-			media-sound/vorbis-tools
-		)
-	)
-	extras? ( dev-perl/gnome2-wnck )
-	libnotify? ( dev-perl/Gtk2-Notify )"
-DEPEND="sys-devel/gettext
-	doc? ( dev-perl/Text-Markdown )"
-
-src_compile() {
-	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		iconsdir="${D}/usr/share/icons/hicolor" \
-		install
-
-	use doc && local HTML_DOCS=( layout_doc.html )
-	einstalldocs
-}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
deleted file mode 100644
index e3ecb295b17b..000000000000
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils gnome2-utils xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
-	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-fi
-
-DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
-HOMEPAGE="https://gmusicbrowser.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus doc extras gstreamer libnotify mplayer"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Gtk2
-	virtual/perl-MIME-Base64
-	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? ( dev-perl/Glib-Object-Introspection )
-	mplayer? ( || ( media-video/mplayer media-video/mpv ) )
-	!gstreamer? ( !mplayer? (
-			media-sound/alsa-utils
-			media-sound/flac123
-			|| ( media-sound/mpg123 media-sound/mpg321 )
-			media-sound/vorbis-tools
-		)
-	)
-	extras? ( dev-perl/gnome2-wnck )
-	libnotify? ( dev-perl/Gtk2-Notify )"
-DEPEND="sys-devel/gettext
-	doc? ( dev-perl/Text-Markdown )"
-
-src_compile() {
-	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		iconsdir="${D}/usr/share/icons/hicolor" \
-		install
-
-	use doc && local HTML_DOCS=( layout_doc.html )
-	einstalldocs
-}
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
deleted file mode 100644
index 1663c00e8552..000000000000
--- a/media-sound/gmusicbrowser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<use>
-		<flag name="extras">Install some extra deps for plugins (ex. Titlebar)</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/gnomad/gnomad-2.9.6.ebuild b/media-sound/gnomad/gnomad-2.9.6-r1.ebuild
index 5c0417d87c23..9b740cadb21a 100644
--- a/media-sound/gnomad/gnomad-2.9.6.ebuild
+++ b/media-sound/gnomad/gnomad-2.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,19 +8,20 @@ inherit xdg
 MY_PN=${PN}2
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A GTK+ music manager for the Portable Digital Entertainment (PDE) protocol"
-HOMEPAGE="http://gnomad2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+DESCRIPTION="GTK+ music manager for the Portable Digital Entertainment (PDE) protocol"
+HOMEPAGE="https://gnomad2.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="nls"
 
 RDEPEND="
 	dev-libs/libgudev:=
-	media-libs/libid3tag
-	media-libs/libmtp
+	media-libs/libid3tag:=
+	media-libs/libmtp:=
 	media-libs/libnjb
 	media-libs/taglib
 	>=x11-libs/gtk+-2.24:2"
@@ -32,8 +33,6 @@ BDEPEND="
 		sys-devel/gettext
 	)"
 
-S=${WORKDIR}/${MY_P}
-
 PATCHES=( "${FILESDIR}"/${PN}-2.9.6-fno-common.patch )
 DOCS=( AUTHORS README TODO ) # ChangeLog and NEWS are both outdated
 
diff --git a/media-sound/gnomad/metadata.xml b/media-sound/gnomad/metadata.xml
index f13622c881f6..c48223658390 100644
--- a/media-sound/gnomad/metadata.xml
+++ b/media-sound/gnomad/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index a7ebae569640..cacc1458f334 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,2 +1 @@
-DIST gnome-music-3.36.4.1.tar.xz 979064 BLAKE2B e744bee915a48a5d2366350cda7ebb0c43382f46de07d9203d95675cad45d825f2d93cc07be7865eceb5be3554ab478ecf84c52d9b8f5defc198b4f1b6638926 SHA512 8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca
-DIST gnome-music-3.36.7.tar.xz 971980 BLAKE2B f27d0eb49a1728873ef6d439eead83cc34fb6802afdba3b4e0ef8d15c88d2012634ec0a18a4df4ba18079915d4227f526a93ac7989ce6ea4a807b620722fad1e SHA512 3470563621c17004d0b92451950ebfca203e830cb9ffe481fef7fe4d5187afa36ccb33130695226d4db95a89af9fac592910d2a19e715af4dd0c0ffba081c3a4
+DIST gnome-music-45.1.tar.xz 1666152 BLAKE2B 27403070735003df5d907fae2675b67f5b907e10e55e2ed3b31e369e146c03a2d7c95371092043862d83968fc45131ddb7643e34634b0a98d686402fdf676118 SHA512 6cc123eda769d524e5c215c7167248b15ac21fd99a1ac385069c8bac8a03652d458460438adec5853daf329f61d70339f5765b938badc862151b655ba64a80cf
diff --git a/media-sound/gnome-music/gnome-music-3.36.7.ebuild b/media-sound/gnome-music/gnome-music-3.36.7.ebuild
deleted file mode 100644
index 333450fc479b..000000000000
--- a/media-sound/gnome-music/gnome-music-3.36.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	>=net-libs/gnome-online-accounts-3.35.90[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.7:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-2.3.0:=[introspection(+)]
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.12:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.10:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		>=app-misc/tracker-miners-2.2.0[gstreamer]
-		>=app-misc/tracker-miners-2.2.0[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-3.36.4.1.ebuild b/media-sound/gnome-music/gnome-music-45.1.ebuild
index 8b133e12694f..b983b5705323 100644
--- a/media-sound/gnome-music/gnome-music-3.36.4.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-45.1.ebuild
@@ -1,43 +1,43 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
 DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music https://gitlab.gnome.org/GNOME/gnome-music/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
+	>=dev-libs/glib-2.67.1:2
 	>=net-libs/gnome-online-accounts-3.35.90[introspection]
 	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.7:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
+	>=gui-libs/gtk-4.5.0:4[introspection]
+	>=gui-libs/libadwaita-1.2:1=[introspection]
 	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-2.3.0:=[introspection(+)]
+	net-libs/libsoup:3.0[introspection]
+	app-misc/tracker:3=[introspection(+)]
+	>=x11-libs/pango-1.44:=
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
 	')
-	>=media-libs/grilo-0.3.12:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.10:0.3
+	>=media-libs/grilo-0.3.15-r1:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.16:0.3[tracker]
 "
 # xdg-user-dirs-update needs to be there to create needed dirs
 # https://bugzilla.gnome.org/show_bug.cgi?id=731613
 RDEPEND="${DEPEND}
 	|| (
-		>=app-misc/tracker-miners-2.2.0[gstreamer]
-		>=app-misc/tracker-miners-2.2.0[ffmpeg]
+		app-misc/tracker-miners:3[gstreamer]
+		app-misc/tracker-miners:3[ffmpeg]
 	)
 	x11-libs/libnotify[introspection]
 	media-libs/gstreamer:1.0[introspection]
@@ -53,17 +53,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
 pkg_setup() {
 	python_setup
 }
 
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
 src_install() {
 	meson_src_install
 	python_fix_shebang "${D}"/usr/bin/gnome-music
diff --git a/media-sound/gnome-music/metadata.xml b/media-sound/gnome-music/metadata.xml
index 39980802b1da..18b3073c0f13 100644
--- a/media-sound/gnome-music/metadata.xml
+++ b/media-sound/gnome-music/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gnome-music</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index ad7eb8afc50a..6fd5e46155a6 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1 +1 @@
-DIST gnome-sound-recorder-3.34.0.tar.xz 133808 BLAKE2B 2e8b83eb58776324717fcbeb8e0383ef3370e394f26978b1367bff22eaef3d9143eef65cd5c678bc25a67b32ed8d1c9e838ce63b0e2868f2ddb88805a5c43c5c SHA512 cb28f1f93f78cae5cc98750f937f60abb326065cdbbb1ee48146daceb9e34f03bc9bf4d78b7a149e579654673b9879fb249fd5a370a19764f01961c565b901ee
+DIST gnome-sound-recorder-42.0.tar.xz 162208 BLAKE2B 6f4f17ad5cb2cd893626defb3b91e62c0dfbfdae4c815df934a2d35a7b0e315f689f3ea222d9adef960935828095c337e00076aba60b4c1b3d243c274063aed3 SHA512 53fe2fe0646c5055cedc1c62cf87176dca52bf3d9452d83bcc849d9946179afbef826f08ff65a97ede7a0d14ade4da0755b2ef3780460d5a80f8f9e6c85fcfbd
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
index 4ada7e52cb73..0f5aae4211dd 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
@@ -1,37 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Simple sound recorder"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder https://gitlab.gnome.org/GNOME/gnome-sound-recorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
-	>=dev-libs/gjs-1.50
+	>=dev-libs/gjs-1.54.0
 	>=dev-libs/glib-2.46:2
-	>=x11-libs/gtk+-3.12:3[introspection]
+	>=gui-libs/gtk-4.4.0:4[introspection]
+	media-libs/gst-plugins-bad:1.0
+	>=gui-libs/libadwaita-1.1.0:1=
 	>=dev-libs/gobject-introspection-1.31.6
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection,ogg]
 	x11-libs/gdk-pixbuf:2[introspection]
 "
 RDEPEND="${DEPEND}
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection,ogg]
-	media-libs/gst-plugins-bad:1.0
 	media-libs/gst-plugins-good:1.0
 	media-plugins/gst-plugins-flac:1.0
 	media-plugins/gst-plugins-pulse:1.0
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/media-sound/gnome-sound-recorder/metadata.xml b/media-sound/gnome-sound-recorder/metadata.xml
index 39980802b1da..92689050ea84 100644
--- a/media-sound/gnome-sound-recorder/metadata.xml
+++ b/media-sound/gnome-sound-recorder/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">World/vocalis</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/gnump3d/files/gnump3d.init.d b/media-sound/gnump3d/files/gnump3d.init.d-r1
index 730fc0cdb2db..6a644d6c5346 100644
--- a/media-sound/gnump3d/files/gnump3d.init.d
+++ b/media-sound/gnump3d/files/gnump3d.init.d-r1
@@ -1,12 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="index"
 
 depend() {
 	need net
-	after netmount nfsmount
+	after netmount
 }
 
 start() {
@@ -34,3 +34,7 @@ index() {
 	/usr/bin/gnump3d-index
 	eend $?
 }
+
+start_pre() {
+	checkpath -d -o "gnump3d:gnump3d" -q "/var/cache/gnump3d" "/var/cache/gnump3d/serving"
+}
diff --git a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild b/media-sound/gnump3d/gnump3d-3.0-r6.ebuild
index 8cb6bc9c4d0b..4b8beef479f8 100644
--- a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
+++ b/media-sound/gnump3d/gnump3d-3.0-r6.ebuild
@@ -1,27 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils multilib user perl-module
+inherit perl-module
 
-DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
+DESCRIPTION="Streaming server for MP3, OGG vorbis and other streamable files"
 HOMEPAGE="https://www.gnu.org/software/gnump3d/"
 SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
 IUSE="sox"
 
-RDEPEND="sox? ( media-sound/sox )"
-DEPEND="sys-apps/sed"
+DEPEND="
+	acct-group/gnump3d
+	acct-user/gnump3d
+"
+
+RDEPEND="
+	${DEPEND}
+	sox? ( media-sound/sox )
+"
 
 RESTRICT="test"
 
 pkg_setup() {
-	enewuser gnump3d '' '' '' nogroup
 	LIBDIR=/usr/$(get_libdir)
 }
 
@@ -38,7 +43,7 @@ src_install() {
 	doins lib/gnump3d/lang/*.pm
 
 	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
-	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
+	dosym gnump3d2 /usr/bin/gnump3d
 	doman man/*.1
 
 	insinto /usr/share/gnump3d
@@ -51,13 +56,11 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
 
-	newinitd "${FILESDIR}"/${PN}.init.d gnump3d
+	newinitd "${FILESDIR}"/${PN}.init.d-r1 gnump3d
 	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
 
 	keepdir /var/log/gnump3d
-	keepdir /var/cache/gnump3d/serving
-
-	fowners gnump3d:nogroup /var/log/gnump3d /var/cache/gnump3d
+	fowners gnump3d:gnump3d /var/log/gnump3d
 }
 
 pkg_postinst() {
diff --git a/media-sound/gnump3d/metadata.xml b/media-sound/gnump3d/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/gnump3d/metadata.xml
+++ b/media-sound/gnump3d/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch b/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
index 44ec564e6f2d..bf487b207909 100644
--- a/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
+++ b/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
@@ -1,6 +1,5 @@
-diff -ru gogglesmm-1.2.1/gap/ap_http_response.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/gap/ap_http_response.cpp
---- gogglesmm-1.2.1/gap/ap_http_response.cpp	2018-08-01 01:59:22.000000000 +0200
-+++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/gap/ap_http_response.cpp	2019-12-16 19:21:06.596524627 +0100
+--- a/gap/ap_http_response.cpp
++++ b/gap/ap_http_response.cpp
 @@ -341,7 +341,7 @@
          break;
  
@@ -10,9 +9,8 @@ diff -ru gogglesmm-1.2.1/gap/ap_http_response.cpp /var/tmp/portage/media-sound/g
        p++;
        }
      else {
-diff -ru gogglesmm-1.2.1/src/GMDBus.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMDBus.cpp
---- gogglesmm-1.2.1/src/GMDBus.cpp	2018-08-01 01:59:22.000000000 +0200
-+++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMDBus.cpp	2019-12-16 19:27:05.072866638 +0100
+--- a/src/GMDBus.cpp
++++ b/src/GMDBus.cpp
 @@ -60,7 +60,7 @@
    void setuphooks() {
      for (FXint i=0;i<connections.no();i++) {
@@ -31,9 +29,8 @@ diff -ru gogglesmm-1.2.1/src/GMDBus.cpp /var/tmp/portage/media-sound/gogglesmm-1
        delete reply;
        }
      }
-diff -ru gogglesmm-1.2.1/src/GMFilename.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMFilename.cpp
---- gogglesmm-1.2.1/src/GMFilename.cpp	2018-08-01 01:59:22.000000000 +0200
-+++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMFilename.cpp	2019-12-16 19:24:44.801263832 +0100
+--- a/src/GMFilename.cpp
++++ b/src/GMFilename.cpp
 @@ -167,7 +167,7 @@
      else if (Unicode::isPrint(src.wc(i))) {
        if (codec->wc2mb(&c,1,src.wc(i))==1) {
@@ -61,9 +58,8 @@ diff -ru gogglesmm-1.2.1/src/GMFilename.cpp /var/tmp/portage/media-sound/goggles
    FXString dst;
    FXint i,n=0;
  
-diff -ru gogglesmm-1.2.1/src/GMTrackDatabase.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMTrackDatabase.cpp
---- gogglesmm-1.2.1/src/GMTrackDatabase.cpp	2018-08-01 01:59:22.000000000 +0200
-+++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMTrackDatabase.cpp	2019-12-16 19:26:29.609893508 +0100
+--- a/src/GMTrackDatabase.cpp
++++ b/src/GMTrackDatabase.cpp
 @@ -1372,8 +1372,8 @@
  void GMTrackDatabase::clear_path_lookup() {
    DEBUG_DB_GET();
@@ -86,9 +82,8 @@ diff -ru gogglesmm-1.2.1/src/GMTrackDatabase.cpp /var/tmp/portage/media-sound/go
        delete a;
        }
      }
-diff -ru gogglesmm-1.2.1/src/gmutils.h /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/gmutils.h
---- gogglesmm-1.2.1/src/gmutils.h	2018-08-01 01:59:22.000000000 +0200
-+++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/gmutils.h	2019-12-16 19:22:25.340787153 +0100
+--- a/src/gmutils.h
++++ b/src/gmutils.h
 @@ -26,7 +26,7 @@
    FXint remove(FXint name) {  return (FXint)(FXival)FXHash::remove((void*)(FXival)name); }
    //FXint find(FXint name) const { return (FXint)(FXival)FXHash::find((void*)(FXival)name); }
diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild
index e5b64d9f6255..a7082b3d01f7 100644
--- a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,26 +11,26 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus +flac +mad +vorbis +ogg +opus +aac +pulseaudio +opengl nls"
 
 RDEPEND="x11-libs/fox:1.7
-		x11-libs/libSM
-		x11-libs/libICE
-		dev-db/sqlite
-		media-libs/taglib
-		dev-libs/expat
-		dev-libs/libgcrypt:=
-		dbus? ( sys-apps/dbus )
-		flac? ( media-libs/flac )
-		mad? ( media-libs/libmad )
-		vorbis? ( media-libs/libvorbis )
-		ogg? ( media-libs/libogg )
-		opus? ( media-libs/opus )
-		aac? ( media-libs/faad2 )
-		pulseaudio? ( media-sound/pulseaudio )
-		opengl? ( media-libs/libepoxy virtual/glu )"
-DEPEND="dev-util/cmake ${RDEPEND}"
+	x11-libs/libSM
+	x11-libs/libICE
+	dev-db/sqlite
+	media-libs/taglib
+	dev-libs/expat
+	dev-libs/libgcrypt:=
+	dbus? ( sys-apps/dbus )
+	flac? ( media-libs/flac:= )
+	mad? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libogg )
+	opus? ( media-libs/opus )
+	aac? ( media-libs/faad2 )
+	pulseaudio? ( media-sound/pulseaudio )
+	opengl? ( media-libs/libepoxy virtual/glu )"
+DEPEND="dev-build/cmake ${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/"${P}"-use-fox-1.7.67.patch )
 
diff --git a/media-sound/gogglesmm/metadata.xml b/media-sound/gogglesmm/metadata.xml
index ed725894ca70..36839fb2b570 100644
--- a/media-sound/gogglesmm/metadata.xml
+++ b/media-sound/gogglesmm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zx2c4@gentoo.org</email>
diff --git a/media-sound/gom/metadata.xml b/media-sound/gom/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/gom/metadata.xml
+++ b/media-sound/gom/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 78ef06e18e82..c41082c2d193 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1 +1,2 @@
-DIST gpodder-3.10.16.tar.gz 1058386 BLAKE2B d73bc8a9d9d2cfe642a6c1e7ae3e7811e05db8c1ebf566904e669a5f9d029c6bce73599da737d25f42c4740d23537b1c414e7a23cf15076394fb714a2f33c79c SHA512 ce9525864e5a640dd82fb535021d63e1d1ddeb7785774b00c668ff86a279a45e075ab7488120ec93d1a07a0a943daa0abb786f822d74866e0fd8c6713d7f8531
+DIST gpodder-3.11.3.tar.gz 1183434 BLAKE2B 553642b17beaadc686c2a2b01971436ca44e84029269f776423905bbac1c2448878d4fb8f3d9f8a1776da5c0417b5df425a884bb2b4d2a80c19e952ceb922a92 SHA512 643097fe209cc69a7674fd265a64099c9b34cc9b2dcee4cc09004113559334822db1dea5359f302956e15b74d3f9c5e1ce8727b89e02f067e7ee6b8261c53ca6
+DIST gpodder-3.11.4.tar.gz 1183463 BLAKE2B ec16bd8dbe531869dd68b062e12013adeb4010a1423b274e52e5cf765828ddffccbfe021a3936e1a6985c2a00f9d1aaf63b80f89beace968501b2e55d284d53d SHA512 f60e2e04abec7d9713d169f9eccb431325bcfe40303e14d0cb42c3b5b4696d7435b86eb1c69b430ef99f81a6b71f89dffafec84d1f1c51118af59e57dcfa0d2d
diff --git a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
deleted file mode 100644
index 37b510d6394d..000000000000
--- a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="A free cross-platform podcast aggregator"
-HOMEPAGE="https://gpodder.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus bluetooth kernel_linux mtp test"
-RESTRICT="!test? ( test )"
-
-# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_MULTI_USEDEP}] and
-# ipod? ( media-libs/libgpod[python,${PYTHON_MULTI_USEDEP}] ) once they
-# support python3
-COMMON_DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/podcastparser-0.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mygpoclient-1.8[${PYTHON_MULTI_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
-	')
-	bluetooth? ( net-wireless/bluez )
-	mtp? ( >=media-libs/libmtp-1.0.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/iproute2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-apps/help2man
-	test? (
-		dev-python/minimock
-		dev-python/coverage
-	)
-"
-
-src_install() {
-	emake PYTHON=python3 DESTDIR="${D}" install
-	distutils-r1_src_install
-}
-
-src_test() {
-	emake releasetest
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If you want to use Youtube-dl extension, you need"
-	elog "to emerge net-misc/youtube-dl."
-	elog
-}
diff --git a/media-sound/gpodder/gpodder-3.11.3.ebuild b/media-sound/gpodder/gpodder-3.11.3.ebuild
new file mode 100644
index 000000000000..08280b1bfa58
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.11.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+dbus bluetooth mtp"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/podcastparser[${PYTHON_USEDEP}]
+		dev-python/mygpoclient[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	')
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( media-libs/libmtp:= )
+	kernel_linux? ( sys-apps/iproute2 )
+"
+BDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/minimock[${PYTHON_USEDEP}]
+			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--cov=gpodder::' makefile || die
+}
+
+python_test() {
+	# These are pulled out from the Makefile to give us more control
+	# See bug #795165
+	# Previously, we used 'emake releasetest' in src_test
+	LC_ALL=C epytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py \
+		-p no:localserver
+	LC_ALL=C epytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient \
+		-p no:localserver
+}
+
+src_install() {
+	emake PYTHON="${EPYTHON}" DESTDIR="${D}" install
+
+	distutils-r1_src_install
+
+	touch "${ED}"/usr/share/gpodder/no-update-check || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "track length detection for device sync (only one package is needed)" media-video/mplayer dev-python/eyeD3
+	optfeature "for the YouTube extension" net-misc/yt-dlp
+	optfeature "iPod sync support" media-libs/libgpod
+}
diff --git a/media-sound/gpodder/gpodder-3.11.4.ebuild b/media-sound/gpodder/gpodder-3.11.4.ebuild
new file mode 100644
index 000000000000..08280b1bfa58
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.11.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+dbus bluetooth mtp"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/podcastparser[${PYTHON_USEDEP}]
+		dev-python/mygpoclient[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	')
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( media-libs/libmtp:= )
+	kernel_linux? ( sys-apps/iproute2 )
+"
+BDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/minimock[${PYTHON_USEDEP}]
+			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--cov=gpodder::' makefile || die
+}
+
+python_test() {
+	# These are pulled out from the Makefile to give us more control
+	# See bug #795165
+	# Previously, we used 'emake releasetest' in src_test
+	LC_ALL=C epytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py \
+		-p no:localserver
+	LC_ALL=C epytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient \
+		-p no:localserver
+}
+
+src_install() {
+	emake PYTHON="${EPYTHON}" DESTDIR="${D}" install
+
+	distutils-r1_src_install
+
+	touch "${ED}"/usr/share/gpodder/no-update-check || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "track length detection for device sync (only one package is needed)" media-video/mplayer dev-python/eyeD3
+	optfeature "for the YouTube extension" net-misc/yt-dlp
+	optfeature "iPod sync support" media-libs/libgpod
+}
diff --git a/media-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml
index 39626a990be5..8d4504326611 100644
--- a/media-sound/gpodder/metadata.xml
+++ b/media-sound/gpodder/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">gpodder/gpodder</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/gqradio/gqradio-1.9.2.ebuild b/media-sound/gqradio/gqradio-1.9.2.ebuild
index 235f711463f2..9c1e825f94ab 100644
--- a/media-sound/gqradio/gqradio-1.9.2.ebuild
+++ b/media-sound/gqradio/gqradio-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="An FM radio tuner app from the people who brought you GQmpeg"
-HOMEPAGE="http://gqmpeg.sourceforge.net/radio.html"
-SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
+HOMEPAGE="https://gqmpeg.sourceforge.net/radio.html"
+SRC_URI="https://downloads.sourceforge.net/gqmpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/gqradio/metadata.xml b/media-sound/gqradio/metadata.xml
index 9677f71ccfff..287be76e34c3 100644
--- a/media-sound/gqradio/metadata.xml
+++ b/media-sound/gqradio/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
deleted file mode 100644
index 3f13ca04b177..000000000000
--- a/media-sound/gramofile/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gramofile_1.6-9.diff.gz 25244 BLAKE2B 60170f960693932d894022d0c576b2d58764e546e6f2a13461ab78abfb92235007047bb9f35964859908c580c815d21e8c80d73ddd4e33b0c1d25deda78d395a SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249
-DIST gramofile_1.6.orig.tar.gz 108596 BLAKE2B fc076c60d3f2f46ab33f63194db165b6d0df6bd76996bade730968dfd821d234b0a88f486e98f84e76804efb8b08fb2538cb553de5f9eb09eb3dde60b441fbf4 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch b/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
deleted file mode 100644
index 9fdbe1477233..000000000000
--- a/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -14,15 +14,12 @@
- OBJS = $(SRCS:.c=.o)
- SHELL = /bin/sh
- 
--CC = gcc
--LDFLAGS = 
--
- ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
- 
- # For Linux (and maybe others), use these:
--CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
-+CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
- DEPS = $(OBJS) makebplay
--LIBS = -lncurses -lrfftw -lfftw -lm
-+LIBS = $(shell ${PKG_CONFIG} --libs ncurses) -lrfftw -lfftw -lm
- COPY_A = -a
- 
- # For FreeBSD (and maybe others), use these:
---- a/bplaysrc/Makefile
-+++ b/bplaysrc/Makefile
-@@ -6,14 +6,11 @@
-         ../clrscr.o ../secshms.o
- #SRCS = bplay.c sndfunc.o shmbuf.c
- 
--CC = gcc
--LDFLAGS = 
--
- ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
- 
- # For Linux (and maybe others), use these:
--CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
--LIBS = -lncurses
-+CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
-+LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
- 
- # For FreeBSD (and maybe others), use these:
- #CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
deleted file mode 100644
index 0369914779fd..000000000000
--- a/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gramofile.c
-+++ b/gramofile.c
-@@ -11,6 +11,7 @@
- #include "splashscr.h"
- #include <signal.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
---- a/signpr_cmf3.c
-+++ b/signpr_cmf3.c
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
- #else
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
deleted file mode 100644
index c0697de57da2..000000000000
--- a/media-sound/gramofile/gramofile-1.6_p9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Transfer sound from gramophone records to CD"
-HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
-SRC_URI="
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}.orig.tar.gz
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	sci-libs/fftw:2.1"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P/_p*}"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
-	"${S}"/debian/patches
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-strlen_and_exit.patch
-)
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	dobin gramofile
-
-	exeinto /usr/$(get_libdir)/gramofile
-	doexe bplay_gramo brec_gramo
-
-	dodoc ChangeLog README TODO *.txt
-	newdoc debian/changelog ChangeLog.debian
-}
diff --git a/media-sound/gramofile/metadata.xml b/media-sound/gramofile/metadata.xml
deleted file mode 100644
index 5b2e2819c938..000000000000
--- a/media-sound/gramofile/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<longdescription lang="en">
-GramoFile is intended primarily for transferring gramophone records to CDs, but
-has many other possible uses. It can record very long .wav files with a bargraph
-signal peak-level meter, playback any part of the files, split long .wav files
-into separate tracks (with automatic track location), and process the signal
-with filters to reduce ticks and pops (multiple filters are provided, they can
-be applied in any order (multiple instances) with user-adjustable parameters).
-Track splitting and signal processing are done in the same run, and don't need
-any temporary files.
-</longdescription>
-</pkgmetadata>
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 032881bc3fcb..ada417bd434e 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1 +1 @@
-DIST grip-4.2.0.tar.gz 1209972 BLAKE2B 087118b0871b149745fa083f3eeaa79ac8c00c2b094a486cb9c5188e215dd7ce4cb06d13fb362914d7b688c89989e3b6b86ee889b4027e38b727876a06f06dd1 SHA512 26cb32064019da1d1683c44caa3c52ae513cec5b1fb435930e8e4c62433a70f14145d92f2215bf54a5bface96945d3e5e879302e2824029650d2a34218528e94
+DIST grip-4.2.4.tar.gz 1212479 BLAKE2B 58203a4faca90e8662347a5f67b7e026c2235ed53c5dbfe351faf4027608eb9e9c7b106907f2abb0dfffd4d01da33eeb334d2500c7f359314c003dc881e1a863 SHA512 fdc2808b91df617f4d2447114037c31bd5fa0657aa4ea2453e644b155468971c65a364bb0a3c6ed8ff2ba0e44e7117a51bec3081c7defd590f9fbc802a216bf5
diff --git a/media-sound/grip/grip-4.2.4-r1.ebuild b/media-sound/grip/grip-4.2.4-r1.ebuild
new file mode 100644
index 000000000000..3968529682a7
--- /dev/null
+++ b/media-sound/grip/grip-4.2.4-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="https://downloads.sourceforge.net/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	!app-text/grip
+	dev-libs/glib:2
+	media-libs/id3lib
+	>=media-sound/cdparanoia-3.10.2-r8
+	media-sound/lame
+	net-misc/curl
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug #416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dcdparanoia=enabled
+		-Did3lib=enabled
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/grip/grip-4.2.0.ebuild b/media-sound/grip/grip-4.2.4.ebuild
index 0879f66ffe97..44af0358ab3a 100644
--- a/media-sound/grip/grip-4.2.0.ebuild
+++ b/media-sound/grip/grip-4.2.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit eutils flag-o-matic toolchain-funcs libtool xdg
+EAPI=8
+inherit flag-o-matic toolchain-funcs xdg strip-linguas
 
 DESCRIPTION="GTK+ based Audio CD Player/Ripper"
 HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/grip/metadata.xml b/media-sound/grip/metadata.xml
index 0f291d57a1e8..21a9a3129aa5 100644
--- a/media-sound/grip/metadata.xml
+++ b/media-sound/grip/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index 377c6dd24e40..f0e396447e37 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -1 +1,3 @@
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
+DIST gsm-1.0.22.tar.gz 66583 BLAKE2B 4c654997e2dd91bc5cee406bd664426f86479bfa8624abb0d7ec164eaebe83c3f534b5ee16952b302500630a6f53df26bbb2287f7a329c8878ae48e61fb770ab SHA512 f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2
+DIST libgsm_1.0.22-1.debian.tar.xz 10516 BLAKE2B 8839082ec446c3eb9dde5d1348806ac5015557257b0c1d319945c36080277b40b25f4903013c5242115467a73e425731661ad4882cf35bba51a90e4f44f284ae SHA512 21929f790d7c821e03113baf3e0690e8cb4b8b3c9015ca6fa05593dba9c4fb000ad41546826bc623c69b19689e81092afe0f7e266b22f9db35e8c735516c9de4
diff --git a/media-sound/gsm/files/gsm-1.0.22-makefile.patch b/media-sound/gsm/files/gsm-1.0.22-makefile.patch
new file mode 100644
index 000000000000..9ef9e5a246c6
--- /dev/null
+++ b/media-sound/gsm/files/gsm-1.0.22-makefile.patch
@@ -0,0 +1,188 @@
+https://src.fedoraproject.org/rpms/gsm/blob/rawhide/f/gsm-makefile.patch
+
+--- a/Makefile
++++ b/Makefile
+@@ -44,13 +44,17 @@ WAV49	= -DWAV49
+ # CCFLAGS 	= -c -O
+ 
+ CC		= gcc -ansi -pedantic
+-CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
++CCFLAGS 	= -c -DNeedFunctionPrototypes=1 -Wall -Wno-comment -D_XOPEN_SOURCE=700 -D_REENTRANT -fPIC
+ 
+ LD 		= $(CC)
+ 
+ # LD		= gcc
+ # LDFLAGS 	=
+ 
++SO_MAJOR = 1
++SO_MINOR = 0
++SO_PATCH = 19
++SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_PATCH)
+ 
+ # If your compiler needs additional flags/libraries, regardless of
+ # the source compiled, configure them here.
+@@ -81,7 +85,7 @@ INSTALL_ROOT	=
+ GSM_INSTALL_ROOT = $(INSTALL_ROOT)
+ GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
+ GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
+-GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
++GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3
+ 
+ 
+ # Where do you want to install the toast binaries and their manpage?
+@@ -91,12 +95,12 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
+ 
+ TOAST_INSTALL_ROOT	  = $(INSTALL_ROOT)
+ TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
+-TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
++TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1
+ 
+ #  Other tools
+ 
+ SHELL		= /bin/sh
+-LN		= ln
++LN		= ln -s
+ BASENAME 	= basename
+ AR		= ar
+ ARFLAGS		= cr
+@@ -140,6 +144,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
+ # Targets
+ 
+ LIBGSM	= $(LIB)/libgsm.a
++LIBGSMSO = $(LIB)/libgsm.so
+ 
+ TOAST	= $(BIN)/toast
+ UNTOAST	= $(BIN)/untoast
+@@ -257,7 +262,9 @@ STUFF = 	ChangeLog			\
+ # Install targets
+ 
+ GSM_INSTALL_TARGETS =	\
+-		$(GSM_INSTALL_LIB)/libgsm.a		\
++		$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER)	\
++		$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR)\
++		$(GSM_INSTALL_LIB)/libgsm.so		\
+ 		$(GSM_INSTALL_INC)/gsm.h		\
+ 		$(GSM_INSTALL_MAN)/gsm.3		\
+ 		$(GSM_INSTALL_MAN)/gsm_explode.3	\
+@@ -279,7 +286,7 @@ TOAST_INSTALL_TARGETS =	\
+ 
+ # Target rules
+ 
+-all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
+ 		@-echo $(ROOT): Done.
+ 
+ tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -299,24 +306,32 @@ install:	toastinstall gsminstall
+ 
+ # The basic API: libgsm
+ 
++$(LIBGSMSO).$(SO_VER): $(LIB) $(GSM_OBJECTS)
++		$(LD) $(LFLAGS) -o $@ -shared -Xlinker -soname -Xlinker libgsm.so.$(SO_MAJOR) $(GSM_OBJECTS) -lc
++
++$(LIBGSMSO).$(SO_MAJOR): $(LIBGSMSO).$(SO_VER)
++		ln -fs libgsm.so.$(SO_VER) lib/libgsm.so.$(SO_MAJOR)
++
++$(LIBGSMSO): $(LIBGSMSO).$(SO_VER)
++		ln -fs libgsm.so.$(SO_VER) lib/libgsm.so
++
+ $(LIBGSM):	$(LIB) $(GSM_OBJECTS)
+ 		-rm $(RMFLAGS) $(LIBGSM)
+ 		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+ 		$(RANLIB) $(LIBGSM)
+ 
+-
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+-$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSMSO)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
+ 
+ $(UNTOAST):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(UNTOAST)
+-		$(LN) $(TOAST) $(UNTOAST)
++		$(LN) toast $(UNTOAST)
+ 
+ $(TCAT):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(TCAT)
+-		$(LN) $(TOAST) $(TCAT)
++		$(LN) toast $(TCAT)
+ 
+ 
+ # The local bin and lib directories
+@@ -352,52 +367,55 @@ toastuninstall:
+ 
+ $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
+ 		-rm $(RMFLAGS) $@
+-		cp $(TOAST) $@
+-		chmod 755 $@
++		install -pm755 $(TOAST) $@
+ 
+ $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
+ 		-rm $(RMFLAGS) $@
+-		$(LN) $? $@
++		$(LN) -rs $? $@
+ 
+ $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTALL_BIN)/toast
+ 		-rm $(RMFLAGS) $@
+-		$(LN) $? $@
++		$(LN) -rs $? $@
+ 
+ $(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_option.3:	$(MAN)/gsm_option.3
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_explode.3:	$(MAN)/gsm_explode.3
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_print.3:	$(MAN)/gsm_print.3
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_INC)/gsm.h:	$(INC)/gsm.h
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
++$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER):	$(LIBGSMSO).$(SO_VER)
++		-rm $(RMFLAGS) $@
++		install -pm755 $? $@
++
++$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR):	$(LIBGSMSO).$(SO_MAJOR)
++		-rm $(RMFLAGS) $@
++		ln -s libgsm.so.$(SO_VER) $@
++
++$(GSM_INSTALL_LIB)/libgsm.so:	$(LIBGSMSO)
++		-rm $(RMFLAGS) $@
++		ln -s libgsm.so.$(SO_VER) $@
+ 
+ # Distribution
+ 
+
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 17031a42b832..6a0a5898782e 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="gsm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 S="${WORKDIR}/${PN}-$(ver_rs 2 '-pl' )"
 
diff --git a/media-sound/gsm/gsm-1.0.22_p1.ebuild b/media-sound/gsm/gsm-1.0.22_p1.ebuild
new file mode 100644
index 000000000000..130cb74bbf7e
--- /dev/null
+++ b/media-sound/gsm/gsm-1.0.22_p1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Lossy speech compression library and tool"
+HOMEPAGE="https://packages.qa.debian.org/libg/libgsm.html"
+SRC_URI="
+	https://www.quut.com/gsm/${PN}-$(ver_cut 1-3).tar.gz
+	mirror://debian/pool/main/libg/lib${PN}/lib${PN}_${PV/_p/-}.debian.tar.xz
+"
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)-pl$(ver_cut 3)"
+
+LICENSE="gsm"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.12-memcpy.patch
+	"${FILESDIR}"/${PN}-1.0.12-64bit.patch
+	"${WORKDIR}"/debian/patches
+	"${FILESDIR}"/${PN}-1.0.22-makefile.patch
+)
+
+DOCS=( ChangeLog MACHINES MANIFEST README )
+
+src_prepare() {
+	# Use Fedora's instead as it handles install perms (bug #554358)
+	rm "${WORKDIR}"/debian/patches/01_makefile.patch || die
+
+	default
+
+	sed -e 's/\$(GSM_INSTALL_LIB)\/libgsm.a	//g' -i Makefile || die
+
+	multilib_copy_sources
+}
+
+src_configure() {
+	# From upstream Makefile. Define this if your host multiplies
+	# floats faster than integers, e.g. on a SPARCstation.
+	use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
+}
+
+multilib_src_compile() {
+	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1 -fPIC" \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install() {
+	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
+
+	emake -j1 INSTALL_ROOT="${ED}"/usr \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" \
+		GSM_INSTALL_LIB="${ED}"/usr/$(get_libdir) \
+		GSM_INSTALL_INC="${ED}"/usr/include/gsm \
+		GSM_INSTALL_MAN="${ED}"/usr/share/man/man3 \
+		TOAST_INSTALL_MAN="${ED}"/usr/share/man/man1 \
+		install
+
+	dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
+}
diff --git a/media-sound/gsm/metadata.xml b/media-sound/gsm/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/gsm/metadata.xml
+++ b/media-sound/gsm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/gst123/Manifest b/media-sound/gst123/Manifest
index 0d875d4ed19a..c0958002c6b7 100644
--- a/media-sound/gst123/Manifest
+++ b/media-sound/gst123/Manifest
@@ -1 +1,2 @@
 DIST gst123-0.3.5.tar.bz2 125468 BLAKE2B c8e6d9956f4371fc70d43768f0cf537b1c7281b49b3426be4d7b16f6f4c80057e50068f26546a93050d9e0c08284a33264e2a61aeaddab34ec1e09188f2145e3 SHA512 a967e4ba00b9ef744aa7a80e24fb7aa452c29b0b024a3bb446570ae9254ea295563deae1a000e9d363f57ce7aa11e537b124ccc672a98bf3230d371dcfb7e4ee
+DIST gst123-0.4.1.tar.bz2 121588 BLAKE2B 216c0058de19237697f5a139d627aead79b094d335590b0edffa3aaf968a7ae6a2531eb4f750f4d75e9b94ca555d582a1df3e840c0055c6558bc9e370c0d6b45 SHA512 c25c7ad545ed8b17248c26d51ff1d81ca5112ecbdfe3262c4ded38a9ae93dbdbfdc476d9893042ab97b4e4a0b15445aa2a03070d11d4d3562a006db56ed3b23b
diff --git a/media-sound/gst123/gst123-0.3.5.ebuild b/media-sound/gst123/gst123-0.3.5.ebuild
index d62b71ae8d3d..89f6a151b333 100644
--- a/media-sound/gst123/gst123-0.3.5.ebuild
+++ b/media-sound/gst123/gst123-0.3.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="A GStreamer based command line media player"
-HOMEPAGE="http://space.twc.de/~stefan/gst123.php"
-SRC_URI="http://space.twc.de/~stefan/gst123/${P}.tar.bz2"
+DESCRIPTION="GStreamer based command line media player"
+HOMEPAGE="https://space.twc.de/~stefan/gst123.php"
+SRC_URI="https://space.twc.de/~stefan/gst123/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
@@ -21,5 +21,5 @@ CDEPEND="
 "
 RDEPEND="${CDEPEND}
 	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
+DEPEND="${CDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/gst123/gst123-0.4.1.ebuild b/media-sound/gst123/gst123-0.4.1.ebuild
new file mode 100644
index 000000000000..f58f952c9d20
--- /dev/null
+++ b/media-sound/gst123/gst123-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GStreamer based command line media player"
+HOMEPAGE="https://space.twc.de/~stefan/gst123.php"
+SRC_URI="https://github.com/swesterfeld/gst123/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-libs/glib:2
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	sys-libs/ncurses:0=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+RDEPEND="${CDEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${CDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/gst123/metadata.xml b/media-sound/gst123/metadata.xml
index c870d0eef0ab..9664b0075b93 100644
--- a/media-sound/gst123/metadata.xml
+++ b/media-sound/gst123/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">swesterfeld/gst123</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
index 04fce64ff8b1..98a7de6e4bf2 100644
--- a/media-sound/gstreamripper/gstreamripper-0.2.ebuild
+++ b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools desktop
+inherit desktop
 
 MY_P=GStreamripperX-${PV}
 
 DESCRIPTION="A GTK+ toolkit based frontend for streamripper"
 HOMEPAGE="https://sourceforge.net/projects/gstreamripper/"
-SRC_URI="mirror://sourceforge/gstreamripper/${MY_P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/gstreamripper/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/gtk+:2
@@ -22,8 +22,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }
diff --git a/media-sound/gstreamripper/metadata.xml b/media-sound/gstreamripper/metadata.xml
index 56c63be9eead..f72bdfe7cea8 100644
--- a/media-sound/gstreamripper/metadata.xml
+++ b/media-sound/gstreamripper/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/gtick/files/gtick-0.5.5-autotools.patch b/media-sound/gtick/files/gtick-0.5.5-autotools.patch
new file mode 100644
index 000000000000..e1b8b16d5b96
--- /dev/null
+++ b/media-sound/gtick/files/gtick-0.5.5-autotools.patch
@@ -0,0 +1,27 @@
+--- a/configure.ac	2020-05-17 13:08:52.000000000 +0300
++++ b/configure.ac	2024-04-18 07:54:45.000000000 +0300
+@@ -24,7 +24,6 @@
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([m], [floor])
+-AC_CHECK_LIB([sndfile], [sf_open])
+ AC_CHECK_LIB([check], [fail_if])
+ AC_CHECK_LIB([dmalloc], [dmalloc_debug])
+ 
+@@ -71,7 +70,7 @@
+ fi
+ 
+ # GNU gettext
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT(external)
+ AM_GNU_GETTEXT_VERSION(0.19.8)
+ 
+ # directory containing configuration support files
+--- a/Makefile.am	2014-07-27 21:32:03.000000000 +0400
++++ b/Makefile.am	2024-04-18 07:54:01.400000000 +0300
+@@ -1,4 +1,4 @@
+-SUBDIRS = doc intl po src testsuite
++SUBDIRS = doc po src testsuite
+ 
+ EXTRA_DIST = config.rpath \
+ 	     autogen.sh \
diff --git a/media-sound/gtick/gtick-0.5.5.ebuild b/media-sound/gtick/gtick-0.5.5-r1.ebuild
index f3a3e28b5666..2d7dec66d23a 100644
--- a/media-sound/gtick/gtick-0.5.5.ebuild
+++ b/media-sound/gtick/gtick-0.5.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop xdg-utils
+inherit autotools desktop xdg-utils
 
 DESCRIPTION="Metronome application supporting different meters and speeds ranging"
 HOMEPAGE="https://www.antcom.de/gtick"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="nls sndfile"
 
-RDEPEND="media-sound/pulseaudio
+RDEPEND="media-libs/libpulse
+	virtual/libintl
 	x11-libs/gtk+:2
 	sndfile? ( media-libs/libsndfile )"
 DEPEND="${RDEPEND}"
@@ -24,14 +25,17 @@ BDEPEND="virtual/pkgconfig
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${PN}-0.5.5-desktop.patch
+	"${FILESDIR}"/${PN}-0.5.5-autotools.patch
 )
 
 src_prepare() {
 	default
 
 	sed -i 's:^\(appdatadir = .*/\)appdata:\1metainfo:' \
-		Makefile.in || die
+		Makefile.{am,in} || die
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/gtick/metadata.xml b/media-sound/gtick/metadata.xml
index 1dd556888a36..0fda71326edd 100644
--- a/media-sound/gtick/metadata.xml
+++ b/media-sound/gtick/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/gtkguitune/metadata.xml b/media-sound/gtkguitune/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/gtkguitune/metadata.xml
+++ b/media-sound/gtkguitune/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
deleted file mode 100644
index a46c671e1301..000000000000
--- a/media-sound/guayadeque/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7
diff --git a/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch b/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch
deleted file mode 100644
index 69a6e8b673a8..000000000000
--- a/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e46d921..13e4ffa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,7 @@ SET( SEARCH_LIBS
- 
- SET( wxWidgets_USE_LIBS base core adv net html xml aui qa )
- 
--FIND_PACKAGE( wxWidgets )
-+FIND_PACKAGE( wxWidgets COMPONENTS base core adv net html xml aui qa REQUIRED )
- 
- IF( NOT wxWidgets_FOUND)
-     MESSAGE( FATAL_ERROR "wxWidgets not found!" )
diff --git a/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch b/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch
deleted file mode 100644
index 41529d20c051..000000000000
--- a/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 6be35ba2153f1c36400b8c535d8ba49292a1f51e Mon Sep 17 00:00:00 2001
-From: Juan Rios <anonbeat@gmail.com>
-Date: Wed, 20 May 2020 05:23:22 +0100
-Subject: [PATCH] Fix compilation with gcc and fix some warnings with wxString
- Trim
-
----
- src/ui/jamendo/Jamendo.cpp                    | 5 ++---
- src/ui/mediaviewer/playlists/PlayListFile.cpp | 4 ++--
- src/ui/podcasts/PodcastsPanel.cpp             | 2 +-
- 3 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/ui/jamendo/Jamendo.cpp b/src/ui/jamendo/Jamendo.cpp
-index 8725bb60..107cadd7 100644
---- a/src/ui/jamendo/Jamendo.cpp
-+++ b/src/ui/jamendo/Jamendo.cpp
-@@ -487,7 +487,7 @@ guJamendoUpdateThread::~guJamendoUpdateThread()
-     }
- }
- 
--#if 0
-+/*
- <JamendoData epoch="1282819258" documentation="http://developer.jamendo.com/en/wiki/DatabaseDumps" type="artistalbumtrack">
- <Artists>
-     <artist>
-@@ -538,8 +538,7 @@ guJamendoUpdateThread::~guJamendoUpdateThread()
-     </artist>
- ...
- </Artists>
--#endif
--
-+*/
- 
- // -------------------------------------------------------------------------------- //
- void ReadJamendoXmlTrack( wxXmlNode * xmlnode, guJamendoUpdateThread * thread, guTrack * track )
-diff --git a/src/ui/mediaviewer/playlists/PlayListFile.cpp b/src/ui/mediaviewer/playlists/PlayListFile.cpp
-index a7ae4a4d..e038e20b 100644
---- a/src/ui/mediaviewer/playlists/PlayListFile.cpp
-+++ b/src/ui/mediaviewer/playlists/PlayListFile.cpp
-@@ -287,7 +287,7 @@ bool guPlaylistFile::ReadM3uStream( wxInputStream &playlist, const wxString &pat
-         int Count = Lines.Count();
-         for( Index = 0; Index < Count; Index++ )
-         {
--            Lines[ Index ].Trim( wxString::both );
-+            Lines[ Index ].Trim( false ).Trim( true );
-             if( Lines[ Index ].IsEmpty() || ( Lines[ Index ].Find( wxT( "#EXTM3U" ) ) != wxNOT_FOUND ) )
-             {
-                 continue;
-@@ -676,7 +676,7 @@ bool guCuePlaylistFile::LoadFromText( const wxString &content )
-         int Count = Lines.Count();
-         for( Index = 0; Index < Count; Index++ )
-         {
--            Lines[ Index ].Trim( wxString::both );
-+            Lines[ Index ].Trim( false ).Trim( true );
-             wxString Line = Lines[ Index ];
-             //guLogMessage( wxT( "'%s'" ), Line.c_str() );
-             wxArrayString Keys = wxStringTokenize( Line, wxT( " " ) );
-diff --git a/src/ui/podcasts/PodcastsPanel.cpp b/src/ui/podcasts/PodcastsPanel.cpp
-index b715bd29..f242608d 100644
---- a/src/ui/podcasts/PodcastsPanel.cpp
-+++ b/src/ui/podcasts/PodcastsPanel.cpp
-@@ -1193,7 +1193,7 @@ void guPodcastPanel::AddChannel( wxCommandEvent &event )
-         wxSetCursor( * wxHOURGLASS_CURSOR );
-         wxTheApp->Yield();
- 
--        wxString PodcastUrl = NewPodcastChannel->GetValue().Trim( wxString::both );
-+        wxString PodcastUrl = NewPodcastChannel->GetValue().Trim( false ).Trim( true );
-         if( !PodcastUrl.IsEmpty() )
-         {
-             // If we find an itunes link we replace the itpc to the standard http
diff --git a/media-sound/guayadeque/files/guayadeque-0.4.6-metadata.patch b/media-sound/guayadeque/files/guayadeque-0.4.6-metadata.patch
deleted file mode 100644
index b35be4f133fa..000000000000
--- a/media-sound/guayadeque/files/guayadeque-0.4.6-metadata.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e46d921..40e640e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -158,7 +158,7 @@ ADD_SUBDIRECTORY( po )
- # freedesktop.org-specific files
- INSTALL( FILES defconfig/guayadeque.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
- INSTALL( FILES defconfig/guayadeque.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps )
--INSTALL( FILES defconfig/guayadeque.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata )
-+INSTALL( FILES defconfig/guayadeque.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metadata )
- 
- # program-specific files
- INSTALL( FILES defconfig/guayadeque.default.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/guayadeque )
diff --git a/media-sound/guayadeque/guayadeque-0.4.6.ebuild b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
deleted file mode 100644
index 02eecd472933..000000000000
--- a/media-sound/guayadeque/guayadeque-0.4.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-
-inherit cmake wxwidgets xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-https://github.com/anonbeat/guayadeque}
-	EGIT_BRANCH=${EGIT_BRANCH:-master}
-else
-	SRC_URI="https://github.com/anonbeat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Music management program designed for all music enthusiasts"
-HOMEPAGE="https://guayadeque.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator ipod +minimal"
-
-# No test available, Making src_test fail
-RESTRICT="test"
-
-GST_DEPS="
-	media-plugins/gst-plugins-libav:1.0
-	media-plugins/gst-plugins-libnice:1.0
-	media-plugins/gst-plugins-pulse:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-ugly:1.0
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-db/sqlite:3
-	dev-db/wxsqlite3
-	dev-libs/glib:2
-	media-libs/flac
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/taglib
-	net-misc/curl
-	sys-apps/dbus
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	appindicator? ( >=dev-libs/libindicate-0.7 )
-	ipod? ( media-libs/libgpod )
-	!minimal? ( ${GST_DEPS} )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.5_p20170110-missing-aui-component.patch"
-	"${FILESDIR}/${P}-gcc10.patch"
-	"${FILESDIR}/${P}-metadata.patch"
-)
-
-# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
-LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# remove bundled libs
-	rm -rf src/wx/wxsql* src/wxsqlite3 || die
-
-	# comment out unused languages
-	cd po || die
-	local l
-	for l in "${LANGS[@]}"; do
-		! has ${l} ${LINGUAS-${l}} && cmake_comment_add_subdirectory ${l}
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_IPOD=$(usex ipod)
-		-DENABLE_LIBINDICATE=$(usex appindicator)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if use minimal; then
-		elog "If you are missing functionalities consider setting USE=-minimal"
-		elog "or install any of the following packages:"
-
-		local pkg
-		for pkg in ${GST_DEPS}; do
-			elog "\t ${pkg}"
-		done
-	fi
-
-	xdg_desktop_database_update
-}
diff --git a/media-sound/guayadeque/guayadeque-9999.ebuild b/media-sound/guayadeque/guayadeque-9999.ebuild
deleted file mode 100644
index 2578fcf2e894..000000000000
--- a/media-sound/guayadeque/guayadeque-9999.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-
-inherit cmake wxwidgets xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-https://github.com/anonbeat/guayadeque}
-	EGIT_BRANCH=${EGIT_BRANCH:-master}
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/anonbeat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Music management program designed for all music enthusiasts"
-HOMEPAGE="https://guayadeque.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="appindicator ipod +minimal"
-
-# No test available, Making src_test fail
-RESTRICT="test"
-
-GST_DEPS="
-	media-plugins/gst-plugins-libav:1.0
-	media-plugins/gst-plugins-libnice:1.0
-	media-plugins/gst-plugins-pulse:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-ugly:1.0
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-db/sqlite:3
-	dev-db/wxsqlite3
-	dev-libs/glib:2
-	media-libs/flac
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/taglib
-	net-misc/curl
-	sys-apps/dbus
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	appindicator? ( >=dev-libs/libindicate-0.7 )
-	ipod? ( media-libs/libgpod )
-	!minimal? ( ${GST_DEPS} )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.6-metadata.patch"
-)
-
-# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
-LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# remove bundled libs
-	rm -rf src/wx/wxsql* src/wxsqlite3 || die
-
-	# comment out unused languages
-	cd po || die
-	local l
-	for l in "${LANGS[@]}"; do
-		! has ${l} ${LINGUAS-${l}} && cmake_comment_add_subdirectory ${l}
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_IPOD=$(usex ipod)
-		-DENABLE_LIBINDICATE=$(usex appindicator)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if use minimal; then
-		elog "If you are missing functionalities consider setting USE=-minimal"
-		elog "or install any of the following packages:"
-
-		local pkg
-		for pkg in ${GST_DEPS}; do
-			elog "\t ${pkg}"
-		done
-	fi
-
-	xdg_desktop_database_update
-}
diff --git a/media-sound/guayadeque/metadata.xml b/media-sound/guayadeque/metadata.xml
deleted file mode 100644
index a7ec7781ef07..000000000000
--- a/media-sound/guayadeque/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">guayadeque</remote-id>
-    <remote-id type="github">anonbeat/guayadeque</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 734320f450c8..6c38532b233d 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,2 +1 @@
-DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
-DIST guitarix2-0.42.1.tar.xz 71825372 BLAKE2B 06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43 SHA512 66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0
+DIST guitarix2-0.46.0.tar.xz 77670776 BLAKE2B b650d53f4e73539419bbe194e07ee770494f80b547d407f5a269c035b91fbf3e0fe078a9e82da21f773d69395523f70fc179be7942f08e2b8689b220414c9925 SHA512 cdb8eccdd230bade493cf0b7fd2a6e748fcaf3c3fd6b5ed5fbd6134d08be9518c93400625d63e386b436fcef3e1738cae543256b09941445436d7f2bf41649a0
diff --git a/media-sound/guitarix/files/guitarix-0.45.0-fix-flto.patch b/media-sound/guitarix/files/guitarix-0.45.0-fix-flto.patch
new file mode 100644
index 000000000000..8f832da0c102
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.45.0-fix-flto.patch
@@ -0,0 +1,11 @@
+--- a/waftools/cpu_optimization.py
++++ b/waftools/cpu_optimization.py
+@@ -168,7 +168,7 @@ def configure(conf):
+             conf.env['OPT'] = False
+             cpu_model = append_optimization_flags(conf, cxxflags)
+ 
+-    if '-flto' in cxxflags:
++    if any(x.startswith('-flto') for x in cxxflags):
+         conf.env['LTO'] = True
+         cxxflags.append ("-ffat-lto-objects")
+ 
diff --git a/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.45.0-nostrip.patch
index 03850a8acb03..e26256ae7aa0 100644
--- a/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch
+++ b/media-sound/guitarix/files/guitarix-0.45.0-nostrip.patch
@@ -1,15 +1,3 @@
-From f630c226e4d6f342f78a82f6dd6df4fe3e3f3e01 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Fri, 5 Jun 2020 17:21:10 +0300
-Subject: [PATCH] Do not strip lv2 plugins
-
----
- waftools/lv2.py | 4 ++--
- wscript         | 1 -
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/waftools/lv2.py b/waftools/lv2.py
-index 7397f6b7..256d52b1 100644
 --- a/waftools/lv2.py
 +++ b/waftools/lv2.py
 @@ -40,7 +40,7 @@ def lv2_add_common(tg, target, install_path, defines=None, linkflags=None, cxxfl
@@ -27,14 +15,12 @@ index 7397f6b7..256d52b1 100644
      lv2_base, dst = get_lv2_base(bld, kw)
 -    tg = bld.shlib(features='strip', *k, **kw)
 +    tg = bld.shlib(*k, **kw)
-     lv2_add_common(tg, lv2_base+'_gui', dst, ["LV2_GUI"], ['-fvisibility=hidden','-Wl,-z,relro,-z,now','-Wl,--exclude-libs,ALL'])
+     lv2_add_common(tg, lv2_base+'_gui', dst, ["LV2_GUI"], bld.env['OS_LV2_CXXFLAGS'])
      return tg
  
-diff --git a/wscript b/wscript
-index 3e2114d3..0d49cd16 100644
 --- a/wscript
 +++ b/wscript
-@@ -375,7 +375,6 @@ def configure(conf):
+@@ -418,7 +418,6 @@ def configure(conf):
      conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
      conf.env['BIN_NAME'] = APPNAME
      if opt.lv2:
@@ -42,6 +28,3 @@ index 3e2114d3..0d49cd16 100644
          conf.gxload('lv2')
      conf.env['LADSPA'] = opt.ladspa
      conf.env['NEW_LADSPA'] = opt.new_ladspa
--- 
-2.26.2
-
diff --git a/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch
new file mode 100644
index 000000000000..7bb46c88eb16
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch
@@ -0,0 +1,30 @@
+--- a/waftools/lv2.py
++++ b/waftools/lv2.py
+@@ -40,7 +40,7 @@ def lv2_add_common(tg, target, install_path, defines=None, linkflags=None, cxxfl
+ @Configure.conf
+ def lv2(bld, *k, **kw):
+     lv2_base, dst = get_lv2_base(bld, kw)
+-    tg = bld.shlib(features='strip', *k, **kw)
++    tg = bld.shlib(*k, **kw)
+     cxxflags = []
+     if not bld.env['OPT'] and bld.env['SSE2']:
+         cxxflags = [ "-msse2", "-mfpmath=sse"]
+@@ -57,7 +57,7 @@ def lv2_gui(bld, *k, **kw):
+     if not bld.env['LV2GUI']:
+         return None
+     lv2_base, dst = get_lv2_base(bld, kw)
+-    tg = bld.shlib(features='strip', *k, **kw)
++    tg = bld.shlib(*k, **kw)
+     lv2_add_common(tg, lv2_base+'_gui', dst, ["LV2_GUI"], bld.env['OS_LV2_CXXFLAGS'])
+     return tg
+ 
+--- a/wscript
++++ b/wscript
+@@ -404,7 +404,6 @@ def configure(conf):
+     conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
+     conf.env['BIN_NAME'] = APPNAME
+     if opt.lv2:
+-        conf.gxload('strip')
+         conf.gxload('lv2')
+ 
+     conf.gxload('cpu_optimization')
diff --git a/media-sound/guitarix/guitarix-0.41.0.ebuild b/media-sound/guitarix/guitarix-0.41.0.ebuild
deleted file mode 100644
index 6e027895e479..000000000000
--- a/media-sound/guitarix/guitarix-0.41.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils xdg
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
-REQUIRED_USE="|| ( lv2 standalone )"
-
-COMMON_DEPEND="dev-cpp/eigen:3
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
-	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.1.2:3.0=
-	x11-libs/gtk+:3
-	lv2? ( media-libs/lv2 )
-	standalone? (
-		dev-libs/boost:=
-		media-libs/liblrdf
-		media-libs/lilv
-		virtual/jack
-		bluetooth? ( net-wireless/bluez )
-		nsm? ( media-libs/liblo )
-		zeroconf? ( net-dns/avahi )
-	)
-"
-# roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
-	standalone? (
-		media-fonts/roboto
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-lang/sassc
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-DOCS=( changelog README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nostrip.patch
-)
-
-src_configure() {
-	local myconf=(
-		--cxxflags-debug=""
-		--cxxflags-release="-DNDEBUG"
-		--ldflags="${LDFLAGS}"
-		--enable-lfs
-		--lib-dev
-		--no-desktop-update
-		--no-faust
-		--no-ldconfig
-		--shared-lib
-		$(use_enable nls)
-		$(usex bluetooth "" "--no-bluez")
-		$(usex debug "--debug" "")
-		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
-		$(usex nsm "" "--no-nsm")
-		$(usex standalone "" "--no-standalone")
-		$(usex zeroconf "" "--no-avahi")
-	)
-	waf-utils_src_configure "${myconf[@]}"
-}
diff --git a/media-sound/guitarix/guitarix-0.42.1.ebuild b/media-sound/guitarix/guitarix-0.46.0.ebuild
index 2c8d5e6f5a0f..7d5de843f0ad 100644
--- a/media-sound/guitarix/guitarix-0.42.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.46.0.ebuild
@@ -1,22 +1,20 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-any-r1 waf-utils xdg
-
-MY_P="${PN}2-${PV}"
+inherit multiprocessing python-any-r1 waf-utils xdg
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+SRC_URI="https://github.com/brummer10/${PN}/releases/download/V${PV}/guitarix2-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"
 
@@ -25,11 +23,11 @@ DEPEND="
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
+	media-libs/libsndfile
+	media-libs/zita-convolver:=
 	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.3.8:3.0=
+	net-misc/curl
+	sci-libs/fftw:3.0=
 	x11-libs/gtk+:3
 	lv2? ( media-libs/lv2 )
 	standalone? (
@@ -64,11 +62,14 @@ BDEPEND="
 DOCS=( changelog README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+	"${FILESDIR}"/${PN}-0.46.0-nostrip.patch
 )
 
 src_configure() {
+	export -n {CXX,LD}FLAGS
+
 	local myconf=(
+		--cxxflags="${CXXFLAGS}"
 		--cxxflags-debug=""
 		--cxxflags-release="-DNDEBUG"
 		--ldflags="${LDFLAGS}"
@@ -78,6 +79,7 @@ src_configure() {
 		--no-faust
 		--no-ldconfig
 		--shared-lib
+		--jobs=$(makeopts_jobs)
 		$(use_enable nls)
 		$(usex bluetooth "" "--no-bluez")
 		$(usex debug "--debug" "")
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index 5bd6d0e7b8af..8903dc5a603d 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-any-r1 waf-utils xdg git-r3
+EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git"
+EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master"
 
-MY_P="${PN}2-${PV}"
+inherit multiprocessing python-any-r1 waf-utils xdg git-r3
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
-EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git"
+EGIT_REPO_URI="https://github.com/brummer10/${PN}.git"
 S="${WORKDIR}/${P}/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"
 
@@ -26,11 +26,11 @@ DEPEND="
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
+	media-libs/libsndfile
+	media-libs/zita-convolver:=
 	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.3.8:3.0=
+	net-misc/curl
+	sci-libs/fftw:3.0=
 	x11-libs/gtk+:3
 	lv2? ( media-libs/lv2 )
 	standalone? (
@@ -65,7 +65,10 @@ BDEPEND="
 DOCS=( changelog README )
 
 src_configure() {
+	export -n {CXX,LD}FLAGS
+
 	local myconf=(
+		--cxxflags="${CXXFLAGS}"
 		--cxxflags-debug=""
 		--cxxflags-release="-DNDEBUG"
 		--ldflags="${LDFLAGS}"
@@ -75,6 +78,7 @@ src_configure() {
 		--no-faust
 		--no-ldconfig
 		--shared-lib
+		--jobs=$(makeopts_jobs)
 		$(use_enable nls)
 		$(usex bluetooth "" "--no-bluez")
 		$(usex debug "--debug" "")
diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml
index a17618d6ef19..3cf3426490c1 100644
--- a/media-sound/guitarix/metadata.xml
+++ b/media-sound/guitarix/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>fordfrog@gentoo.org</email>
-		<name>Miroslav Šulc</name>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -18,4 +18,7 @@
 		<flag name="nsm">Build NSM (Non Session Manager) support</flag>
 		<flag name="standalone">Build standalone application</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">brummer10/guitarix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/helm/files/helm-0.9.0-musl.patch b/media-sound/helm/files/helm-0.9.0-musl.patch
new file mode 100644
index 000000000000..f089041c1da7
--- /dev/null
+++ b/media-sound/helm/files/helm-0.9.0-musl.patch
@@ -0,0 +1,129 @@
+Upstream (JUCE, bundled): https://github.com/juce-framework/JUCE/pull/1239
+
+From 393de14d3fb55e462eeae24a4e64978a8a30cd4f Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Thu, 15 Jun 2023 19:01:32 +0000
+Subject: [PATCH] JUCE: Add support for musl
+
+---
+ JUCE/modules/juce_core/juce_core.cpp          |  2 +-
+ .../native/juce_linux_SystemStats.cpp         | 34 +++++++++++++++++--
+ .../juce_core/native/juce_posix_SharedCode.h  |  2 +-
+ .../juce_core/system/juce_SystemStats.cpp     |  2 +-
+ .../juce_core/system/juce_TargetPlatform.h    |  9 +++++
+ 5 files changed, 43 insertions(+), 6 deletions(-)
+
+diff --git a/JUCE/modules/juce_core/juce_core.cpp b/JUCE/modules/juce_core/juce_core.cpp
+index 9f87047..c6f28ce 100644
+--- a/JUCE/modules/juce_core/juce_core.cpp
++++ b/JUCE/modules/juce_core/juce_core.cpp
+@@ -93,7 +93,7 @@
+  #include <net/if.h>

+  #include <sys/ioctl.h>

+ 

+- #if ! JUCE_ANDROID

++ #if ! (JUCE_ANDROID || JUCE_MUSL)

+   #include <execinfo.h>

+  #endif

+ #endif

+diff --git a/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp b/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
+index 4b8f4bd..55906eb 100644
+--- a/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -126,9 +126,37 @@ static String getLocaleValue (nl_item key)
+     return result;

+ }

+ 

+-String SystemStats::getUserLanguage()    { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }

+-String SystemStats::getUserRegion()      { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }

+-String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }

++String SystemStats::getUserLanguage()

++{

++   #if JUCE_GLIBC

++    return getLocaleValue (_NL_ADDRESS_LANG_AB);

++   #else

++    if (auto langEnv = getenv ("LANG"))

++        return String::fromUTF8 (langEnv).upToLastOccurrenceOf (".UTF-8", false, true);

++

++    return {};

++   #endif

++}

++

++String SystemStats::getUserRegion()

++{

++   #if JUCE_GLIBC

++    return getLocaleValue (_NL_ADDRESS_COUNTRY_AB2);

++   #else

++    return {};

++   #endif

++}

++

++String SystemStats::getDisplayLanguage()

++{

++    auto result = getUserLanguage();

++    auto region = getUserRegion();

++

++    if (region.isNotEmpty())

++        result << "-" << region;

++

++    return result;

++}

+ 

+ //==============================================================================

+ void CPUInformation::initialise() noexcept

+diff --git a/JUCE/modules/juce_core/native/juce_posix_SharedCode.h b/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
+index 876e681..59c49ba 100644
+--- a/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
++++ b/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
+@@ -235,7 +235,7 @@ int juce_siginterrupt (int sig, int flag)
+ //==============================================================================

+ namespace

+ {

+-   #if JUCE_LINUX || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)

++   #if JUCE_GLIBC || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)

+     typedef struct stat64 juce_statStruct;

+     #define JUCE_STAT     stat64

+    #else

+diff --git a/JUCE/modules/juce_core/system/juce_SystemStats.cpp b/JUCE/modules/juce_core/system/juce_SystemStats.cpp
+index 7e05277..cac9a14 100644
+--- a/JUCE/modules/juce_core/system/juce_SystemStats.cpp
++++ b/JUCE/modules/juce_core/system/juce_SystemStats.cpp
+@@ -120,7 +120,7 @@ String SystemStats::getStackBacktrace()
+ {

+     String result;

+ 

+-   #if JUCE_ANDROID || JUCE_MINGW

++   #if JUCE_ANDROID || JUCE_MINGW || JUCE_MUSL

+     jassertfalse; // sorry, not implemented yet!

+ 

+    #elif JUCE_WINDOWS

+diff --git a/JUCE/modules/juce_core/system/juce_TargetPlatform.h b/JUCE/modules/juce_core/system/juce_TargetPlatform.h
+index ae9d7e1..9dca4bc 100644
+--- a/JUCE/modules/juce_core/system/juce_TargetPlatform.h
++++ b/JUCE/modules/juce_core/system/juce_TargetPlatform.h
+@@ -33,6 +33,7 @@
+     - Either JUCE_LITTLE_ENDIAN or JUCE_BIG_ENDIAN.

+     - Either JUCE_INTEL or JUCE_ARM

+     - Either JUCE_GCC or JUCE_CLANG or JUCE_MSVC

++    - Either JUCE_GLIBC or JUCE_MUSL will be defined on Linux depending on the system's libc implementation.

+ */

+ 

+ //==============================================================================

+@@ -177,6 +178,14 @@
+   #elif __MMX__ || __SSE__ || __amd64__

+     #define JUCE_INTEL 1

+   #endif

++

++  #if JUCE_LINUX

++    #ifdef __GLIBC__

++      #define JUCE_GLIBC 1

++    #else

++      #define JUCE_MUSL 1

++    #endif

++  #endif

+ #endif

+ 

+ //==============================================================================

+-- 
+2.41.0
+
diff --git a/media-sound/helm/helm-0.9.0-r1.ebuild b/media-sound/helm/helm-0.9.0-r2.ebuild
index eb8bb1120649..46ef109dc534 100644
--- a/media-sound/helm/helm-0.9.0-r1.ebuild
+++ b/media-sound/helm/helm-0.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,7 @@ DOCS=( changelog README.md )
 PATCHES=(
 	"${FILESDIR}/${P}-nomancompress.patch"
 	"${FILESDIR}/${P}-fix-gcc91.patch"
+	"${FILESDIR}/${P}-musl.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/helm/metadata.xml b/media-sound/helm/metadata.xml
index ad30917b36ef..03af74a47381 100644
--- a/media-sound/helm/metadata.xml
+++ b/media-sound/helm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>proaudio@gentoo.org</email>
diff --git a/media-sound/helvum/Manifest b/media-sound/helvum/Manifest
new file mode 100644
index 000000000000..d0ea0abb0849
--- /dev/null
+++ b/media-sound/helvum/Manifest
@@ -0,0 +1,144 @@
+DIST aho-corasick-1.0.4.crate 171175 BLAKE2B b3d450533f0799a18fa6ceba41ce841573a3b9fe9bc66745aba9b5a1ef4d86b107aa68c049bd30df7bc86229c71264142e40da8e1d145e776017269a01aed86e SHA512 7cb8feb3289a508b1345b3cc04b59f2f730b80f561b17c7605ce23bf92780b5b3714ec84f5e3c5f4ba0c3abd47ac44fd0064a8bf4c5a7d00bd580774c6a3aee8
+DIST aho-corasick-1.1.1.crate 182812 BLAKE2B df74c2cfa0ae392a8d466e370ba761c4cd37c65773affba9a3cdcf7f5797b34b4a25e1646be3de5081644b34db2dce273609edb4f18a1ce7fdbf31ac28a10b88 SHA512 a894e1cefbb63a3b7b78a3676874d0b7a507c27970f48cdfbda1e5deefbf6b20ed4271b660a12eea77b318cd2fa0f80850a0b1ddfe0d0731ffa326c0fc295692
+DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bindgen-0.66.1.crate 218860 BLAKE2B e0edc8dd6c14220ca223b5d2a5f2af93aa64ed32f4fedfabcca1b93e46d8e7a88b283c2e67070c71900e0dfc899fdf51e3931781575b25e40c8c1f4891905e35 SHA512 82ceed313f6b45d54745ec79040e4298ad29e3f600bf7e16a48e88c2d166204b14aabd919e8449548997f20a65400e74bb56abc511c0131b98ec1cc050411c6e
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c
+DIST cairo-rs-0.18.0.crate 54153 BLAKE2B 37452643d0466d8f9b8c236158c0408d0d9ea6b34b151263211834439a716a051e98349cd437a5f4ff22ad232f63362cc5db623325a588d453f42edcfaef121a SHA512 b3e778aa275c510989dad43684293f60758e0770c7eaf0c12c1c641bbca1e410b011cd90e6b5f76ac1f8c3f1f18dae7643336b3ca316a191d1a3601163ceb9e6
+DIST cairo-rs-0.18.2.crate 54200 BLAKE2B 499551c1195174e59b314a0854bc01111521a4d9a60774f28e19f7cb3648204af3d71c57464710891f4b1f2cb787b003ef9d8956ea94fa6350e5e48f3b5e752b SHA512 2343429c6ac03068db66e12429e462ae07157b7850175d5a03db261bf36ff518032a87a3a88c7ab60544d53a45e07f143342e8e4121b8ee0ff0620ddd1df8d7a
+DIST cairo-sys-rs-0.18.0.crate 11803 BLAKE2B b7358bfb19b846e619dc57544f342e5f8a5a5a5d2d0b19368e6d03375141176961c6a8780906c2a218970513525a7f7eab71348b5f09578d3c509f5f5f1038fc SHA512 e5d86d1c2d9825f3c69b194bd8068b8db61a125a9c8646d7b56859417176692188a1f9f40228ff7ac2836b16e49bac5ce5ea762928c872cd4c3aa14ec8029568
+DIST cairo-sys-rs-0.18.2.crate 11855 BLAKE2B da237a944a6eed675b6812bf8a71f99354c0c41302d222cc0ddf38e47d612d6c49754cb8854c92dbc62d32de5f716bc869cc874949b62c2ac4736104c5996144 SHA512 b101f7a2543793fbc1a1cf86c62a8fa404ce171160603e72f9aae3592736e4d68ae53b8ad91aa8d70e21965d263dc740f96fe001bb049674b4efee1039d3d68a
+DIST cc-1.0.82.crate 67879 BLAKE2B 3b06cbe1516d4fe8291e1543b09d32d39a135c2352e545b64bc69fc82a40128a9b1291f20bd4cac6a3c37d9466093f8b63cae20663ad517bd7dbc380bfa87ee7 SHA512 27810ea12401635b0122e5b3a71367a52ca7040f196cb30f709e0b8ec0e717aeb8a89ef4e891b1c7c88f7cc8a1c35e55db132b728b0c499e0b683d5b803a671f
+DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
+DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
+DIST cfg-expr-0.15.4.crate 41460 BLAKE2B ed09121cbbae52f91a5c65c56b162e7223a467b931f6a0b4c35b9b947cbe36bbc0778e58240864668002a3a6fa3c36cc10b406cce59a302edaea461bdcd3ebe8 SHA512 6370348665551fea37bc85ee444f302fc5890fee0620b365b03a27aebf2c366facfc73d3a6aa040b83dc39c463948dbe8a15e679c3e413566dfb506ba855cd33
+DIST cfg-expr-0.15.5.crate 41639 BLAKE2B 8dce19ca74027fd284086797829caad8202ccd4c774f918f47384988a4b5ac20053054d5b656e8ab67575b7075a819fedd2f09f0b2d46198581883bc61bfd620 SHA512 13e9c47e66d74da94a742af01716655dde119d7928fcc519a52720f3d9c27ccdee9b3de231617c3f5739775c251e695e892bd1b7511d4bfca65e93447d86dd76
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clang-sys-1.6.1.crate 41346 BLAKE2B b70104e6c6b3c1b85caa111c2b1fb2c20d30eeb85059bc616afc49bce9409f7ee2dd8b800750a466accad6a74ef29d10c6a2ee4459d854a2c0c54050ff51cc4b SHA512 a6c62c1d3faae3796f5e7d98ed4f1a8119f0ffaf8fceee8e728cd4da57b0140e82631012450bb0c551cd13814a97065e9e47015320707a87bdfbb6fd317e952c
+DIST convert_case-0.6.0.crate 18675 BLAKE2B 5e5ab159a61e68b801f1c95dc5336f3af7ffe6fee212c8ffb9905af1121f0b272b234b4e70a30f29f5ed24f4825ccfb59722057b69549fec0fc3472857ee1ce9 SHA512 3b17449195a9a36e3965db89eeb967979c192ad7743217ea08e8c8b91ecae1ac1674362d05dc6f32f1f361fface3f783398285bb78060403f65a777a9d29adf2
+DIST cookie-factory-0.3.2.crate 14325 BLAKE2B 34a45c00e033b7d684b1bfd61a60d5969d3f5cf72532239d09f4f9f803b8cdff4858d1c827bdccc991b562c3ecad3b308995430775080c06fd5ad03538e6e9de SHA512 8c3eb5ac052368a426158ec23c4d2cd3d74f14b426782cab4b89de6070611cbdaf4360a668dc3c76d9168f738cd10389eb56094f72014c7e5c249ee1616aebc7
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST field-offset-0.3.6.crate 10032 BLAKE2B b4b43d35f793c55e8c521de7bc1648501cfe46494fc17d0b6135ba3456c8d72a11b422a16735c681c7c6542084652c119661372628096d61197f6e387b66143a SHA512 3ec99bf5e860dc68f3fcd0abd2b0de2ae0b3174eb177458506aabeee9dc7b0b8b58b925e2c6108a8f18ab95f2e1952dd9474650a639e1c1d50ec3f72bbd30077
+DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99
+DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0
+DIST futures-executor-0.3.28.crate 17743 BLAKE2B b192025f0838c924783090e7b0bd7806edae0502172e5f961d4cab5a4a5c074050ab6a707a50baa0ac2f505deb1e3ace4259349570beab0bff34b7bf6849e9ef SHA512 1404717a512f1968e3ac6c53bb6c428fa049b0f6c61565ddc4859407cf16c56735cddf7a2931b2816c6c8dc8809f76e7f98ff05d4f80e4567488c2aa7b424a50
+DIST futures-io-0.3.28.crate 8910 BLAKE2B 5554e9dd8548be47e7195ae8b223288cc2e765dc9feb703092972ec9e19ade825bc9d7093625a77c7dd2213df59e2c70ada84a84446b5a940c3e62daeb9dd57d SHA512 805177f2677a09d94ce5f010af9244e0e0dc285937e355a836179297c4c912a762f8d96bce57af388502810dcb67a772b7a522f5c6b21be3aa4b7ee46372d402
+DIST futures-macro-0.3.28.crate 11272 BLAKE2B 3f6bd63f402ab3348e1eae96897b4c18aad01b99a1f9ff555496fc6f3114cfb3334b1949604c21af251fdc4923c09e4412f40031ed92646a06ee05f6bee9a0d9 SHA512 accbe4f434b3704fea440e1fa7492c438068ac89798e3b2c85a2b251c55663ef2c65480f6da0884c8e80a9c5f5203aa6ae623059235f4a480a54d91bc5e9426a
+DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82
+DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4
+DIST gdk-pixbuf-0.18.0.crate 18173 BLAKE2B 44367c346398bc670321b30019fe557e1a84210ba531094297cf925b672f663f58f45e46850e5d2104e6ce00902af4df579783a3440d27d78d7c1bdd4c4a4350 SHA512 20ef7a417ff80434c1354199e0e19ee9db7be5d56f1810e0f8b4e82ce9fe5f4ecbdc53a4bb9d2e51a4f8c47710877bd513e8fc058cb6286fbbe3b69b2e56d176
+DIST gdk-pixbuf-sys-0.18.0.crate 9674 BLAKE2B f9c224988cc2d46181a5d3dde212988785c5cd8fd411ca5d4a55156307ee5895465c5185d761b246a7ebfff81a60ef7c5973ecbe5704b5e0ad77ec72b55025e2 SHA512 ef757be6df8f6ffbe8a0276ccac2b3d4c46b7acc6580876635a10b6782d5afb9ae6e8b11c7dccb0933b6d8767c57bc89b0ab117470f33b73f7a4a141f44fb121
+DIST gdk4-0.7.2.crate 88698 BLAKE2B be4a5989d7a5a0490a9feed74d61fbe98300c3993ec729f2cfbfe4ec6c21b2d87725668ad1b6b4d3159ef7825257a0eeed034d57229b52aa415b03e3b0966c0f SHA512 8e649a7a3f76cf4dd2796bcd9db3250c20b8a3ee726bbecc7d1fed859a7228ef15951ca73b0f3eea2ff72d9e9378c11b6131509f9a634e0811d853f10b40d386
+DIST gdk4-0.7.3.crate 88832 BLAKE2B d4cb8f0e76c238123f934d241bb172559cfb560aa57a51698fb2d254131b8035aead4b892d58c785c17607befc83aab1379efe443d0ba454a7175ebe5f093d2e SHA512 5fa610b59b1f2ed179889289cba0901806ff0d30a10d8c7d919f7c34357ed823debcee3db8ff5659b821f6c0fff520bc8a183dd951538addf0b9a25e8be0a376
+DIST gdk4-sys-0.7.2.crate 64775 BLAKE2B f54ec0a8f4b63709b015801ddb2c1e8df185b13ced0b66ff453655dee10f750dc555f36e1965487eec6e814c9e35e816a8aedfc46cd18b6b284fe1c0aec952c3 SHA512 e4ab0e5b50c86e90da016e7efc0b824caa4d09a12d1f2d9cf2236dec6060a36da0609a7206c74937a0747df3a8fca0c16e2c8aa22e1ff58b223dfe5a5a3a105c
+DIST gio-0.18.1.crate 204998 BLAKE2B 36e3f697db478cb5b1da3c5136ea158713eab2ab126126b4fe22f9b5c6093b623b8efbb72cecf672df107bdca0f651fff40d2985c4a9f2cf9e5f2a9ca8d0809b SHA512 f489a0f0223a68673eecabfce71d494973d46fcd19c385e2bf219adcc612997fdbe542a36cc5fcf539120d5177325dc297fb1120b72fc172fd458d50b87e2e52
+DIST gio-0.18.2.crate 205555 BLAKE2B af94572db03f5e270bafe884b18b4a1a5919a997d0ed6d7e1cdc6bddf62d2c9095d3d788102d6168c408b27d9be8b44500056c060ebcbab2ade205a8aed11feb SHA512 c32c55167b33e7e2a5e70101eacef953971ccc0181865963a6a21189bb4c4bda5b7a02345507250a673504a7302e184b89d7ebd71d3eb482999495e7ac2def4d
+DIST gio-sys-0.18.1.crate 81369 BLAKE2B 40b7425735f49cab5748130a3edde01713472cb75c2e3f1612ac1699ff2488abcd17addc8b9de1704328f7656e660f90cf33502f8567c22565f15d9f80aa4079 SHA512 f02e9766754d48407e955fc81bb27820a357a1f6cf7b1e89464c0399cd39d4adfb8586d7d7a2a12e98792fcf6e4fe2807816185824967906d45ff936ba3d911c
+DIST glib-0.18.1.crate 261969 BLAKE2B 8b6e43772952c25c422ba970022f57dfb2e38437a2743ea380c146f4aaab7af8e3275082299a9000f41025ae497b8fdb50aa06d1fd13e8d773817fa95b1f47f9 SHA512 86b761f034151d0f4aedcc313f06430460f3c8fcce5d423c9deaacc6e8d89307e670b5aba09ac687786e31f8ae82b45e5966b97f9350224ef2a43a356430a1f3
+DIST glib-0.18.2.crate 267214 BLAKE2B fe30e388621649e858195998df250c8917f49ee58590c042cb89c1e53032738b5e08b16aefee2f640006d09a327ff56c16669f5874a550cf585b289a51746b6c SHA512 ef1768336827f9bbfcadd013fac6741fecf73e3f25617321b803aeddecb885930d7a17c6abb0c636cce802898381e4d38cebfd9a95f47c7841d29d25e7a76bc5
+DIST glib-macros-0.18.0.crate 49938 BLAKE2B 6f5cc6a9e20c3de82954520b4c7e437de8db082492c12ac26a6262e3d36d25a0e14d188882c3c7d03513d6761b4968e2cd736f27fc4e1a5ddfdddb673f396817 SHA512 e907f3f4dec6511ff20dba71048b80402d3110ab213bbf1e693b16de1a712d403aa4ec6b4cdadc537b0850534f8965916b5ebe23183c2d52b4d6a28a84c0a110
+DIST glib-macros-0.18.2.crate 50855 BLAKE2B 3daeb7596006cafdf1d97fac17c10ba7ce29af7dcbcddf86ba7c32d87f281dbe0a2f12a182e2a5aa6148f4903bea8d007a71356016464b85908ec0f8a89d6bcb SHA512 0adf4e1fb83b627ef65bacf2f0fc2deb0baca817b6bc6a9cd88e529ac5b84badd30a94e1076890049a7558d8249ead1add252c9df00b356180b274460f7fd2b8
+DIST glib-sys-0.18.1.crate 60464 BLAKE2B a68df8198874339988cb60ff45b9904607a7852d224e5efa487f22f3bda8d3eb54f7e30f6e2c30bb20dd6e5d48c205b65b7f8c3787915d3a436666d6fbfb797c SHA512 46583979de6d58cb863e522f9f11f9fd2e16ed5d1ec098f9f9511a7a124029671107beba01d5a19dcb082e57c53a2714ad3f75b0ae47c65985c2ab947d3f2c15
+DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
+DIST gobject-sys-0.18.0.crate 18699 BLAKE2B c5578c791f40ebece8210473bb363174ebf6d41db6a7ce64f4a86a2ab5337c45c5b10ff9093712a846cd2cd9bec99e135b4db556a4d18d6d4758a1a66aac08ed SHA512 7b274a6a4c4f38a4c1a5abf6410151d5ecd669c9a2c3ca874faadb0cf31c94b000c7439e1c1d409cf66ba41d8157dc9bd931de5bac58e50bc2ea9cbab13b3f00
+DIST graphene-rs-0.18.1.crate 17724 BLAKE2B c0d28601904e5b81780b3c535a7805df404a31168fa470f9cd0e49fdf3ad2fc51c77595a9dd95267a8cccb94b3935db3838f21d738bb19a3a398fde9566c31e6 SHA512 d7f6acdc70ed7de110b24297d7df3b1ca298966bb0d7695af8d2c955f521f828638bf3282a5d4c79042d30029c6f77251a204fa5f3be84703a1728a2eb681a81
+DIST graphene-sys-0.18.1.crate 11573 BLAKE2B 029a5afee5ac658ff250c55ff18af09d5dc3657857d7124050d27f85cef97c0bb7f150fc43c5fe238c8961c31b57a9d5a3d757887c90929c4a9a50e25b0c614b SHA512 890556cfc5120fab60d22028394be9ca8ccbb57f34d386768da3e1580047b8c2096a08b636ea2df76f19b7b1c045275b2873b74ee039896c65ab03f5b97e89a9
+DIST gsk4-0.7.2.crate 32358 BLAKE2B 4c8ec9741a8d3a03760429ba6bbe7dcae394206f8e1dc4c1ec50692fb3e9841dcc7098a0787ad87858a63dd85b9d74ea9bec479d032e5b6ab85f8942276529a2 SHA512 d688a2439895904a9b6dceee2d3dd6c8c76c3534be08a634e96684584fa6a08261911904bd7256738978598c0d45bc5ab88edb4c2a7873c928c69e54679583bd
+DIST gsk4-0.7.3.crate 33660 BLAKE2B c3d0aa2cb05bfbd64ffa877272b2d01e9293a513337d46bb84ecdc350de1222e1f0d450d862e9466a1daaaf003ea3e06dc2e98064aecb03df6b755fc63284a70 SHA512 05b49365b85b36e169aada6b9c3f584eeb7bc1a498ab0e7f873c5b6d67848534a7706a5c8eb29368a35334cb6db814f20efac32c0995ddc89f91dc464071851c
+DIST gsk4-sys-0.7.2.crate 14612 BLAKE2B b70e165a36e147efffe200765efbee25881ffba8e50023c120579cb02e6b2902747cc1913291663a3089229633cd4593148c6f58efe132df22c78e80d9497f69 SHA512 9d676819a5692a053ee4a5fa2ce72bf70b27423d8ceb24ba31381e39b9c27860b20eee90989c3a9fbedd678c839497c0ea3b151da24969c94ed1461e713a9e8b
+DIST gsk4-sys-0.7.3.crate 15050 BLAKE2B 7518f8959f2bda9d3a2d8bf1bb8467d2ae0550bfa00db2a86e8e1e8b1c60d218e1708d2936eea2192f95d2e72549cb10ba06b2db28bd9fbe5073d2f28753f22c SHA512 0d14a4d977609c674c67b49a4ba79e819b502d6a7450fdb18320bdf87ca16bd0ead118c8193626a0cf7ed136dbcad9804c61f38bf521ee5824749e7e3a156fff
+DIST gtk4-0.7.2.crate 468489 BLAKE2B 3987b0680ce1554782d208f184dc8fc901a8f0d775c8a15a3f227ac4d0ed27c02872475149401b6f08f9ff6a9611900252dc78ababe0e536e792438f8d187f77 SHA512 6143127c066b0626bdcfeb7c834f16bf49c25e3f237b03e0b5265206e6a191a32b1fc368af13a700635edb4552c19d4f7e8ea2d4141e3bedfe55226df35aec99
+DIST gtk4-0.7.3.crate 468953 BLAKE2B 90bbcc6e13055a170f031131ba12f96e5aa090dafdfa655bab76c4cce0cc42866b6e9b594b328ef8f61ff9cd44fd370e160c65cf20c343d6bb53bf405c04c984 SHA512 53a767c68428e35f59c1b7703793a6b1e460f647804f40b4d9ad206b2cb02985d90af858724c0553496e20517e8dddfe2d18df26822a39f591eab9c92e891722
+DIST gtk4-macros-0.7.2.crate 16770 BLAKE2B a63be9ede28cb264c411f39b698857c72e08f250df4de99c3f475be3dfd683b6e1f19f54d2a637232e83c35280a5e91acfc8fd98e1b9cf4c870e54d4d8016119 SHA512 66486f148acc5a1200536cf63711d71bee44253138f811821a9595759695da03c0b1f79e9d6c7e30a4a140b6e7470792e35d4d7113a2e550df9ce58cf48976b2
+DIST gtk4-sys-0.7.2.crate 105913 BLAKE2B c46e9f2e91ad852886d3ef4da3f5acbf5797b357172c190f6f47d7894224e8ec52b9ace0702bc7e0c75b366f888894f9e0866e537ca7aa130ee554b5918188ef SHA512 6ef8ae72923291db8eefd74d4b51ace58b586e9e4b1101ef9d0b6457c2ce525935d1042acb160042ff92fd6648730282fcfff46e6bbf6af9e41614f15cbe7f71
+DIST gtk4-sys-0.7.3.crate 106028 BLAKE2B 0b80e030a5e17de7692f55efd2600db62c4bdbe2f764dde88151a6ac69e5c81de1a0ac4ffea5b4f00bf511cf4feedc249067e6b0ad69fbb266e12e896ef33251 SHA512 40c14996e8d819bd907d98677fa1e05f86411e030f5b28b076131b36b300af240bee0c255199602d558d4f7429232e1d58e310cd0a95650a6ae84349e3d1b9a2
+DIST hashbrown-0.14.0.crate 116103 BLAKE2B 24bab03e8a8cb7623b92282c83bf8acaf0752c696ee1c010249e3ebb3646e7549d8d6d798b02c9d5b621afbebba7320f8a859d9a1af1523dbd46377b857dbb5f SHA512 f0fbdf81517f59a0b67f792a4097f1131d346b2b4cbda93590749cef7f9f1c9029e0e182f58c23b74d3028f7502c30b9593c1eb4da37f95388d74b14582b8959
+DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
+DIST helvum-0.4.1.tar.bz2 131341 BLAKE2B bdcb48bfe79c0d30b3f5b3e935a873fc1c62d75054f9be93c54074461d18b6cb163e32b934e9f113b64eff5d36df37a7797bbe54e68b06311e717ea8201531cc SHA512 32d847074561359e636d9a845d74fcdcf3e0d159508bfd6717f3f6d8a0dd49b2eb8bd28c8d12984a3b1dec4e22f0ae34fd2538470b26b4825dc9eb846c80263f
+DIST helvum-0.5.1.tar.bz2 165923 BLAKE2B ae3b2d460b70a79454e846f0f92d301398093aca48d10c22a62354044dfcdb4031069a0530317578319654308bb1c07ae665b9b453e350c4279209c7ba75df14 SHA512 84b0031827a1db9824f4be89b8360d3796e164e61b0fd6be7444137c0ba709cfd96ce29bd23b8e572f83c02bca69e42c00138782b39a228823f450aa250abe30
+DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3
+DIST indexmap-2.0.1.crate 64305 BLAKE2B 61863f045afbf78466fb73ef99cc02b48c6781c596cf46a67fbde3c025468bfac3380a31efe10e8c69eee4ec1c85cd79b260627111ca6842d50c39552f3e17e4 SHA512 69b7da13fdc3164630e79ea09bf7e036bdf9cc44384742069ef59b3f8f909a5912c65908f9c605748a1476722d0536c3468cb5243666b37215d3f4f5f38cabc1
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
+DIST libadwaita-0.5.3.crate 100024 BLAKE2B ea960daa5411173be50d9d3290837350c3c45cf1f6c12a6c6e83162d2bccdec8491d979866c30a975eeb87e642c7775d28a413b7c96946d0feb65f2b8388af8d SHA512 5f0880b0ab0e69902230e88db393c0c90243b4ce2a0014006efc0fbccbeb948169981fd683cc05ae9449f44d1ccaee64e7b041453dccf3857a9f21e276dd33f8
+DIST libadwaita-sys-0.5.3.crate 24713 BLAKE2B 9ba2b45383c3427d6096dbd1b4482f0d5e287f75d5feba84f62653ef95dae1834e13c489470cb8211f6d66a74dd5e7eb6fbbd2c0ebe51fb5c41f3617ac061809 SHA512 5108a26bfd53f4fc934a11c76045052e22a2dd1158068271633679b7051c709052d08d5e7a54839fde783c8bf9880c0df304c50c495a394a0f717e030aeffd49
+DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
+DIST libc-0.2.148.crate 690988 BLAKE2B 41dd38cfff1431cd8184220745697d794a66f6badec750be3910ddc4a6ddcf964692b5b28a5a9714592c5579da26248092facb9407920330b55aaef38501420c SHA512 1dec9ec8f4c610c08f62bc2b45dd32f1e4528a045161d848b5c4f0382be1158a690f4d7760203d7d2347a80422671f43b07531871cf44990887eaaed35d924d4
+DIST libloading-0.7.4.crate 27580 BLAKE2B 491faef2659270b10bb88ac46e0453f747f35e78d7f28b7d6d9151177b4c7a7aec0a1efdf702eda0988c31e9dafff2990eba4e6a9b0b695c535ea9086ccf36e7 SHA512 34439d9eca68bac8fcbe2bc94a70e07550e7e95d713ab74ed60ba6736ec807fd9c9135c178d436fbeb39afb074b2a9b05775d953340845c088f5f8712f5f56a1
+DIST libspa-0.7.0.crate 54348 BLAKE2B 08915c54da7f1382136fed70f16e45bc5596ee4d6b1109619d365f2f8d6ecb1a4bb446a11267faa859b6567deccec84278d8e603d07a9da7671126c716a9104f SHA512 6c1dee8b339b2fe66c108c5e585c4033ab1d66a04e27154cc4f2851a5b8a1078ddccecbd34be724e351f4f048e88e4af9bac1606eb0ebef0154c2b7d2718c0bc
+DIST libspa-0.7.2.crate 54357 BLAKE2B d1e16ceecc5fb1dd68ea56db45afc6529bada6f0b002f2d2b31bdf5bd5522fe5c64c5044d36a180430e03d3d5608acded9ae5e6d33a9d867eacb8bc5cc5bf521 SHA512 df09cd4d71f2d806967a7a18cb0eecdc2771cad271320e4c2479884aeae94d5c78c27ae37cdc55bc33c1a7c030b40982f3937e6027f7bf92f6ae20c94eb29075
+DIST libspa-sys-0.7.0.crate 10140 BLAKE2B 5e1a695c653b54552d19235214a714a662b8e4064b163cc531a9a73d18a4bc2e48f7bdb519c84e522f96696180766f1e6a02cffed5e3899a2c510425cd8a1f24 SHA512 dd3e058655acb8dc84415c31cd1a59619f1e03e22ca94dd95f5c00e70c39518ff5e6354573527d4714080a3b6badb61fbf14b326b5e41c281d6ecb45fc3108d0
+DIST libspa-sys-0.7.2.crate 10156 BLAKE2B 69c4e81753f9638b0d57f512ddf7c4ed0ef25fa96362d842ca8b9340b8a5ac1f01daf0c956b66fb8f62c70f781f96c9de55c42e53f7a523ffe585b7d4f37c096 SHA512 e5b1bafdc8143ebe8d0ba6a8c4e77a68b0d6df7fe88a4bc04c176b4d65ecd7b591e951f5ed408b9ff3d5e05e4b5d9d6d35fc4de1f0537763e774a175c05829c9
+DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
+DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc
+DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
+DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
+DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704
+DIST nix-0.26.4.crate 279099 BLAKE2B 41debf1f21427ad6c25c6cd26b7867feb8ba46366028c4b74073307e902e526543f536fc0a66db2cdc5a52fbbf9166a6a4843aba57e5e5caada3d914286ddd60 SHA512 cc68ff8e3e8ea8635c6fd4c0a866cf42121aa3e25165666ef3b97b5b2c1d9273cba6f689e80eb812b55b5ee513390924a926d95fce45de0a74b98764dd1fa27d
+DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
+DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
+DIST pango-0.18.0.crate 47499 BLAKE2B 7f446be2a20cb9bdded6668deb0c6aee8a8368ed2439df131ec47c42eeef9ca8440e43623455638e8bb9433d016af0f732cf558021b7feefc4218be86a0e897d SHA512 6c2a333b65cb39d6dab511f3f5a6e3fffb7aec0bd02ac147cd4b6dd7cf5f917d69b4515472f3e999a30c4ea2974b1b85b6b6f684a3de7ca2902728b013576ea8
+DIST pango-sys-0.18.0.crate 24709 BLAKE2B f197872258fae7b554be9d62ad2c7a3484fc817430b008263a6b2d20845809ee3c450fa8c65e6845854d5885cdd80f24791a94ee7fa3cde43bf1c7c504f886a0 SHA512 b20df431e744c7b19896b31f487060e0d929c65289520f1fd4d624ff708698d4e082baa73366321206a2a7e3f4ad126ace9b3e55169ff815c9c6b25e5ec5ba3f
+DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
+DIST pin-project-lite-0.2.12.crate 29073 BLAKE2B ab66a6dad606804eb6121fac25bfbca3ad00e8d80af2e7d1ab38add91c3f76761fd1864f0fb184cb305cd216cc92e81c2f73f0cd2e6f210ede3bde4cbdeff77c SHA512 9d2eb190169819fadece7fcf33d006863ebe2c298066ad97d97ba96ced6229892b4087ec1f364d5c6150cc80b0ded8f431d9d4285adceb5fc9ae1da8e1a6d82e
+DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST pipewire-0.7.0.crate 46397 BLAKE2B bb7d7b0fdc66ee7b07399febe8c290f834902e95e8ea5871d66757900ff830c967f4cdedb3217f7a5e7a2f8d4b5f519d42a79981d8517df540dd835f418112db SHA512 0f682d25e9bf7869c59e3cd8ec871d1b08138d0303367287a855bf6543913b501156f10651b567abd6264653f28fcca704751c30df0ec63606c1f0621a157f31
+DIST pipewire-0.7.2.crate 46643 BLAKE2B 0a5919d53ef5b2234fab83fa61aa319da48f853cc178eaf9a19fea163f96dbe2dc984f8e9da79472efb2d386a3d2614230fa34dbb5166b1e5149618c5194d979 SHA512 ff92a0e38fb0c3068fa32c95f717e6adb0890b5f0eb6c82e0461fbb738a355ac1c0547f7fd4dbca0049ef304c0cdb21e32fe9ff2911c3ffd1e4aa0d4608cec36
+DIST pipewire-sys-0.7.0.crate 2992 BLAKE2B 9b84c231adc15ad55d95e2938e18e0e3e43ed25a84b053da2f20c9a2a17f44a09bd31bdba9a926c27454960b115ca42e8f380f274e0b443d9a00af9f76639abe SHA512 70f64f556fff2a7a59f028eed22b6a6d06bb31e1e76cd99ea608e38209753c5e5202f887e9dfe1c1ac891cf3760031a5f959d8472b08cb4a4ff816b6fbcb53d4
+DIST pipewire-sys-0.7.2.crate 3009 BLAKE2B c42dd90b62e07cda89a7cf9d3346dda17cfb42d54e8273bc4036789d8707b7e9fc81fb7228e53b3b0e8d83c375735ed8478c43bc825fe0e95cbdb449b2815cfc SHA512 20d37b828624251eed7af5a06033f5230f9bf0536b4c59a3df5fa156602c140202a9fbc247171230de0707b3d623b4f3004484ce8fd504c1ff92ff371f9acc98
+DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a
+DIST proc-macro-crate-1.3.1.crate 9678 BLAKE2B ed617a1930bf28a26e865f6477229566a0c4ade7f2c1e8f70d628c5536985f03c7533c561490415e207c0f58b4885367e7f54ddcf10b058711829f78a34d68a9 SHA512 5306f017933ffa89eb6111ee00b0536179c5cfab56529440630a0bec86b62194ff16f57ebb471b233e88cd886b7b9871de8402ed29073b23e5ca98193e513659
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
+DIST proc-macro2-1.0.67.crate 43683 BLAKE2B a7f485d058ffb654c22ad01088756d8050780e559d86f96590e284c3babf1bb59ce347400c1681b296c6f58e2d42ed67d3e458483368399c22d7810685adcbc6 SHA512 3827f5f698aaecc168a03643e330e03aca7b0de98bd57dc97507c1bd53b6ec64752a1f4dee4c8a12ab02f410775a11f5ce7b0d36ec0e1fbbec197e3d7e199eab
+DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
+DIST regex-1.9.3.crate 252676 BLAKE2B dd419b02b7dbd28a71e14c90bc538e98a63c0b9cc2ea01e7d8f6a0075c723c42c3d7bcbb45391431dec3008e6709e9d1d396d8e505f7f8d5d3a629ededf74b4d SHA512 ef5ece7d2b80a136d437ac42c5395cb01f6d357dcc490c8f6c89657f3f97af6befcc699008535c27583d7354e979418d1d933e36e8774ff2bb62750b9009d5d6
+DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e
+DIST regex-automata-0.3.6.crate 607174 BLAKE2B 6d02512501b45b0e87d8746c894009ec669fbfdeb742966e8ba8960ebf692f3b2c3df44ce5ee03e7d5320136709ad83b532dbc322a779e3c21ff0f65768c0d0e SHA512 ab3da2e63ff2c6a4da2c149dd34e565303f961f38547db7b34fbe984cf90aac107d4ec116111c765c9b71c4bf26022742151e1d4c5d01a6beac0a8a0887e30ce
+DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac
+DIST regex-syntax-0.7.4.crate 343365 BLAKE2B b50c01f02e08729496e8bcf023949d088463bf62348b4a1043fe5205650da37863b2ca51f683662a4df33bd56085e0501e50410106c9c471a0daec4c71dfe945 SHA512 b33713c71f6f753820ca6405e8415e5eeed457efd01e81b0b720e48c135b9bb0973962269587ddca31350233aec6d3f598596cb48310db0633bf67f8970f0e18
+DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
+DIST semver-1.0.18.crate 29703 BLAKE2B b1867f552ac87968d895c5e49123bcce0f8aa0ad384e421e5ac88bd04ae203ed6b731d5c77fb8488ec6601f1f02a8f2a207a9d21f1cc66d433032628f5d7beda SHA512 698dcd37b354cfd6ee452dce02d16051f23088ce53f0b4d099e1e4ad0f9350996f0b9b2e1c3ac7d5ed258accd92773266892e945fcae28055d4671c7ae5aac02
+DIST semver-1.0.19.crate 30027 BLAKE2B 426db70341dea6a78264d70f6aba45dd6b9f9ad5950a2dc09ed07c59642ea0ab5bd70325837ba4280aa40321027c4110f86f441fa29b726c6ecec3eb7da60c19 SHA512 df67c8042a8045196ef2a929b3075056d27da68cbf8d895bc4527ed2a769c579382cbe720e34554078182c12657fe40d47206a676d142d82b73715551f3f6e1c
+DIST serde-1.0.183.crate 77210 BLAKE2B 280e3d253a29b664b4e2d17f41397b17fe22af64417facca42d6ca0c839f1def745380a5402d7a87345bb16f4fdacf9a8c01966579b8c08fb06c05f097a87e68 SHA512 3a27efdff92cb1f6b50449a761efde781af91584b8410fbf5ce37b20005e7d46dc4c750fd1730e15468ea22aac7799421c4e60c74243c65ef7916d3cbadd0ef8
+DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2
+DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0
+DIST serde_spanned-0.6.3.crate 7737 BLAKE2B 957352cb24d5cb1173613a48de7e411d768c61a73dd57572530490be0569e133e7c8eb62ec34e542a17010871562a53e37b296386c54dee8ea61d175dd0b05e3 SHA512 5c4f4a861dba2af7f0ad0c585859f845a7ea6c0a8ff8b63985503c9da27f313ba15b904b0aa56a59043c44a87c75fd317b23006a3804d332b84855189e436610
+DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
+DIST shlex-1.2.0.crate 6584 BLAKE2B ac07c648d9affe62512edab307fe07436dce69b428570ba6455aaf21c178145b1026e35704f920fc177b334cf190f57e393e4dd9e522dd26d133f80fb2c15f47 SHA512 cf48c0c47aac44654a48047fed3568c30f53f19cd131615cabbc247dbdf1eb1b7540b0d188f341251b4876dd0d5fcc13792800f0160f7907e8d8fe9a5e75083f
+DIST slab-0.4.8.crate 16928 BLAKE2B f20603e1331a767c3f55b56d58bbdb9fc126794a116db128fce6d204122c420e9a65478f9f10a26f86c045dbd55a62556862f4339f3a41419f810bcfa9fd145d SHA512 1d713a217b3816a1e6c230d4bb52c32c90f600e64520f0c339ea8255ee8aefd887d969fa23497f1bd8b2b1f7dcb4b220957889746f04dc3453240b5f28517192
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
+DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
+DIST smallvec-1.11.1.crate 34831 BLAKE2B bad85ddb1d3a1fcec0cb6aba413f90695e0aa0c16b2b231d6d15095bdd6de1731720ea2b394c3f9a444d6d4763bbf44cff389a01aef3488dc599d2ea63ddbc36 SHA512 d4ed45e8867366072e77f23ebe8b31be96be37e5beed30fc2b5ffea81ab04a2ad2aa34fb4f29724b02a5eb90f8b1d8c40b800ee915453947f90758ce999704b5
+DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
+DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
+DIST syn-2.0.29.crate 241664 BLAKE2B 5b339433249d7ee17b032cc9ecb118169957d91f438619940aeba0003ab0015b01cc6afb00656b5492539a5396325ec16c37e33764b00d6f9b8dc6b5b5e6a9f0 SHA512 a6319ee743a7690c7858da8492ffb6a963d102beba07009e82b08082d33ac8e8ea2675bdfc3ac3684392b3bc3d7f2624983dc508dd8b8f1fb9a57ec8a5b82828
+DIST syn-2.0.37.crate 243250 BLAKE2B b81750ed52bf75bf944542c373a88f5a54421c230c86f23d0ed3e5680d85bb454251bf43e0ad7bd3e2464e6df579550cca1e17e8b044ba62a27a25f3940ff20b SHA512 5cc8f2a17f891477a9b2078580bcb4c5dec0b540fdc4d2c0b8dd51972c734ff4519e891166c1c5f6d35b73bfb564ac747836f7487481a2ea26fb7d8405835023
+DIST system-deps-6.1.1.crate 24171 BLAKE2B 40ec288648bda3c5370f78b7614621d3919589eedd19c86e542e4091066eaaf1d36258cf657a3e74bf2bde70dcedd14d335f4b7c89043b742b96d756df0c38e8 SHA512 14fc67e8a4447381bb5330ae6d579cafe7b1a1e62d3f528256217c18e07f6d0aa7095340b6c771eb62404b1e21771b627d77cdaadeb46cc80dc4fd6c789577d9
+DIST target-lexicon-0.12.11.crate 24594 BLAKE2B cf06720caecb5b5758f05c6375fa600da9260aac04017458060406a042dc578d51a2c5b6f189345d45dacea42ba01fbe46853d07f70d7b37cba17d87aa101f9a SHA512 f38701a8e9dd17b7db591b1b4c82c3b75d317e003262bb7b09b9cabd3afab5ab79c02a7dd524910b6941ada3a8f1378ea9e199b2b5938f8f01ee75bb0eae8718
+DIST thiserror-1.0.47.crate 18811 BLAKE2B ea2da26fdfbe3d9519942761a9fa8a7c3528a170846c290a111a33420dfbe6c3f114591e3ad101258ea2a01a756ce4710d7b46c01b40011e5ea01cabc37db189 SHA512 fdb128982f0b0a6d83221bfa6b274431a1008a9727c82d55a8cb2770bb85d18842e6b26b90885fc0f00801b157b96de61fdb0f72d98b8092c69181d8ee67cf63
+DIST thiserror-1.0.49.crate 18912 BLAKE2B ec93a21ea72626a0d49d87e8989633a4a1c6747e3dc4f183bd490b52488ded6fe97e60d0db59da6e67db2c2181ac13eb903a9b77bc8df7f61de77fdd73bd1c3e SHA512 a6b0476b9250f2a1555ad1f528b062fe7683f7aed338efaebd86b967e58d08f03ea10b4b6c502f4b6ccbeb44cf773b7511996a8504e541c1ea6a6efcc8cc2814
+DIST thiserror-impl-1.0.47.crate 15080 BLAKE2B 4b8084ae885160607905333dbac2287576127992eeb58293050c46ccc2abdc1a04f85b07db35846046d9a3e7e94ffc7c8912bab37e4eb9a5290bd55df46d0d02 SHA512 b6b73e9eea058492c45d41a70d5ce491b773f4747e171b794577f996f0ed5d76562338a18105f82a6733e1e37954aced4fca78d5f66c05e6789c15bca5ebffe7
+DIST thiserror-impl-1.0.49.crate 15101 BLAKE2B 7a097705408155ff28e13b30c9a84e5da5cbb2ea60cd586f2bea303aab8180b4d57dc7edff1b36437376c04aa03758c4ba573492118785c3cd1f12b70d77de66 SHA512 dffaacf5238c81fa5bdd605c84c7d064695c4435b5927c0a7ef8975340170252d1361ad48c26116663fcdb0afaec0ec0a63b5f613ad256d75bcdfa3f0659a437
+DIST toml-0.7.6.crate 49220 BLAKE2B 805bd9928fc3d05a1658188d4b858df62347cc93bf870a3846b9509c1dbdfc4123bc29a26019efa04e98699239ca7bb95ce63c802badffd86246266cebc65d7a SHA512 e51c49af63e37d1682892b84e74d48e171591c36dccb26e26bbf136385181ea9cbb94809b8900eae82b15e1cb79f844ae1cf0b00f0a6ac3afd5ebd02d554f9bc
+DIST toml-0.7.8.crate 49671 BLAKE2B 47988292efa682f34b5295ee15524d9603d7884a0ebdc50aff93823bc9bb565569097b6aa0c622976cb23688aff73e41c0a19b0ab72ca55676cc86d7ae3db693 SHA512 84479acfa305aa682ed6ba655208c245d442d61028c422fefd6174371ec214e88912c257a3e2527e14646b655b18d55ac2d5482b0b4fd8cc2a9f66575ff1c84b
+DIST toml_datetime-0.6.3.crate 10770 BLAKE2B fc1754eb7c3a7073cfe41e5ccba152ff09891a8de8afe38991cf2dd7b93aacf07f1075fd24d7aa643238cf31e3df1fc3162335b2c475438178b4a4d8a2055471 SHA512 cabf5dce24ed3bf4674008743180a21e86286d999cdce79f934de48b1e1fe0f16a7f3d2498bf059acdb823b51bc01986faf47139f8100ae272e6bd19095cfa9b
+DIST toml_edit-0.19.14.crate 94875 BLAKE2B d11328357d66d4139ac23766ddc84985eb9e2ab7eb5ac5b3639be2098938596cb69c28150589f24bd404c10ec2fe06e0adc207b787c3dc869472eff15ec0fa2e SHA512 87f432e0f6870c2ff1476fd1dbafae8cfd736ab39436c1c60627d60511a65fece8c07bd9834d68a080f6969a256430acb20381f210b775c281764b183ec57411
+DIST toml_edit-0.19.15.crate 95324 BLAKE2B f989f96d571693ff81572af6c05a6f51b673e478f22d20a6b166c45909902ac80280ea92ec5c3567327df90100a47fb7504845fc39bbcff6756af6c1a89e2221 SHA512 46d6bd2fea957392ae0ad7e687dad7743b76ee8e8ec76c80d6374ea294d3d09b6f73df0a82c821b9ee3b5268987a4136aa825034309f3cbc1947dbd1af1505dc
+DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b
+DIST version-compare-0.1.1.crate 13224 BLAKE2B 4bb1e7db6a4a5b30f4ef950234fa939bd562e8d5693aad42a5dadddde7caee01b4dc42b28d8ef61a769cf573440e57c0dc321f8a8b4b3dfc0cc035507bfed886 SHA512 efc9441440f702518867e2056c0ab066cd2fa6949112479e463802610f25a4d50c4411eb5fd0ba6ca9b187e358fce8d99579188e0ed9ba0297191172ab7af408
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST winnow-0.5.12.crate 144683 BLAKE2B 3d363754f2f37490a3fd812945408a626c5b17c460d732ef30c5c97a1487d02fd6a5c3632cbc59c1f9f367da996b7f58c8f281db4c45be8d300b5f214f8de055 SHA512 c51782ea9f14ccd76ead83df6562c2f5fbd76ec31d149aac83ef5ce8dd541b92156f1b2acb62f7af2886eb16e2ef419f5be703c96b378ee5b8558a751ebcb9f1
+DIST winnow-0.5.15.crate 145621 BLAKE2B 039262561227641c2d8b996ebb59c79718de3f2b7dd8e369fc3e341f3458b1e0213f35c575d615e87d5f89aad639c7a258e4efb2c10f58c2cd6e120482702cc2 SHA512 42dce18906f41e45e6dd75ba01af6a94501317dee8b45f4c7340f7c9c94f8935afe2536cd9ad5a91eef6f3a6135cab0a451d67a35b5a0fd69130a90e6aa47603
diff --git a/media-sound/helvum/helvum-0.4.1.ebuild b/media-sound/helvum/helvum-0.4.1.ebuild
new file mode 100644
index 000000000000..09902d800f1e
--- /dev/null
+++ b/media-sound/helvum/helvum-0.4.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.10
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.0.4
+	anyhow@1.0.75
+	autocfg@1.1.0
+	bindgen@0.66.1
+	bitflags@1.3.2
+	bitflags@2.4.0
+	cairo-rs@0.18.0
+	cairo-sys-rs@0.18.0
+	cc@1.0.82
+	cexpr@0.6.0
+	cfg-expr@0.15.4
+	cfg-if@1.0.0
+	clang-sys@1.6.1
+	convert_case@0.6.0
+	cookie-factory@0.3.2
+	equivalent@1.0.1
+	field-offset@0.3.6
+	futures-channel@0.3.28
+	futures-core@0.3.28
+	futures-executor@0.3.28
+	futures-io@0.3.28
+	futures-macro@0.3.28
+	futures-task@0.3.28
+	futures-util@0.3.28
+	gdk-pixbuf-sys@0.18.0
+	gdk-pixbuf@0.18.0
+	gdk4-sys@0.7.2
+	gdk4@0.7.2
+	gio-sys@0.18.1
+	gio@0.18.1
+	glib-macros@0.18.0
+	glib-sys@0.18.1
+	glib@0.18.1
+	glob@0.3.1
+	gobject-sys@0.18.0
+	graphene-rs@0.18.1
+	graphene-sys@0.18.1
+	gsk4-sys@0.7.2
+	gsk4@0.7.2
+	gtk4-macros@0.7.2
+	gtk4-sys@0.7.2
+	gtk4@0.7.2
+	hashbrown@0.14.0
+	heck@0.4.1
+	indexmap@2.0.0
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.147
+	libspa-sys@0.7.0
+	libspa@0.7.0
+	log@0.4.20
+	memchr@2.5.0
+	memoffset@0.7.1
+	memoffset@0.9.0
+	minimal-lexical@0.2.1
+	nix@0.26.2
+	nom@7.1.3
+	once_cell@1.18.0
+	pango-sys@0.18.0
+	pango@0.18.0
+	peeking_take_while@0.1.2
+	pin-project-lite@0.2.12
+	pin-utils@0.1.0
+	pipewire-sys@0.7.0
+	pipewire@0.7.0
+	pkg-config@0.3.27
+	proc-macro-crate@1.3.1
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.66
+	quote@1.0.33
+	regex-automata@0.3.6
+	regex-syntax@0.7.4
+	regex@1.9.3
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	semver@1.0.18
+	serde@1.0.183
+	serde_spanned@0.6.3
+	shlex@1.1.0
+	slab@0.4.8
+	smallvec@1.11.0
+	static_assertions@1.1.0
+	syn@1.0.109
+	syn@2.0.29
+	system-deps@6.1.1
+	target-lexicon@0.12.11
+	thiserror-impl@1.0.47
+	thiserror@1.0.47
+	toml@0.7.6
+	toml_datetime@0.6.3
+	toml_edit@0.19.14
+	unicode-ident@1.0.11
+	unicode-segmentation@1.10.1
+	version-compare@0.1.1
+	version_check@0.9.4
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	winnow@0.5.12
+"
+
+LLVM_MAX_SLOT=16
+
+inherit cargo desktop xdg llvm
+
+DESCRIPTION="A GTK patchbay for pipewire"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum"
+SRC_URI="
+	https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${PV}/${P}.tar.bz2
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="GPL-3"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Clang needed for bindgen
+BDEPEND="
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	virtual/pkgconfig
+	>=virtual/rust-1.70
+"
+DEPEND="
+	dev-libs/glib:2
+	gui-libs/gtk:4
+	media-libs/graphene
+	media-video/pipewire:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc README.md
+
+	doicon --size scalable data/icons/org.pipewire.Helvum.svg
+
+	insopts -m 0644
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	doins data/icons/org.pipewire.Helvum-symbolic.svg
+
+	make_desktop_entry "${PN}" Helvum org.pipewire.Helvum \
+		"AudioVideo;Audio;Video;Midi;Settings;GNOME;GTK" "Terminal=false\nGenericName=Patchbay"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	xdg_icon_cache_update
+}
diff --git a/media-sound/helvum/helvum-0.5.1-r2.ebuild b/media-sound/helvum/helvum-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..f6a688ca6351
--- /dev/null
+++ b/media-sound/helvum/helvum-0.5.1-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.1
+	anyhow@1.0.75
+	autocfg@1.1.0
+	bindgen@0.66.1
+	bitflags@1.3.2
+	bitflags@2.4.0
+	cairo-rs@0.18.2
+	cairo-sys-rs@0.18.2
+	cc@1.0.83
+	cexpr@0.6.0
+	cfg-expr@0.15.5
+	cfg-if@1.0.0
+	clang-sys@1.6.1
+	convert_case@0.6.0
+	cookie-factory@0.3.2
+	equivalent@1.0.1
+	field-offset@0.3.6
+	futures-channel@0.3.28
+	futures-core@0.3.28
+	futures-executor@0.3.28
+	futures-io@0.3.28
+	futures-macro@0.3.28
+	futures-task@0.3.28
+	futures-util@0.3.28
+	gdk-pixbuf-sys@0.18.0
+	gdk-pixbuf@0.18.0
+	gdk4-sys@0.7.2
+	gdk4@0.7.3
+	gio-sys@0.18.1
+	gio@0.18.2
+	glib-macros@0.18.2
+	glib-sys@0.18.1
+	glib@0.18.2
+	glob@0.3.1
+	gobject-sys@0.18.0
+	graphene-rs@0.18.1
+	graphene-sys@0.18.1
+	gsk4-sys@0.7.3
+	gsk4@0.7.3
+	gtk4-macros@0.7.2
+	gtk4-sys@0.7.3
+	gtk4@0.7.3
+	hashbrown@0.14.0
+	heck@0.4.1
+	indexmap@2.0.1
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libadwaita-sys@0.5.3
+	libadwaita@0.5.3
+	libc@0.2.148
+	libloading@0.7.4
+	libspa-sys@0.7.2
+	libspa@0.7.2
+	log@0.4.20
+	memchr@2.6.3
+	memoffset@0.7.1
+	memoffset@0.9.0
+	minimal-lexical@0.2.1
+	nix@0.26.4
+	nom@7.1.3
+	once_cell@1.18.0
+	pango-sys@0.18.0
+	pango@0.18.0
+	peeking_take_while@0.1.2
+	pin-project-lite@0.2.13
+	pin-utils@0.1.0
+	pipewire-sys@0.7.2
+	pipewire@0.7.2
+	pkg-config@0.3.27
+	proc-macro-crate@1.3.1
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.67
+	quote@1.0.33
+	regex-automata@0.3.8
+	regex-syntax@0.7.5
+	regex@1.9.5
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	semver@1.0.19
+	serde@1.0.188
+	serde_derive@1.0.188
+	serde_spanned@0.6.3
+	shlex@1.2.0
+	slab@0.4.9
+	smallvec@1.11.1
+	syn@1.0.109
+	syn@2.0.37
+	system-deps@6.1.1
+	target-lexicon@0.12.11
+	thiserror-impl@1.0.49
+	thiserror@1.0.49
+	toml@0.7.8
+	toml_datetime@0.6.3
+	toml_edit@0.19.15
+	unicode-ident@1.0.12
+	unicode-segmentation@1.10.1
+	version-compare@0.1.1
+	version_check@0.9.4
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	winnow@0.5.15
+"
+
+LLVM_MAX_SLOT=17
+
+inherit cargo desktop xdg llvm
+
+DESCRIPTION="A GTK patchbay for pipewire"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum"
+SRC_URI="
+	https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${PV}/${P}.tar.bz2
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="GPL-3"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Clang needed for bindgen
+BDEPEND="
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	virtual/pkgconfig
+	>=virtual/rust-1.70
+"
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.4.0:4
+	>=gui-libs/libadwaita-1.3
+	media-libs/graphene
+	>=media-video/pipewire-0.3:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc README.md
+
+	doicon --size scalable data/icons/org.pipewire.Helvum.svg
+
+	insopts -m 0644
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	doins data/icons/org.pipewire.Helvum-symbolic.svg
+
+	make_desktop_entry "${PN}" Helvum org.pipewire.Helvum \
+		"AudioVideo;Audio;Video;Midi;Settings;GNOME;GTK" "Terminal=false\nGenericName=Patchbay"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	xdg_icon_cache_update
+}
diff --git a/media-sound/helvum/metadata.xml b/media-sound/helvum/metadata.xml
new file mode 100644
index 000000000000..7231f0daee5e
--- /dev/null
+++ b/media-sound/helvum/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Adel Kara Slimane</name>
+		<email>adel.ks@zegrapher.com</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://gitlab.freedesktop.org/pipewire/helvum/-/issues</bugs-to>
+		<remote-id type="freedesktop-gitlab">pipewire/helvum</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
index 03a2c7397da8..ce01e5c0c6ed 100644
--- a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
+++ b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
@@ -3,19 +3,19 @@ Fix ncurses underlinking by using the pkg-config output instead of assuming
 directive. See also:
 https://bugs.gentoo.org/show_bug.cgi?id=573522
 
---- herrie-2.2/configure
-+++ herrie-2.2/configure
+--- a/configure
++++ b/configure
 @@ -215,7 +215,7 @@
  	exit 1
  fi
  CFLAGS_main="-DAUDIO_OUTPUT=\\\"$CFG_AO\\\" -DCONFFILE=\\\"$CONFFILE\\\""
 -LDFLAGS="$LDFLAGS -L$PREFIX/lib -l$CFG_CURSES_LIB"
-+LDFLAGS="$LDFLAGS -L$PREFIX/lib `pkg-config --libs $CFG_CURSES_LIB`"
++LDFLAGS="$LDFLAGS -L$PREFIX/lib `${PKG_CONFIG} --libs $CFG_CURSES_LIB`"
  SRCS="audio_file audio_output_$CFG_AO config gui_browser gui_draw \
      gui_input gui_msgbar gui_playq gui_vfslist main playq playq_party \
      playq_xmms vfs vfs_playlist vfs_regular"
---- herrie-2.2/src/audio_format_modplug.c
-+++ herrie-2.2/src/audio_format_modplug.c
+--- a/src/audio_format_modplug.c
++++ b/src/audio_format_modplug.c
 @@ -31,7 +31,7 @@
  #include "stdinc.h"
  
@@ -25,8 +25,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=573522
  
  #include "audio_file.h"
  #include "audio_format.h"
---- herrie-2.2/src/main.c
-+++ herrie-2.2/src/main.c
+--- a/src/main.c
++++ b/src/main.c
 @@ -165,7 +165,7 @@
  #endif /* CLOSE_STDERR */
  	if ((errmsg = vfs_lockup()) != NULL) {
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r2.ebuild
index b54555ffc4fc..cb67e755fdf6 100644
--- a/media-sound/herrie/herrie-2.2-r1.ebuild
+++ b/media-sound/herrie/herrie-2.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Herrie is a command line music player"
 HOMEPAGE="http://herrie.info/"
@@ -15,14 +15,14 @@ KEYWORDS="amd64 ppc x86"
 IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
 REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
 
-RDEPEND="sys-libs/ncurses:0=[unicode?]
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
 	>=dev-libs/glib-2:2
-	ao? ( media-libs/libao )
+	ao? ( media-libs/libao:= )
 	alsa? ( media-libs/alsa-lib )
 	http? ( net-misc/curl )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-libs/libmad
-		media-libs/libid3tag )
+		media-libs/libid3tag:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	sndfile? ( media-libs/libsndfile )
 	vorbis? ( media-libs/libvorbis )
@@ -52,6 +52,8 @@ src_configure() {
 	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
 	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
 
+	tc-export PKG_CONFIG
+
 	einfo "./configure ${EXTRA_CONF}"
 	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
 		./configure ${EXTRA_CONF} || die "configure failed"
diff --git a/media-sound/herrie/metadata.xml b/media-sound/herrie/metadata.xml
index 94eb56d9752a..149a73f33c20 100644
--- a/media-sound/herrie/metadata.xml
+++ b/media-sound/herrie/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/horgand/horgand-1.14-r2.ebuild b/media-sound/horgand/horgand-1.14-r2.ebuild
index 2de59fda12c2..6506e49d4be4 100644
--- a/media-sound/horgand/horgand-1.14-r2.ebuild
+++ b/media-sound/horgand/horgand-1.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ PATCHES=( "${FILESDIR}/${P}-overflow.patch" )
 
 src_compile() {
 	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \
-		$(pkg-config --cflags jack) $(pkg-config --cflags sndfile)"
+		$($(tc-getPKG_CONFIG) --cflags jack) $($(tc-getPKG_CONFIG) --cflags sndfile)"
 }
 
 src_install() {
diff --git a/media-sound/horgand/metadata.xml b/media-sound/horgand/metadata.xml
index c870d0eef0ab..a800ae7365fa 100644
--- a/media-sound/horgand/metadata.xml
+++ b/media-sound/horgand/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="sourceforge">horgand.berlios</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index f5fc3caf85ca..f67eb3c86039 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1 @@
-DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
+DIST hydrogen-1.2.2.tar.gz 12948890 BLAKE2B 30d8624078a29a0514aee01d56865e5923f755de02acfddde45a26d6ffbd68cf3c8c774827fe4538b7d03faefaabb9ddcfd9a28bb404c535ad7f6734eb5b1aff SHA512 bd6b102b14d30a8e2f4ea7e405199bb34f9b7691b57c3f9f3096c9e30c25c158e3bfd40bcfdd2d449bc153b7d3d9717df401f1e7a086e33dc953247870f1dee0
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
deleted file mode 100644
index 9b8429753072..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 04aa6380..e979783e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -362,10 +362,10 @@ ELSE()
- 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
- ENDIF()
- IF(NOT MINGW AND NOT APPLE)
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.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()
- 
- #
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index cfdc72a7..b7b0dbcb 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
- 
- IF(NOT APPLE AND NOT WIN32)
-     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
--    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
- ENDIF()
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
index ef70497abf72..61f94d84bfc7 100644
--- a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
@@ -1,14 +1,12 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 04aa6380..e979783e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -362,10 +362,10 @@ ELSE()
- 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+@@ -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.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
+-	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.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
++	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")
@@ -16,11 +14,9 @@ index 04aa6380..e979783e 100644
  ENDIF()
  
  #
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index cfdc72a7..b7b0dbcb 100644
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
-@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
+@@ -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)
diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
new file mode 100644
index 000000000000..13bd531df885
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
@@ -0,0 +1,11 @@
+--- 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/files/hydrogen-1.2.2-no-pch-include.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
new file mode 100644
index 000000000000..fd0ee64b76a0
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/922034
+--- a/src/gui/src/Widgets/FileDialog.h
++++ b/src/gui/src/Widgets/FileDialog.h
+@@ -23,6 +23,7 @@
+ #define FILEDIALOG_H
+ 
+ #include <QDialog>
++#include <QFileDialog>
+ #include <core/Object.h>
+ 
+ /** Custom file dialog checking whether the user has write access to
diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
new file mode 100644
index 000000000000..f08f1af10ddd
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -173,7 +173,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/files/hydrogen-1.3.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch
new file mode 100644
index 000000000000..c716ca75ac9e
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -478,10 +478,10 @@ else()
+ 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/hydrogen-1.0.1.ebuild b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index 86ef3e86fe01..71df9f243599 100644
--- a/media-sound/hydrogen/hydrogen-1.0.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
 DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
+HOMEPAGE="http://hydrogen-music.org/"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS="amd64 ppc ppc64 x86"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -28,26 +27,28 @@ REQUIRED_USE="lash? ( alsa )"
 BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	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-1.0.18
+	media-libs/libsndfile
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	!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-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 "
 DEPEND="
 	${CDEPEND}
@@ -55,9 +56,13 @@ DEPEND="
 "
 RDEPEND="${CDEPEND}"
 
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
+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
@@ -69,7 +74,6 @@ src_configure() {
 		-DWANT_CPPUNIT=OFF
 		-DWANT_DEBUG=OFF
 		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
 		-DWANT_LADSPA=$(usex ladspa)
 		-DWANT_LASH=$(usex lash)
 		-DWANT_LIBARCHIVE=$(usex archive)
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index aa141dadf063..8f4c81733c3c 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
 DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
+HOMEPAGE="http://hydrogen-music.org/"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS=""
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -28,26 +27,28 @@ REQUIRED_USE="lash? ( alsa )"
 BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	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-1.0.18
+	media-libs/libsndfile
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	!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-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 "
 DEPEND="
 	${CDEPEND}
@@ -55,10 +56,11 @@ DEPEND="
 "
 RDEPEND="${CDEPEND}"
 
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+DOCS=( AUTHORS ChangeLog DEVELOPERS.md README.md )
 
 PATCHES=(
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-1.3.0-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-1.3.0-cflags.patch"
 )
 
 src_prepare() {
@@ -71,7 +73,6 @@ src_configure() {
 		-DWANT_CPPUNIT=OFF
 		-DWANT_DEBUG=OFF
 		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
 		-DWANT_LADSPA=$(usex ladspa)
 		-DWANT_LASH=$(usex lash)
 		-DWANT_LIBARCHIVE=$(usex archive)
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index 972362fefd42..930bdc51d5a4 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/icecream/icecream-1.3.ebuild b/media-sound/icecream/icecream-1.3.ebuild
index 535a6f44327f..8abda51ac458 100644
--- a/media-sound/icecream/icecream-1.3.ebuild
+++ b/media-sound/icecream/icecream-1.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Extracts and records individual MP3 tracks from shoutcast streams"
-HOMEPAGE="http://icecream.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://icecream.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
diff --git a/media-sound/icecream/metadata.xml b/media-sound/icecream/metadata.xml
index 7bb6d0d92a1a..05af01ac33d9 100644
--- a/media-sound/icecream/metadata.xml
+++ b/media-sound/icecream/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/id3/files/id3-0.15-makefile.patch b/media-sound/id3/files/id3-0.15-makefile.patch
new file mode 100644
index 000000000000..265fa0970269
--- /dev/null
+++ b/media-sound/id3/files/id3-0.15-makefile.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,9 +3,6 @@
+ 
+ SHELL = /bin/sh
+ 
+-CC = gcc
+-CFLAGS = -g -O2
+-LDFLAGS = 
+ LIBS = 
+ DEFS =  
+ INSTALL = /usr/bin/install -c
+@@ -20,11 +17,6 @@
+ SRCS = id3.c
+ OBJS = $(SRCS:.c=.o)
+ 
+-.SUFFIXES: .c .o
+-
+-.c.o:
+-	$(CC) $(DEFS) $(CFLAGS) -c $<
+-
+ all: $(PRODUCT)
+ 
+ $(PRODUCT): $(OBJS)
+@@ -35,6 +27,6 @@
+ 
+ install: $(PRODUCT)
+ 	$(INSTALL) -d -m 755 $(bindir)
+-	$(INSTALL) -s -m 755 -o 0 $(PRODUCT) $(bindir)
++	$(INSTALL) -m 755 -o 0 $(PRODUCT) $(bindir)
+ 	$(INSTALL) -d -m 755 $(mandir)
+ 	$(INSTALL) -m 644 -o 0 $(PRODUCT).1 $(mandir)
diff --git a/media-sound/id3/id3-0.15-r1.ebuild b/media-sound/id3/id3-0.15-r2.ebuild
index c918d1331c9c..27233f54fba6 100644
--- a/media-sound/id3/id3-0.15-r1.ebuild
+++ b/media-sound/id3/id3-0.15-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,15 +11,10 @@ SRC_URI="http://lly.org/~rcw/id3/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 
-src_prepare() {
-	default
-	sed -i -e "s:-s::" Makefile || die "sed failed"
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
diff --git a/media-sound/id3/metadata.xml b/media-sound/id3/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/id3/metadata.xml
+++ b/media-sound/id3/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/id3ed/metadata.xml b/media-sound/id3ed/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/id3ed/metadata.xml
+++ b/media-sound/id3ed/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/id3ted/id3ted-1.0.ebuild b/media-sound/id3ted/id3ted-1.0.ebuild
index d0517031cfc7..bc33e7789072 100644
--- a/media-sound/id3ted/id3ted-1.0.ebuild
+++ b/media-sound/id3ted/id3ted-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A Command-line ID3 Tag Editor"
-HOMEPAGE="https://muennich.github.com/id3ted/"
-SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/xyb3rt/id3ted"
+SRC_URI="https://github.com/xyb3rt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/id3ted/metadata.xml b/media-sound/id3ted/metadata.xml
index ee7258ac28eb..d87d575c05e5 100644
--- a/media-sound/id3ted/metadata.xml
+++ b/media-sound/id3ted/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">xyb3rt/id3ted</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/id3tool/metadata.xml b/media-sound/id3tool/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/id3tool/metadata.xml
+++ b/media-sound/id3tool/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
index 40c4ac809079..c9f3b3ad922a 100644
--- a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="A command line editor for id3v2 tags"
-HOMEPAGE="http://id3v2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
+DESCRIPTION="Command line editor for id3v2 tags"
+HOMEPAGE="https://id3v2.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/id3v2/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~riscv x86"
 
 DEPEND="media-libs/id3lib"
 RDEPEND="${DEPEND}"
diff --git a/media-sound/id3v2/metadata.xml b/media-sound/id3v2/metadata.xml
index 550bd829366e..2ca5fa522129 100644
--- a/media-sound/id3v2/metadata.xml
+++ b/media-sound/id3v2/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/jaaa/files/jaaa-0.9.2-Makefile.patch b/media-sound/jaaa/files/jaaa-0.9.2-Makefile.patch
index c4f472acd636..c76c6cf520f1 100644
--- a/media-sound/jaaa/files/jaaa-0.9.2-Makefile.patch
+++ b/media-sound/jaaa/files/jaaa-0.9.2-Makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/source/Makefile b/source/Makefile
-index fec867e..0c769f6 100644
 --- a/source/Makefile
 +++ b/source/Makefile
 @@ -23,9 +23,8 @@ BINDIR ?= $(PREFIX)/bin
@@ -9,7 +7,7 @@ index fec867e..0c769f6 100644
 -CPPFLAGS += $(shell pkgconf --cflags freetype2)
 -CXXFLAGS += -O2 -Wall
 -CXXFLAGS += -march=native
-+CPPFLAGS += $(shell pkg-config --cflags freetype2)
++CPPFLAGS += $(shell ${PKG_CONFIG} --cflags freetype2)
 +CXXFLAGS += -Wall
  LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lasound -lpthread \
  	-lfftw3f -ljack -lXft -lX11 -lrt
diff --git a/media-sound/jaaa/jaaa-0.9.2.ebuild b/media-sound/jaaa/jaaa-0.9.2.ebuild
index b6575ea56713..11b227292172 100644
--- a/media-sound/jaaa/jaaa-0.9.2.ebuild
+++ b/media-sound/jaaa/jaaa-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,9 +12,8 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
-CDEPEND="
+RDEPEND="
 	dev-libs/libclthreads
 	>=media-libs/zita-alsa-pcmi-0.3
 	sci-libs/fftw:3.0=
@@ -22,15 +21,15 @@ CDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/libclxclient
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch
 )
 
 src_compile() {
-	tc-export CXX
+	tc-export CXX PKG_CONFIG
 	emake -C source PREFIX="${EPREFIX}"/usr
 }
 
diff --git a/media-sound/jaaa/metadata.xml b/media-sound/jaaa/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/jaaa/metadata.xml
+++ b/media-sound/jaaa/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
index b53cf5201545..8e109be88a08 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic eutils multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org"
+HOMEPAGE="https://jackaudio.org"
 SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
 # libsndfile: ditto for jackrec
@@ -33,7 +33,7 @@ RDEPEND="${RDEPEND}
 	pam? ( sys-auth/realtime-base )"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-text/doxygen )"
 
 DOCS=( AUTHORS TODO README )
 
@@ -64,7 +64,7 @@ multilib_src_configure() {
 	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
 
 	econf \
-		$(use_enable altivec) \
+		$(use_enable cpu_flags_ppc_altivec altivec) \
 		$(use_enable alsa) \
 		$(use_enable coreaudio) \
 		$(use_enable debug) \
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index 0b8daf306a04..4fc61802269e 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jackaudio/jack1</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/jack-example-tools/Manifest b/media-sound/jack-example-tools/Manifest
new file mode 100644
index 000000000000..3a8e8a7e9a42
--- /dev/null
+++ b/media-sound/jack-example-tools/Manifest
@@ -0,0 +1 @@
+DIST jack-example-tools-4.tar.gz 125676 BLAKE2B 0cfe696efb227558c13e3f7d3afb57938a69bc9f04a7efb7eaf6a22f123f97898d321490022a62ed1897ed6101bf04669f28dc24b70ab920d7fecadeabaf0c92 SHA512 f3fbbf24d4bdcbca959da74793b44292883192f91675f6ee80f01f9ff5181fca052bea6725c5b8b93a1ecfe293f6dc1c14c49519c2b8b57d26202b224d53f0ed
diff --git a/media-sound/jack-example-tools/jack-example-tools-4.ebuild b/media-sound/jack-example-tools/jack-example-tools-4.ebuild
new file mode 100644
index 000000000000..9acca74396fc
--- /dev/null
+++ b/media-sound/jack-example-tools/jack-example-tools-4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Official examples and tools from the JACK project"
+HOMEPAGE="https://jackaudio.org/"
+SRC_URI="https://github.com/jackaudio/jack-example-tools/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ zalsa? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
+IUSE="alsa jack-net jack-netsource opus +readline sndfile zalsa"
+
+RDEPEND="
+	virtual/jack
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsamplerate
+	)
+	jack-net? (
+		|| (
+			media-sound/jack2[libsamplerate]
+			media-video/pipewire[jack-sdk(-)]
+		)
+	)
+	jack-netsource? (
+		media-libs/libsamplerate
+		opus? ( media-libs/opus[custom-modes] )
+	)
+	readline? ( sys-libs/readline:= )
+	sndfile? ( media-libs/libsndfile )
+	zalsa? (
+		media-libs/alsa-lib
+		media-libs/zita-alsa-pcmi
+		media-libs/zita-resampler:=
+	)
+	!<media-sound/jack-audio-connection-kit-0.126.0
+	!<media-sound/jack2-1.9.21"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature alsa alsa_in_out)
+		$(meson_feature jack{-,_}net)
+		$(meson_feature jack{-,_}netsource)
+		$(meson_feature readline readline_support)
+		$(meson_feature sndfile jack_rec)
+		$(meson_feature zalsa)
+		$(usex jack-netsource \
+			$(meson_feature opus opus_support) \
+			-Dopus_support=disabled)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/jack-example-tools/metadata.xml b/media-sound/jack-example-tools/metadata.xml
new file mode 100644
index 000000000000..3b4295e2da37
--- /dev/null
+++ b/media-sound/jack-example-tools/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="jack-net">Build jack_net_* example clients</flag>
+		<flag name="jack-netsource">Build jack_netsource for configuring network sources</flag>
+		<flag name="zalsa">Build the zalsa internal client using <pkg>media-libs/zita-resampler</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jackaudio/jack-example-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild b/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild
index 804da88c2323..8b0b9d10c4ca 100644
--- a/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild
+++ b/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit cmake xdg
 
 DESCRIPTION="A virtual MIDI keyboard for JACK MIDI"
 HOMEPAGE="http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/media-sound/jack-keyboard/metadata.xml b/media-sound/jack-keyboard/metadata.xml
index 491df6cb552a..0524feeabd47 100644
--- a/media-sound/jack-keyboard/metadata.xml
+++ b/media-sound/jack-keyboard/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
diff --git a/media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild b/media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
index f92eced8b109..bf21bbc149cf 100644
--- a/media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_P=${PN}_${PV/_/\~}
 DEB_URI="mirror://debian/pool/main/j/${PN}"
 
 DESCRIPTION="JACK Rack is an effects rack for the JACK low latency audio API"
-HOMEPAGE="http://jack-rack.sourceforge.net/"
+HOMEPAGE="https://jack-rack.sourceforge.net/"
 SRC_URI="${DEB_URI}/${MY_P}.orig.tar.gz ${DEB_URI}/${MY_P}-1.debian.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/jack-rack/metadata.xml b/media-sound/jack-rack/metadata.xml
index e8461483bf46..cdfb23727096 100644
--- a/media-sound/jack-rack/metadata.xml
+++ b/media-sound/jack-rack/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/jack-smf-utils/metadata.xml b/media-sound/jack-smf-utils/metadata.xml
index 77ba4a61c5dd..a12fa83aea7f 100644
--- a/media-sound/jack-smf-utils/metadata.xml
+++ b/media-sound/jack-smf-utils/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index 18f450fa8446..055ba631ef0b 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -1 +1 @@
-DIST jack-4.0.0_pre20200706.tar.gz 198987 BLAKE2B e45c2457c82901c5cd63f726be3a6931fdb09e9fd5cb1dbaec13951614a108f07c14f98ef7ba18f4c81a0da48d151f13e5f7250121e80c5e8b163c344ce07b15 SHA512 bcb2e629daf6b015cfcb63bb07eed37cc9a517f6581489846bc9cd236c5e9f7163765959f042cbc9a87160dead36cf023c79ce1e3207b14ff52959ed21989dc4
+DIST jack-4.0.0_pre20201220.tar.gz 199310 BLAKE2B d36f52d0cf1ce0744929c1d3da2e0929d3a0bfcfe3f7088bd4f1b170cafa0989921ac1a5a4d8ffec17a86c6eeca4f233c9ca0a159ec76629a5ba48d1686d22cd SHA512 8ff5b5abcfc39ffa373cd215ae5d1fdc9838e92040621e8455485e1243ec6e4bf0fb1675f3280441b2ecc993f996c30c77871e2ba14020ae76ed50634cff15f9
diff --git a/media-sound/jack/jack-4.0.0_pre20200706.ebuild b/media-sound/jack/jack-4.0.0_pre20201220-r1.ebuild
index 93a92e7a23d0..467c1fcf5695 100644
--- a/media-sound/jack/jack-4.0.0_pre20200706.ebuild
+++ b/media-sound/jack/jack-4.0.0_pre20201220-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="ncurses"
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
 DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
-HOMEPAGE="https://github.com/jack-cli-cd-ripper/jack http://www.home.unix-ag.org/arne/jack/"
-GIT_COMMIT_HASH="8e2004d7453f5d71d5e73032cbe7770b75bfbd41" # branch "python3-mb"
+HOMEPAGE="https://github.com/jack-cli-cd-ripper/jack https://www.home.unix-ag.org/arne/jack/"
+GIT_COMMIT_HASH="5f3e5f43f476b0d506144c103eb8d4edf76fc5de" # branch "python3-mb"
 SRC_URI="https://github.com/jack-cli-cd-ripper/jack/archive/${GIT_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${GIT_COMMIT_HASH}"
 
@@ -22,8 +21,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/python-discid[${PYTHON_MULTI_USEDEP}]
-		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+		dev-python/discid[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
 	')
 	media-libs/flac
 	media-sound/cdparanoia
diff --git a/media-sound/jack/metadata.xml b/media-sound/jack/metadata.xml
index e89252b7a39a..d238502d54fd 100644
--- a/media-sound/jack/metadata.xml
+++ b/media-sound/jack/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -13,4 +13,7 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jack-cli-cd-ripper/jack</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 4894fdb792d7..83521bcaf9c9 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1 +1,2 @@
-DIST jack2-1.9.16.tar.gz 974652 BLAKE2B ff20d57f544bd636d93e77c2c6dec3af3afbafe4a217ba480c66247ddb6d8ca60755fa55599240fdd75e8ce2c1f7d8fb4f1bf68de8a212268588245f35731ead SHA512 8e4717cad097806a436e3a7b7977faa65987ca0fe59fd285014d6207899c62f9abbb79474170d0e5a6e82d0dbfe998c1310b13c4de8cd68cea0a6935ba579fd1
+DIST jack2-1.9.22-python3.12.patch.xz 32080 BLAKE2B d581d38cd32d8933bf4a9fdb1c6f3445d8e05be5ae1775335180b6f5daea9e5bad036560a33027d09d0a996a22fcb068140e2b61483fa8a7c4e8091bda39d114 SHA512 e63b73526719dcd4276036e71a7dd8f44c01c3048330724ec3fa8cf5f189055ac58f57493e87163017fbbe201b76672a9115b64957b575f0f7a1b6d9f7ec40e3
+DIST jack2-1.9.22.tar.gz 933448 BLAKE2B 8c42cb996e132f711ad8b7071d44601e21bfc8fe24802113825b8434abc8734c981daa2b09f10a7ecb1492a51d631255a99649d6d76343622b5e38da07e0c598 SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4
diff --git a/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch b/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch
deleted file mode 100644
index 10dd10afe565..000000000000
--- a/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doxyfile.in b/doxyfile.in
-index f92e264..2335ada 100644
---- a/doxyfile.in
-+++ b/doxyfile.in
-@@ -792,7 +792,7 @@ HTML_HEADER            =
- # each generated HTML page. If it is left blank doxygen will generate a
- # standard footer.
- 
--HTML_FOOTER            = @SRCDIR@/no_date_footer.html
-+HTML_FOOTER            =
- 
- # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
- # style sheet that is used by each HTML page. It can be used to
diff --git a/media-sound/jack2/jack2-1.9.16.ebuild b/media-sound/jack2/jack2-1.9.16.ebuild
deleted file mode 100644
index cceb860aa7e3..000000000000
--- a/media-sound/jack2/jack2-1.9.16.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.14-fix-doc.patch"
-)
-
-src_prepare() {
-	default
-	python_fix_shebang waf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.22.ebuild b/media-sound/jack2/jack2-1.9.22.ebuild
new file mode 100644
index 000000000000..c52bbee4676b
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.22.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://dev.gentoo.org/~ionen/distfiles/${P}-python3.12.patch.xz
+	"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )
+"
+
+DEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
+	systemd? ( classic? ( sys-apps/systemd:= ) )
+"
+RDEPEND="
+	${DEPEND}
+	dbus? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit
+	!media-video/pipewire[jack-sdk(-)]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+# tools were formerly provided here, pull to maintain expectations
+PDEPEND="tools? ( media-sound/jack-example-tools )"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
+
+PATCHES=(
+	"${WORKDIR}"/${P}-python3.12.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang waf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# clients crash if built with lto
+	# https://github.com/jackaudio/jack2/issues/485
+	filter-lto
+
+	local wafargs=(
+		--mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1
+
+		--alsa=$(usex alsa)
+		--celt=no
+		$(usev classic --classic)
+		--db=$(usex metadata)
+		$(usev dbus --dbus)
+		--doxygen=$(multilib_native_usex doc)
+		--firewire=$(usex ieee1394)
+		--iio=no
+		--opus=$(usex opus)
+		--portaudio=no
+		--samplerate=$(usex libsamplerate)
+		--systemd=$(multilib_native_usex systemd $(usex classic))
+		--winmme=no
+	)
+
+	waf-utils_src_configure "${wafargs[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control
+}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index f80759ad3794..2241477aa20d 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -1,96 +1,109 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
+inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	SRC_URI="
+		https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
 
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
+	|| ( classic dbus )
+"
 
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
+DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	dbus? (
 		dev-libs/expat[${MULTILIB_USEDEP}]
 		sys-apps/dbus[${MULTILIB_USEDEP}]
 	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
+	systemd? ( classic? ( sys-apps/systemd:= ) )
+"
+RDEPEND="
+	${DEPEND}
 	dbus? (
+		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
+	!media-sound/jack-audio-connection-kit
+	!media-video/pipewire[jack-sdk(-)]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+# tools were formerly provided here, pull to maintain expectations
+PDEPEND="tools? ( media-sound/jack-example-tools )"
 
 DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
 
 src_prepare() {
 	default
+
 	python_fix_shebang waf
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
+	# clients crash if built with lto
+	# https://github.com/jackaudio/jack2/issues/485
+	filter-lto
+
+	local wafargs=(
+		--mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1
+
+		--alsa=$(usex alsa)
 		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
+		$(usev classic --classic)
+		--db=$(usex metadata)
+		$(usev dbus --dbus)
+		--doxygen=$(multilib_native_usex doc)
+		--firewire=$(usex ieee1394)
 		--iio=no
-		--opus=$(usex opus yes no)
+		--opus=$(usex opus)
 		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
+		--samplerate=$(usex libsamplerate)
+		--systemd=$(multilib_native_usex systemd $(usex classic))
 		--winmme=no
 	)
 
-	waf-utils_src_configure ${mywafconfargs[@]}
+	waf-utils_src_configure "${wafargs[@]}"
 }
 
 multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+	waf-utils_src_compile
 }
 
 multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+	waf-utils_src_install
 }
 
 multilib_src_install_all() {
-	python_fix_shebang "${ED}"
+	use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control
 }
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 61e6667c2b4e..70cba767c741 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -1,16 +1,21 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">jackaudio/jack2</remote-id>
-	</upstream>
 	<use>
 		<flag name="classic">Enable building of jackd</flag>
 		<flag name="metadata">Enable metadata API</flag>
 		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+		<flag name="tools">Pull basic tools (e.g. jack_lsp/connect) from <pkg>media-sound/jack-example-tools</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jackaudio/jack2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch
index ef69ed5d810c..8b5bb15d1f6c 100644
--- a/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch
+++ b/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch
@@ -1,6 +1,5 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2017-07-07 17:42:49.613728707 -0400
-+++ b/Makefile	2017-07-07 17:44:39.393726882 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -3,16 +3,13 @@
  
  VERSION=0.9.73
@@ -35,7 +34,7 @@ diff -Naur a/Makefile b/Makefile
  
  jack_capture_gui2: jack_capture_gui2.cpp
 -	$(CPP) $(CPPFLAGS) $(OPTIMIZE) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
-+	$(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
++	$(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `${PKG_CONFIG} --libs --cflags gtk+-2.0` -o jack_capture_gui2
  
  config_flags: Makefile das_config.h
  	cat das_config.h |grep COMPILEFLAGS|sed s/\\/\\/COMPILEFLAGS//|tr '\n' ' ' >config_flags
diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch
new file mode 100644
index 000000000000..6c4d32985b6e
--- /dev/null
+++ b/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch
@@ -0,0 +1,68 @@
+diff --git a/jack_capture.c b/jack_capture.c
+index b2d15a1..ccbfa5c 100644
+--- a/jack_capture.c
++++ b/jack_capture.c
+@@ -20,6 +20,8 @@
+ 
+ #include "das_config.h"
+ 
++#define _GNU_SOURCE 1
++
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -900,54 +902,6 @@ static void stop_helper_thread(void){
+ /////////////////////////////////////////////////////////////////////
+ 
+ 
+-#ifndef __USE_GNU
+-/* This code has been derived from an example in the glibc2 documentation.
+- * "asprintf() implementation for braindamaged operating systems"
+- * Copyright (C) 1991, 1994-1999, 2000, 2001 Free Software Foundation, Inc.
+- */
+-#ifdef _WIN32
+-#define vsnprintf _vsnprintf
+-#endif
+-#ifndef __APPLE__
+-int asprintf(char **buffer, char *fmt, ...) {
+-    /* Guess we need no more than 200 chars of space. */
+-    int size = 200;
+-    int nchars;
+-    va_list ap;
+-
+-    *buffer = (char*)malloc(size);
+-    if (*buffer == NULL) return -1;
+-
+-    /* Try to print in the allocated space. */
+-    va_start(ap, fmt);
+-    nchars = vsnprintf(*buffer, size, fmt, ap);
+-    va_end(ap);
+-
+-    if (nchars >= size)
+-    {
+-        char *tmpbuff;
+-        /* Reallocate buffer now that we know how much space is needed. */
+-        size = nchars+1;
+-        tmpbuff = (char*)realloc(*buffer, size);
+-
+-        if (tmpbuff == NULL) { /* we need to free it*/
+-            free(*buffer);
+-            return -1;
+-        }
+-
+-        *buffer=tmpbuff;
+-        /* Try again. */
+-        va_start(ap, fmt);
+-        nchars = vsnprintf(*buffer, size, fmt, ap);
+-        va_end(ap);
+-    }
+-
+-    if (nchars < 0) return nchars;
+-    return size;
+-}
+-#endif
+-#endif
+-
+ #define ARGS_ADD_ARGV(FMT,ARG) \
+   argv=(char**) realloc((void*)argv, (argc+2)*sizeof(char*)); \
+   asprintf(&argv[argc++], FMT, ARG); argv[argc] = 0;
diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch
index c4909fbde8e3..b9c3386e330a 100644
--- a/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch
+++ b/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 6e1fef9..d75ebfb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -3,16 +3,16 @@ bindir = $(PREFIX)/bin
@@ -37,7 +35,7 @@ index 6e1fef9..d75ebfb 100644
  
  jack_capture_gui2: jack_capture_gui2.cpp
 -	$(CPP) $(CPPFLAGS) $(OPTIMIZE) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
-+	$(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
++	$(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `${PKG_CONFIG} --libs --cflags gtk+-2.0` -o jack_capture_gui2
  
  config_flags: Makefile das_config.h
  	cat das_config.h |grep COMPILEFLAGS|sed s/\\/\\/COMPILEFLAGS//|tr '\n' ' ' >config_flags
diff --git a/media-sound/jack_capture/jack_capture-0.9.73.ebuild b/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
index 6131ce16cd9c..d8ddd678eb88 100644
--- a/media-sound/jack_capture/jack_capture-0.9.73.ebuild
+++ b/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="JACK Recording utility"
 HOMEPAGE="https://github.com/kmatheussen/jack_capture"
@@ -14,18 +14,19 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="mp3 ogg osc"
 
-CDEPEND="
+RDEPEND="
 	media-libs/libsndfile
 	virtual/jack
 	mp3? ( media-sound/lame )
 	ogg? ( media-libs/libogg )
 	osc? ( media-libs/liblo )
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-avoid-custom-asprintf.patch"
 )
 
 DOCS=( README config )
@@ -38,15 +39,13 @@ src_prepare() {
 	use osc || sed -i -e 's/HAVE_LIBLO 1/HAVE_LIBLO 0/' -e '/COMPILEFLAGS .* liblo/d' gen_das_config_h.sh
 }
 
-src_compile()
-{
+src_compile() {
 	tc-export CC CXX
 
-	emake PREFIX="${EPREFIX}/usr" jack_capture
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${EPREFIX}/usr" jack_capture
 }
 
-src_install()
-{
+src_install() {
 	dobin jack_capture
 
 	dodoc "${DOCS[@]}"
diff --git a/media-sound/jack_capture/jack_capture-9999.ebuild b/media-sound/jack_capture/jack_capture-9999.ebuild
index f0073414466d..15a6a0cbbd2f 100644
--- a/media-sound/jack_capture/jack_capture-9999.ebuild
+++ b/media-sound/jack_capture/jack_capture-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs git-r3
+inherit toolchain-funcs git-r3
 
 DESCRIPTION="JACK Recording utility"
 HOMEPAGE="https://github.com/kmatheussen/jack_capture"
@@ -11,21 +11,20 @@ EGIT_REPO_URI="https://github.com/kmatheussen/jack_capture.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="mp3 ogg osc"
 
-CDEPEND="
+RDEPEND="
 	media-libs/libsndfile
 	virtual/jack
 	mp3? ( media-sound/lame )
 	ogg? ( media-libs/libogg )
 	osc? ( media-libs/liblo )
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.73-r1-Makefile.patch"
+	"${FILESDIR}"/${PN}-0.9.73-r1-Makefile.patch
 )
 
 DOCS=( README config )
@@ -38,15 +37,13 @@ src_prepare() {
 	use osc || sed -i -e 's/HAVE_LIBLO 1/HAVE_LIBLO 0/' -e '/COMPILEFLAGS .* liblo/d' gen_das_config_h.sh
 }
 
-src_compile()
-{
+src_compile() {
 	tc-export CC CXX
 
-	emake PREFIX="${EPREFIX}/usr" jack_capture
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${EPREFIX}/usr" jack_capture
 }
 
-src_install()
-{
+src_install() {
 	dobin jack_capture
 
 	dodoc "${DOCS[@]}"
diff --git a/media-sound/jack_capture/metadata.xml b/media-sound/jack_capture/metadata.xml
index ff35dc3000fb..59f65865927d 100644
--- a/media-sound/jack_capture/metadata.xml
+++ b/media-sound/jack_capture/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
 	<email>fordfrog@gentoo.org</email>
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index 17894b5c5156..8b9cbe97fb04 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,2 +1 @@
-DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b
-DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
+DIST jalv-1.6.8.tar.xz 60712 BLAKE2B d2264163821273bf40795d4dbfc1905c6ab334449461e311a18a6f667abafb92ed12afa8e9315bcf8d3f7bd3bde3a765994add294e5037b06349157f8b0bd734 SHA512 a3361239cbff8b02a0d46bb06480d727ad45abe1856ad4cec1a1299851392be04fdfa58ba6803ed2a446eb8964c4a44191733b53fe8529c65155b0221323428f
diff --git a/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch b/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
deleted file mode 100644
index 1f9b6147a219..000000000000
--- a/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wscript b/wscript
-index af363ca..5060b4d 100644
---- a/wscript
-+++ b/wscript
-@@ -235,7 +235,7 @@ def build(bld):
-                   lib          = ['pthread'],
-                   uselib       = libs + ' QT5',
-                   install_path = '${BINDIR}',
--                  cxxflags     = ['-fPIC'])
-+                  cxxflags     = ['-fPIC', '-std=c++11'])
- 
-     # Man pages
-     bld.install_files('${MANDIR}/man1', bld.path.ant_glob('doc/*.1'))
diff --git a/media-sound/jalv/files/jalv-1.6.8-qt5-fPIC.patch b/media-sound/jalv/files/jalv-1.6.8-qt5-fPIC.patch
new file mode 100644
index 000000000000..3b0e3008662e
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.8-qt5-fPIC.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 9ebc14f..25e3704 100644
+--- a/meson.build
++++ b/meson.build
+@@ -344,8 +344,8 @@ if not get_option('qt5').disabled()
+     executable(
+       'jalv.qt5',
+       sources + files('src/jalv_qt.cpp') + [jalv_qt5_meta_cpp],
+-      c_args: c_suppressions + platform_defines + suil_defines,
+-      cpp_args: cpp_suppressions + platform_defines + suil_defines,
++      c_args: c_suppressions + platform_defines + suil_defines + '-fPIC',
++      cpp_args: cpp_suppressions + platform_defines + suil_defines + '-fPIC',
+       dependencies: common_dependencies + [qt5_dep, suil_dep],
+       include_directories: include_directories('src'),
+       install: true,
diff --git a/media-sound/jalv/jalv-1.6.4.ebuild b/media-sound/jalv/jalv-1.6.4.ebuild
deleted file mode 100644
index d162740d5e99..000000000000
--- a/media-sound/jalv/jalv-1.6.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 qmake-utils waf-utils
-
-DESCRIPTION="Simple but fully featured LV2 host for Jack"
-HOMEPAGE="http://drobilla.net/software/jalv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="gtk gtk2 gtkmm portaudio qt5"
-
-RDEPEND="
-	>=dev-libs/serd-0.24.0
-	>=dev-libs/sord-0.14.0
-	>=media-libs/lilv-0.24.0
-	>=media-libs/lv2-1.16.0
-	>=media-libs/sratom-0.6.0
-	>=media-libs/suil-0.10.0
-	gtk? ( >=x11-libs/gtk+-3.0.0:3 )
-	gtk2? ( >=x11-libs/gtk+-2.18.0:2 )
-	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
-	portaudio? ( media-libs/portaudio )
-	!portaudio? ( virtual/jack )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.7.0.patch" )
-
-src_configure() {
-	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
-	waf-utils_src_configure \
-		"--docdir=/usr/share/doc/${PF}" \
-		--no-qt4 \
-		$(use qt5       || echo --no-qt5)       \
-		$(use gtk       || echo --no-gtk3)      \
-		$(use gtk2      || echo --no-gtk2)      \
-		$(use gtkmm     || echo --no-gtkmm)     \
-		$(use portaudio && echo --portaudio)
-}
diff --git a/media-sound/jalv/jalv-1.6.6.ebuild b/media-sound/jalv/jalv-1.6.6.ebuild
deleted file mode 100644
index 734fd57beb73..000000000000
--- a/media-sound/jalv/jalv-1.6.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 qmake-utils waf-utils
-
-DESCRIPTION="Simple but fully featured LV2 host for Jack"
-HOMEPAGE="http://drobilla.net/software/jalv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gtk gtk2 gtkmm portaudio qt5"
-
-RDEPEND="
-	dev-libs/serd
-	dev-libs/sord
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/sratom
-	media-libs/suil
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	gtkmm? ( dev-cpp/gtkmm:2.4 )
-	portaudio? ( media-libs/portaudio )
-	!portaudio? ( virtual/jack )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-DOCS=( AUTHORS NEWS README.md )
-
-src_configure() {
-	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
-	waf-utils_src_configure \
-		"--docdir=/usr/share/doc/${PF}" \
-		--no-qt4 \
-		$(use qt5       || echo --no-qt5)       \
-		$(use gtk       || echo --no-gtk3)      \
-		$(use gtk2      || echo --no-gtk2)      \
-		$(use gtkmm     || echo --no-gtkmm)     \
-		$(use portaudio && echo --portaudio)
-}
diff --git a/media-sound/jalv/jalv-1.6.8.ebuild b/media-sound/jalv/jalv-1.6.8.ebuild
new file mode 100644
index 000000000000..da48f7dfbce1
--- /dev/null
+++ b/media-sound/jalv/jalv-1.6.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson qmake-utils flag-o-matic xdg
+
+DESCRIPTION="Simple but fully featured LV2 host for Jack"
+HOMEPAGE="https://drobilla.net/software/jalv.html"
+SRC_URI="https://download.drobilla.net/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="gtk +jack portaudio qt5 test"
+REQUIRED_USE="^^ ( jack portaudio )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/serd
+	dev-libs/sord
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/sratom
+	media-libs/suil
+	gtk? ( x11-libs/gtk+:3 )
+	jack? ( virtual/jack )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt5-fPIC.patch"
+)
+
+src_configure() {
+	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
+
+	local emesonargs=(
+		$(meson_feature gtk gtk3)
+		$(meson_feature jack)
+		$(meson_feature portaudio)
+		$(meson_feature qt5)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	append-flags -fPIC
+
+	meson_src_compile
+}
diff --git a/media-sound/jalv/metadata.xml b/media-sound/jalv/metadata.xml
index de663c86a7ee..1e376ed9229c 100644
--- a/media-sound/jalv/metadata.xml
+++ b/media-sound/jalv/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
@@ -14,9 +14,4 @@
 	To make it simple to test plugins in hosts that use different toolkits, there are several Jalv executables: jalv, jalv.gtk, jalv.gtkmm, and jalv.qt.
 </longdescription>
 
-<use>
-	<flag name="gtk2">Adds support for GTK+2 in addition to GTK+3 controlled by the gtk useflag.</flag>
-	<flag name="gtkmm"> Adds support for <pkg>dev-cpp/gtkmm</pkg>: C++ interface for GTK+2</flag>
-</use>
-
 </pkgmetadata>
diff --git a/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild b/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild
index 6cf9723e2421..9af81db56873 100644
--- a/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild
+++ b/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,9 +6,9 @@ EAPI=7
 inherit autotools xdg
 
 DESCRIPTION="Audio mastering interface for JACK Audio Connection Kit (JACK)"
-HOMEPAGE="http://jamin.sourceforge.net/en/about.html https://salsa.debian.org/multimedia-team/jamin"
-SRC_URI="http://deb.debian.org/debian/pool/main/j/${PN}/${PN}_${PV/_pre/~git}~199091~repack1.orig.tar.bz2
-http://deb.debian.org/debian/pool/main/j/${PN}/${PN}_${PV/_pre/~git}~199091~repack1-1.debian.tar.xz"
+HOMEPAGE="https://jamin.sourceforge.net/en/about.html https://salsa.debian.org/multimedia-team/jamin"
+SRC_URI="https://deb.debian.org/debian/pool/main/j/${PN}/${PN}_${PV/_pre/~git}~199091~repack1.orig.tar.bz2
+https://deb.debian.org/debian/pool/main/j/${PN}/${PN}_${PV/_pre/~git}~199091~repack1-1.debian.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/jamin/metadata.xml b/media-sound/jamin/metadata.xml
index 2b3f906e21d0..ed916bcef29e 100644
--- a/media-sound/jamin/metadata.xml
+++ b/media-sound/jamin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/justeport/metadata.xml b/media-sound/justeport/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/justeport/metadata.xml
+++ b/media-sound/justeport/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/kasts/Manifest b/media-sound/kasts/Manifest
new file mode 100644
index 000000000000..ce32208f1690
--- /dev/null
+++ b/media-sound/kasts/Manifest
@@ -0,0 +1,2 @@
+DIST kasts-23.08.5.tar.xz 581312 BLAKE2B eb85f74a6934947146f9ef277ed963eeba6ab108e8ff6a446255229cf7e7f4e6e6eacc16a508d46688f244f6b857a5d168387431f1520decd2e83b39189bcc05 SHA512 bfe2fa6d0bc628c51fa0db13a434e80c08a29e4bae95bccbaf6d029c424d6277eea9d0625f9de69ad6f011c482cd571000566ac838e22b03c57e8671ff4c3bd8
+DIST kasts-24.04.90.tar.xz 607848 BLAKE2B ec833219b142c5f6206d0cfa425ce288f08ce09bc2a0b7bfad13c131630bb1d1f119fa4c5e501c49e61ac01d2d7d36c9093585bf83100a2c26f092cae75bdea8 SHA512 31de31304423f4fd3b0c0e9e0aafe873694a3b06e98c3aa485a5fb713206275f8d6e5b47e99122e97615adb07bb935c251b3b5357af79835538ce000f3d9d1a6
diff --git a/media-sound/kasts/kasts-23.08.5.ebuild b/media-sound/kasts/kasts-23.08.5.ebuild
new file mode 100644
index 000000000000..53db2e77c645
--- /dev/null
+++ b/media-sound/kasts/kasts-23.08.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="Convergent podcast application for desktop and mobile"
+HOMEPAGE="https://apps.kde.org/kasts/"
+
+LICENSE="GPL-2 GPL-2+ GPL-3+ BSD LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="gstreamer networkmanager vlc"
+
+DEPEND="
+	>=dev-libs/kirigami-addons-0.7.2:5
+	dev-libs/qtkeychain:=[qt5(+)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/syndication-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	media-libs/taglib:=
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-good:1.0
+	)
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+BDEPEND="gstreamer? ( virtual/pkgconfig )"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_qt_module Test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLE_PLAYER=OFF
+		-DBUILD_GSTREAMER_BACKEND=$(usex gstreamer)
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+	ecm_src_configure
+}
diff --git a/media-sound/kasts/kasts-24.04.90.ebuild b/media-sound/kasts/kasts-24.04.90.ebuild
new file mode 100644
index 000000000000..201e023c5ff5
--- /dev/null
+++ b/media-sound/kasts/kasts-24.04.90.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.2.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Convergent podcast application for desktop and mobile"
+HOMEPAGE="https://apps.kde.org/kasts/"
+
+LICENSE="GPL-2 GPL-2+ GPL-3+ BSD LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gstreamer networkmanager vlc"
+
+DEPEND="
+	dev-libs/kirigami-addons:6
+	>=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/breeze-icons-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/syndication-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+	media-libs/taglib:=
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-good:1.0
+	)
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+	vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
+BDEPEND="gstreamer? ( virtual/pkgconfig )"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_qt_module Test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLE_PLAYER=OFF
+		-DBUILD_GSTREAMER_BACKEND=$(usex gstreamer)
+		$(cmake_use_find_package networkmanager KF6NetworkManagerQt)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+	ecm_src_configure
+}
diff --git a/media-sound/kasts/metadata.xml b/media-sound/kasts/metadata.xml
new file mode 100644
index 000000000000..0d868180f4be
--- /dev/null
+++ b/media-sound/kasts/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">multimedia/kasts</remote-id>
+	</upstream>
+	<use>
+		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index abfaa4c81234..ba2bf1bd75c0 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1 +1 @@
-DIST kid3-3.8.4.tar.gz 3161673 BLAKE2B 0055805bd0470bd000549c970c69cf911eb12d0ca291985759d0ebc2b6aa7394c65a72193606a4730136eeafef7a3d7a21822e998f2d841caa0a23c424a1f906 SHA512 c5abef6b0b7b4cfe606aa547563efff77f70b06770ea8423ed2cb25099a5c015e5de4badf5e87e080b05926459423584bd747aa3e475393026d92f6d73c9782a
+DIST kid3-3.9.5.tar.xz 1843528 BLAKE2B 6bd7cf85eb6da91e1fb2dad40f63cdd443b1f75f3fab685f7af3caa5727f49afbf9b53a8d304f5e127743c4e0f8e3672b62fca33cf6de0a02ef091e758b2335a SHA512 a5b21ebabeddb49a2755fd1b5c563a822419d2a82184182bda85e5be9932ccd9626e969f944fb55cfa4c85f7c7c9821adba75375f966ee90272c2cf2283acdd8
diff --git a/media-sound/kid3/kid3-3.8.4.ebuild b/media-sound/kid3/kid3-3.9.5.ebuild
index ff949e076256..20121e18a128 100644
--- a/media-sound/kid3/kid3-3.8.4.ebuild
+++ b/media-sound/kid3/kid3-3.9.5.ebuild
@@ -1,29 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit kde.org cmake xdg
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake kde.org python-any-r1 xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
 HOMEPAGE="https://kid3.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
 SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
+RESTRICT="!test? ( test )"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-DEPEND="
+RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
@@ -31,13 +29,13 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sys-libs/readline:0=
+	sys-libs/readline:=
 	acoustid? (
-		media-libs/chromaprint
-		media-video/ffmpeg
+		media-libs/chromaprint:=
+		media-video/ffmpeg:=
 	)
 	flac? (
-		media-libs/flac[cxx]
+		media-libs/flac:=[cxx]
 		media-libs/libvorbis
 	)
 	kde? (
@@ -49,7 +47,7 @@ DEPEND="
 		kde-frameworks/kxmlgui:5
 	)
 	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
+	mp4? ( media-libs/libmp4v2 )
 	mpris? ( dev-qt/qtdbus:5 )
 	taglib? ( >=media-libs/taglib-1.9.1 )
 	vorbis? (
@@ -57,25 +55,39 @@ DEPEND="
 		media-libs/libvorbis
 	)
 "
-RDEPEND="${DEPEND}
-	!media-sound/kid3:4
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:0 )
 "
 
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	# overengineered upstream build system
 	cmake_src_prepare
 	# applies broken python hacks, bug #614950
 	cmake_comment_add_subdirectory doc
+
+	sed -e "/^ *find_package.*QT NAMES/s/Qt6 //" \
+		-i CMakeLists.txt || die # ensure Qt5 build
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_WITH_QT6=OFF
+		-DWITH_QAUDIODECODER=ON # bug 855281
 		-DWITH_CHROMAPRINT=$(usex acoustid)
 		-DWITH_DBUS=$(usex mpris)
 		-DWITH_FLAC=$(usex flac)
 		-DWITH_ID3LIB=$(usex mp3)
 		-DWITH_MP4V2=$(usex mp4)
 		-DWITH_TAGLIB=$(usex taglib)
+		-DBUILD_TESTING=$(usex test)
 		-DWITH_VORBIS=$(usex vorbis)
 	)
 
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index ec4f401b5c32..802d3fde5502 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
@@ -9,6 +9,9 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+	</upstream>
 	<use>
 		<flag name="acoustid">Build acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
 		<flag name="mpris">Enable support for MPRIS2 interface using <pkg>dev-qt/qtdbus</pkg></flag>
diff --git a/media-sound/klick/files/klick-0.12.2-gcc6.patch b/media-sound/klick/files/klick-0.12.2-gcc6.patch
index c8c07121e497..016d221d30e0 100644
--- a/media-sound/klick/files/klick-0.12.2-gcc6.patch
+++ b/media-sound/klick/files/klick-0.12.2-gcc6.patch
@@ -1,44 +1,78 @@
---- klick-0.12.2/src/metronome_map.hh.old	2016-09-21 22:17:41.364102201 -0400
-+++ klick-0.12.2/src/metronome_map.hh	2016-09-21 22:28:50.611858765 -0400
-@@ -48,7 +48,7 @@
+Description: Fix build with gcc-6.
+Author: Jaromír Mikeš <mira.mikes@seznam.cz>
+Forwarded: dominic.sacre@gmx.de
+
+Index: klick/src/metronome_map.hh
+===================================================================
+--- klick.orig/src/metronome_map.hh
++++ klick/src/metronome_map.hh
+@@ -48,7 +48,7 @@ class MetronomeMap
      virtual void timebase_callback(position_t *);
  
    private:
 -    static double const TICKS_PER_BEAT = 1920.0;
-+    static double const TICKS_PER_BEAT;
++    static double constexpr TICKS_PER_BEAT = 1920.0;
  
      // transport position
      nframes_t _current;
---- klick-0.12.2/src/metronome_map.cc.old	2016-09-21 22:27:01.551067088 -0400
-+++ klick-0.12.2/src/metronome_map.cc	2016-09-21 22:28:49.027158380 -0400
-@@ -195,3 +195,5 @@
-         p->beats_per_minute = _pos.map_entry().tempi[n];
-     }
- }
-+
-+double const MetronomeMap::TICKS_PER_BEAT = 1920.0;
---- klick-0.12.2/src/metronome_simple.hh.old	2016-09-21 22:18:57.674628602 -0400
-+++ klick-0.12.2/src/metronome_simple.hh	2016-09-21 22:29:04.307859355 -0400
-@@ -58,9 +58,9 @@
- 
+Index: klick/src/metronome_simple.hh
+===================================================================
+--- klick.orig/src/metronome_simple.hh
++++ klick/src/metronome_simple.hh
+@@ -59,8 +59,8 @@ class MetronomeSimple
    private:
  
--    static int const MAX_TAPS = 5;
+     static int const MAX_TAPS = 5;
 -    static float const MAX_TAP_AGE = 3.0;
 -    static float const TAP_DIFF = 0.2;
-+    static int const MAX_TAPS;
-+    static float const MAX_TAP_AGE;
-+    static float const TAP_DIFF;
++    static float constexpr MAX_TAP_AGE = 3.0;
++    static float constexpr TAP_DIFF = 0.2;
  
      float _tempo;
      float _tempo_increment, _tempo_start, _tempo_limit;
---- klick-0.12.2/src/metronome_simple.cc.old	2016-09-21 22:27:24.883846428 -0400
-+++ klick-0.12.2/src/metronome_simple.cc	2016-09-21 22:28:46.015859632 -0400
-@@ -217,3 +217,7 @@
+Index: klick/src/tempomap.cc
+===================================================================
+--- klick.orig/src/tempomap.cc
++++ klick/src/tempomap.cc
+@@ -57,17 +57,17 @@ static char const regex_blank[] = "^[[:b
+ // matches any valid line in a tempomap file
+ static char const regex_valid[] =
+     // label
+-    "^[[:blank:]]*("REGEX_LABEL":)?" \
++    "^[[:blank:]]*(" REGEX_LABEL":)?" \
+     // bars
+-    "[[:blank:]]*"REGEX_INT"" \
++    "[[:blank:]]*" REGEX_INT"" \
+     // meter
+-    "([[:blank:]]+"REGEX_INT"/"REGEX_INT")?" \
++    "([[:blank:]]+" REGEX_INT"/" REGEX_INT")?" \
+     // tempo
+-    "[[:blank:]]+"REGEX_FLOAT"(-"REGEX_FLOAT"|((,"REGEX_FLOAT")*))?" \
++    "[[:blank:]]+" REGEX_FLOAT"(-" REGEX_FLOAT"|((," REGEX_FLOAT")*))?" \
+     // pattern
+-    "([[:blank:]]+"REGEX_PATTERN")?" \
++    "([[:blank:]]+" REGEX_PATTERN")?" \
+     // volume
+-    "([[:blank:]]+"REGEX_FLOAT")?" \
++    "([[:blank:]]+" REGEX_FLOAT")?" \
+     // comment
+     "[[:blank:]]*(#.*)?$";
+ 
+@@ -87,13 +87,13 @@ static int const
+ // matches valid tempo parameters on the command line
+ static char const regex_cmdline[] =
+     // bars
+-    "^[[:blank:]]*("REGEX_INT"[[:blank:]]+)?" \
++    "^[[:blank:]]*(" REGEX_INT"[[:blank:]]+)?" \
+     // meter
+-    "("REGEX_INT"/"REGEX_INT"[[:blank:]]+)?" \
++    "(" REGEX_INT"/" REGEX_INT"[[:blank:]]+)?" \
+     // tempo
+-    REGEX_FLOAT"(-"REGEX_FLOAT"/"REGEX_FLOAT")?" \
++    REGEX_FLOAT"(-" REGEX_FLOAT"/" REGEX_FLOAT")?" \
+     // pattern
+-    "([[:blank:]]+"REGEX_PATTERN")?[[:blank:]]*$";
++    "([[:blank:]]+" REGEX_PATTERN")?[[:blank:]]*$";
  
-     _frame += nframes;
- }
-+
-+int const MetronomeSimple::MAX_TAPS = 5;
-+float const MetronomeSimple::MAX_TAP_AGE = 3.0;
-+float const MetronomeSimple::TAP_DIFF = 0.2;
+ static int const
+     RE_NMATCHES_CMD = 15,
diff --git a/media-sound/klick/klick-0.12.2-r2.ebuild b/media-sound/klick/klick-0.12.2-r4.ebuild
index 578c9bd794d7..bee2f5f90249 100644
--- a/media-sound/klick/klick-0.12.2-r2.ebuild
+++ b/media-sound/klick/klick-0.12.2-r4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="An advanced command-line based metronome for JACK"
-HOMEPAGE="http://das.nasophon.de/klick"
-SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
+HOMEPAGE="https://das.nasophon.de/klick/"
+SRC_URI="https://das.nasophon.de/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -38,7 +38,6 @@ src_configure() {
 		CXXFLAGS="${CXXFLAGS}"
 		LINKFLAGS="${LDFLAGS}"
 		PREFIX="${EPREFIX}/usr"
-		DESTDIR="${D}"
 		DEBUG=$(usex debug)
 		OSC=$(usex osc)
 		RUBBERBAND=$(usex rubberband)
@@ -50,6 +49,6 @@ src_compile() {
 }
 
 src_install() {
-	escons "${MYSCONS[@]}" install
+	escons "${MYSCONS[@]}" DESTDIR="${D}" install
 	einstalldocs
 }
diff --git a/media-sound/klick/metadata.xml b/media-sound/klick/metadata.xml
index 807ed60afdd3..399d843db8c7 100644
--- a/media-sound/klick/metadata.xml
+++ b/media-sound/klick/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index 2bac2f15c606..3add0d97d0b4 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1,2 +1 @@
-DIST kmetronome-1.0.1.tar.bz2 226758 BLAKE2B 9a9e7070f78fe109dce18d3fb66c29e1819f443bc578f03ec31670c994377d7f760367c0c6eb8edc40b2f64b58f2b461beed19b02eadc6dfc9762be537f9f196 SHA512 b5d4c290bb92cdc531ad432dda6ad21ea6c7ec9a144e0482aa4219293e2bc515dbb68ffdbbd4e552daf425c5206636c378e587adfc7029f7bc67d902b591897a
-DIST kmetronome-1.2.0.tar.bz2 227803 BLAKE2B 89d95f088ff038586ceee56315ae8172715a32e8b1c3c2b482fff4e072b523900016b2004b16d19e0e0210b743a8a6753552be8c0ca3e2873038cbbfd8fc5b9a SHA512 6bfba857661b031da37067a88a3ed07f687167ad218f924295d2b953ee555722d00bd5700d541207a93a43afce3f95ded11809630d15657b6d4b0df055792ead
+DIST kmetronome-1.3.0.tar.bz2 366463 BLAKE2B 5140fbf8a31a76febda94713419f14455196ab0017ef048be1d780e66bde95c9f79f6917a02a73f74cd996f39d5e020c6b6fff744c48f21ae0c516940f43aba7 SHA512 3b888dfc802a5a3e83d11a42c6f6f9fd5cd21e294fafa6ef670a6a76cf6b0f37616fcf465d0589c10238b18881e44b85a2104f9b986bc5ddfeecddb51918a78a
diff --git a/media-sound/kmetronome/kmetronome-1.0.1-r1.ebuild b/media-sound/kmetronome/kmetronome-1.0.1-r1.ebuild
deleted file mode 100644
index d9f51bb24774..000000000000
--- a/media-sound/kmetronome/kmetronome-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="MIDI based metronome using ALSA sequencer"
-HOMEPAGE="https://kmetronome.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	=media-sound/drumstick-1*
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
diff --git a/media-sound/kmetronome/kmetronome-1.2.0.ebuild b/media-sound/kmetronome/kmetronome-1.3.0.ebuild
index dc9fee36a96d..df9631db20e2 100644
--- a/media-sound/kmetronome/kmetronome-1.2.0.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.3.0.ebuild
@@ -1,23 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
 DESCRIPTION="MIDI based metronome using ALSA sequencer"
 HOMEPAGE="https://kmetronome.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+KEYWORDS="amd64 x86"
+IUSE=""
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -28,7 +24,15 @@ DEPEND="
 	>=media-sound/drumstick-2.0.0
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
-src_prepare() {
-	cmake_src_prepare
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
+		-DUSE_QT=5
+	)
+	cmake_src_configure
 }
diff --git a/media-sound/kmetronome/metadata.xml b/media-sound/kmetronome/metadata.xml
index f5ba73ce7ff9..08fc44e0716d 100644
--- a/media-sound/kmetronome/metadata.xml
+++ b/media-sound/kmetronome/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index ebda93d39404..9836e8994487 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -1 +1 @@
-DIST kmidimon-1.0.0_pre20201003.zip 559637 BLAKE2B 57843d2718b8efb6d0be1174390bb21949e200efddc8a7ed65a67eef422eb0976f6008184bdb836bcaa3aabba9a1ea6e2ae848f931a26255a97cc11a29b85643 SHA512 0e6750196a0ecd138746602f6e9c2344aa3fe1ea49a0bb6a40d0626e7a428fb3c8fe51bed76b4df342eef32163c83deffd610bd3904108706943ee6e969b5b26
+DIST kmidimon-1.3.0.tar.bz2 698412 BLAKE2B 185125fda809042a064b225f14ef5c04c69f07bda77d2291d2719256ccbee122bc181d9ea602cb43335f764ae9576daf79966a681637d080f5e3533bd856715d SHA512 02085e6d6768fe5d35649446ec5db2eadcf34b4c727fb250bdbc33d79c86a16d6dc3993ddd9fe08e93e08e1400fb3f56bb71913020ffa410f56ad7168bf08b97
diff --git a/media-sound/kmidimon/files/kmidimon-1.2.0-fix-cmake-pathvar.patch b/media-sound/kmidimon/files/kmidimon-1.2.0-fix-cmake-pathvar.patch
new file mode 100644
index 000000000000..6ee1afea0932
--- /dev/null
+++ b/media-sound/kmidimon/files/kmidimon-1.2.0-fix-cmake-pathvar.patch
@@ -0,0 +1,11 @@
+--- a/doc/CMakeLists.txt	2021-12-12 11:29:13.249013335 +0100
++++ b/doc/CMakeLists.txt	2021-12-17 11:45:36.458111658 +0100
+@@ -30,7 +30,7 @@
+     if (UNIX AND NOT APPLE)
+         install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}
+                 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.ja.1
++        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.ja.1
+                 DESTINATION ${CMAKE_INSTALL_MANDIR}/ja/man1
+                 RENAME ${MANPAGE})
+         foreach(_lang IN ITEMS cs en es fr ja)
diff --git a/media-sound/kmidimon/kmidimon-1.0.0_pre20201003.ebuild b/media-sound/kmidimon/kmidimon-1.3.0.ebuild
index 230e713785ec..2abf5a9171d1 100644
--- a/media-sound/kmidimon/kmidimon-1.0.0_pre20201003.ebuild
+++ b/media-sound/kmidimon/kmidimon-1.3.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
 DESCRIPTION="MIDI monitor for ALSA sequencer"
 HOMEPAGE="https://kmidimon.sourceforge.io/"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/k/km/${PN}/code/${PN}-code-r217-trunk.zip -> ${P}.zip"
-S="${WORKDIR}/${PN}-code-r217-trunk"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
@@ -20,7 +19,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
-	>=media-sound/drumstick-2.0.0
+	>=media-sound/drumstick-2.4.0
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -28,13 +27,13 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
-src_prepare() {
-	cmake_src_prepare
-}
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-fix-cmake-pathvar.patch" )
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DUSE_QT=5
 	)
 	cmake_src_configure
 }
diff --git a/media-sound/kmidimon/metadata.xml b/media-sound/kmidimon/metadata.xml
index e3a6e95b81ee..81579d22b0c5 100644
--- a/media-sound/kmidimon/metadata.xml
+++ b/media-sound/kmidimon/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
diff --git a/media-sound/krecorder/Manifest b/media-sound/krecorder/Manifest
new file mode 100644
index 000000000000..58e572be7b54
--- /dev/null
+++ b/media-sound/krecorder/Manifest
@@ -0,0 +1,2 @@
+DIST krecorder-23.08.5.tar.xz 162496 BLAKE2B 8323c13e7c633fcfb3b53ffb43b59fad725f85ff9980db312cd262ccf4a4c1813f5323adfdb3ce8b4efebd5ee3e4a61dd0f8d2c0858b6840d0c1cfb48d14a3c8 SHA512 dfe9ba96c1476e019b569fc811dccde1dfe866375d8b0a663f253d2dfa36b4be012f3f31c5ca83ba59f76546cfa6a3720c79112820d43dd26648a1680f987b64
+DIST krecorder-24.04.90.tar.xz 166728 BLAKE2B 9e0a437a423e8907cc74742331dcd4720192a2dc04396a4c8a40226f81b7ce2cc776820a16ed1544f6bddcb50b5547a0faaee9c1e942f82988f97c7e7da91ced SHA512 fc563a6625a8f1407d3db1a7b0d9fdcbd9af412210405f08515c8fb570dfbac2d3199ce45cee08a95e6e50e3657b74ed19d22da5251990d8e8c1e0164ccc707f
diff --git a/media-sound/krecorder/krecorder-23.08.5.ebuild b/media-sound/krecorder/krecorder-23.08.5.ebuild
new file mode 100644
index 000000000000..f21d218c9044
--- /dev/null
+++ b/media-sound/krecorder/krecorder-23.08.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="Convergent audio recording application for Plasma"
+HOMEPAGE="https://apps.kde.org/krecorder/"
+
+LICENSE="CC0-1.0 CC-BY-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+
+DEPEND="
+	>=dev-libs/kirigami-addons-0.6:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+BDEPEND=">=kde-frameworks/ki18n-${KFMIN}:5"
diff --git a/media-sound/krecorder/krecorder-24.04.90.ebuild b/media-sound/krecorder/krecorder-24.04.90.ebuild
new file mode 100644
index 000000000000..59c215ba3e7f
--- /dev/null
+++ b/media-sound/krecorder/krecorder-24.04.90.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+KFMIN=6.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Convergent audio recording application for Plasma"
+HOMEPAGE="https://apps.kde.org/krecorder/"
+
+LICENSE="CC0-1.0 CC-BY-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+BDEPEND=">=kde-frameworks/ki18n-${KFMIN}:6"
diff --git a/media-sound/krecorder/metadata.xml b/media-sound/krecorder/metadata.xml
new file mode 100644
index 000000000000..5144f75a1df9
--- /dev/null
+++ b/media-sound/krecorder/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="kde-invent">utilities/krecorder</remote-id>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=krecorder</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Krecorder is a convergent audio recording application for Plasma.
+		Features:
+		- Record audio with a visualizer, and pausing functionality
+		- Ability to select audio sources
+		- Ability to select encoding and container formats
+		- Audio playback with a visualizer
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/lame/lame-3.100-r3.ebuild b/media-sound/lame/lame-3.100-r3.ebuild
index 87f1c4a92de7..88d390f09164 100644
--- a/media-sound/lame/lame-3.100-r3.ebuild
+++ b/media-sound/lame/lame-3.100-r3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="LAME Ain't an MP3 Encoder"
-HOMEPAGE="http://lame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://lame.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/lame/metadata.xml b/media-sound/lame/metadata.xml
index 433fd3db8ae4..c5d5fdc0bd21 100644
--- a/media-sound/lame/metadata.xml
+++ b/media-sound/lame/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/lash/files/lash-0.5.4-autotools.patch b/media-sound/lash/files/lash-0.5.4-autotools.patch
new file mode 100644
index 000000000000..54988c70bbc7
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-autotools.patch
@@ -0,0 +1,32 @@
+Fix build with modern autoconf/automake and fix a bashism in configure.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = m4 docs lash liblash lashd clients icons pylash
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,6 @@ AC_INIT([LASH],[0.5.4])
+ AC_CONFIG_SRCDIR([lash/types.h])
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE
+-AM_ACLOCAL_INCLUDE([m4])
+ 
+ ### Check for programs ###
+ AC_LANG([C])
+@@ -161,10 +160,10 @@ AC_ARG_ENABLE(pylash, [AS_HELP_STRING(--disable-pylash, [Force disable pylash bu
+ if test x$build_pylash != xdisabled; then
+   AM_PATH_PYTHON(2.3, python_found=yes, python_found=no)
+ 
+-  if test x$python_found == xyes; then
++  if test x$python_found = xyes; then
+     AM_CHECK_PYTHON_HEADERS(, python_found=no)
+ 
+-    if test x$python_found == xyes; then
++    if test x$python_found = xyes; then
+       AC_PROG_SWIG(1.3.31)
+       if test "$SWIG_LIB" ; then
+         build_pylash=yes
diff --git a/media-sound/lash/files/lash-0.5.4-c99.patch b/media-sound/lash/files/lash-0.5.4-c99.patch
new file mode 100644
index 000000000000..31dab715db7e
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-c99.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/925439
+--- a/clients/synth/lash.c
++++ b/clients/synth/lash.c
+@@ -22,6 +22,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r5.ebuild
index da41b2341e12..3b74b7b4d2f9 100644
--- a/media-sound/lash/lash-0.5.4-r4.ebuild
+++ b/media-sound/lash/lash-0.5.4-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit autotools eutils multilib-minimal python-single-r1
+inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="LASH Audio Session Handler"
 HOMEPAGE="http://www.nongnu.org/lash/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 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/lash/lash-0.5.4-r6.ebuild b/media-sound/lash/lash-0.5.4-r6.ebuild
new file mode 100644
index 000000000000..1ee913743360
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r6.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..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
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-c99.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/texi2html/s:-number:&-sections:' \
+		docs/Makefile.am || die #422045
+
+	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/metadata.xml b/media-sound/lash/metadata.xml
index f79bb67acbd9..e7aa4c7f804b 100644
--- a/media-sound/lash/metadata.xml
+++ b/media-sound/lash/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!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>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah-nongnu">lash</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/liblc3/Manifest b/media-sound/liblc3/Manifest
new file mode 100644
index 000000000000..9c33a7e0c686
--- /dev/null
+++ b/media-sound/liblc3/Manifest
@@ -0,0 +1,3 @@
+DIST liblc3-1.0.3.tar.gz 261702 BLAKE2B 5b4f6961eb0990e746c9659c18f8a5daf1841cf3035d78f15414dfd631c18d0a61d8fbffb602130cae42d4ad3d87cee2bf311cb7065c217b79cc25637f2337c6 SHA512 ba8e2515b88bdc2db5c6fca0189d0f03720af1e2c33c91ade586efbd6f402a4ff9af33b5235716cac8dce7c17a5a432471f9572c17641fbc7877855aa0c2c2b4
+DIST liblc3-1.0.4.tar.gz 263276 BLAKE2B 8c4b5e23b3dafe2fa22812c688f1f57167369cebe565b097e554be693d49b0c196fb5e454f3db8e724410f8c04d4bb66bd7594ab46b2a1b91c277300e5c48dc2 SHA512 bc047aa26059f2b2a7f5275b580f39a9237ffdd6da03645c7e95957447ba7410768ae5c08fcf1e0ac16fac873be4cbf62695b2298ef72f54f09e577664c27255
+DIST liblc3-1.1.1.tar.gz 1658742 BLAKE2B a38f1bede375fb57ee64b6e8ee7b639b01a58049815585a4528b2d0dfd5bf118455708f90e964b4a7b0599eb72dd6ba21b98a8c80588e64111ad9669f2c7fc3d SHA512 cd424a46fe8bad3cd2d633ef957305538afeb86f211d8824cf21e5c47c7ed174674a33a4e1906b73ab478cac7ed747c730f2d71d0021a7027c1c28b63ba3e588
diff --git a/media-sound/liblc3/liblc3-1.0.3.ebuild b/media-sound/liblc3/liblc3-1.0.3.ebuild
new file mode 100644
index 000000000000..41357ff874f3
--- /dev/null
+++ b/media-sound/liblc3/liblc3-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="LC3 is an efficient low latency audio codec"
+HOMEPAGE="https://github.com/google/liblc3"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="tools"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use tools)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/liblc3/liblc3-1.0.4-r1.ebuild b/media-sound/liblc3/liblc3-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..c4a93f1f6c8f
--- /dev/null
+++ b/media-sound/liblc3/liblc3-1.0.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+inherit meson python-any-r1
+
+DESCRIPTION="LC3 is an efficient low latency audio codec"
+HOMEPAGE="https://github.com/google/liblc3"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test tools"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/scipy[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/numpy[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/scipy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use arm || rm -rf "test/arm" || die
+	use arm64 || rm -rf "test/neon" || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		# We let users choose to enable LTO
+		-Db_lto=false
+		$(meson_use tools)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	V= emake test CFLAGS:="${CPPFLAGS} ${CFLAGS} -I"$("${EPYTHON}" -c "import numpy;print(numpy.get_include())")""
+}
diff --git a/media-sound/liblc3/liblc3-1.0.4.ebuild b/media-sound/liblc3/liblc3-1.0.4.ebuild
new file mode 100644
index 000000000000..8b03cf750af5
--- /dev/null
+++ b/media-sound/liblc3/liblc3-1.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="LC3 is an efficient low latency audio codec"
+HOMEPAGE="https://github.com/google/liblc3"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="tools"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+
+src_configure() {
+	local emesonargs=(
+		# We let users choose to enable LTO
+		-Db_lto=false
+		$(meson_use tools)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/liblc3/liblc3-1.1.1.ebuild b/media-sound/liblc3/liblc3-1.1.1.ebuild
new file mode 100644
index 000000000000..8c34042ea3e6
--- /dev/null
+++ b/media-sound/liblc3/liblc3-1.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+inherit meson python-any-r1
+
+DESCRIPTION="LC3 is an efficient low latency audio codec"
+HOMEPAGE="https://github.com/google/liblc3"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test tools"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/scipy[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/numpy[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/scipy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use arm || rm -rf "test/arm" || die
+	use arm64 || rm -rf "test/neon" || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dpython=false
+		$(meson_use tools)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	V= emake test CFLAGS:="${CPPFLAGS} ${CFLAGS} -I"$("${EPYTHON}" -c "import numpy;print(numpy.get_include())")""
+}
diff --git a/media-sound/liblc3/metadata.xml b/media-sound/liblc3/metadata.xml
new file mode 100644
index 000000000000..b49d07f25122
--- /dev/null
+++ b/media-sound/liblc3/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>joakim.tjernlund@infinera.com</email>
+		<name>Joakim Tjernlund</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/google/liblc3/issues</bugs-to>
+		<changelog>https://github.com/google/liblc3/releases</changelog>
+		<doc>https://github.com/google/liblc3#readme</doc>
+		<remote-id type="github">google/liblc3</remote-id>
+	</upstream>
+	<use>
+		<flag name="tools">Enable extra tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 86c44eb63be8..b6090ff8bdc6 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,2 +1,6 @@
-DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
 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
diff --git a/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch
new file mode 100644
index 000000000000..ab2bd8e59ae4
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch
@@ -0,0 +1,13 @@
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index 053ce17..48bddd3 100644
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -382,7 +382,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
+       tail = SCM_CDRLOC (*tail);
+     }
+ 
+-  PangoFontDescription *descr = pango_font_describe (pa->font);
++  PangoFontDescription *descr = pango_context_get_font_description (context_);
+   Real size = pango_font_description_get_size (descr)
+               / (static_cast<Real> (PANGO_SCALE));
+   pango_font_description_free (descr);
diff --git a/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
new file mode 100644
index 000000000000..2d27291551d4
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
@@ -0,0 +1,14 @@
+Revert "Pango_font: Free temporary font description"
+This reverts commit 102bed8b5a6332f2021a284bd5a937a2603fb327.
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index 053ce17143..1a63b18338 100644
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -385,7 +385,6 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
+   PangoFontDescription *descr = pango_font_describe (pa->font);
+   Real size = pango_font_description_get_size (descr)
+               / (static_cast<Real> (PANGO_SCALE));
+-  pango_font_description_free (descr);
+ 
+   if (ps_name_str0.empty ())
+     warning (_f ("no PostScript font name for font `%s'", file_name));
diff --git a/media-sound/lilypond/files/lilypond-9999-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch
index 45a3ad5e22ca..45a3ad5e22ca 100644
--- a/media-sound/lilypond/files/lilypond-9999-fix-font-size.patch
+++ b/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch
diff --git a/media-sound/lilypond/lilypond-2.21.6.ebuild b/media-sound/lilypond/lilypond-2.22.0-r1.ebuild
index 1206511028a6..dc2e3093c83e 100644
--- a/media-sound/lilypond/lilypond-2.21.6.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -28,8 +28,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="
 	dev-texlive/texlive-metapost
 	sys-apps/texinfo
-	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/yacc
+	app-alternatives/lex
 	virtual/pkgconfig
 	doc? ( app-text/texi2html )
 "
diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
index 99720d1e7045..a7c1bdfd17b5 100644
--- a/media-sound/lilypond/lilypond-2.22.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -28,8 +28,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="
 	dev-texlive/texlive-metapost
 	sys-apps/texinfo
-	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/yacc
+	app-alternatives/lex
 	virtual/pkgconfig
 	doc? ( app-text/texi2html )
 "
@@ -63,7 +63,8 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
+	"${FILESDIR}"/${P}-fix-font-size.patch
+	"${FILESDIR}"/${P}-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.23.0-r1.ebuild b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
new file mode 100644
index 000000000000..1ca508cfa3a1
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
@@ -0,0 +1,139 @@
+# 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
new file mode 100644
index 000000000000..82909b60dbe2
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
@@ -0,0 +1,139 @@
+# 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
new file mode 100644
index 000000000000..e7321aa8924b
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.24.0.ebuild
@@ -0,0 +1,132 @@
+# 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
new file mode 100644
index 000000000000..8acc71dc798d
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.24.3.ebuild
@@ -0,0 +1,139 @@
+# 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="https://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 )
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+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
+
+	# http://lilypond.org/doc/v2.24/Documentation/changes/index#notes-for-source-compilation-and-packagers
+	emake bytecode
+
+	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 install-bytecode
+
+	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-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 03ab64de7f8d..fb0d6447256b 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
-if [[ "${PV}" = "9999" ]]; then
+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"
+	SRC_URI="https://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
@@ -21,30 +22,25 @@ 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}"
+IUSE="debug doc emacs profile ${LANG_USE}"
 unset LANG_USE
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	dev-texlive/texlive-metapost
 	sys-apps/texinfo
-	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/yacc
+	app-alternatives/lex
 	virtual/pkgconfig
 	doc? ( app-text/texi2html )
 "
 RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
+	>=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:* )
-	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
@@ -63,24 +59,22 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
-DOCS=( DEDICATION HACKING README.md ROADMAP )
+DOCS=( DEDICATION README.md ROADMAP )
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
 
 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
@@ -91,7 +85,6 @@ src_configure() {
 	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)
@@ -107,6 +100,9 @@ src_configure() {
 src_compile() {
 	default
 
+	# http://lilypond.org/doc/v2.24/Documentation/changes/index#notes-for-source-compilation-and-packagers
+	emake bytecode
+
 	use doc && emake LANGS="${L10N}" doc info
 
 	if use emacs ; then
@@ -116,7 +112,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install install-bytecode
 
 	use doc && emake DESTDIR="${D}" install-doc
 
diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml
index a9cdf5b3658e..ecc01c28acaf 100644
--- a/media-sound/lilypond/metadata.xml
+++ b/media-sound/lilypond/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>scheme@gentoo.org</email>
diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
index 196a07fdc813..4c7f947233db 100644
--- a/media-sound/lingot/Manifest
+++ b/media-sound/lingot/Manifest
@@ -1 +1 @@
-DIST lingot-1.0.1.tar.gz 510112 BLAKE2B a04ef52cc70dba8af54746419190eedc2f2512120e3c1e8576dab0d6dd20c3470a6f857fd751ed4bcf8e291a993ff1f8fa7b0264a24957dcfab0efd9684ef3ba SHA512 98182721ef68411485b3f2faccbf315f340e549dd7cce0fdfaacab7c34fb708c98eda9b96da00701f1987becefced3a7587ffaaad77d6ef86046fb8c9f5f1cb5
+DIST lingot-1.1.1.tar.gz 727028 BLAKE2B c681fcd72f67ae20e49f0229aa9791eace1f65cb596c60e52cff7805bc70d6d418cd87c96629306163756db81236ad31b6c8fe78b7ee401d155f8f81dda4f334 SHA512 71ee6b992a8f9cfe4a90d7cd8ba0098512857d65d773d3d5ec26aeeaa104ee812051b9d6b86c5e6462d1032bf03d7e6120aecd60ca8758fdf96c37f2d7ceacc7
diff --git a/media-sound/lingot/files/lingot-1.0.1-configure.patch b/media-sound/lingot/files/lingot-1.0.1-configure.patch
deleted file mode 100644
index f39dc3d9ad55..000000000000
--- a/media-sound/lingot/files/lingot-1.0.1-configure.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 916ed65b3901731fff02eceadcbc5b18f4c27d6f Mon Sep 17 00:00:00 2001
-From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
-Date: Sat, 14 Jul 2018 09:40:37 +0200
-Subject: [PATCH] Remove unused variables from configure.ac.
-
-Also replace
-  configure.ac: NO_PREFIX_PACKAGE_FOO_DIR = "share/foo"
-  configure.ac: AC_SUBST(NO_PREFIX_PACKAGE_FOO_DIR)
-and
-  Makefile.am : .. = $(prefix)/@NO_PREFIX_PACKAGE_FOO_DIR@
-with
-  Makefile.am : .. = $(datadir)/foo
-for simplicity and conformity with the usual meaning of datadir.
-
-These changes may require regeneration by Anjuta.
----
- Makefile.am       |  2 +-
- configure.ac      | 85 -----------------------------------------------
- icons/Makefile.am |  2 +-
- 3 files changed, 2 insertions(+), 87 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index db5ec16..d61162f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,7 +27,7 @@ DISTCLEANFILES = \
- 	m4/* \
- 	po/Makefile.in.in
- 
--gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@
-+gnomemenudir = $(datadir)/applications
- gnomemenu_DATA = org.nongnu.lingot.desktop
- appdatadir = $(datadir)/metainfo
- appdata_DATA = org.nongnu.lingot.appdata.xml
-diff --git a/configure.ac b/configure.ac
-index 08f208f..cfb1259 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -162,90 +162,6 @@ if test "x$uselibfftw" = "xyes"; then
-  fi
- fi
- 
--
--dnl PKG_CHECK_MODULES([GLADE], [libglade-2.0])
--dnl AC_SUBST(GLADE_CFLAGS)
--dnl AC_SUBST(GLADE_LIBS)
--
--dnl Set PACKAGE_LOCALE_DIR in config.h.
--if test "x${prefix}" = "xNONE"; then
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Package local directory])
--else
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Package local directory])
--fi
--
--dnl Set PACKAGE SOURCE DIR in config.h.
--packagesrcdir=`cd $srcdir && pwd`
--
--dnl Set PACKAGE PREFIX
--if test "x${prefix}" = "xNONE"; then
--  packageprefix=${ac_default_prefix}
--else
--  packageprefix=${prefix}
--fi
--
--dnl Set PACKAGE DATA & DOC DIR
--packagedatadir=share
--packagedocdir=doc/${PACKAGE}
--
--dnl Set PACKAGE DIRs in config.h.
--packagepixmapsdir=share/pixmaps/${PACKAGE}
--packageicondir=share/icons/hicolor/scalable/apps/
--packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
--
--dnl Subst PACKAGE_DATA_DIR.
--NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
--AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
--PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
--AC_SUBST(PACKAGE_DATA_DIR)
--
--dnl Subst PACKAGE_DOC_DIR.
--NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
--PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
--AC_SUBST(PACKAGE_DOC_DIR)
--
--dnl Subst PACKAGE_PIXMAPS_DIR.
--NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
--PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
--AC_SUBST(PACKAGE_PIXMAPS_DIR)
--
--dnl Subst PACKAGE_ICON_DIR.
--NO_PREFIX_PACKAGE_ICON_DIR="${packageicondir}"
--AC_SUBST(NO_PREFIX_PACKAGE_ICON_DIR)
--PACKAGE_ICON_DIR="${packageprefix}/${packageicondir}"
--AC_SUBST(PACKAGE_ICON_DIR)
--
--dnl Subst PACKAGE_HELP_DIR.
--NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
--PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
--AC_SUBST(PACKAGE_HELP_DIR)
--
--dnl Subst PACKAGE_MENU_DIR.
--NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
--AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
--PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
--AC_SUBST(PACKAGE_MENU_DIR)
--
--dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
--
--
--AC_DEFINE([PACKAGE_DATA_DIR], [share], [Package data dir])
--AC_DEFINE([PACKAGE_DOC_DIR], [doc], [Package doc dir])
--AC_DEFINE([PACKAGE_HELP_DIR], [doc], [Help])
--AC_DEFINE([PACKAGE_MENU_DIR], [], [Menu])
--AC_DEFINE([PACKAGE_ICON_DIR], [icons], [Icons])
--AC_DEFINE([PACKAGE_SRC_DIR], [src], [Source])
--
--
- AC_CONFIG_FILES([
- Makefile
- po/Makefile.in
-@@ -254,4 +170,3 @@ icons/Makefile
- test/Makefile
- ])
- AC_OUTPUT
--
-diff --git a/icons/Makefile.am b/icons/Makefile.am
-index 9588562..0b17692 100644
---- a/icons/Makefile.am
-+++ b/icons/Makefile.am
-@@ -4,7 +4,7 @@
- ## If you don't want it to overwrite it,
- ## 	Please disable it in the Anjuta project configuration
- 
--lingot_iconsdir = $(prefix)/@NO_PREFIX_PACKAGE_ICON_DIR@
-+lingot_iconsdir = $(datadir)/icons/hicolor/scalable/apps
- 
- lingot_icons_DATA = \
- 	org.nongnu.lingot.svg
-From 0d65c3c71000a1f234288af4d703af888d569fd1 Mon Sep 17 00:00:00 2001
-From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
-Date: Sat, 14 Jul 2018 09:07:52 +0200
-Subject: [PATCH] Stop generating the desktop file.
-
-Drop the absolute path, and allow the icon to be found dynamically.
-This makes adding bitmaps additionally to the SVG easier later as well.
----
- configure.ac                                              | 1 -
- org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
- rename org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop (86%)
-
-diff --git a/configure.ac b/configure.ac
-index 5f1ea03..08f208f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -252,7 +252,6 @@ po/Makefile.in
- src/Makefile
- icons/Makefile
- test/Makefile
--org.nongnu.lingot.desktop
- ])
- AC_OUTPUT
- 
-diff --git a/org.nongnu.lingot.desktop.in b/org.nongnu.lingot.desktop
-similarity index 86%
-rename from org.nongnu.lingot.desktop.in
-rename to org.nongnu.lingot.desktop
-index 76842ce..8b3524f 100644
---- a/org.nongnu.lingot.desktop.in
-+++ b/org.nongnu.lingot.desktop
-@@ -6,7 +6,7 @@ Comment=LINGOT Is Not a Guitar-Only Tuner
- Comment[cs]=(Nejen kytarová) ladička
- Comment[fr]=Un accordeur de guitare, mais pas que
- Exec=lingot
--Icon=@PACKAGE_ICON_DIR@/org.nongnu.lingot.svg
-+Icon=org.nongnu.lingot.svg
- Terminal=false
- Type=Application
- Categories=GNOME;GTK;AudioVideo;
-From 29691022bae3180cc021ad7b97023dd483be19de Mon Sep 17 00:00:00 2001
-From: Iban Cereijo <ibancg@users.noreply.github.com>
-Date: Wed, 18 Jul 2018 13:59:25 +0200
-Subject: [PATCH] Putting the desktop file in the distributed files.
-
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index d61162f..d359df3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,7 +10,6 @@
- lingotdocdir = ${docdir}
- lingotdoc_DATA = \
- 	README \
--	COPYING \
- 	AUTHORS \
- 	ChangeLog \
- 	NEWS \
-@@ -37,6 +37,7 @@ dist_man_MANS = lingot.1
- 
- EXTRA_DIST = \
- 	$(lingotdoc_DATA) \
-+	$(gnomemenu_DATA) \
- 	$(appdata_DATA) \
- 	build-aux/gitlog-to-changelog \
- 	bootstrap
diff --git a/media-sound/lingot/files/lingot-1.1.1-desktop-icon.patch b/media-sound/lingot/files/lingot-1.1.1-desktop-icon.patch
new file mode 100644
index 000000000000..c378bfb6e81a
--- /dev/null
+++ b/media-sound/lingot/files/lingot-1.1.1-desktop-icon.patch
@@ -0,0 +1,11 @@
+--- a/org.nongnu.lingot.desktop
++++ b/org.nongnu.lingot.desktop
+@@ -7,7 +7,7 @@ Comment=LINGOT Is Not a Guitar-Only Tuner
+ Comment[cs]=(Nejen kytarová) ladička
+ Comment[fr]=Un accordeur de guitare, mais pas que
+ Exec=lingot
+-Icon=org.nongnu.lingot.svg
++Icon=org.nongnu.lingot
+ Terminal=false
+ Type=Application
+ Categories=GNOME;GTK;AudioVideo;
diff --git a/media-sound/lingot/lingot-1.0.1.ebuild b/media-sound/lingot/lingot-1.1.1.ebuild
index 523ec2ba532c..50150787ae07 100644
--- a/media-sound/lingot/lingot-1.0.1.ebuild
+++ b/media-sound/lingot/lingot-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="Accurate, easy to use, and highly configurable musical instrument tuner"
 HOMEPAGE="https://www.nongnu.org/lingot/"
@@ -12,26 +12,30 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa +fftw jack pulseaudio"
+IUSE="alsa +fftw jack pulseaudio test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( pulseaudio )"
 
 RDEPEND="
 	dev-libs/glib:2
+	dev-libs/json-c:=
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	alsa? ( media-libs/alsa-lib )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cunit )
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${P}-configure.patch )
+PATCHES=( "${FILESDIR}"/${P}-desktop-icon.patch )
 
 src_prepare() {
 	default
@@ -40,15 +44,17 @@ src_prepare() {
 
 src_configure() {
 	local myemakeargs=(
-		$(use_enable alsa)
-		$(use_enable fftw libfftw)
-		$(use_enable jack)
-		$(use_enable pulseaudio)
+		$(use_with alsa)
+		$(use_with fftw)
+		$(use_with jack)
+		$(use_with pulseaudio)
+		$(use_with test cunit)
 	)
 
 	econf "${myemakeargs[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/lingot/metadata.xml b/media-sound/lingot/metadata.xml
index ee7258ac28eb..a8573374e624 100644
--- a/media-sound/lingot/metadata.xml
+++ b/media-sound/lingot/metadata.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="savannah-nongnu">lingot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/linux-show-player/Manifest b/media-sound/linux-show-player/Manifest
new file mode 100644
index 000000000000..e11bb84e9f0e
--- /dev/null
+++ b/media-sound/linux-show-player/Manifest
@@ -0,0 +1,2 @@
+DIST linux-show-player-0.5.3.tar.gz 1080409 BLAKE2B 8292263965434587b0086c6505167a1a3dbe82593a07a7c26855136f8c330ffd1c16ecd1e7e758af7e07731df7db79a66743297d22594d9332025e73a7990c34 SHA512 f60f65c045fb57c2c2e5f2daf6b225115a0f4fef173869e971741f2e40b71931b88e56c2343c348701784449d1f032219d307cdb7bb31d6283ea2b0c816d0286
+DIST linux-show-player-0.6.1.tar.gz 1955112 BLAKE2B c655aac4f83653c96b728ca8d0a249343697fb98ba1fb885220d300ab08d71c564f06a355d67c9d920654a3c7388876ef57eaa4538fe5a70b0395e590a061961 SHA512 7bab76b3f9bf354479a57d0bc4492c6f47e93a05692b878aa8ee6aa025cdb97f2c2a84b88c70fc1d88f5742b614a5d283afa6397c57612bcd6b0828b67a71042
diff --git a/media-sound/linux-show-player/linux-show-player-0.5.3-r1.ebuild b/media-sound/linux-show-player/linux-show-player-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..ad88223db828
--- /dev/null
+++ b/media-sound/linux-show-player/linux-show-player-0.5.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A cue player designed for stage productions"
+HOMEPAGE="https://www.linux-show-player.org/ https://github.com/FrancescoCeruti/linux-show-player/"
+SRC_URI="https://github.com/FrancescoCeruti/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa jack midi pulseaudio timecode"
+
+RDEPEND="$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/sortedcontainers[${PYTHON_USEDEP}]
+	')
+	media-libs/gstreamer[introspection]
+	alsa? ( media-libs/gst-plugins-base[alsa] )
+	jack? (
+		$(python_gen_cond_dep '
+			dev-python/jack-client[${PYTHON_USEDEP}]
+		')
+		media-plugins/gst-plugins-jack
+	)
+	midi? (
+		$(python_gen_cond_dep '
+			dev-python/mido[${PYTHON_USEDEP}]
+		')
+	)
+	pulseaudio? ( media-plugins/gst-plugins-pulse )
+	timecode? (
+		app-misc/ola[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "${PN} uses GStreamer as its audio back-end so make sure you have plug-ins installed for all the audio formats you want to use"
+	fi
+
+	if use timecode; then
+		elog "Remember to start an OLA session on your computer if you want ${PN} to send timecodes"
+	fi
+}
diff --git a/media-sound/linux-show-player/linux-show-player-0.6.1.ebuild b/media-sound/linux-show-player/linux-show-player-0.6.1.ebuild
new file mode 100644
index 000000000000..a70843e858f4
--- /dev/null
+++ b/media-sound/linux-show-player/linux-show-player-0.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# py3.12 blocked by pyalsa: https://github.com/alsa-project/alsa-python/issues/8
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+DESCRIPTION="A cue player designed for stage productions"
+HOMEPAGE="https://www.linux-show-player.org/ https://github.com/FrancescoCeruti/linux-show-player/"
+SRC_URI="https://github.com/FrancescoCeruti/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa jack midi pulseaudio timecode"
+
+# TODO:
+#  - network mode - falcon not packaged (QA issues, several unpackaged test dependencies)
+#  - Open Sound Control support - pyliblo3 not packaged (last release in 2021, fails to build against modern cython)
+RDEPEND="$(python_gen_cond_dep '
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/humanize[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-python/sortedcontainers[${PYTHON_USEDEP}]
+	')
+	media-libs/gstreamer[introspection]
+	alsa? (
+		$(python_gen_cond_dep '
+			dev-python/pyalsa[${PYTHON_USEDEP}]
+		')
+		media-libs/gst-plugins-base[alsa]
+	)
+	jack? (
+		$(python_gen_cond_dep '
+			dev-python/jack-client[${PYTHON_USEDEP}]
+		')
+		media-plugins/gst-plugins-jack
+	)
+	midi? (
+		$(python_gen_cond_dep '
+			dev-python/mido[rtmidi,${PYTHON_USEDEP}]
+		')
+	)
+	pulseaudio? ( media-plugins/gst-plugins-pulse )
+	timecode? (
+		app-misc/ola[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "${PN} uses GStreamer as its audio back-end so make sure you have plug-ins installed for all the audio formats you want to use"
+	else
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 0.6.0; then
+				ewarn "Please be warned that current versions of ${PN} *cannot* open 0.5.x save files."
+				ewarn "Unfortunately upstream has provided no workaround for this."
+				ewarn
+				break
+			fi
+		done
+	fi
+
+	if use timecode; then
+		elog "Remember to start an OLA session on your computer if you want ${PN} to send timecodes"
+	fi
+}
diff --git a/media-sound/linux-show-player/metadata.xml b/media-sound/linux-show-player/metadata.xml
new file mode 100644
index 000000000000..f0160b34a484
--- /dev/null
+++ b/media-sound/linux-show-player/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">FrancescoCeruti/linux-show-player</remote-id>
+	</upstream>
+	<use>
+		<flag name="midi">Allow cues to send, or trigger on, MIDI messages</flag>
+		<flag name="timecode">Support the sending of time code of running audio files over ArtNet,
+			for instance to trigger cues in lighting-control software on lighting desks</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 8bec786238e3..9896842fe4ee 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1 +1 @@
-DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
+DIST linuxsampler-2.3.1.tar.bz2 1267554 BLAKE2B e07866d1ccaadf4bb95e4bb17f4b643b8dec5ff8c3b363b0e55b7fcb1383be59d2a22c84536db3e31f7c67467ef293a01147120294884005bd1d4c1f5b6c326b SHA512 160820d1a1c44169bb84fd5b6380256af31e42701ff2d2e4394df8c680fa0b6f9b8a21047ff2ec757009f53d1694bafdf254067d8aae9994c244aaf247a5890d
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.3.1.ebuild
index d12a254629bd..c9fd88b64354 100644
--- a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -16,12 +16,12 @@ IUSE="alsa doc jack lv2 sf2 sqlite"
 REQUIRED_USE="|| ( alsa jack )"
 
 RDEPEND="
-	>=media-libs/libgig-4.2.0
+	>=media-libs/libgig-4.4.0
 	media-libs/libsndfile[-minimal]
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
 	lv2? ( media-libs/lv2 )
-	sqlite? ( >=dev-db/sqlite-3.3 )
+	sqlite? ( dev-db/sqlite )
 "
 DEPEND="${RDEPEND}
 	media-libs/dssi
@@ -29,13 +29,13 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? ( app-text/doxygen )
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
 	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
-	"${FILESDIR}/${P}-fix-yyterror-not-declared.patch"
+	"${FILESDIR}/${PN}-2.1.1-fix-yyterror-not-declared.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README )
@@ -62,7 +62,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	# bug #666738
+	emake -j1
 	use doc && emake docs
 }
 
diff --git a/media-sound/linuxsampler/linuxsampler-9999.ebuild b/media-sound/linuxsampler/linuxsampler-9999.ebuild
index bd097fd3cce7..abca02a402df 100644
--- a/media-sound/linuxsampler/linuxsampler-9999.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools subversion
 
@@ -11,17 +11,16 @@ ESVN_REPO_URI="https://svn.linuxsampler.org/svn/linuxsampler/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa doc jack lv2 sf2 sqlite"
 REQUIRED_USE="|| ( alsa jack )"
 
 RDEPEND="
-	>=media-libs/libgig-4.2.0
+	media-libs/libgig
 	media-libs/libsndfile[-minimal]
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
 	lv2? ( media-libs/lv2 )
-	sqlite? ( >=dev-db/sqlite-3.3 )
+	sqlite? ( dev-db/sqlite )
 "
 DEPEND="${RDEPEND}
 	media-libs/dssi
@@ -29,7 +28,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? ( app-text/doxygen )
 "
 
 PATCHES=(
@@ -61,7 +60,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	# bug #666738
+	emake -j1
 	use doc && emake docs
 }
 
diff --git a/media-sound/linuxsampler/metadata.xml b/media-sound/linuxsampler/metadata.xml
index f1a8718cd39b..aa853c5ab354 100644
--- a/media-sound/linuxsampler/metadata.xml
+++ b/media-sound/linuxsampler/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/litestream/metadata.xml b/media-sound/litestream/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/litestream/metadata.xml
+++ b/media-sound/litestream/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/lltag/lltag-0.14.6.ebuild b/media-sound/lltag/lltag-0.14.6.ebuild
index c4d43b6f07c3..f9c3cdedb575 100644
--- a/media-sound/lltag/lltag-0.14.6.ebuild
+++ b/media-sound/lltag/lltag-0.14.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,23 +27,20 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
 
-pkg_setup() {
+src_compile() {
 	mylltagopts=(
-		DESTDIR="${D}"
 		PREFIX=/usr
 		SYSCONFDIR=/etc
 		MANDIR=/usr/share/man
 		PERL_INSTALLDIRS=vendor
 		DOCDIR=/usr/share/doc/${PF}
 	)
-}
 
-src_compile() {
 	emake "${mylltagopts[@]}"
 }
 
 src_install() {
-	emake "${mylltagopts[@]}" install{,-doc,-man}
+	emake DESTDIR="${D}" "${mylltagopts[@]}" install{,-doc,-man}
 	dodoc Changes
 	perl_delete_localpod
 	# Move config to recommended location
diff --git a/media-sound/lltag/metadata.xml b/media-sound/lltag/metadata.xml
index ee7258ac28eb..f1b664c3f1fb 100644
--- a/media-sound/lltag/metadata.xml
+++ b/media-sound/lltag/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">bgoglin/lltag</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 16f24a2a4c61..efa2cac4b3a0 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1 +1 @@
-DIST lmms-1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
+DIST lmms_1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
diff --git a/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch b/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch
new file mode 100644
index 000000000000..0fabfbb89a30
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/907285
+https://github.com/LMMS/lmms/issues/5884
+https://src.fedoraproject.org/rpms/lmms/blob/rawhide/f/lmms-1.2.2_lib_suffix.patch
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -564,6 +564,9 @@ IF(USE_CCACHE)
+     ENDIF()
+ ENDIF()
+ 
++# pass LIB_SUFFIX
++add_definitions(-DLIB_SUFFIX="${LIB_SUFFIX}")
++
+ # make sub-directories
+ ADD_SUBDIRECTORY(cmake)
+ ADD_SUBDIRECTORY(src)
+--- a/src/core/PluginFactory.cpp
++++ b/src/core/PluginFactory.cpp
+@@ -64,7 +64,7 @@ PluginFactory::PluginFactory()
+ 	//           plugins at "C:/Program Files/LMMS/plugins/"
+ 
+ #ifndef LMMS_BUILD_WIN32
+-	addRelativeIfExists("../lib/lmms"); // Installed
++	addRelativeIfExists("../lib" LIB_SUFFIX "/lmms"); // Installed
+ #endif
+ 	addRelativeIfExists("plugins"); // Portable
+ #ifdef PLUGIN_DIR // We may also have received a relative directory via a define
diff --git a/media-sound/lmms/files/lmms-9999-no_compress_man.patch b/media-sound/lmms/files/lmms-9999-no_compress_man.patch
new file mode 100644
index 000000000000..e6db189f50ed
--- /dev/null
+++ b/media-sound/lmms/files/lmms-9999-no_compress_man.patch
@@ -0,0 +1,48 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -669,7 +669,7 @@ ADD_SUBDIRECTORY(doc)
+ ADD_SUBDIRECTORY(cmake/install)
+ 
+ FIND_PACKAGE(UnixCommands)
+-IF(GZIP)
++IF(FALSE)
+ 	ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
+ 					COMMAND ${GZIP} -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
+ 					DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
+@@ -680,7 +680,6 @@ IF(GZIP)
+ 	ADD_CUSTOM_TARGET(manpage ALL
+ 					DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
+ ELSEIF(UNIX)
+-	MESSAGE(FATAL_ERROR "Can't find gzip required for generating lmms.1.gz")
+ ENDIF()
+ 
+ # install headers
+@@ -698,7 +697,7 @@ ENDIF(LMMS_BUILD_LINUX)
+ #
+ ADD_CUSTOM_TARGET(distclean
+ 			COMMAND make clean
+-			COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1.gz)
++			COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1)
+ 
+ #
+ # add tarball-target
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -140,7 +140,7 @@ IF(NOT CMAKE_VERSION VERSION_LESS 3.6)
+ 	SET_PROPERTY(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lmms)
+ ENDIF()
+ 
+-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz")
++SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1")
+ 
+ IF(LMMS_BUILD_WIN32)
+ 	SET(EXTRA_LIBRARIES "winmm")
+@@ -233,7 +233,7 @@ ELSE()
+ 	ELSE(CMAKE_INSTALL_MANDIR)
+ 		SET(INSTALL_MANDIR ${CMAKE_INSTALL_PREFIX}/share/man)
+ 	ENDIF(CMAKE_INSTALL_MANDIR)
+-	INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz"
++	INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1"
+ 			DESTINATION "${INSTALL_MANDIR}/man1/"
+ 			PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ ENDIF()
diff --git a/media-sound/lmms/files/lmms-9999-plugin-path.patch b/media-sound/lmms/files/lmms-9999-plugin-path.patch
new file mode 100644
index 000000000000..0d04bf8d3027
--- /dev/null
+++ b/media-sound/lmms/files/lmms-9999-plugin-path.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/907285
+https://github.com/LMMS/lmms/issues/5884
+https://src.fedoraproject.org/rpms/lmms/blob/rawhide/f/lmms-1.2.2_lib_suffix.patch
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -657,6 +657,9 @@ ENDIF()
+ # use ccache
+ include(CompileCache)
+ 
++# pass LIB_SUFFIX
++add_definitions(-DLIB_SUFFIX="${LIB_SUFFIX}")
++
+ # make sub-directories
+ ADD_SUBDIRECTORY(cmake)
+ ADD_SUBDIRECTORY(src)
+--- a/src/core/PluginFactory.cpp
++++ b/src/core/PluginFactory.cpp
+@@ -78,7 +78,7 @@ void PluginFactory::setupSearchPaths()
+ 	//           plugins at "C:/Program Files/LMMS/plugins/"
+ 
+ #ifndef LMMS_BUILD_WIN32
+-	addRelativeIfExists("../lib/lmms"); // Installed
++	addRelativeIfExists("../lib" LIB_SUFFIX "/lmms"); // Installed
+ #endif
+ 	addRelativeIfExists("plugins"); // Portable
+ #ifdef PLUGIN_DIR // We may also have received a relative directory via a define
diff --git a/media-sound/lmms/lmms-1.2.2.ebuild b/media-sound/lmms/lmms-1.2.2-r1.ebuild
index edae2ae36731..2f8132cd28a8 100644
--- a/media-sound/lmms/lmms-1.2.2.ebuild
+++ b/media-sound/lmms/lmms-1.2.2-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# The order is important here! Both, cmake and xdg define src_prepare.
-# We need the one from cmake
-inherit xdg cmake
+inherit cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -13,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz -> ${P}.tar.xz"
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz"
 	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
@@ -43,7 +41,7 @@ COMMON_DEPEND="
 		media-libs/libvorbis
 	)
 	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sdl? (
 		media-libs/libsdl
 		>=media-libs/sdl-sound-1.0.1
@@ -72,10 +70,11 @@ S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284
+	"${FILESDIR}/${PN}-1.2.2-plugin-path.patch" #907285
 )
 
 src_configure() {
-	local mycmakeargs+=(
+	local mycmakeargs=(
 		-DUSE_WERROR=FALSE
 		-DWANT_CAPS=FALSE
 		-DWANT_TAP=FALSE
@@ -96,17 +95,6 @@ src_configure() {
 		-DWANT_VST=$(usex vst)
 		-DWANT_SF2=$(usex fluidsynth)
 	)
-	cmake_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
 
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
+	cmake_src_configure
 }
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index a92a923b07b8..f525286d2873 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# The order is important here! Both, cmake and xdg define src_prepare.
-# We need the one from cmake
-inherit xdg cmake
+inherit cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -13,9 +11,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz"
+	S="${WORKDIR}/${PN}"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="GPL-2 LGPL-2"
@@ -43,7 +41,7 @@ COMMON_DEPEND="
 		media-libs/libvorbis
 	)
 	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sdl? (
 		media-libs/libsdl
 		>=media-libs/sdl-sound-1.0.1
@@ -68,8 +66,13 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md doc/AUTHORS )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-no_compress_man.patch" #733284
+	"${FILESDIR}/${PN}-9999-plugin-path.patch" #907285
+)
+
 src_configure() {
-	local mycmakeargs+=(
+	local mycmakeargs=(
 		-DUSE_WERROR=FALSE
 		-DWANT_CAPS=FALSE
 		-DWANT_TAP=FALSE
@@ -90,17 +93,6 @@ src_configure() {
 		-DWANT_VST=$(usex vst)
 		-DWANT_SF2=$(usex fluidsynth)
 	)
-	cmake_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
 
-pkg_postrm() {
-	xdg_pkg_postrm
+	cmake_src_configure
 }
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index 597ac163f21d..32965e9b9b51 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 856286fccc8a..0463100146d7 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1 +1,2 @@
-DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
+DIST lollypop-1.4.37.tar.xz 600812 BLAKE2B 08719d3c370332d398cb7dfc3c89128c895f89b0f5ca2b10fd85b1ef88d79ec96fbf945bbf4549e029e80726c80ccf6212e87d13b8808c08615626c6f01a4297 SHA512 9266677e8200626859793693e8cbf0e76b134fe37ff1b915841c1aebb5785eaaf1af5325c57bed78e887c98e947101103b1898d81c62cd9517b3420aebfeb685
+DIST lollypop-1.4.39.tar.xz 599984 BLAKE2B c985bda8f8ec979cc222f3860f17f2d2329bbd04f808462011f92dcca350c9b5a99af6e5aa3efc68e128946f932890d35602e1dcfbb4b86d46468dc188e5443d SHA512 5a7fe675fb70d7f4f8d4c15f8a6e4faad0f430689f3612dd72801da10174218feb444f40ee90bdcbcf39f63b0df5889c2244772f50b7389d27f3a9e969f7cdbf
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
deleted file mode 100644
index 70b5f2889b80..000000000000
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 gnome2-utils meson xdg
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
-KEYWORDS="amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/appstream-glib[introspection]
-	dev-libs/glib:2
-	dev-libs/gobject-introspection[cairo(+)]
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-base/gnome-common
-	x11-libs/gtk+:3
-"
-BDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pkgconfig[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pylast-1.0.0[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-src_install() {
-	meson_src_install
-	python_optimize
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/media-sound/lollypop/lollypop-1.4.37.ebuild b/media-sound/lollypop/lollypop-1.4.37.ebuild
new file mode 100644
index 000000000000..9aa0ae1192be
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.4.37.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+inherit python-single-r1 gnome2-utils meson xdg
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# Dependencies being checked by Meson
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	net-libs/libsoup:3.0[introspection]
+	x11-libs/gtk+:3[introspection]
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	media-plugins/gst-plugins-pulse
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser[introspection]
+	gui-libs/libhandy:1[introspection]
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	')
+"
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}/usr/bin"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	elog "Remember to install the necessary gst-plugins packages to read your audio files."
+	elog "You can also use the gst-plugins-meta pakcage and its USE flags."
+	elog "Lollypop now relies on yt-dlp instead of youtube-dl, since version 1.4.36."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/lollypop/lollypop-1.4.39.ebuild b/media-sound/lollypop/lollypop-1.4.39.ebuild
new file mode 100644
index 000000000000..7806e83ea85f
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.4.39.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+inherit gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+# Tarballs on adishatz.org have files from Git submodule 'subprojects/po'
+SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# Dependencies being checked by Meson
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	net-libs/libsoup:3.0[introspection]
+	x11-libs/gtk+:3[introspection]
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser[introspection]
+	gui-libs/libhandy:1[introspection]
+	media-plugins/gst-plugins-pulse
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	')
+"
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}/usr/bin"
+	python_fix_shebang "${ED}/usr/libexec/lollypop-sp"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Remember to install the necessary gst-plugins packages for your audio files."
+		elog "You can also use the gst-plugins-meta package and its USE flags."
+	fi
+
+	local log_yt_dlp ver
+	for ver in ${REPLACING_VERSIONS}; do
+		ver_test "${ver}" -lt "1.4.36" && log_yt_dlp=1
+	done
+	[[ ${log_yt_dlp} ]] &&
+		elog "Since version 1.4.36, Lollypop relies on yt-dlp instead of youtube-dl."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/lollypop/metadata.xml b/media-sound/lollypop/metadata.xml
index 15fd2f3a22be..28a02ea04c47 100644
--- a/media-sound/lollypop/metadata.xml
+++ b/media-sound/lollypop/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+	<maintainer type="person" proxied="yes">
+		<email>liaoyuan@gmail.com</email>
+		<name>Yuan Liao</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gnome-gitlab">World/lollypop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/loudness-scanner/Manifest b/media-sound/loudness-scanner/Manifest
deleted file mode 100644
index 81baaa84e354..000000000000
--- a/media-sound/loudness-scanner/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST loudness-scanner-0.5.1_p20190709.tar.xz 65360 BLAKE2B 122a14b1700e0b971d423bb3c6395eddd49663d8980ecc57dec85cbf45b67ef72b68203b15ac21b040af824b71641635bd72c67b40b0ba757ed536e121c7e3ae SHA512 2160a1dcba92efeb308f65e2dbd32405ad6c9b72355a4161f12579d767757e709c0ffe17df988105210cbb8f05f727f6b143cbe0540edeb8c7c6585b14998fe1
diff --git a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
deleted file mode 100644
index d3c803e98dcf..000000000000
--- a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Scans your music files and tags them with loudness information"
-HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
-SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ffmpeg gtk mpg123 musepack qt5 sndfile"
-REQUIRED_USE="|| ( sndfile ffmpeg mpg123 musepack )"
-
-DEPEND="
-	dev-libs/glib
-	media-libs/libebur128
-	media-libs/taglib
-	ffmpeg? ( media-video/ffmpeg )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	sndfile? ( media-libs/libsndfile )
-	gtk? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-		x11-libs/gtk+:2
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
-		"${S}"/scanner/inputaudio/input.c
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_SHARED_LIBS:BOOL=OFF # use static internal libraries
-		-DDISABLE_FFMPEG:BOOL=$(usex ffmpeg no yes)
-		-DDISABLE_GSTREAMER:BOOL=ON # depends on obsolete gstreamer-0.10
-		-DDISABLE_GTK2:BOOL=$(usex gtk no yes)
-		-DDISABLE_MPCDEC:BOOL=$(usex musepack no yes)
-		-DDISABLE_MPG123:BOOL=$(usex mpg123 no yes)
-		-DDISABLE_QT4:BOOL=ON
-		-DDISABLE_QT5:BOOL=$(usex qt5 no yes)
-		-DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
-		-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/loudness
-	use gtk && dobin "${BUILD_DIR}"/loudness-drop-gtk
-	use qt5 && dobin "${BUILD_DIR}"/loudness-drop-qt5
-
-	insinto /usr/$(get_libdir)/loudness-scanner
-	doins "${BUILD_DIR}"/libinput_*.so
-
-	einstalldocs
-}
diff --git a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
deleted file mode 100644
index f7320da421be..000000000000
--- a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="Scans your music files and tags them with loudness information"
-HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
-EGIT_REPO_URI="https://github.com/jiixyj/loudness-scanner.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="+ffmpeg gtk mpg123 musepack qt5 sndfile"
-REQUIRED_USE="|| ( sndfile ffmpeg mpg123 musepack )"
-
-DEPEND="
-	dev-libs/glib
-	media-libs/libebur128
-	media-libs/taglib
-	ffmpeg? ( media-video/ffmpeg )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	sndfile? ( media-libs/libsndfile )
-	gtk? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-		x11-libs/gtk+:2
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
-		"${S}"/scanner/inputaudio/input.c
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_SHARED_LIBS:BOOL=OFF # use static internal libraries
-		-DDISABLE_FFMPEG:BOOL=$(usex ffmpeg no yes)
-		-DDISABLE_GSTREAMER:BOOL=ON # depends on obsolete gstreamer-0.10
-		-DDISABLE_GTK2:BOOL=$(usex gtk no yes)
-		-DDISABLE_MPCDEC:BOOL=$(usex musepack no yes)
-		-DDISABLE_MPG123:BOOL=$(usex mpg123 no yes)
-		-DDISABLE_QT4:BOOL=ON
-		-DDISABLE_QT5:BOOL=$(usex qt5 no yes)
-		-DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
-		-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/loudness
-	use gtk && dobin "${BUILD_DIR}"/loudness-drop-gtk
-	use qt5 && dobin "${BUILD_DIR}"/loudness-drop-qt5
-
-	insinto /usr/$(get_libdir)/loudness-scanner
-	doins "${BUILD_DIR}"/libinput_*.so
-
-	einstalldocs
-}
diff --git a/media-sound/loudness-scanner/metadata.xml b/media-sound/loudness-scanner/metadata.xml
deleted file mode 100644
index 399d30caf9c4..000000000000
--- a/media-sound/loudness-scanner/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<maintainer type="person">
-		<name>Stefan Briesenick</name>
-		<email>gentoo@sbriesen.de</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		loudness-scanner is a tool that scans your music files according
-		to the EBU R128 standard for loudness normalisation. It optionally
-		adds ReplayGain compatible tags to the files.
-	</longdescription>
-	<use>
-		<flag name="mpg123">build the mpg123 plugin</flag>
-		<flag name="musepack">build the musepack plugin</flag>
-		<flag name="sndfile">build the sndfile plugin</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jiixyj/loudness-scanner</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/lxmusic/lxmusic-0.4.7-r2.ebuild b/media-sound/lxmusic/lxmusic-0.4.7-r2.ebuild
new file mode 100644
index 000000000000..d495aca86a96
--- /dev/null
+++ b/media-sound/lxmusic/lxmusic-0.4.7-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Simple GUI XMMS2 client with minimal functionality"
+HOMEPAGE="https://wiki.lxde.org/en/LXMusic"
+SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-sound/xmms2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf --enable-gtk3
+}
diff --git a/media-sound/lxmusic/lxmusic-0.4.7.ebuild b/media-sound/lxmusic/lxmusic-0.4.7.ebuild
deleted file mode 100644
index 45825d844b8f..000000000000
--- a/media-sound/lxmusic/lxmusic-0.4.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A simple GUI XMMS2 client with minimal functionality"
-HOMEPAGE="https://wiki.lxde.org/en/LXMusic"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-sound/xmms2
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-sound/lxmusic/metadata.xml b/media-sound/lxmusic/metadata.xml
index fd5647d2ee41..eb6c52bb507a 100644
--- a/media-sound/lxmusic/metadata.xml
+++ b/media-sound/lxmusic/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 9c2c80c10951..85598328a405 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -1 +1,3 @@
+DIST mac-10.53.zip 1665239 BLAKE2B 70b7a12eb873ec648ceb97f23bcac6ec79a6626e61de7535b549f7fd718121e5f835f64c64f3e29914e1ceb2ee2897e03a09a7d7a050810082c67ba76e740c3f SHA512 3d9323d8440c11553838e89ee4cd695fee790ef4af888daa1be1a63a4eec8db807a940f20c52b56cd069d06899305930173efab196c0932b238060bff7dc025a
+DIST mac-10.71.zip 1673369 BLAKE2B 99a96eed196b80cdc3fb1df3101d28122e41b9f182efe9a84b6321cc6dc5c1d66373f61064ddf434c35dedb48261c1feebaed4820fb3bc261df1fd340850bd86 SHA512 40d7b56e9d8eeff6854bcb34ce87ad63d1923a42adb59248d12fb42104016e39dc3a315953f1eb884c7ed9b79c8eb9b43aa2d75b891d42fb7bcebfca13e30ec3
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
diff --git a/media-sound/mac/files/mac-10.18-linux.patch b/media-sound/mac/files/mac-10.18-linux.patch
new file mode 100644
index 000000000000..0346101f3eb0
--- /dev/null
+++ b/media-sound/mac/files/mac-10.18-linux.patch
@@ -0,0 +1,24 @@
+diff -Naur mac-10.18_orig/Shared/All.h mac-10.18/Shared/All.h
+--- mac-10.18_orig/Shared/All.h	2023-08-13 18:59:03.447085864 +0200
++++ mac-10.18/Shared/All.h	2023-08-13 19:00:20.053081298 +0200
+@@ -11,7 +11,7 @@
+ **************************************************************************************************/

+ #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_APPLE) && !defined(PLATFORM_LINUX)

+     #pragma message("No platform set for MACLib, defaulting to Windows")

+-    #define PLATFORM_WINDOWS

++    #define PLATFORM_LINUX

+ #endif

+ 

+ #ifdef PLATFORM_ANDROID

+diff -Naur mac-10.18_orig/Source/Shared/All.h mac-10.18/Source/Shared/All.h
+--- mac-10.18_orig/Source/Shared/All.h	2023-08-13 18:59:03.453085864 +0200
++++ mac-10.18/Source/Shared/All.h	2023-08-13 19:00:12.732081734 +0200
+@@ -11,7 +11,7 @@
+ **************************************************************************************************/

+ #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_APPLE) && !defined(PLATFORM_LINUX)

+     #pragma message("No platform set for MACLib, defaulting to Windows")

+-    #define PLATFORM_WINDOWS

++    #define PLATFORM_LINUX

+ #endif

+ 

+ #ifdef PLATFORM_ANDROID

diff --git a/media-sound/mac/files/mac-10.52-output.patch b/media-sound/mac/files/mac-10.52-output.patch
new file mode 100644
index 000000000000..8ad2e3d47ef9
--- /dev/null
+++ b/media-sound/mac/files/mac-10.52-output.patch
@@ -0,0 +1,39 @@
+diff -Naur mac-10.52_orig/Source/Console/Console.cpp mac-10.52/Source/Console/Console.cpp
+--- mac-10.52_orig/Source/Console/Console.cpp	2024-03-05 19:05:13.958352435 +0100
++++ mac-10.52/Source/Console/Console.cpp	2024-03-05 19:06:50.968831483 +0100
+@@ -68,7 +68,7 @@
+ **************************************************************************************************/

+ static void DisplayProperUsage(FILE * pFile)

+ {

+-    fwprintf(pFile, L"Proper Usage: [EXE] [Input File] [Output File] [Mode]\n\n");

++    fwprintf(pFile, L"Proper Usage: [mac] [Input File] [Output File] [Mode]\n\n");

+ 

+     fwprintf(pFile, L"Modes: \n");

+     fwprintf(pFile, L"    Compress (fast): '-c1000'\n");

+@@ -85,16 +85,16 @@
+     fwprintf(pFile, L"    Convert to ID3v1 (needed by some players, etc.): '-L'\n\n");

+ 

+     fwprintf(pFile, L"Examples:\n");

+-    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n");

+-    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -t \"Artist=Metallica|Album=Black|Name=One\"\n");

+-    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" auto -c2000\n");

+-    fwprintf(pFile, L"    Transcode from pipe: ffmpeg.exe -i \"Metallica - One.flac\" -f wav - | mac.exe - \"Metallica - One.ape\" -c2000\n");

+-    fwprintf(pFile, L"    Decompress: mac.exe \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n");

+-    fwprintf(pFile, L"    Decompress: mac.exe \"Metallica - One.ape\" auto -d\n");

+-    fwprintf(pFile, L"    Verify: mac.exe \"Metallica - One.ape\" -v\n");

+-    fwprintf(pFile, L"    Full Verify: mac.exe \"Metallica - One.ape\" -V\n");

+-    fwprintf(pFile, L"    Tag: mac.exe \"Metallica - One.ape\" -t \"Artist=Metallica|Album=Black|Name=One|Comment=\\\"This is in quotes\\\"\"\n");

+-    fwprintf(pFile, L"    Remove tag: mac.exe \"Metallica - One.ape\" -r\n");

++    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n");

++    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -t \"Artist=Metallica|Album=Black|Name=One\"\n");

++    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" auto -c2000\n");

++    fwprintf(pFile, L"    Transcode from pipe: ffmpeg -i \"Metallica - One.flac\" -f wav - | mac - \"Metallica - One.ape\" -c2000\n");

++    fwprintf(pFile, L"    Decompress: mac \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n");

++    fwprintf(pFile, L"    Decompress: mac \"Metallica - One.ape\" auto -d\n");

++    fwprintf(pFile, L"    Verify: mac \"Metallica - One.ape\" -v\n");

++    fwprintf(pFile, L"    Full Verify: mac \"Metallica - One.ape\" -V\n");

++    fwprintf(pFile, L"    Tag: mac \"Metallica - One.ape\" -t \"Artist=Metallica|Album=Black|Name=One|Comment=\\\"This is in quotes\\\"\"\n");

++    fwprintf(pFile, L"    Remove tag: mac \"Metallica - One.ape\" -r\n");

+ }

+ 

+ /**************************************************************************************************

diff --git a/media-sound/mac/mac-10.53.ebuild b/media-sound/mac/mac-10.53.ebuild
new file mode 100644
index 000000000000..1eb6fd8c4351
--- /dev/null
+++ b/media-sound/mac/mac-10.53.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Monkey's Audio Codecs"
+HOMEPAGE="https://www.monkeysaudio.com"
+SRC_URI="https://monkeysaudio.com/files/MAC_${PV/.}_SDK.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~riscv sparc x86"
+
+BDEPEND="app-arch/unzip"
+
+src_unpack() {
+	mkdir -p "${S}" || die
+	cd "${S}" || die
+	default
+}
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-10.18-linux.patch"
+	"${FILESDIR}/${PN}-10.52-output.patch"
+)
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/927060
+	#
+	# Upstream contact method is via email. I sent an email detailing the issue
+	# and got a fast response with a fix. "I'm hoping to do a build soon with a
+	# new open source certificate.  I can sure include this."
+	#
+	# Do not trust with LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	cmake_src_configure
+}
diff --git a/media-sound/mac/mac-10.71.ebuild b/media-sound/mac/mac-10.71.ebuild
new file mode 100644
index 000000000000..9ceccbd8f31e
--- /dev/null
+++ b/media-sound/mac/mac-10.71.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake
+
+DESCRIPTION="Monkey's Audio Codecs"
+HOMEPAGE="https://www.monkeysaudio.com"
+SRC_URI="https://monkeysaudio.com/files/MAC_${PV/.}_SDK.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-10.18-linux.patch"
+	"${FILESDIR}/${PN}-10.52-output.patch"
+)
+
+src_unpack() {
+	mkdir -p "${S}" || die
+	cd "${S}" || die
+	default
+}
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index 521c7ab667ee..37f6548f510d 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 MY_PN=monkeys-audio
 MY_PV=$(ver_cut 1-2)-u$(ver_cut 3)-b$(ver_cut 4)-s$(ver_cut 5)
@@ -12,19 +12,14 @@ MY_P=${MY_PN}_${MY_PV}
 DESCRIPTION="Monkey's Audio Codecs"
 HOMEPAGE="http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
 SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
+S="${WORKDIR}/${MY_P/_/-}"
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
-RDEPEND=""
-DEPEND="
-	sys-apps/sed
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-"
-
-S=${WORKDIR}/${MY_P/_/-}
+BDEPEND="cpu_flags_x86_mmx? ( dev-lang/yasm )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-output.patch
@@ -39,7 +34,11 @@ RESTRICT="mirror"
 src_prepare() {
 	default
 
-	sed -i -e 's:-O3::' configure || die
+	sed -i -e 's:-O3::' configure{,.in} || die
+
+	# bug #778260
+	sed -i 's/tag=ASM/tag=NASM/' src/MACLib/Assembly/Makefile.am || die
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/mac/metadata.xml b/media-sound/mac/metadata.xml
index 0943267a4afc..a1a5e42df26f 100644
--- a/media-sound/mac/metadata.xml
+++ b/media-sound/mac/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>billie@gentoo.org</email>
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r2.ebuild
index 444be063a6b9..146df6759c67 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="The MAD audio player"
 HOMEPAGE="http://www.underbit.com/products/mad/"
-SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,8 +16,8 @@ IUSE="alsa nls"
 
 RDEPEND="
 	media-libs/libid3tag:=
-	media-libs/libmad:=
-	alsa? ( media-libs/alsa-lib:= )"
+	media-libs/libmad
+	alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
diff --git a/media-sound/madplay/metadata.xml b/media-sound/madplay/metadata.xml
index e929ca1abedc..d17315e75d9e 100644
--- a/media-sound/madplay/metadata.xml
+++ b/media-sound/madplay/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch b/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch
new file mode 100644
index 000000000000..feec08089421
--- /dev/null
+++ b/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch
@@ -0,0 +1,18 @@
+Description: Declare byte array as unsigned char rather than char to avoid narrowing
+ A step up in pedantics in C++11 has identified a byte array that was not
+ declared as unsigned.
+Author: William Panlener <wpanlener@gmail.com>
+Bug-Debian: https://bugs.debian.org/805160
+Forwarded: no
+
+--- a/src/manglerg15.h
++++ b/src/manglerg15.h
+@@ -52,7 +52,7 @@
+         std::vector<Glib::ustring> events;
+ };
+ 
+-const char g15_blank[] = {
++const unsigned char g15_blank[] = {
+     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/media-sound/mangler/files/mangler-1.2.5-espeak-ng.patch b/media-sound/mangler/files/mangler-1.2.5-espeak-ng.patch
new file mode 100644
index 000000000000..45db427d70b4
--- /dev/null
+++ b/media-sound/mangler/files/mangler-1.2.5-espeak-ng.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,9 +117,9 @@ if test "$disable_ui" != "yes" ; then
+ 	fi
+ 
+ 	if test "$enable_espeak" != "no" ; then
+-		AC_CHECK_LIB([espeak], [espeak_Initialize], [
++		AC_CHECK_LIB([espeak-ng], [espeak_Initialize], [
+ 			AC_DEFINE(HAVE_ESPEAK, 1, [have espeak])
+-			LIBS="-lespeak $LIBS"
++			LIBS="-lespeak-ng $LIBS"
+ 			echo "Enabled optional eSpeak support."
+ 		], [
+ 			echo "Optional eSpeak support is not enabled."
diff --git a/media-sound/mangler/files/mangler-version-info.patch b/media-sound/mangler/files/mangler-version-info.patch
new file mode 100644
index 000000000000..200c8e7ecab9
--- /dev/null
+++ b/media-sound/mangler/files/mangler-version-info.patch
@@ -0,0 +1,19 @@
+commit 2581fbd54434df6dc4babd48bb41eaf7f5d6d06a
+Author: orbea <orbea@riseup.net>
+Date:   Wed Apr 7 10:01:31 2021 -0700
+
+    libventrilo3: Fix -version-info typo.
+
+diff --git a/libventrilo3/Makefile.am b/libventrilo3/Makefile.am
+index a934acf..c2fea99 100644
+--- a/libventrilo3/Makefile.am
++++ b/libventrilo3/Makefile.am
+@@ -7,7 +7,7 @@ libventrilo3_la_SOURCES = libventrilo3.c  libventrilo3_message.c  ventrilo3_hand
+ 
+ libventrilo3_la_LIBADD = $(speex_LIBS) $(opus_LIBS) $(LIBS) -lm
+ 
+-libventrilo3_la_LDFLAGS = -version 0:0:0
++libventrilo3_la_LDFLAGS = -version-info 0:0:0
+ 
+ include_HEADERS = ventrilo3.h
+ 
diff --git a/media-sound/mangler/mangler-1.2.5-r1.ebuild b/media-sound/mangler/mangler-1.2.5-r4.ebuild
index 8f58aefd5e7c..4e9b84ac88b8 100644
--- a/media-sound/mangler/mangler-1.2.5-r1.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
 HOMEPAGE="http://www.mangler.org/"
@@ -24,15 +24,27 @@ RDEPEND="
 	x11-libs/libXi
 	alsa? ( media-libs/alsa-lib )
 	opus? ( media-libs/opus )
-	espeak? ( app-accessibility/espeak )
+	espeak? ( app-accessibility/espeak-ng )
 	g15? ( app-misc/g15daemon )
 	gsm? ( media-sound/gsm )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
 	speex? ( >=media-libs/speex-1.2_rc1 )
-	xosd? ( x11-libs/xosd )"
+	xosd? ( x11-libs/xosd )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/mangler-version-info.patch"
+	"${FILESDIR}/fix_ftbfs_narrowing_conversion.patch"
+	"${FILESDIR}/mangler-1.2.5-espeak-ng.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	tc-export CC
 
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index 1ca96e6372cb..ef8f41988dde 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <use>
     <flag name="espeak">Text to speech engine</flag>
@@ -8,7 +8,7 @@
   <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
deleted file mode 100644
index fce580437bd5..000000000000
--- a/media-sound/marrie/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST marrie-0.4.tar.gz 7775 BLAKE2B 7b68fbdfe35c7e72fe111b44bbabf4e60eb9f6211867184d1f3f7bc7b1c067f99223eea2dd3c7809f041d0a7b5ac80be360d3c14808605f3145b8d39a0a9c7fd SHA512 9ed8677729e7575519f130c1866923e7223dabf07c9c24b9e3f6a70cd5e1e56da2a5d1a34011b73d65c8d8fa4c962f65709883b9444d078d6439769d4afb644b
diff --git a/media-sound/marrie/marrie-0.4.ebuild b/media-sound/marrie/marrie-0.4.ebuild
deleted file mode 100644
index 128c50ca86f9..000000000000
--- a/media-sound/marrie/marrie-0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7} )
-
-GIT_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-fi
-
-inherit distutils-r1 ${GIT_ECLASS}
-
-DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
-HOMEPAGE="https://github.com/rafaelmartins/marrie"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	distutils-r1_pkg_postinst
-	elog
-	elog "You'll need a media player and a file downloader."
-	elog "Recommended packages: net-misc/wget and media-video/mpv"
-	elog
-}
diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild
deleted file mode 100644
index 128c50ca86f9..000000000000
--- a/media-sound/marrie/marrie-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7} )
-
-GIT_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-fi
-
-inherit distutils-r1 ${GIT_ECLASS}
-
-DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
-HOMEPAGE="https://github.com/rafaelmartins/marrie"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	distutils-r1_pkg_postinst
-	elog
-	elog "You'll need a media player and a file downloader."
-	elog "Recommended packages: net-misc/wget and media-video/mpv"
-	elog
-}
diff --git a/media-sound/marrie/metadata.xml b/media-sound/marrie/metadata.xml
deleted file mode 100644
index 2e59b5ed0d01..000000000000
--- a/media-sound/marrie/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer status="active">
-			<email>rafael@rafaelmartins.eng.br</email>
-			<name>Rafael G. Martins</name>
-		</maintainer>
-		<bugs-to>mailto:rafael@rafaelmartins.eng.br</bugs-to>
-		<remote-id type="pypi">marrie</remote-id>
-		<remote-id type="github">rafaelmartins/marrie</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/mcdp/mcdp-0.4b.ebuild b/media-sound/mcdp/mcdp-0.4b.ebuild
index 81afdbc08af0..3f1fbbe4567f 100644
--- a/media-sound/mcdp/mcdp-0.4b.ebuild
+++ b/media-sound/mcdp/mcdp-0.4b.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="A very small console cd player"
-HOMEPAGE="http://www.mcmilk.de/projects/mcdp/"
-SRC_URI="http://www.mcmilk.de/projects/mcdp/dl/${P}.tar.bz2"
+DESCRIPTION="Very small console cd player"
+HOMEPAGE="https://www.mcmilk.de/projects/mcdp/"
+SRC_URI="https://www.mcmilk.de/projects/mcdp/dl/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4a-dietlibc-fix.patch
diff --git a/media-sound/mcdp/metadata.xml b/media-sound/mcdp/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/mcdp/metadata.xml
+++ b/media-sound/mcdp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/metadata.xml b/media-sound/metadata.xml
index 84c7cb8e83c3..14a48c89c360 100644
--- a/media-sound/metadata.xml
+++ b/media-sound/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
 		The media-sound category contains sound, music and audio applications.
@@ -38,4 +38,3 @@
 		Kategoria media-sound zawiera programy dźwiękowe i muzyczne.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-sound/meterbridge/metadata.xml b/media-sound/meterbridge/metadata.xml
index f79bb67acbd9..3fed8a8997c3 100644
--- a/media-sound/meterbridge/metadata.xml
+++ b/media-sound/meterbridge/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
diff --git a/media-sound/mhwaveedit/metadata.xml b/media-sound/mhwaveedit/metadata.xml
index c870d0eef0ab..31618ced5d74 100644
--- a/media-sound/mhwaveedit/metadata.xml
+++ b/media-sound/mhwaveedit/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">magnush/mhwaveedit</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/mikmod/files/mikmod-3.2.8-macro-strict-prototypes.patch b/media-sound/mikmod/files/mikmod-3.2.8-macro-strict-prototypes.patch
new file mode 100644
index 000000000000..2ede6e74c5b4
--- /dev/null
+++ b/media-sound/mikmod/files/mikmod-3.2.8-macro-strict-prototypes.patch
@@ -0,0 +1,14 @@
+Already fixed upstream in https://github.com/sezero/mikmod/commit/4ceeed3f3929b9d9f7cfe891d44f43d202b64416.
+
+Fixes -Wstrict-prototypes.
+--- a/m4/libmikmod.m4
++++ b/m4/libmikmod.m4
+@@ -79,7 +79,7 @@ char* my_strdup (char *str)
+   return new_str;
+ }
+ 
+-int main()
++int main(void)
+ {
+   int major,minor,micro;
+   int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;
diff --git a/media-sound/mikmod/metadata.xml b/media-sound/mikmod/metadata.xml
index d8ca5118a0b8..942bec8d0a79 100644
--- a/media-sound/mikmod/metadata.xml
+++ b/media-sound/mikmod/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mikmod</remote-id>
+		<remote-id type="github">sezero/mikmod</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/mikmod/mikmod-3.2.8-r1.ebuild b/media-sound/mikmod/mikmod-3.2.8-r1.ebuild
new file mode 100644
index 000000000000..c41d14ec8c2d
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.8-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Console MOD-Player based on libmikmod"
+HOMEPAGE="https://mikmod.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/mikmod/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+
+DEPEND="
+	>=media-libs/libmikmod-3.3
+	>=sys-libs/ncurses-5.7-r7:=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-macro-strict-prototypes.patch
+)
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
deleted file mode 100644
index aa4da6360bd3..000000000000
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A console MOD-Player based on libmikmod"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND="
-	>=media-libs/libmikmod-3.3
-	>=sys-libs/ncurses-5.7-r7:0="
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index e97cd0100e27..f624777ce10c 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,3 +1 @@
-DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
-DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
-DIST milkytracker-1.03.00.tar.gz 3705395 BLAKE2B f14a7112de39748121933d242d89dc6efb71a73c3591fedb92785814e2edc788edfb6608e9237cdfed19ee7337d5920d0232eed5d85f692dbef5d4cb43a27cd0 SHA512 d5489994d9c5d24552073afcbd787c20720096dd81d640356fc13b2e2b8a49713b798066d54f2b589f3819c14279142e295e4d6317ed325537069faad47abbe6
+DIST milkytracker-1.04.00.tar.gz 3756275 BLAKE2B da4885592ae4aae87080c8979f92a77b05cb3cc4594fe328346deef949375ad3abb1910f5cc834f41b6d7278312deff45550300b96e3afbd89eedebe1fadd854 SHA512 5a41fa07d51880e220f15ff3f50e73b999931c875d31e627233669f5a07dfd38621478b8ec27b2242aa4ae6143a0d2ad51627a366fd366256331b71c47ad25da
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch
deleted file mode 100644
index d59522d6d1d0..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/fd607a3439fcdd0992e5efded3c16fc79c804e34
-
-commit fd607a3439fcdd0992e5efded3c16fc79c804e34
-Author: Christopher O'Neill <code@chrisoneill.co.uk>
-Date:   Tue Jul 30 19:11:58 2019 +0100
-
-    Fix #184: Heap overflow in S3M loader
-
-diff --git a/src/milkyplay/LoaderS3M.cpp b/src/milkyplay/LoaderS3M.cpp
-index 5abf211..edf0fd5 100644
---- a/src/milkyplay/LoaderS3M.cpp
-+++ b/src/milkyplay/LoaderS3M.cpp
-@@ -340,7 +340,11 @@ mp_sint32 LoaderS3M::load(XMFileBase& f, XModule* module)
- 		return MP_OUT_OF_MEMORY;
- 	
- 	header->insnum = f.readWord(); // number of instruments
--	header->patnum = f.readWord(); // number of patterns	
-+	if (header->insnum > MP_MAXINS)
-+		return MP_LOADER_FAILED;
-+	header->patnum = f.readWord(); // number of patterns
-+	if (header->patnum > 256)
-+		return MP_LOADER_FAILED;
- 	
- 	mp_sint32 flags = f.readWord(); // st3 flags	
- 
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch
deleted file mode 100644
index 0560cd2b825b..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-This patch is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/ea7772a3fae0a9dd0a322e8fec441d15843703b7
-
-commit ea7772a3fae0a9dd0a322e8fec441d15843703b7
-Author: Christopher O'Neill <code@chrisoneill.co.uk>
-Date:   Tue Jul 30 18:40:03 2019 +0100
-
-    Fixes for buffer overflow issues #182 & #183
-
-diff --git a/src/milkyplay/LoaderXM.cpp b/src/milkyplay/LoaderXM.cpp
-index 108d915..f87f5c1 100644
---- a/src/milkyplay/LoaderXM.cpp
-+++ b/src/milkyplay/LoaderXM.cpp
-@@ -63,8 +63,8 @@ const char* LoaderXM::identifyModule(const mp_ubyte* buffer)
- mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- {
- 	mp_ubyte insData[230];		
--	mp_sint32 smpReloc[96];
--	mp_ubyte nbu[96];
-+	mp_sint32 smpReloc[MP_MAXINSSAMPS];
-+	mp_ubyte nbu[MP_MAXINSSAMPS];
- 	mp_uint32 fileSize = 0;
- 			
- 	module->cleanUp();
-@@ -117,6 +117,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 	memcpy(header->ord, hdrBuff+16, 256);
- 	if(header->ordnum > MP_MAXORDERS)
- 		header->ordnum = MP_MAXORDERS;
-+	if(header->insnum > MP_MAXINS)
-+		return MP_LOADER_FAILED;
- 
- 	delete[] hdrBuff;
- 	
-@@ -143,7 +145,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 			f.read(&instr[y].type,1,1);
- 			mp_uword numSamples = 0;
- 			f.readWords(&numSamples,1);
--			if(numSamples > 96)
-+			if(numSamples > MP_MAXINSSAMPS)
- 				return MP_LOADER_FAILED;
- 			instr[y].samp = numSamples;
- 
-@@ -169,8 +171,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 			if (instr[y].samp) {
- 				mp_ubyte* insDataPtr = insData;
- 				
--				memcpy(nbu, insDataPtr, 96);
--				insDataPtr+=96;
-+				memcpy(nbu, insDataPtr, MP_MAXINSSAMPS);
-+				insDataPtr+=MP_MAXINSSAMPS;
- 				
- 				TEnvelope venv;
- 				TEnvelope penv;
-@@ -285,7 +287,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 
- 				instr[y].samp = g;
- 
--				for (sc = 0; sc < 96; sc++) {
-+				for (sc = 0; sc < MP_MAXINSSAMPS; sc++) {
- 					if (smpReloc[nbu[sc]] == -1)
- 						instr[y].snum[sc] = -1;
- 					else
-@@ -491,6 +493,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 				f.read(&instr[y].type,1,1);
- 				f.readWords(&instr[y].samp,1);
- 			}
-+			if (instr[y].samp > MP_MAXINSSAMPS)
-+				return MP_LOADER_FAILED;
- 
- 			//printf("%i, %i\n", instr[y].size, instr[y].samp);
- 
-@@ -532,8 +536,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 				
- 				//f.read(&nbu,1,96);
- 				
--				memcpy(nbu, insDataPtr, 96);
--				insDataPtr+=96;
-+				memcpy(nbu, insDataPtr, MP_MAXINSSAMPS);
-+				insDataPtr+=MP_MAXINSSAMPS;
- 				
- 				TEnvelope venv;
- 				TEnvelope penv;
-@@ -650,7 +654,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 
- 				instr[y].samp = g;
- 
--				for (sc = 0; sc < 96; sc++) {					
-+				for (sc = 0; sc < MP_MAXINSSAMPS; sc++) {					
- 					if (smpReloc[nbu[sc]] == -1)
- 						instr[y].snum[sc] = -1;
- 					else
-diff --git a/src/milkyplay/XModule.h b/src/milkyplay/XModule.h
-index f42d04b..4f04a2d 100644
---- a/src/milkyplay/XModule.h
-+++ b/src/milkyplay/XModule.h
-@@ -40,6 +40,8 @@
- 
- #define MP_MAXTEXT 32
- #define MP_MAXORDERS 256
-+#define MP_MAXINS 255
-+#define MP_MAXINSSAMPS 96
- 
- struct TXMHeader 
- {
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch
deleted file mode 100644
index 59c2f9942ae6..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/7afd55c42ad80d01a339197a2d8b5461d214edaf
-
-Gentoo Bug: https://bugs.gentoo.org/711280
-
-commit 7afd55c42ad80d01a339197a2d8b5461d214edaf
-Author: Jeremy Clarke <geckojsc@gmail.com>
-Date:   Mon Apr 13 23:53:51 2020 +0100
-
-    Fix use-after-free in PlayerGeneric destructor
-
-diff --git a/src/milkyplay/PlayerGeneric.cpp b/src/milkyplay/PlayerGeneric.cpp
-index 8df2c13..59f7cba 100644
---- a/src/milkyplay/PlayerGeneric.cpp
-+++ b/src/milkyplay/PlayerGeneric.cpp
-@@ -202,15 +202,16 @@ PlayerGeneric::PlayerGeneric(mp_sint32 frequency, AudioDriverInterface* audioDri
- 	
- PlayerGeneric::~PlayerGeneric()
- {
--	if (mixer)
--		delete mixer;
- 
- 	if (player)
- 	{
--		if (mixer->isActive() && !mixer->isDeviceRemoved(player))
-+		if (mixer && mixer->isActive() && !mixer->isDeviceRemoved(player))
- 			mixer->removeDevice(player);
- 		delete player;
- 	}
-+	
-+	if (mixer)
-+		delete mixer;
- 
- 	delete[] audioDriverName;
- 	
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
deleted file mode 100644
index 48e6dc39cb5a..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/src/tracker/EQConstants.cpp b/src/tracker/EQConstants.cpp
-index ffbf6ea..fa6fdce 100644
---- a/src/tracker/EQConstants.cpp
-+++ b/src/tracker/EQConstants.cpp
-@@ -27,9 +27,9 @@
- 
- const float EQConstants::EQ3bands[3] = 
- {
--	p(5),  // 32     Hz
--	p(9),  // 522    Hz
--	p(12), // 4181.5 Hz
-+	(float) p(5),  // 32     Hz
-+	(float) p(9),  // 522    Hz
-+	(float) p(12), // 4181.5 Hz
- };
- 
- const float EQConstants::EQ3bandwidths[3] = 
-@@ -41,28 +41,28 @@ const float EQConstants::EQ3bandwidths[3] =
- 
- const float EQConstants::EQ10bands[10] = 
- {
--	p(3),  // 8      Hz
--	p(4),  // 16     Hz
--	p(5),  // 32     Hz
--	p(6),  // 65     Hz
--	p(7),  // 130    Hz
--	p(8),  // 261    Hz
--	p(9),  // 522    Hz
--	p(10), // 1     kHz
--	p(11), // 2     kHz
--	p(12), // 4181.5 Hz
-+	(float) p(3),  // 8      Hz
-+	(float) p(4),  // 16     Hz
-+	(float) p(5),  // 32     Hz
-+	(float) p(6),  // 65     Hz
-+	(float) p(7),  // 130    Hz
-+	(float) p(8),  // 261    Hz
-+	(float) p(9),  // 522    Hz
-+	(float) p(10), // 1     kHz
-+	(float) p(11), // 2     kHz
-+	(float) p(12), // 4181.5 Hz
- };
- 
- const float EQConstants::EQ10bandwidths[10] = 
- {
- 	16,
--	p(3)*1.5f,
--	p(4)*1.5f,
--	p(5)*1.5f,
--	p(6)*1.5f,
--	p(7)*1.5f,
--	p(8)*1.0f,
--	p(9)*1.0f,
-+	(float) p(3)*1.5f,
-+	(float) p(4)*1.5f,
-+	(float) p(5)*1.5f,
-+	(float) p(6)*1.5f,
-+	(float) p(7)*1.5f,
-+	(float) p(8)*1.0f,
-+	(float) p(9)*1.0f,
- 	600.0f,
- 	800.0f
- };
-diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
-index 420b4d9..d404f08 100644
---- a/src/tracker/sdl/SDL_Main.cpp
-+++ b/src/tracker/sdl/SDL_Main.cpp
-@@ -609,7 +609,7 @@ void translateKeyDownEvent(const SDL_Event& event)
- 	printf ("DEBUG: Key pressed: VK: %d, SC: %d, Scancode: %d\n", toVK(keysym), toSC(keysym), keysym.sym);
- #endif
- 
--	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
-+	pp_uint16 chr[3] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
- 
- 	PPEvent myEvent(eKeyDown, &chr, sizeof(chr));
- 	RaiseEventSerialized(&myEvent);
-@@ -621,7 +621,7 @@ void translateKeyUpEvent(const SDL_Event& event)
- 
- 	preTranslateKey(keysym);
- 
--	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
-+	pp_uint16 chr[3] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
- 
- 	PPEvent myEvent(eKeyUp, &chr, sizeof(chr));
- 	RaiseEventSerialized(&myEvent);
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch
deleted file mode 100644
index 090e433b5fdc..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From f85f5336df72dc44e407ae756ed20a8f8422cb76 Mon Sep 17 00:00:00 2001
-From: Dale Whinham <daleyo@gmail.com>
-Date: Sat, 11 Apr 2020 16:51:31 +0100
-Subject: [PATCH] Fix hard dependency on RtMidi
-
-It is perfectly reasonable for libasound to be installed, but not
-librtmidi, and so we should only enable the MIDI code if both are
-present.
-
-Fixes #207.
----
- src/tracker/CMakeLists.txt   |  1 +
- src/tracker/sdl/SDL_Main.cpp | 12 ++++++------
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
-index 0a935330..f4243a0f 100644
---- a/src/tracker/CMakeLists.txt
-+++ b/src/tracker/CMakeLists.txt
-@@ -348,6 +348,7 @@ elseif(WIN32)
-     target_link_libraries(tracker midi)
- else()
-     if(ALSA_FOUND AND RTMIDI_FOUND)
-+        target_compile_definitions(tracker PRIVATE -DHAVE_LIBRTMIDI)
-         target_link_libraries(tracker midi)
-     endif()
- endif()
-diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
-index 1a49fc12..75ffa1df 100644
---- a/src/tracker/sdl/SDL_Main.cpp
-+++ b/src/tracker/sdl/SDL_Main.cpp
-@@ -78,7 +78,7 @@
- #include "PPSystem_POSIX.h"
- #include "PPPath_POSIX.h"
- 
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- #include "../midi/posix/MidiReceiver_pthread.h"
- #endif
- // --------------------------------------------------------------------------
-@@ -89,7 +89,7 @@ static SDL_TimerID			timer;
- static PPScreen*			myTrackerScreen		= NULL;
- static Tracker*				myTracker			= NULL;
- static PPDisplayDevice*		myDisplayDevice		= NULL;
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- static MidiReceiver*		myMidiReceiver		= NULL;
- #endif
- 
-@@ -223,7 +223,7 @@ static Uint32 SDLCALL timerCallback(Uint32 interval, void* param)
- 	return interval;
- }
- 
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- class MidiEventHandler : public MidiReceiver::MidiEventHandler
- {
- public:
-@@ -829,7 +829,7 @@ myDisplayDevice = new PPDisplayDeviceFB(windowSize.width, windowSize.height, sca
- 	// Startup procedure
- 	myTracker->startUp(noSplash);
- 
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- 	InitMidi();
- #endif
- 
-@@ -962,7 +962,7 @@ int main(int argc, char *argv[])
- 	initTracker(defaultBPP, orientation, swapRedBlue, noSplash);
- 	globalMutex->unlock();
- 
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- 	if (myMidiReceiver && recVelocity)
- 	{
- 		myMidiReceiver->setRecordVelocity(true);
-@@ -1036,7 +1036,7 @@ int main(int argc, char *argv[])
- 	SDL_RemoveTimer(timer);
- 
- 	globalMutex->lock();
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- 	delete myMidiReceiver;
- #endif
- 	delete myTracker;
diff --git a/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch b/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch
new file mode 100644
index 000000000000..977264a8f37b
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/910283
+https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d
+https://github.com/milkytracker/MilkyTracker/issues/316
+https://github.com/milkytracker/MilkyTracker/issues/318
+
+From 7e9171488fc47ad2de646a4536794fda21e7303d Mon Sep 17 00:00:00 2001
+From: Leon van Kammen <leonvankammen@gmail.com>
+Date: Thu, 6 Jul 2023 14:38:20 +0200
+Subject: [PATCH] possible bugfix: return nPorts
+
+--- a/src/midi/posix/MidiReceiver_pthread.cpp
++++ b/src/midi/posix/MidiReceiver_pthread.cpp
+@@ -145,4 +145,5 @@ unsigned int MidiReceiver::countPorts()
+ 	}
+ 	delete midiin;
+ 	midiin = NULL;
+-}
+\ No newline at end of file
++  return nPorts;
++}
diff --git a/media-sound/milkytracker/metadata.xml b/media-sound/milkytracker/metadata.xml
index a2dc0870f775..cb581de54f58 100644
--- a/media-sound/milkytracker/metadata.xml
+++ b/media-sound/milkytracker/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
deleted file mode 100644
index ca410696e6b8..000000000000
--- a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-# This commit is needed so the milkytrace binary is linked properly, bug 711564
-# It is also ~40kb so it is better to fetch it rather than ship it in-tree
-COMMIT="2b145b074581ddf3b4ad78a402cdf5fab500b125"
-
-DESCRIPTION="FastTracker 2 inspired music tracker"
-HOMEPAGE="https://milkytracker.titandemo.org/"
-SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/milkytracker/MilkyTracker/commit/${COMMIT}.patch -> ${P}-cmake.patch"
-
-LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa jack"
-
-RDEPEND="
-	dev-libs/zziplib
-	media-libs/libsdl2[X]
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${DISTDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-CVE-2019-14464.patch"
-	"${FILESDIR}/${P}-CVE-2019-1449x.patch"
-	"${FILESDIR}/${P}-CVE-2020-15569.patch"
-	"${FILESDIR}/${P}-fix-hard-dependency-on-rtmidi.patch"
-	"${FILESDIR}/${P}-clang.patch"
-)
-
-S="${WORKDIR}/MilkyTracker-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-		$(cmake_use_find_package jack JACK)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newicon resources/pictures/carton.png ${PN}.png
-	make_desktop_entry ${PN} MilkyTracker ${PN} \
-		"AudioVideo;Audio;Sequencer"
-}
diff --git a/media-sound/milkytracker/milkytracker-1.03.00.ebuild b/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
index 7497b79d44be..aa271bf6bf5c 100644
--- a/media-sound/milkytracker/milkytracker-1.03.00.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake desktop xdg
+inherit cmake desktop flag-o-matic xdg
 
 DESCRIPTION="FastTracker 2 inspired music tracker"
 HOMEPAGE="https://milkytracker.titandemo.org/"
@@ -12,22 +12,34 @@ S="${WORKDIR}/MilkyTracker-${PV}"
 
 LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="alsa jack"
 
 RDEPEND="
 	dev-libs/zziplib
 	media-libs/libsdl2[X]
 	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/rtmidi
+	)
 	jack? ( virtual/jack )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-wreturn-type.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860870
+	# https://github.com/milkytracker/MilkyTracker/issues/340
+	filter-lto
+
 	local mycmakeargs=(
 		$(cmake_use_find_package alsa ALSA)
 		$(cmake_use_find_package jack JACK)
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 34cfc9a0f4f6..4ed0e4c162a6 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1 +1,24 @@
-DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
+DIST mixxx-2.3.6.tar.gz 41285084 BLAKE2B 35bedb5f41a56577bc59411ca979e3e780c1da2420bc0a7ad98d998c89f8c272202ba42e8b8089904ca8e1a1b6ac5155d08d556538245ce3242b4ea5a670e6d2 SHA512 a92c2c92dc7619ac135d940f23ffdc101c528eca6322517805afb9eb48a84c6339cefb88b96bdac6ffb23967c2f93f621daf3e98bfecbf7f3fe7626ddcec4398
+DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
+DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76 SHA512 648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
+DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86 SHA512 fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc
+DIST mixxx-manual-2.3-en.pdf 34055279 BLAKE2B 1d4dac58d1d51dec0868f584b7c338a0f5889811c8c1770f89fb86a8ff25c189f68e58c39fb8d279622df1ae5955c3d5d476026976ea4c2144f1d264e0026273 SHA512 ae050aac9d10767de4f1793b9147a85cb41b2070d4747e50b4e17308dd6a4a54e049559473bb1c1dd0dcf0c50a51a649fd2e70aebde78139073adb4068e0ac77
+DIST mixxx-manual-2.3-es.pdf 34063874 BLAKE2B 9a08615f7f01051c01585b967ca82829e264335462874b42bab4314079d1cc08dd5678472403451dde83bd57097be0f827d1e15b4cfe6567a96e817403eea942 SHA512 0bfb5d45a950e08120856ebbd4af771ae4da646a5d77994f2423166b3f9c8c8c90087ccf7eb6ccd81d596867f351ea935623b7299d077d587e1265c7ecf196c1
+DIST mixxx-manual-2.3-fi.pdf 34061528 BLAKE2B e7408e8efec4fab095f6e46f8c25ec0410895cf3d4fac6e11b7ad048d27fa6226b5516c9fba5428f357bf979d7878811bbb719490675da20a06190a6b93e775d SHA512 70fa602c2c90c629a0b5b671f63ffff0110e8945ed76c7e9fe5b09ee167bb75e6a73d1d7c0a23ea30736710555cd1626c4c313cd45436488d3ecd254e245cd58
+DIST mixxx-manual-2.3-fr.pdf 34104354 BLAKE2B fd9b0c2d3a2705018771ca2ad4e609ec6a4a969148dc711bee4bd829f60a71713277cd94d0d95c6ca080a2c75233c7e395532aa816b1e2150c2fe45fe8242364 SHA512 cf8f9a0559845f1d4540d2a27ffa8b251e85aab6408166b352416f357ea045387ab8dd60c746b99c7d84eaf708f8d173bc16d4b92ebf726042b7aea59d3c460d
+DIST mixxx-manual-2.3-gl.pdf 34059337 BLAKE2B 27cc942a0fd9994c573913e246d833e5014b535d152c338d18cd30d3f4f6cf2ffaf782a076862a7df638d0c7b2b61fb23dee61fa51f0cd3e4a4abed47ec48843 SHA512 17460fba1e754018b67d010fd529218b26a0218cc22c3da3ad92db837c5e5cc7d81ae463b168e965a296fff7fb790ee1e04a8228b5596450027cec12bb445a1e
+DIST mixxx-manual-2.3-id.pdf 34061075 BLAKE2B 382d72e6429a83586f1b32779d2abef3a4610688b4bbd194568d4561f8df9d388dcb18cdfe3fd005a79cfca1ea32c948531d7964524d3195c65686d9eff11483 SHA512 231b5e8e617b714095952350dcf84ad5038d37a3e15071f32a827917c8a74bdf16aa529e7832eb46b12169156c30665365c6d4e354ec85a523641fb83d06ac07
+DIST mixxx-manual-2.3-it.pdf 34065113 BLAKE2B 44c7cb83d17c3529096c3f94eab77a9cd6d09e2b33032042efcb8ba776fcf02cb298c5cd6e029bf33c1cd1f3a5239540a2e071cd091960bb3ce8e356fb9f7448 SHA512 d899171401fa5bc3b20b78997aa80cd806c7c2a901ff3e05204c819a7c039d460d09bc29276e862718e84db2e0c2875155b4bb20320b323668a971fc99a5fcdd
+DIST mixxx-manual-2.3-ja-JP.pdf 32835197 BLAKE2B d4fffe0297abaef128fabb14bbead429cf6ee0249b7a7679af88e5cbde606a2ec5f2f2f6fa587efa4fb8f37ebc5559af2e39dca67c20098f12a0442079248ed3 SHA512 ddb288925ceb759ecb33820326d400f5c5fa02a7e8905c5d84b374c6d3eb646fe0da738aa617c787bb9787d0b9be538ef123cb016c5ab0dfd12d77685717ae04
+DIST mixxx-manual-2.3-kn.pdf 34058121 BLAKE2B 9d33e5c2c4f2a4d558968b9af495263dbe817ccc9aeadac947e5eec738d658b303ace613bf9824fae4a5c7de4040ecfea66092bc4dea9306fed610abfc1dd5a9 SHA512 e09a231d17f0c69a95df89112c75ed0a683783d4b1561c575f6ea7b9cc16e0129ba4aa7bd1968ad33cd068826bd9b2ac7bd986b5e9ba99251b87fd618f906cc3
+DIST mixxx-manual-2.3-nl.pdf 34060208 BLAKE2B ccecf45483bfe42691893d68abe8955d57af03116a44e5d4aed506686ec9e77113e424b0eca0e1e9cecefac281749cfba2bc273c0c3caf9da5acf0f2070fdf03 SHA512 5329383a9be0ab39110efc11cd6c3465fc7e57d830b46bf7065a44b1dff330406367f249a9da36a898b26979464ecb68baa1f3e08dad18aba087a0e659048d74
+DIST mixxx-manual-2.3-pl.pdf 34067404 BLAKE2B d50af6a710b1e08a67742bbb97d5c62127ca63508344c6986b5ceede39a58203f950516c6ce9b6a8df00dedc9231e216f63dfe268ec23a204cf67d51809a90a9 SHA512 9fba40e45913e56fb64f3071a0255b459c58a882306ed62e06ed358b8c8a2f209184d55b6f833bd5fdadeb85e0be73b3fa1b8a9ba5093368a0fec384a35a4be1
+DIST mixxx-manual-2.3-pt.pdf 34062564 BLAKE2B 13bdfd9ecf376a6fd516bbacd382956628338c1da77354a8d946c53f4c66828726d50c0fdc26294034853db42daad7bc448aaa3bbac676f82117d1fe68d7cbf4 SHA512 ce73a8bb92832e446bbd6e4ed177455011b0be3210ff11a31dcb2ba6d3c9c7e97495cb34ae1bec30d31be939ea396af70106b61c7b3262c1afdce489e79c8739
+DIST mixxx-manual-2.3-ro.pdf 34067722 BLAKE2B 70cc517f0926fe1bc867d723a0bffcf6dedc75ef0e5cda0ab1a1294f28aad45fdd8f0a9373573ae2d1466a7832710c621cd1c84f692733ad2262e1c98f669872 SHA512 57b60df38aca9000d73bdd1a58c4bb5633340f37d284e6f92921216ac09d38a53415dafc374e43fbffbe2cf528299a61e744db96ab6aa808e11bc30dbc4f8c1d
+DIST mixxx-manual-2.3-ru.pdf 34024493 BLAKE2B d3faca1606cf155ecbf8215d9e0ab94167ff5e536a96625679993000186b02c41d9867490808458d1bd00fd837817a6ddc5e9c5286ef2c71d2ea0aec48e562bc SHA512 9c4abaccb3f6ff452d6d356853a4ba4cf4bd7bbfe9314edcf3c8adf8ff2902445c8ec377cdd3ef97acca1e2a2dccc453f670c2abbfc69cf43a2ab05ac2040bf9
+DIST mixxx-manual-2.3-sl.pdf 34102881 BLAKE2B d7bb7470b7d0164ce7c5ad6341889e465afc2d3e1f79fd57dd708ff2170cb6f7e65773f1977b512caebee41d0313891be7e684f386d176673bfe577f20a3ed4d SHA512 c2f79073b2e3c5afc45f48076314cbdde5a2b60e359e688ff7d1b2c7550c3b2ab4be7a1ab601e4a3b58506e0f86aad9e4ae21b1beb7e3eee067572e6114d60bd
+DIST mixxx-manual-2.3-sq.pdf 34074464 BLAKE2B 2ea7e6b58f821a1969a2bfe167c6045ec4410ef3f87edbabbd28fd304ec2bed1d76591452f08fe3ce627bff9e8bd1ffd70fb80fd66cdf6fc992a7e70800cea7f SHA512 c7d702dde88f4c5607c8fbacb7a89f68f3b42b1a16ae15e478a6ee2165eeee1739d7195ef201cc84b81ab668103a553f12ad9e49b055a34c01ead4f0fbab07e7
+DIST mixxx-manual-2.3-sr.pdf 34079603 BLAKE2B 83ed178b8b095928138c853b530017631621c3c77dcf9944e9ebf6a4bbbcd0202e5aafae9bded76d6c6fd464d8faf7803e16fbb298c597ba59224c8cefab4d56 SHA512 6fd07e473348fe93fc0bf68cd05ae8c78e9a624e48422480b7723952a067489cd72d90f0752f91e3c343e3caae57660b0721a6c947db3c3fb83591373f0829f2
+DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0104d509f76c0569f99348d17131926a564d7e43a73d34036c5a94be4b61a37645e7933b1dea2513c6d72d5d25334fc SHA512 b05f297f3000767e2a8a2319e56f0db73981418943a96d0822f4f3f51f29bbb5667cc0b487ef328f1d6d115013af705371668ef3081321b6980ea95834a40895
+DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
+DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-docs.patch b/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
deleted file mode 100644
index 702ce6cd8df5..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mixxx-9999/src/SConscript
-+++ mixxx-9999/src/SConscript
-@@ -290,7 +290,6 @@
-                 env.Alias('install', controllermappings)
-                 env.Alias('install', translations)
-                 env.Alias('install', keyboardmappings)
--                env.Alias('install', docs)
-                 env.Alias('install', dotdesktop)
-                 env.Alias('install', icon)
-                 env.Alias('install', promotracks)
diff --git a/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch b/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch
deleted file mode 100644
index 686b16e159f0..000000000000
--- a/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From e581b59fa838f471259ea24089d663bec4c02a1a Mon Sep 17 00:00:00 2001
-From: "S.Brandt" <s.brandt@mixxx.org>
-Date: Fri, 17 Jan 2020 13:03:58 +0100
-Subject: [PATCH 1/2] Fixes faders become invisible for the Deere skin with QT
- 5.14.0 . Simplified the affected svg graphics. There was some transformation
- going on (that rotates a shape around the point 0,0), also the unscaled
- handle graphics were bigger than the slider graphics. That was apparently not
- an issue pre-QT5.14.0.
-
----
- res/skins/Deere/handle-crossfader-blue.svg   | 8 ++++++--
- res/skins/Deere/handle-crossfader-grey.svg   | 8 ++++++--
- res/skins/Deere/handle-crossfader-lime.svg   | 8 ++++++--
- res/skins/Deere/handle-crossfader-orange.svg | 8 ++++++--
- res/skins/Deere/handle-vertical-blue.svg     | 8 ++++++--
- res/skins/Deere/handle-vertical-carmine.svg  | 8 ++++++--
- res/skins/Deere/handle-vertical-grey.svg     | 8 ++++++--
- res/skins/Deere/handle-vertical-lime.svg     | 8 ++++++--
- res/skins/Deere/handle-vertical-orange.svg   | 8 ++++++--
- res/skins/Deere/handle-vertical-purple.svg   | 8 ++++++--
- res/skins/Deere/slider-crossfader-AutoDJ.svg | 6 +++++-
- res/skins/Deere/slider-crossfader.svg        | 8 ++++++--
- res/skins/Deere/slider-vertical.svg          | 8 ++++++--
- 13 files changed, 77 insertions(+), 25 deletions(-)
-
-diff --git a/res/skins/Deere/handle-crossfader-blue.svg b/res/skins/Deere/handle-crossfader-blue.svg
-index d17d769ec93..673ab8c304f 100644
---- a/res/skins/Deere/handle-crossfader-blue.svg
-+++ b/res/skins/Deere/handle-crossfader-blue.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#c5d11f"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#378df7"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-crossfader-grey.svg b/res/skins/Deere/handle-crossfader-grey.svg
-index 6c08871bae8..eb80ee8306e 100644
---- a/res/skins/Deere/handle-crossfader-grey.svg
-+++ b/res/skins/Deere/handle-crossfader-grey.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#939393"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#939393"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-crossfader-lime.svg b/res/skins/Deere/handle-crossfader-lime.svg
-index d17d769ec93..581868854b1 100644
---- a/res/skins/Deere/handle-crossfader-lime.svg
-+++ b/res/skins/Deere/handle-crossfader-lime.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#c5d11f"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#c5d11f"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-crossfader-orange.svg b/res/skins/Deere/handle-crossfader-orange.svg
-index c3587a775e1..15f2949153e 100644
---- a/res/skins/Deere/handle-crossfader-orange.svg
-+++ b/res/skins/Deere/handle-crossfader-orange.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#ffb108"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#ffb108"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-vertical-blue.svg b/res/skins/Deere/handle-vertical-blue.svg
-index b12a90b8194..c595936fb43 100644
---- a/res/skins/Deere/handle-vertical-blue.svg
-+++ b/res/skins/Deere/handle-vertical-blue.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#378df7"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#378df7"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-vertical-carmine.svg b/res/skins/Deere/handle-vertical-carmine.svg
-index 2ed243a60de..e1e700d8814 100644
---- a/res/skins/Deere/handle-vertical-carmine.svg
-+++ b/res/skins/Deere/handle-vertical-carmine.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#e02f00"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#e02f00"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-vertical-grey.svg b/res/skins/Deere/handle-vertical-grey.svg
-index c93bbfdf0b8..3bc72218911 100644
---- a/res/skins/Deere/handle-vertical-grey.svg
-+++ b/res/skins/Deere/handle-vertical-grey.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#939393"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#939393"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-vertical-lime.svg b/res/skins/Deere/handle-vertical-lime.svg
-index 5cd4d0c76bd..158d494d62a 100644
---- a/res/skins/Deere/handle-vertical-lime.svg
-+++ b/res/skins/Deere/handle-vertical-lime.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#c5d11f"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#c5d11f"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-vertical-orange.svg b/res/skins/Deere/handle-vertical-orange.svg
-index 1b6b91152df..10f79b79b87 100644
---- a/res/skins/Deere/handle-vertical-orange.svg
-+++ b/res/skins/Deere/handle-vertical-orange.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#e3ca1f"/><rect id="rect5888" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#ffb108"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#ffb108"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-vertical-purple.svg b/res/skins/Deere/handle-vertical-purple.svg
-index c606eac9b8c..1ccd440a239 100644
---- a/res/skins/Deere/handle-vertical-purple.svg
-+++ b/res/skins/Deere/handle-vertical-purple.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#f2d440"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#f2d440"/>
-+</svg>
-diff --git a/res/skins/Deere/slider-crossfader-AutoDJ.svg b/res/skins/Deere/slider-crossfader-AutoDJ.svg
-index 3d4ee50b5a6..281dd06c32a 100644
---- a/res/skins/Deere/slider-crossfader-AutoDJ.svg
-+++ b/res/skins/Deere/slider-crossfader-AutoDJ.svg
-@@ -1 +1,5 @@
--<svg id="svg2" width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect2984" x="3.9767" y="12.759" width="172.05" height="14.483" color="#000000" fill="#f60"/><!-- marker lines every 5px --><!-- end marker --><!-- quarter marker --><!-- middle marker --><!-- quarter marker --><!-- end marker --></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <rect x="1" y="12" width="178" height="16" color="#000000" fill="#f60"/>
-+</svg>
-diff --git a/res/skins/Deere/slider-crossfader.svg b/res/skins/Deere/slider-crossfader.svg
-index 3ff945454de..ac5cb8cb52b 100644
---- a/res/skins/Deere/slider-crossfader.svg
-+++ b/res/skins/Deere/slider-crossfader.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4167" transform="rotate(90)" x="12.633" y="-176.2" width="14.734" height="172.4" rx=".92518" ry="1.0809" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/><path id="path4175" d="m170.32 18.062h-160.64v3.875h160.64v-3.875z" fill="#222" stroke="#222" stroke-linecap="round" stroke-width="2.5"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <rect x="1.75" y="12.75" width="176.5" height="14.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/>
-+ <path d="m6.4826 20h167.03z" fill="none" stroke="#222" stroke-width="6"/>
-+</svg>
-diff --git a/res/skins/Deere/slider-vertical.svg b/res/skins/Deere/slider-vertical.svg
-index 6876b84e028..30bc5061623 100644
---- a/res/skins/Deere/slider-vertical.svg
-+++ b/res/skins/Deere/slider-vertical.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="40" height="162" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4167" x="12.633" y="1.25" width="14.734" height="159.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/><path id="path4175" transform="translate(0,-9)" d="m18.062 15.688v148.62h3.875v-148.62h-3.875z" fill="#222" stroke="#222" stroke-linecap="round" stroke-width="2.5"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="162" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <rect x="12.75" y="1.75" width="14.5" height="158.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/>
-+ <path d="m20 156v-150z" fill="none" stroke="#222" stroke-width="6"/>
-+</svg>
-
-From 8d1e0e2aabb8c95c0ca06faa93d50dbc75f537db Mon Sep 17 00:00:00 2001
-From: "S.Brandt" <s.brandt@mixxx.org>
-Date: Fri, 17 Jan 2020 13:05:25 +0100
-Subject: [PATCH 2/2] Deere skin:  Add maximum size for the crossfader slider
- image to stop the crossfader handle from overflowing the background graphic.
-
----
- res/skins/Deere/mixer.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
-index b27e3e8b4e0..315d1f30709 100644
---- a/res/skins/Deere/mixer.xml
-+++ b/res/skins/Deere/mixer.xml
-@@ -122,6 +122,7 @@
-                       <SliderComposed>
-                         <TooltipId>crossfader</TooltipId>
-                         <Size>1me,40f</Size>
-+                        <MaximumSize>200,40</MaximumSize>
-                         <Slider scalemode="STRETCH">slider-crossfader.svg</Slider>
-                         <Handle scalemode="STRETCH_ASPECT">handle-crossfader-orange.svg</Handle>
-                         <Horizontal>true</Horizontal>
diff --git a/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch b/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch
deleted file mode 100644
index cf1e43654fec..000000000000
--- a/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mixxx-release-2.2.4/src/SConscript
-+++ mixxx-release-2.2.4/src/SConscript
-@@ -405,7 +405,7 @@
-                 translations = env.Install(os.path.join(unix_share_path, 'mixxx', 'translations'), translation_files)
-                 keyboardmappings = env.Install(os.path.join(unix_share_path, 'mixxx', 'keyboard'), keyboardmappings_files)
-                 dotdesktop = env.Install(os.path.join(unix_share_path, 'applications'), dotdesktop_files)
--                dotappstream = env.Install(os.path.join(unix_share_path, 'appdata'), dotappstream_files)
-+                dotappstream = env.Install(os.path.join(unix_share_path, 'metadata'), dotappstream_files)
-                 docs = env.Install(os.path.join(unix_share_path, 'doc', 'mixxx'), docs_files)
-                 icon = env.Install(os.path.join(unix_share_path, 'pixmaps'), icon_files)
- 
diff --git a/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch
new file mode 100644
index 000000000000..b573a624d31e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch
@@ -0,0 +1,11 @@
+--- mixxx-2.3.0/CMakeLists.txt
++++ mixxx-2.3.0/CMakeLists.txt
+@@ -53,8 +53,6 @@
+     set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE)
+     # Set the possible values of build type for cmake-gui
+     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo")
+-  elseif(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo)$")
+-    message(FATAL_ERROR "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} is not supported, use one of Debug, Release or RelWithDebInfo.")
+   endif()
+ endif()
+ 
diff --git a/media-sound/mixxx/files/mixxx-2.3.0-docs.patch b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch
new file mode 100644
index 000000000000..e956e1ce2401
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch
@@ -0,0 +1,26 @@
+--- mixxx-2.3.0/CMakeLists.txt
++++ mixxx-2.3.0/CMakeLists.txt
+@@ -1320,23 +1320,6 @@
+     "${MIXXX_INSTALL_LICENSEDIR}"
+ )
+ 
+-# Documentation
+-install(
+-  FILES
+-    "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
+-  DESTINATION
+-    "${MIXXX_INSTALL_DOCDIR}"
+-)
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
+-  install(
+-    FILES
+-      "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf"
+-    DESTINATION
+-      "${MIXXX_INSTALL_DOCDIR}"
+-  )
+-endif()
+-
+ # Additional Linux-only files
+ if(UNIX AND NOT APPLE)
+   # .desktop file for KDE/GNOME menu
diff --git a/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch
new file mode 100644
index 000000000000..2ab50c85309e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch
@@ -0,0 +1,10 @@
+--- mixxx-2.3.1/lib/benchmark/src/benchmark_register.h
++++ mixxx-2.3.1/lib/benchmark/src/benchmark_register.h
+@@ -2,6 +2,7 @@
+ #define BENCHMARK_REGISTER_H
+ 
+ #include <vector>
++#include <limits>
+ 
+ #include "check.h"
+ 
diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch b/media-sound/mixxx/files/mixxx-9999-docs.patch
index d1de4e6e9443..0ac74959df2e 100644
--- a/media-sound/mixxx/files/mixxx-9999-docs.patch
+++ b/media-sound/mixxx/files/mixxx-9999-docs.patch
@@ -1,19 +1,27 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cc5b3a7ba..63f18bfda4 100644
+index e35d8dd4e1..798179955c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1142,15 +1142,6 @@ install(
+@@ -1504,23 +1504,6 @@ install(
      "${MIXXX_INSTALL_LICENSEDIR}"
  )
- 
+
 -# Documentation
 -install(
 -  FILES
--    "${CMAKE_CURRENT_SOURCE_DIR}/README"
--    "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
 -  DESTINATION
 -    "${MIXXX_INSTALL_DOCDIR}"
 -)
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
+-  install(
+-    FILES
+-      "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf"
+-    DESTINATION
+-      "${MIXXX_INSTALL_DOCDIR}"
+-  )
+-endif()
 -
  # Additional Linux-only files
  if(UNIX AND NOT APPLE)
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 5e69aa297bf4..38deddc8020f 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
 		<flag name="keyfinder">Enable musical key detection support via <pkg>media-libs/libkeyfinder</pkg></flag>
+		<flag name="modplug">Add libmodplug support</flag>
 		<flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag>
 		<flag name="qtkeychain">Enable Secure credential storage support via <pkg>dev-libs/qtkeychain</pkg></flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild
deleted file mode 100644
index d26bd4e971fd..000000000000
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8})
-
-inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
-else
-	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
-
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib:2
-	dev-libs/protobuf:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
-	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
-	media-libs/portmidi
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	sys-power/upower
-	virtual/glu
-	virtual/libusb:1
-	virtual/opengl
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	hid? ( dev-libs/hidapi )
-	lv2? ( >=media-libs/lilv-0.24.2-r3 )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	opus? (	media-libs/opusfile )
-	shout? ( media-libs/libshout )
-	wavpack? ( media-sound/wavpack )
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-	"${FILESDIR}"/${PN}-2.2.3-qt-5.14.patch
-	"${FILESDIR}"/${PN}-2.2.4-metadata.patch
-)
-
-src_prepare() {
-	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
-
-	default
-}
-
-src_configure() {
-	local myoptimize=0
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	MYSCONS=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		lilv="$(usex lv2 1 0)"
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		opus="$(usex opus 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
-	)
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]}
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \
-		install_root="${ED}"/usr install
-
-	dodoc README Mixxx-Manual.pdf
-}
diff --git a/media-sound/mixxx/mixxx-2.3.6.ebuild b/media-sound/mixxx/mixxx-2.3.6.ebuild
new file mode 100644
index 000000000000..35f24b5dfacb
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.6.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg udev
+
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	if [[ ${PV} == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="amd64 ~arm64 x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac:=
+	media-libs/libebur128
+	media-libs/libid3tag:=
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/libvorbis
+	media-libs/portaudio[alsa]
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	media-sound/lame
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	virtual/udev
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	hid? ( dev-libs/hidapi )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
+	wavpack? ( media-sound/wavpack )
+"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
+
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-docs.patch
+	"${FILESDIR}"/${PN}-2.3.0-cmake.patch
+	"${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
+)
+
+PLOCALES="
+	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
+"
+
+mixxx_set_globals() {
+	local lang
+	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/${MY_PV}"
+	for lang in ${PLOCALES} ; do
+		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-${lang/ja/ja-JP}.pdf )"
+		IUSE+=" l10n_${lang/ en/ +en}"
+	done
+	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-en.pdf"
+}
+mixxx_set_globals
+
+src_configure() {
+	local mycmakeargs=(
+		# Not available on Linux yet and requires additional deps
+		-DBATTERY="off"
+		-DBROADCAST="$(usex shout on off)"
+		-DCCACHE_SUPPORT="off"
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DKEYFINDER="$(usex keyfinder on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DMODPLUG="$(usex modplug on off)"
+		-DOPTIMIZE="off"
+		-DOPUS="$(usex opus on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DVINYLCONTROL="on"
+		-DWAVPACK="$(usex wavpack on off)"
+	)
+
+	if [[ ${PV} == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
+	dodoc README.md CHANGELOG.md
+	local locale
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc "${DISTDIR}"/${PN}-manual-${MY_PV}-${locale/ja/ja-JP}.pdf
+		fi
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
new file mode 100644
index 000000000000..55d859df3021
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg udev
+
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	if [[ ${PV} == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac:=
+	media-libs/libebur128
+	media-libs/libid3tag:=
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/libvorbis
+	media-libs/portaudio[alsa]
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	media-sound/lame
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	virtual/udev
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	hid? ( dev-libs/hidapi )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
+	wavpack? ( media-sound/wavpack )
+"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
+
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-docs.patch
+)
+
+PLOCALES="
+	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
+"
+
+mixxx_set_globals() {
+	local lang
+	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/${MY_PV}"
+	for lang in ${PLOCALES} ; do
+		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-${lang/ja/ja-JP}.pdf )"
+		IUSE+=" l10n_${lang/ en/ +en}"
+	done
+	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-en.pdf"
+}
+mixxx_set_globals
+
+src_configure() {
+	local mycmakeargs=(
+		# Not available on Linux yet and requires additional deps
+		-DBATTERY="off"
+		-DBROADCAST="$(usex shout on off)"
+		-DCCACHE_SUPPORT="off"
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DKEYFINDER="$(usex keyfinder on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DMODPLUG="$(usex modplug on off)"
+		-DOPTIMIZE="off"
+		-DOPUS="$(usex opus on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DVINYLCONTROL="on"
+		-DWAVPACK="$(usex wavpack on off)"
+	)
+
+	if [[ ${PV} == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
+	dodoc README.md CHANGELOG.md
+	local locale
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc "${DISTDIR}"/${PN}-manual-${MY_PV}-${locale/ja/ja-JP}.pdf
+		fi
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index bbfbe57f1f07..0447de377599 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 ]] ; then
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
+	if [[ ${PV} == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
 else
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
@@ -23,7 +26,7 @@ IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
 RDEPEND="
 	dev-db/sqlite
 	dev-libs/glib:2
-	dev-libs/protobuf:0=
+	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -37,9 +40,9 @@ RDEPEND="
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	media-libs/chromaprint
-	media-libs/flac
+	media-libs/flac:=
 	media-libs/libebur128
-	media-libs/libid3tag
+	media-libs/libid3tag:=
 	media-libs/libogg
 	media-libs/libsndfile
 	media-libs/libsoundtouch
@@ -58,35 +61,33 @@ RDEPEND="
 	x11-libs/libX11
 	aac? (
 		media-libs/faad2
-		media-libs/libmp4v2:0
+		media-libs/libmp4v2
 	)
-	ffmpeg? ( media-video/ffmpeg:0= )
+	ffmpeg? ( media-video/ffmpeg:= )
 	hid? ( dev-libs/hidapi )
 	keyfinder? ( media-libs/libkeyfinder )
 	lv2? ( media-libs/lilv )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
 	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
-	"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+"
+DEPEND="${RDEPEND}
+	dev-cpp/ms-gsl
+"
+BDEPEND="
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5"
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/mixxx-9999-docs.patch
-	)
-
-src_prepare() {
-	cmake_src_prepare
-}
+	"${FILESDIR}"/${PN}-9999-docs.patch
+)
 
 src_configure() {
-
 	local mycmakeargs=(
 		-DFAAD="$(usex aac on off)"
 		-DFFMPEG="$(usex ffmpeg on off)"
@@ -102,20 +103,33 @@ src_configure() {
 		-DWAVPACK="$(usex wavpack on off)"
 		-DQTKEYCHAIN="$(usex qtkeychain on off)"
 		-DKEYFINDER="$(usex keyfinder on off)"
+		-DDOWNLOAD_MANUAL=OFF
+		-DBUILD_SHARED_LIBS=OFF
 	)
 
+	if [[ ${PV} == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+		)
+	fi
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
 
 	if use doc ; then
-		dodoc README Mixxx-Manual.pdf
+		dodoc README res/Mixxx-Keyboard-Shortcuts.pdf
 	fi
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mmix/metadata.xml b/media-sound/mmix/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/mmix/metadata.xml
+++ b/media-sound/mmix/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/mmix/mmix-0.3-r1.ebuild b/media-sound/mmix/mmix-0.3-r1.ebuild
index f00dba606ab5..7f990d1aa054 100644
--- a/media-sound/mmix/mmix-0.3-r1.ebuild
+++ b/media-sound/mmix/mmix-0.3-r1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
-DESCRIPTION="A soundcard mixer for the OSS driver"
-HOMEPAGE="http://www.mcmilk.de/projects/mmix/"
-SRC_URI="http://www.mcmilk.de/projects/${PN}/dl/${P}.tar.bz2"
+DESCRIPTION="Soundcard mixer for the OSS driver"
+HOMEPAGE="https://www.mcmilk.de/projects/mmix/"
+SRC_URI="https://www.mcmilk.de/projects/${PN}/dl/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # media-sound/mmix and dev-lang/mmix both install 'mmix' binary, bug #426874
 RDEPEND=""
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 6e4241432fdf..dab264635837 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,2 +1 @@
-DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
diff --git a/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch
new file mode 100644
index 000000000000..1600af599b28
--- /dev/null
+++ b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch
@@ -0,0 +1,39 @@
+diff -ru a/configure.in b/configure.in
+--- a/configure.in	2016-11-16 02:29:53.000000000 +0200
++++ b/configure.in	2020-11-21 06:07:06.778092416 +0200
+@@ -152,9 +152,9 @@
+ 	CFLAGS="$save_CFLAGS"
+ 	LDFLAGS="$LDFLAGS $BDB_LDFLAGS"
+ 	EXTRA_LIBS="$EXTRA_LIBS $BDB_LIBS"
+-	AC_CHECK_TYPES([u_int], , , [[#include "${srcdir}/compiler.h"]
++	AC_CHECK_TYPES([u_int,u_int32_t], , , [[#include "${srcdir}/compiler.h"]
+ 	                             [#include <sys/types.h>]
+-	                             [#include <db.h>]])
++	                             [#include <stdint.h>]])
+ fi
+ 
+ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],
+diff -ru a/tags_cache.c b/tags_cache.c
+--- a/tags_cache.c	2016-11-16 02:29:53.000000000 +0200
++++ b/tags_cache.c	2020-11-21 06:02:55.043214842 +0200
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <dirent.h>
++#include <stdint.h>
+ 
+ #ifdef HAVE_DB_H
+ # ifndef HAVE_U_INT
+@@ -32,6 +33,12 @@
+ typedef unsigned int u_int;
+ typedef unsigned long int u_long;
+ # endif
++# ifndef HAVE_U_INT32_T
++typedef uint8_t u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++typedef uint64_t u_int64_t;
++# endif
+ #include <db.h>
+ #endif
+ 
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
index 5d50f496122e..0d3046ab4ef7 100644
--- a/media-sound/moc/metadata.xml
+++ b/media-sound/moc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="cache">Enable tags caching support</flag>
-		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 		<flag name="tremor">Build vorbis support using an integer implementation
 			of the vorbis library (<pkg>media-libs/tremor</pkg>)</flag>
 	</use>
diff --git a/media-sound/moc/moc-2.5.2-r1.ebuild b/media-sound/moc/moc-2.5.2-r1.ebuild
deleted file mode 100644
index c3a79d27a2c9..000000000000
--- a/media-sound/moc/moc-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/_/-}
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="https://moc.daper.net"
-SRC_URI="http://ftp.daper.net/pub/soft/moc/stable/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
-	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
-
-RDEPEND=">=dev-libs/libltdl-2:0
-	sys-libs/ncurses:0=[unicode?]
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cache? ( >=sys-libs/db-4:= )
-	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
-	magic? ( sys-apps/file )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-sound/musepack-tools media-libs/taglib )
-	sid? ( >=media-libs/libsidplay-2 )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex )
-	timidity? ( media-libs/libtimidity media-sound/timidity++ )
-	vorbis? (
-		media-libs/libogg
-		tremor? ( media-libs/tremor )
-		!tremor? ( media-libs/libvorbis )
-	)
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable cache)
-		$(use_with oss)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with magic)
-		$(use_with unicode ncursesw)
-		$(use_with libsamplerate samplerate)
-		$(use_with aac)
-		$(use_with ffmpeg)
-		$(use_with flac)
-		$(use_with modplug)
-		$(use_with mad mp3)
-		--without-rcc
-		$(use_with musepack)
-		$(use_with sid sidplay2)
-		$(use_with sndfile)
-		$(use_with speex)
-		$(use_with timidity)
-		$(use_with vorbis vorbis $(usex tremor tremor ""))
-		$(use_with wavpack)
-		$(use_with curl)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-sound/moc/moc-2.6_alpha3-r2.ebuild b/media-sound/moc/moc-2.6_alpha3-r6.ebuild
index 649ff0ddc2ed..0a24feba0780 100644
--- a/media-sound/moc/moc-2.6_alpha3-r2.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r6.ebuild
@@ -1,35 +1,39 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 MY_P=${PN}-${PV/_/-}
 DESCRIPTION="Music On Console - ncurses interface for playing audio files"
 HOMEPAGE="https://moc.daper.net"
 SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
-	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
+	oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack"
 
+# <ffmpeg-5 dep for bug #834393
 RDEPEND="
-	>=dev-libs/libltdl-2:0
+	>=dev-libs/libltdl-2
 	dev-libs/popt
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	cache? ( >=sys-libs/db-4.1:= )
 	curl? ( >=net-misc/curl-7.15.1 )
-	ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 )
-	flac? ( >=media-libs/flac-1.1.3 )
+	ffmpeg? ( <media-video/ffmpeg-5:= )
+	flac? ( >=media-libs/flac-1.1.3:= )
 	jack? ( virtual/jack )
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
 	mad? (
 		media-libs/libmad
 		sys-libs/zlib
-		media-libs/libid3tag
+		media-libs/libid3tag:=
 	)
 	magic? ( sys-apps/file )
 	modplug? ( >=media-libs/libmodplug-0.7 )
@@ -39,6 +43,7 @@ RDEPEND="
 	)
 	sid? ( >=media-libs/libsidplay-2.1.1 )
 	sndfile? ( >=media-libs/libsndfile-1.0.0 )
+	sndio? ( media-sound/sndio )
 	speex? ( >=media-libs/speex-1.0.0 )
 	timidity? (
 		>=media-libs/libtimidity-0.1.0
@@ -51,13 +56,22 @@ RDEPEND="
 	)
 	wavpack? ( >=media-sound/wavpack-4.31 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
 "
 
-S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
+PATCHES=(
+	"${FILESDIR}/ffmpeg4.patch"
+	"${FILESDIR}/${P}-stdint_uint_types.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
 
 src_configure() {
 	local myconf=(
@@ -67,6 +81,7 @@ src_configure() {
 		$(use_with oss)
 		$(use_with alsa)
 		$(use_with jack)
+		$(use_with sndio)
 		$(use_with magic)
 		$(use_with unicode ncursesw)
 		$(use_with libsamplerate samplerate)
@@ -80,15 +95,15 @@ src_configure() {
 		$(use_with sndfile)
 		$(use_with speex)
 		$(use_with timidity)
-		$(use_with vorbis vorbis $(usex tremor tremor ""))
+		$(use_with vorbis vorbis $(usev tremor))
 		$(use_with wavpack)
 		$(use_with curl)
 	)
 
-	econf "${myconf[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/modplugtools/metadata.xml b/media-sound/modplugtools/metadata.xml
index fb6210026670..5cf72c7c471e 100644
--- a/media-sound/modplugtools/metadata.xml
+++ b/media-sound/modplugtools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/modplugtools/modplugtools-0.5.3.ebuild b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
index 16d99a42a461..4a039132a8d5 100644
--- a/media-sound/modplugtools/modplugtools-0.5.3.ebuild
+++ b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="libmodplug based module players modplug123 and modplugplay"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
+HOMEPAGE="https://modplug-xmms.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/modplug-xmms/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND=">=media-libs/libao-0.8.0
 	>=media-libs/libmodplug-0.8.8.1
diff --git a/media-sound/mp32ogg/metadata.xml b/media-sound/mp32ogg/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/mp32ogg/metadata.xml
+++ b/media-sound/mp32ogg/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r7.ebuild
index 92d9ea2f2c79..c6a304b79373 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r7.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files"
 HOMEPAGE="http://faceprint.com/code/"
 SRC_URI="ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg"
+S="${WORKDIR}"
 
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="media-sound/mpg123
+RDEPEND="
 	dev-perl/MP3-Info
 	dev-perl/String-ShellQuote
+	media-sound/mpg123
 	media-sound/vorbis-tools"
-DEPEND=""
-
-S=${WORKDIR}
 
 PATCHES=(
-	"${FILESDIR}/${P}-r4-mpg321.patch"
-	"${FILESDIR}/${P}-r4-quality.patch"\
-	"${FILESDIR}/${P}-r5-german_umlaut.patch"
-	"${FILESDIR}/${P}-r6-force-filename-stringification.patch"
+	"${FILESDIR}"/${P}-r4-mpg321.patch
+	"${FILESDIR}"/${P}-r4-quality.patch
+	"${FILESDIR}"/${P}-r5-german_umlaut.patch
+	"${FILESDIR}"/${P}-r6-force-filename-stringification.patch
 )
 
 src_unpack() {
diff --git a/media-sound/mp3_check/Manifest b/media-sound/mp3_check/Manifest
deleted file mode 100644
index f1b54596957e..000000000000
--- a/media-sound/mp3_check/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mp3_check-1.98.tar.gz 83098 BLAKE2B 49f6a368ae0326aa426818e737964aa8019e09e8ed90316b333bee7aad973fdbd5ab9872ae1dcf41f8d9eed911b25c0b3b07f6dd5ba4557c6ed804c764186f87 SHA512 65eac5498ea3d4a63e0ab23c769a0baa233ddc863c907e934b691b1e8eb2a68da8a3bd7c6bd1b53d30d06330ab84d615c397753bb30257b0aac404e4b18ea4a3
diff --git a/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch b/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch
deleted file mode 100644
index 906ad468f0fa..000000000000
--- a/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: mp3_check-1.98/Makefile
-===================================================================
---- mp3_check-1.98.orig/Makefile
-+++ mp3_check-1.98/Makefile
-@@ -2,7 +2,7 @@
- 
- CC ?= gcc
- LOCALBASE ?= /usr/local
--CFLAGS += -Wall -Werror
-+#CFLAGS += -Wall -Werror
- OPT_FLAGS = -L${LOCALBASE}/lib 
- OBJS = 	mp3_check.o \
- 	mp3_check_misc.o
-@@ -16,8 +16,7 @@ norm: 	$(OBJS) 
- 	$(CC) -g $(CFLAGS) $(OBJS) -o mp3_check
- 
- trim: 	$(OBJS)
--	$(CC) $(CFLAGS) $(OPT_FLAGS) $(OBJS) -o mp3_check
--	strip mp3_check
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OPT_FLAGS) $(OBJS) -o mp3_check
- 	cat MILESTONE.INTRO
- 
- install: all
diff --git a/media-sound/mp3_check/metadata.xml b/media-sound/mp3_check/metadata.xml
deleted file mode 100644
index dcd2c2b8c0a9..000000000000
--- a/media-sound/mp3_check/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://sourceforge.net/p/mp3check/bugs/</bugs-to>
-		<remote-id type="sourceforge">mp3check</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
deleted file mode 100644
index 6eaa72e075c5..000000000000
--- a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="MP3 consistency checker"
-HOMEPAGE="https://sourceforge.net/projects/mp3check/"
-SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-DOCS=(
-	"README"
-	"TODO"
-	"MILESTONE"
-	"MILESTONE.INTRO"
-	"GOALS"
-	"FOR_TESTING"
-	"THANKYOU"
-	"NOTES"
-	"MY_NOTES"
-	"WISHLIST"
-)
-
-src_install() {
-	# Use dobin because Makefile doesn't support DESTDIR
-	# https://sourceforge.net/p/mp3check/bugs/8/
-	dobin mp3_check
-	einstalldocs
-}
diff --git a/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch b/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch
new file mode 100644
index 000000000000..2fe3c032ce79
--- /dev/null
+++ b/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch
@@ -0,0 +1,8 @@
+Lazy fix to prevent log() overlap that leads to failure with clang.
+https://bugs.gentoo.org/731028
+--- a/src/mp3asm.h
++++ b/src/mp3asm.h
+@@ -48,2 +48,3 @@
+ extern char *me; /* name of the executable */
++#define log logfile
+ extern logfile_t log; /* file to log to */
diff --git a/media-sound/mp3asm/metadata.xml b/media-sound/mp3asm/metadata.xml
index 572aedf45610..2c0f771ca376 100644
--- a/media-sound/mp3asm/metadata.xml
+++ b/media-sound/mp3asm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
index a03af0ddc1db..9ce7db5a0640 100644
--- a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -1,32 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 MY_PV="${PV}-1" # Patchlevel
 
-DESCRIPTION="A command line tool to clean and edit mp3 files"
+DESCRIPTION="Command line tool to clean and edit mp3 files"
 HOMEPAGE="https://sourceforge.net/projects/mp3asm/"
-SRC_URI="mirror://sourceforge/mp3asm/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/mp3asm/${PN}-${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}-0.1" # the author uses weird numbering...
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
-# the author uses weird numbering...
-S="${WORKDIR}/${PN}-0.1"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-autotools.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-autotools.patch
+	"${FILESDIR}"/${P}-log.patch
+)
 
 src_prepare() {
 	default
-	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
 src_install() {
 	default
+
 	dodoc Changelog
 }
diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch
new file mode 100644
index 000000000000..9ef2dd6e3226
--- /dev/null
+++ b/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch
@@ -0,0 +1,593 @@
+Bug: https://bugs.gentoo.org/897790
+--- a/mpegsound/filter.cc
++++ b/mpegsound/filter.cc
+@@ -25,7 +25,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+ 
+   // compute new values via a fast cosine transform:
+   {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
+     p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
+@@ -59,7 +59,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf);
+ 
+   {
+-    register REAL tmp;
++    REAL tmp;
+ 
+     tmp=p6+p7;
+     OUT2(36)=-(p5+tmp);
+@@ -84,7 +84,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   }
+ 
+   {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]);
+     p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]);
+@@ -165,8 +165,8 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+ inline void Mpegtoraw::generatesingle(void)
+ {
+   int i;
+-  register REAL r, *vp;
+-  register const REAL *dp;
++  REAL r, *vp;
++  const REAL *dp;
+   int raw;
+ 
+   i=32;
+@@ -251,8 +251,8 @@ inline void Mpegtoraw::generate(void)
+ {
+   int i;
+   REAL r1,r2;
+-  register REAL *vp1,*vp2;
+-  register const REAL *dp;
++  REAL *vp1,*vp2;
++  const REAL *dp;
+   int raw;
+ 
+   dp=filter;
+--- a/mpegsound/filter_2.cc
++++ b/mpegsound/filter_2.cc
+@@ -25,7 +25,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+ 
+   // compute new values via a fast cosine transform:
+   /*  {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
+     p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
+@@ -41,7 +41,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   qe=hcos_32[6]*(p6-p9);qf=hcos_32[7]*(p7-p8); */
+ 
+   {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     q0=x[ 0]+x[15];q1=x[ 1]+x[14];q2=x[ 2]+x[13];q3=x[ 3]+x[12];
+     q4=x[ 4]+x[11];q5=x[ 5]+x[10];q6=x[ 6]+x[ 9];q7=x[ 7]+x[ 8];
+@@ -70,7 +70,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf);
+ 
+   {
+-    register REAL tmp;
++    REAL tmp;
+ 
+     tmp=p6+p7;
+     OUT2(36)=-(p5+tmp);
+@@ -95,7 +95,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   }
+ 
+   {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     /*    p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]);
+     p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]);
+@@ -186,8 +186,8 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+ inline void Mpegtoraw::generatesingle_2(void)
+ {
+   int i;
+-  register REAL r, *vp;
+-  register const REAL *dp;
++  REAL r, *vp;
++  const REAL *dp;
+   int raw;
+ 
+   i=32/2;
+@@ -273,8 +273,8 @@ inline void Mpegtoraw::generate_2(void)
+ {
+   int i;
+   REAL r1,r2;
+-  register REAL *vp1,*vp2;
+-  register const REAL *dp;
++  REAL *vp1,*vp2;
++  const REAL *dp;
+   int raw;
+ 
+   dp=filter;
+--- a/mpegsound/mpeglayer1.cc
++++ b/mpegsound/mpeglayer1.cc
+@@ -45,7 +45,7 @@ void Mpegtoraw::extractlayer1(void)
+   int bitalloc[MAXCHANNEL][MAXSUBBAND],
+       sample[MAXCHANNEL][MAXSUBBAND];
+ 
+-  register int i,j;
++  int i,j;
+   int s=stereobound,l;
+ 
+ 
+--- a/mpegsound/mpeglayer2.cc
++++ b/mpegsound/mpeglayer2.cc
+@@ -429,8 +429,8 @@ void Mpegtoraw::extractlayer2(void)
+ 
+ // Bitalloc
+   {
+-    register int i;
+-    register const int *t=bitalloclengthtable[tableindex];
++    int i;
++    const int *t=bitalloclengthtable[tableindex];
+ 
+     for(i=0;i<s;i++,t++)
+     {
+@@ -444,18 +444,18 @@ void Mpegtoraw::extractlayer2(void)
+ 
+   // Scale selector
+   if(inputstereo)
+-    for(register int i=0;i<n;i++)
++    for(int i=0;i<n;i++)
+     {
+       if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
+       if(bitalloc[RS][i])scaleselector[RS][i]=getbits(2);
+     }
+   else
+-    for(register int i=0;i<n;i++)
++    for(int i=0;i<n;i++)
+       if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
+ 
+   // Scale index
+   {
+-    register int i,j;
++    int i,j;
+ 
+     for(i=0;i<n;i++)
+     {
+@@ -600,7 +600,7 @@ void Mpegtoraw::extractlayer2(void)
+ 
+ // Read Sample
+   {
+-    register int i;
++    int i;
+ 
+     for(int l=0;l<SCALEBLOCK;l++)
+     {
+@@ -611,7 +611,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	{
+ 	  if(group[LS][i])
+ 	  {
+-	    register const REAL *s;
++	    const REAL *s;
+ 	    int code=getbits(codelength[LS][i]);
+ 
+ 	    code+=code<<1;
+@@ -666,7 +666,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	{
+ 	  if(group[LS][i])
+ 	  {
+-	    register const REAL *s;
++	    const REAL *s;
+ 	    int code=getbits(codelength[LS][i]);
+ 
+ 	    code+=code<<1;
+@@ -705,7 +705,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	      fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
+ 	    }
+ 
+-	    register REAL t=scalefactor[LS][l>>2][i];
++	    REAL t=scalefactor[LS][l>>2][i];
+ 	    fraction[LS][0][i]*=t;
+ 	    fraction[LS][1][i]*=t;
+ 	    fraction[LS][2][i]*=t;
+@@ -720,7 +720,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	      fraction[RS][2][i]=(fraction[RS][2][i]+d[RS][i])*c[LS][i];
+ 	    }
+ 
+-	    register REAL t=scalefactor[RS][l>>2][i];
++	    REAL t=scalefactor[RS][l>>2][i];
+ 	    fraction[RS][0][i]*=t;
+ 	    fraction[RS][1][i]*=t;
+ 	    fraction[RS][2][i]*=t;
+@@ -737,7 +737,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	      fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
+ 	    }
+ 
+-	    register REAL t=scalefactor[LS][l>>2][i];
++	    REAL t=scalefactor[LS][l>>2][i];
+ 	    fraction[LS][0][i]*=t;
+ 	    fraction[LS][1][i]*=t;
+ 	    fraction[LS][2][i]*=t;
+--- a/mpegsound/mpeglayer3.cc
++++ b/mpegsound/mpeglayer3.cc
+@@ -29,7 +29,7 @@ inline void Mpegbitwindow::wrap(void)
+ 
+   if(p>=point)
+   {
+-    for(register int i=4;i<point;i++)
++    for(int i=4;i<point;i++)
+       buffer[WINDOWSIZE+i]=buffer[i];
+   }
+   *((int *)(buffer+WINDOWSIZE))=*((int *)buffer);
+@@ -37,15 +37,15 @@ inline void Mpegbitwindow::wrap(void)
+ 
+ inline int Mpegbitwindow::getbit(void)
+ {
+-//  register int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
+-  register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
++//  int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
++  int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
+   bitindex++;
+   return r;
+ };
+ 
+ inline int Mpegbitwindow::getbits9(int bits)
+ {
+-  register unsigned short a;
++  unsigned short a;
+   int offset=bitindex>>3;
+ 
+   a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
+@@ -134,7 +134,7 @@ void Mpegtoraw::layer3initialize(void)
+ 
+   // Calculate win
+   {
+-    register int i;
++    int i;
+ 
+     for(i=0;i<18;i++)
+       win[0][i]=win[1][i]=0.5*sin(PI_72*(double)(2*i+1))/cos(PI_72*(double)(2*i+19));
+@@ -153,11 +153,11 @@ void Mpegtoraw::layer3initialize(void)
+       win[2][i]=0.5*sin(PI_24*(double)(2*i+1))/cos(PI_24*(double)(2*i+7));
+   }
+ 
+-  for(register int i=0;i<9;i++)
++  for(int i=0;i<9;i++)
+     cos_18[i]=cos(PI_18*double(i));
+-  for(register int i=0;i<9;i++)
++  for(int i=0;i<9;i++)
+     hsec_36[i]=0.5/cos(PI_36*double(i*2+1));
+-  for(register int i=0;i<3;i++)
++  for(int i=0;i<3;i++)
+     hsec_12[i]=0.5/cos(PI_12*double(i*2+1));
+ 
+   for(int i=0;i<40;i++)
+@@ -365,7 +365,7 @@ void Mpegtoraw::layer3getscalefactors(int ch,int gr)
+ 			  {0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}};
+ 
+   layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
+-  register layer3scalefactor *sf=(&scalefactors[ch]);
++  layer3scalefactor *sf=(&scalefactors[ch]);
+   int l0,l1;
+ 
+   {
+@@ -498,7 +498,7 @@ void Mpegtoraw::layer3getscalefactors_2(int ch)
+ 
+   int sb[54];
+   layer3grinfo *gi=&(sideinfo.ch[ch].gr[0]);
+-  register layer3scalefactor *sf=(&scalefactors[ch]);
++  layer3scalefactor *sf=(&scalefactors[ch]);
+ 
+   {
+     int blocktypenumber,sc;
+@@ -660,7 +660,7 @@ inline void Mpegtoraw::huffmandecoder_1(const HUFFMANCODETABLE *h,int *x,int *y)
+     level>>=1;
+     if(!(level || ((unsigned)point<ht->treelen)))
+     {
+-      register int xx,yy;
++      int xx,yy;
+ 
+       xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment
+       yy=(h->ylen<<1);
+@@ -689,7 +689,7 @@ inline void Mpegtoraw::huffmandecoder_2(const HUFFMANCODETABLE *h,
+   {
+     if(h->val[point][0]==0)
+     {   /*end of tree*/
+-      register int t=h->val[point][1];
++      int t=h->val[point][1];
+ 
+       if(t&8)*v=1-(wgetbit()<<1); else *v=0;
+       if(t&4)*w=1-(wgetbit()<<1); else *w=0;
+@@ -761,7 +761,7 @@ void Mpegtoraw::layer3huffmandecode(int ch,int gr,int out[SBLIMIT][SSLIMIT])
+   for(i=0;i<e;)
+   {
+     const HUFFMANCODETABLE *h;
+-    register int end;
++    int end;
+       
+     if     (i<region1Start)
+     {
+@@ -867,10 +867,10 @@ void Mpegtoraw::layer3dequantizesample(int ch,int gr,
+ 		{
+ 			cb_width=(sfBandIndex->s[cb+1]-sfBandIndex->s[cb])>>1;
+ 
+-			for(register int k=0;k<3;k++)
++			for(int k=0;k<3;k++)
+ 			{
+-				register REAL factor;
+-				register int count=cb_width;
++				REAL factor;
++				int count=cb_width;
+ 
+ 				factor=globalgain*
+ 					layer3twopow2_1(gi->subblock_gain[k],gi->scalefac_scale,
+@@ -1249,7 +1249,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT])
+ 			do{
+ 				if(is_pos[i]==7)
+ 				{
+-					register REAL t=in[LS][0][i];
++					REAL t=in[LS][0][i];
+ 					in[LS][0][i]=(t+in[RS][0][i])*0.7071068f;
+ 					in[RS][0][i]=(t-in[RS][0][i])*0.7071068f;
+ 				}
+@@ -1278,7 +1278,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT])
+ 		{
+ 			int i=ARRAYSIZE-1;
+ 			do{
+-				register REAL t=in[LS][0][i];
++				REAL t=in[LS][0][i];
+ 
+ 				in[LS][0][i]=(t+in[RS][0][i])*0.7071068f;
+ 				in[RS][0][i]=(t-in[RS][0][i])*0.7071068f;
+@@ -1400,7 +1400,7 @@ void Mpegtoraw::layer3reorderandantialias(int ch,int gr,
+ 					  REAL  in[SBLIMIT][SSLIMIT],
+ 					  REAL out[SBLIMIT][SSLIMIT])
+ {
+-  register layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
++  layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
+ 
+   if(gi->generalflag)
+   {
+@@ -1438,7 +1438,7 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out)
+     MACRO0(v); }
+ 
+   {
+-    register REAL *in = inbuf;
++    REAL *in = inbuf;
+    
+     in[17]+=in[16];in[16]+=in[15];in[15]+=in[14];in[14]+=in[13]; 
+     in[13]+=in[12];in[12]+=in[11];in[11]+=in[10];in[10]+=in[ 9];
+@@ -1450,10 +1450,10 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out)
+     in[ 9]+=in[ 7];in[7] +=in[ 5];in[ 5]+=in[ 3];in[ 3]+=in[ 1];
+ 
+     {
+-      register REAL *c = cos_18;
+-      register REAL *out2 = prevblk2;
+-      register REAL *out1 = prevblk1;
+-      register REAL *ts = out;
++      REAL *c = cos_18;
++      REAL *out2 = prevblk2;
++      REAL *out1 = prevblk1;
++      REAL *ts = out;
+       
+       REAL ta33,ta66,tb33,tb66;
+ 
+@@ -1513,7 +1513,7 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out)
+ }
+ 
+ 
+-static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,register REAL *out)
++static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out)
+ {
+ #define DCT12_PART1   \
+         in5=in[5*3];  \
+@@ -1547,7 +1547,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis
+ 
+   {
+     REAL in0,in1,in2,in3,in4,in5;
+-    register REAL *pb1=prevblk1;
++    REAL *pb1=prevblk1;
+     out[SBLIMIT*0]=pb1[0];out[SBLIMIT*1]=pb1[1];out[SBLIMIT*2]=pb1[2];
+     out[SBLIMIT*3]=pb1[3];out[SBLIMIT*4]=pb1[4];out[SBLIMIT*5]=pb1[5];
+  
+@@ -1556,7 +1556,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis
+     {
+       REAL tmp0,tmp1=(in0-in4);
+       {
+-	register REAL tmp2=(in1-in5)*hsec_12[1];
++	REAL tmp2=(in1-in5)*hsec_12[1];
+ 	tmp0=tmp1+tmp2;
+ 	tmp1-=tmp2;
+       }
+@@ -1581,7 +1581,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis
+   in++;
+   {
+     REAL in0,in1,in2,in3,in4,in5;
+-    register REAL *pb2 = prevblk2;
++    REAL *pb2 = prevblk2;
+  
+     DCT12_PART1;
+ 
+@@ -1614,7 +1614,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis
+   in++; 
+   {
+     REAL in0,in1,in2,in3,in4,in5;
+-    register REAL *pb2 = prevblk2;
++    REAL *pb2 = prevblk2;
+     pb2[12]=pb2[13]=pb2[14]=pb2[15]=pb2[16]=pb2[17]=0.0;
+ 
+     DCT12_PART1;
+@@ -1719,14 +1719,14 @@ void Mpegtoraw::extractlayer3(void)
+ 				 
+ 		if(issync())
+ 		{
+-			for(register int i=layer3slots;i>0;i--)  // read main data.
++			for(int i=layer3slots;i>0;i--)  // read main data.
+ 			{
+ 				bitwindow.putbyte(getbyte());
+ 			}
+ 		}
+ 		else
+ 		{
+-			for(register int i=layer3slots;i>0;i--)  // read main data.
++			for(int i=layer3slots;i>0;i--)  // read main data.
+ 			{
+ 				bitwindow.putbyte(getbits8());
+ 			}
+@@ -1799,7 +1799,7 @@ void Mpegtoraw::extractlayer3(void)
+ 			layer3reorderandantialias(RS,gr,b2.lr[RS],b1.hin[RS]);
+ 			layer3hybrid (RS,gr,b1.hin[RS],b2.hout[RS]);
+ 
+-			register int i=2*SSLIMIT*SBLIMIT-1;
++			int i=2*SSLIMIT*SBLIMIT-1;
+ 
+ 			do{
+ 				NEG(b2.hout[0][0][i		]);NEG(b2.hout[0][0][i- 2]);
+@@ -1814,7 +1814,7 @@ void Mpegtoraw::extractlayer3(void)
+ 		}
+ 		else
+ 		{
+-			register int i=SSLIMIT*SBLIMIT-1;
++			int i=SSLIMIT*SBLIMIT-1;
+ 			do{
+ 				NEG(b2.hout[0][0][i		]);NEG(b2.hout[0][0][i- 2]);
+ 				NEG(b2.hout[0][0][i- 4]);NEG(b2.hout[0][0][i- 6]);
+@@ -1844,12 +1844,12 @@ void Mpegtoraw::extractlayer3_2(void)
+ 	 
+     if(issync())
+     {
+-      for(register int i=layer3slots;i>0;i--)  // read main data.
++      for(int i=layer3slots;i>0;i--)  // read main data.
+ 	bitwindow.putbyte(getbyte());
+     }
+     else
+     {
+-      for(register int i=layer3slots;i>0;i--)  // read main data.
++      for(int i=layer3slots;i>0;i--)  // read main data.
+ 	bitwindow.putbyte(getbits8());
+     }
+     bitwindow.wrap();
+@@ -1912,7 +1912,7 @@ void Mpegtoraw::extractlayer3_2(void)
+       layer3reorderandantialias(RS,0,b2.lr[RS],b1.hin[RS]);
+       layer3hybrid (RS,0,b1.hin[RS],b2.hout[RS]);
+ 
+-      register int i=2*SSLIMIT*SBLIMIT-1;
++      int i=2*SSLIMIT*SBLIMIT-1;
+       do{
+ 	NEG(b2.hout[0][0][i-16]);NEG(b2.hout[0][0][i-18]);
+ 	NEG(b2.hout[0][0][i-20]);NEG(b2.hout[0][0][i-22]);
+@@ -1922,7 +1922,7 @@ void Mpegtoraw::extractlayer3_2(void)
+     }
+     else
+     {
+-      register int i=SSLIMIT*SBLIMIT-1;
++      int i=SSLIMIT*SBLIMIT-1;
+       do{
+ 	NEG(b2.hout[0][0][i-16]);NEG(b2.hout[0][0][i-18]);
+ 	NEG(b2.hout[0][0][i-20]);NEG(b2.hout[0][0][i-22]);
+--- a/mpegsound/mpegsound_locals.h
++++ b/mpegsound/mpegsound_locals.h
+@@ -8,6 +8,8 @@
+ #ifndef _L__SOUND_LOCALS__
+ #define _L__SOUND_LOCALS__
+ 
++#include "mpegsound.h"
++
+ extern void debug(const char*, ... );
+ // Inline functions
+ inline int Mpegtoraw::getbyte(void)
+@@ -20,7 +22,7 @@ inline int Mpegtoraw::getbyte(void)
+ 
+ inline int Mpegtoraw::getbits9(int bits)
+ {
+-  register unsigned short a;
++  unsigned short a;
+   int offset=bitindex>>3;
+ 
+   a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
+@@ -32,7 +34,7 @@ inline int Mpegtoraw::getbits9(int bits)
+ 
+ inline int Mpegtoraw::getbits8(void)
+ {
+-  register unsigned short a;
++  unsigned short a;
+   int offset=bitindex>>3;
+ 
+   a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
+@@ -44,7 +46,7 @@ inline int Mpegtoraw::getbits8(void)
+ 
+ inline int Mpegtoraw::getbit(void)
+ {
+-  register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
++  int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
+ 
+   bitindex++;
+   return r;
+--- a/mpegsound/mpegtoraw.cc
++++ b/mpegsound/mpegtoraw.cc
+@@ -779,8 +779,8 @@ inline void parseID3(Soundinputstream *fp,ID3 *data)
+ // Mpeg header class
+ bool Mpegtoraw::initialize(const char *filename)
+ {
+-	register int i;
+-	register REAL *s1,*s2;
++	int i;
++	REAL *s1,*s2;
+ 	REAL *s3,*s4;
+ 	static bool initialized=false;
+ 
+@@ -1153,7 +1153,7 @@ void Mpegtoraw::clearbuffer(void)
+ //header is not found at the exact location of the filepointer at call time.
+ bool Mpegtoraw::loadheader(bool lookahead)
+ {
+-	register int c;
++	int c;
+ 	bool flag;
+ 	int bytes_read = 0;
+ 
+--- a/mpegsound/rawplayer.cc
++++ b/mpegsound/rawplayer.cc
+@@ -326,8 +326,8 @@ int Rawplayer::fix_samplesize(void *buffer, int size)
+ 
+ 	if(forcetomono || forceto8)
+ 	{
+-		register unsigned char modify=0;
+-		register unsigned char *source,*dest;
++		unsigned char modify=0;
++		unsigned char *source,*dest;
+ 		int increment=0,c;
+ 
+ 		source=dest=(unsigned char *)buffer;
+@@ -381,8 +381,8 @@ bool Rawplayer::putblock(void *buffer,int size)
+ 
+ 	if(forcetomono || forceto8)
+ 	{
+-		register unsigned char modify=0;
+-		register unsigned char *source,*dest;
++		unsigned char modify=0;
++		unsigned char *source,*dest;
+ 		int increment=0,c;
+ 
+ 		source=dest=(unsigned char *)buffer;
+@@ -408,7 +408,7 @@ bool Rawplayer::putblock(void *buffer,int size)
+ 	}
+ 
+ #if defined(AUDIO_NONBLOCKING) || defined(NEWTHREAD)
+-	register ssize_t
++	ssize_t
+ 		wsize,
+ 		remainsize = modifiedsize;
+ 	char *wbuf = (char*)buffer;
+--- a/src/splay_common.cc
++++ b/src/splay_common.cc
+@@ -66,7 +66,7 @@ const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
+ static bool argsflag=false;
+ void arglist(int argc,char *argv[],int start)
+ {
+-  register int i;
++  int i;
+ 
+   argsflag=true;
+   for(i=start;(i<argc) && (splay_listsize<MAXLISTSIZE); i++)
diff --git a/media-sound/mp3blaster/metadata.xml b/media-sound/mp3blaster/metadata.xml
index f404c281e876..9cceb63ddd89 100644
--- a/media-sound/mp3blaster/metadata.xml
+++ b/media-sound/mp3blaster/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
-  <use>
-    <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">mp3blaster</remote-id>
+    <remote-id type="github">stragulus/mp3blaster</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6-r2.ebuild
index 391c1d5fb9c3..d99dadda54e6 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6-r2.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Text console based program for playing audio files"
 HOMEPAGE="http://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~riscv sparc x86"
 IUSE="lirc oss +sdl sid vorbis"
+REQUIRED_USE="|| ( oss sdl )"
 
 RDEPEND="
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:=
 	lirc? ( app-misc/lirc )
 	sdl? ( media-libs/libsdl )
 	sid? ( media-libs/libsidplay:1 )
 	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	x11-misc/imake
+DEPEND="
+	${RDEPEND}
 	oss? ( virtual/os-headers )"
+BDEPEND="x11-misc/imake"
 
-REQUIRED_USE="|| ( oss sdl )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
 	"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
+	"${FILESDIR}"/${PN}-3.2.6-drop-register-keyword.patch
 )
 
 src_prepare() {
@@ -57,8 +59,8 @@ src_install() {
 	default
 
 	# relocate everything except commands.txt because it's used by src/main.cc
-	mv -vf "${ED%/}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
+	mv -vf "${ED}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
 
 	# file collision with media-sound/splay
-	mv -vf "${ED%/}"/usr/bin/splay{,_mp3blaster} || die
+	mv -vf "${ED}"/usr/bin/splay{,_mp3blaster} || die
 }
diff --git a/media-sound/mp3c/metadata.xml b/media-sound/mp3c/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/mp3c/metadata.xml
+++ b/media-sound/mp3c/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/mp3cat/metadata.xml b/media-sound/mp3cat/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/mp3cat/metadata.xml
+++ b/media-sound/mp3cat/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/mp3check/metadata.xml b/media-sound/mp3check/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/mp3check/metadata.xml
+++ b/media-sound/mp3check/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
index 757721839e47..9142c3a87415 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>kensington@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">mp3diags</remote-id>
 	</upstream>
diff --git a/media-sound/mp3diags/mp3diags-1.5.01.ebuild b/media-sound/mp3diags/mp3diags-1.5.01-r1.ebuild
index 58c6ebc2190d..b255fbbcf6d3 100644
--- a/media-sound/mp3diags/mp3diags-1.5.01.ebuild
+++ b/media-sound/mp3diags/mp3diags-1.5.01-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Qt-based MP3 diagnosis and repair tool"
 HOMEPAGE="http://mp3diags.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-2"
 SLOT="0"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
diff --git a/media-sound/mp3gain/metadata.xml b/media-sound/mp3gain/metadata.xml
index fd6447570dcf..f7b6e0596fec 100644
--- a/media-sound/mp3gain/metadata.xml
+++ b/media-sound/mp3gain/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
diff --git a/media-sound/mp3gain/mp3gain-1.6.2.ebuild b/media-sound/mp3gain/mp3gain-1.6.2.ebuild
index 71da3cd40b67..22860fa1fc32 100644
--- a/media-sound/mp3gain/mp3gain-1.6.2.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,14 @@ inherit toolchain-funcs
 
 MY_P="${P//./_}"
 
-DESCRIPTION="A program to analyze and adjust MP3 files to same volume"
-HOMEPAGE="http://mp3gain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
+DESCRIPTION="Analyze and adjust MP3 files to same volume"
+HOMEPAGE="https://mp3gain.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}-src.zip"
 S="${WORKDIR}"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="media-sound/mpg123"
diff --git a/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch b/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
index 4881b91eb29f..61b520f5aa73 100644
--- a/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
+++ b/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
@@ -9,7 +9,7 @@
  
  gmp3info: $(XSRC) $(XOBJ) 
 -	$(CC) $(XSRC) $(CFLAGS) -o $@ $(XOBJ) `pkg-config --cflags --libs gtk+-2.0`
-+	$(CC) $(XSRC) $(CFLAGS) $(LDFLAGS) -o $@ $(XOBJ) `pkg-config --cflags --libs gtk+-2.0`
++	$(CC) $(XSRC) $(CFLAGS) $(LDFLAGS) -o $@ $(XOBJ) `${PKG_CONFIG} --cflags --libs gtk+-2.0`
  
  mp3info.txt: mp3info.1
  	groff -t -e -mandoc -Tascii mp3info.1 | col -bx > mp3info.txt
diff --git a/media-sound/mp3info/files/mp3info-0.8.5a-musl.patch b/media-sound/mp3info/files/mp3info-0.8.5a-musl.patch
new file mode 100644
index 000000000000..1b190c29d61d
--- /dev/null
+++ b/media-sound/mp3info/files/mp3info-0.8.5a-musl.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/717014
+--- a/mp3tech.c
++++ b/mp3tech.c
+@@ -279,7 +279,7 @@ char *header_mode(mp3header *h) {
+ }
+ 
+ int sameConstant(mp3header *h1, mp3header *h2) {
+-    if((*(uint*)h1) == (*(uint*)h2)) return 1;
++    if((*(unsigned int*)h1) == (*(unsigned int*)h2)) return 1;
+ 
+     if((h1->version       == h2->version         ) &&
+        (h1->layer         == h2->layer           ) &&
diff --git a/media-sound/mp3info/metadata.xml b/media-sound/mp3info/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/mp3info/metadata.xml
+++ b/media-sound/mp3info/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index f59b6efb37a6..5a61609ea488 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk"
 
 BDEPEND="
@@ -27,11 +27,16 @@ PATCHES=(
 	"${FILESDIR}/${P}-ldflags.patch"
 	"${FILESDIR}/${P}-tinfo.patch"
 	"${FILESDIR}/${P}-format-security.patch"
+	"${FILESDIR}/${P}-musl.patch"
 )
 
 src_compile() {
-	tc-export PKG_CONFIG
-	emake mp3info $(usex gtk gmp3info '') CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		mp3info \
+		$(usex gtk gmp3info '')
 }
 
 src_install() {
diff --git a/media-sound/mp3report/metadata.xml b/media-sound/mp3report/metadata.xml
index d3d7fdc0b573..86236559a6cd 100644
--- a/media-sound/mp3report/metadata.xml
+++ b/media-sound/mp3report/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mp3report/mp3report-1.0.2.ebuild b/media-sound/mp3report/mp3report-1.0.2.ebuild
index 9d7c418407b0..e0ca2d8faa23 100644
--- a/media-sound/mp3report/mp3report-1.0.2.ebuild
+++ b/media-sound/mp3report/mp3report-1.0.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Perl script to create an HTML report of MP3 files in a directory"
-HOMEPAGE="http://mp3report.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PF}.tar.gz"
+HOMEPAGE="https://mp3report.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${PF}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/media-sound/mp3splt-gtk/metadata.xml b/media-sound/mp3splt-gtk/metadata.xml
index fa7e71f336a3..d278731c33e9 100644
--- a/media-sound/mp3splt-gtk/metadata.xml
+++ b/media-sound/mp3splt-gtk/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">mp3splt/mp3splt</remote-id>
 		<remote-id type="sourceforge">mp3splt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
index 0e4839d68d47..b02f9c2f01f7 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools xdg
 
-DESCRIPTION="A GTK+ based utility to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
+DESCRIPTION="GTK+ based utility to split mp3 and ogg files without decoding"
+HOMEPAGE="https://mp3splt.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/mp3splt/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc gstreamer nls"
diff --git a/media-sound/mp3splt/metadata.xml b/media-sound/mp3splt/metadata.xml
index fa7e71f336a3..d278731c33e9 100644
--- a/media-sound/mp3splt/metadata.xml
+++ b/media-sound/mp3splt/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">mp3splt/mp3splt</remote-id>
 		<remote-id type="sourceforge">mp3splt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
index 70287bb74e75..80d72b66a203 100644
--- a/media-sound/mp3splt/mp3splt-2.6.2.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib
+DESCRIPTION="Command line utility to split mp3 and ogg files without decoding"
+HOMEPAGE="https://mp3splt.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
-DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="flac"
 
 RDEPEND=">=media-libs/libmp3splt-0.9.2-r1[flac?]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 src_configure() {
 	econf \
diff --git a/media-sound/mp3unicode/metadata.xml b/media-sound/mp3unicode/metadata.xml
index 1027a2ef2e39..7ff2e94927a4 100644
--- a/media-sound/mp3unicode/metadata.xml
+++ b/media-sound/mp3unicode/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild b/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
index f72c781ad0e8..96f8b3a03f3f 100644
--- a/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
+++ b/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Commandline utility to convert ID3 tags in mp3 files between different encodings"
-HOMEPAGE="http://mp3unicode.sourceforge.net"
-SRC_URI="https://github.com/alonbl/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://mp3unicode.sourceforge.net
+  https://github.com/alonbl/mp3unicode"
+SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch b/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch
new file mode 100644
index 000000000000..8da20930602f
--- /dev/null
+++ b/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -1,7 +1,7 @@
+-CXXFLAGS=-Wall -O2

++CXXFLAGS += -Wall

+ 

+ mp3val: main.o mpegparse.o out.o report.o crossapi.o crc.o

+-	$(CXX) $(CXXFLAGS) $^ -o $@

++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $^ -o $@

+ 

+ clean:

+ 	rm -f mp3val

diff --git a/media-sound/mp3val/files/mp3val-0.1.8-open.patch b/media-sound/mp3val/files/mp3val-0.1.8-open.patch
index 2b844c1fac1e..499e23272387 100644
--- a/media-sound/mp3val/files/mp3val-0.1.8-open.patch
+++ b/media-sound/mp3val/files/mp3val-0.1.8-open.patch
@@ -1,11 +1,11 @@
---- mp3val-0.1.8-src/crossapi.cpp.orig	2010-05-03 10:45:53.000000000 -0700
-+++ mp3val-0.1.8-src/crossapi.cpp	2017-02-19 23:38:21.000000000 -0000
+--- a/crossapi.cpp
++++ b/crossapi.cpp
 @@ -241,7 +241,7 @@
- //Moving failed due to different logical drives of source and destination. Let's copy:
- 	id=open(szOldName,O_RDONLY);
- 	if(id==-1) return 0;
--	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC);
-+	od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
- 	if(od==-1) {
- 		close(id);
- 		return 0;
+ //Moving failed due to different logical drives of source and destination. Let's copy:

+ 	id=open(szOldName,O_RDONLY);

+ 	if(id==-1) return 0;

+-	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC);

++	od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);

+ 	if(od==-1) {

+ 		close(id);

+ 		return 0;

diff --git a/media-sound/mp3val/metadata.xml b/media-sound/mp3val/metadata.xml
index 9883d35b70f1..eea7c01c7116 100644
--- a/media-sound/mp3val/metadata.xml
+++ b/media-sound/mp3val/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
diff --git a/media-sound/mp3val/mp3val-0.1.8-r1.ebuild b/media-sound/mp3val/mp3val-0.1.8-r1.ebuild
new file mode 100644
index 000000000000..cf2ec6832def
--- /dev/null
+++ b/media-sound/mp3val/mp3val-0.1.8-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Validate and fix MPEG audio files"
+HOMEPAGE="http://mp3val.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/mp3val/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-open.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake -f Makefile.linux
+}
+
+src_install() {
+	dobin mp3val
+
+	dodoc changelog.txt
+	docinto html
+	dodoc manual.html
+}
diff --git a/media-sound/mp3val/mp3val-0.1.8.ebuild b/media-sound/mp3val/mp3val-0.1.8.ebuild
deleted file mode 100644
index ed2f5fc906a3..000000000000
--- a/media-sound/mp3val/mp3val-0.1.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Validate and fix MPEG audio files"
-HOMEPAGE="http://mp3val.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mp3val/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}/${P}-open.patch"
-)
-
-src_prepare() {
-	edos2unix "${S}"/{*.{cpp,h},Makefile*}
-	chmod a-x "${S}"/*
-	sed -i -e '/^C.*FLAGS.*=/d' "${S}"/Makefile.linux
-	default
-}
-
-src_compile() {
-	emake -f Makefile.linux
-}
-
-src_install() {
-	dobin mp3val
-	dohtml manual.html
-	dodoc changelog.txt
-}
diff --git a/media-sound/mp3wrap/metadata.xml b/media-sound/mp3wrap/metadata.xml
index 42b0671c0758..f26a6ebc45db 100644
--- a/media-sound/mp3wrap/metadata.xml
+++ b/media-sound/mp3wrap/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mp3wrap/mp3wrap-0.5.ebuild b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
index c0f1e36d268f..c93813110524 100644
--- a/media-sound/mp3wrap/mp3wrap-0.5.ebuild
+++ b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
@@ -1,18 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Command-line utility that wraps multiple mp3 files into one large playable mp3"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-HOMEPAGE="http://mp3wrap.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz"
+HOMEPAGE="https://mp3wrap.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch )
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_install() {
 	dobin mp3wrap
 
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index c88ce1010cde..6efb8dd08870 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1 +1 @@
-DIST mpc-0.33.tar.xz 45044 BLAKE2B 220848e088964297fbaddeedf61d5ddc90386df360a6af81b2d3753517f7ee36ff3d9462242f38b17c991996927a7d1fc253e1006253f2f875023ddb75a800c2 SHA512 d3247dfb54ac3c95caf5666088968a952b33eb7e8f941bca4f3715603839cf5a1bc5300488c78fdce6e38f612b243f2252ea682b8d0fec9f230acd760bf3560c
+DIST mpc-0.35.tar.xz 49820 BLAKE2B 7e47d78b762b7334f5fec13897bdf11859310932371a55c189c4554b347f097852e5fa17be3df03d047fabcc60699a3b310d0aa395aadd96a5ebff009a2ddba0 SHA512 be7ec268432eb8e34092d025e6a40379e83d54e5f87943beeb87ed8fe9db4c5c8261b09cc3230ada28300151382f97b1c2da45f54e8aad68af9946f484d0b28b
diff --git a/media-sound/mpc/metadata.xml b/media-sound/mpc/metadata.xml
index 9785ddfc347b..76093b170e90 100644
--- a/media-sound/mpc/metadata.xml
+++ b/media-sound/mpc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">MusicPlayerDaemon/mpc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/mpc/mpc-0.33.ebuild b/media-sound/mpc/mpc-0.35.ebuild
index 0cb9a5d01453..a81ca8f09c5d 100644
--- a/media-sound/mpc/mpc-0.33.ebuild
+++ b/media-sound/mpc/mpc-0.35.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1 meson
 
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc iconv test"
 
 BDEPEND="
diff --git a/media-sound/mpck/files/mpck-0.15-implicit-func-decl.patch b/media-sound/mpck/files/mpck-0.15-implicit-func-decl.patch
new file mode 100644
index 000000000000..2c30d369599c
--- /dev/null
+++ b/media-sound/mpck/files/mpck-0.15-implicit-func-decl.patch
@@ -0,0 +1,10 @@
+--- a/mpck/file.c
++++ b/mpck/file.c
+@@ -27,6 +27,7 @@
+ #include "file.h"
+ #include "mp3errors.h"
+ #include "options.h"
++#include "print.h"
+ 
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
diff --git a/media-sound/mpck/metadata.xml b/media-sound/mpck/metadata.xml
index 5f92e8882156..0fe4d742016e 100644
--- a/media-sound/mpck/metadata.xml
+++ b/media-sound/mpck/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
 <maintainer type="project">
   <email>sound@gentoo.org</email>
   <name>Gentoo Sound project</name>
diff --git a/media-sound/mpck/mpck-0.15.ebuild b/media-sound/mpck/mpck-0.15-r1.ebuild
index 1df48af46667..dfc0a2940a94 100644
--- a/media-sound/mpck/mpck-0.15.ebuild
+++ b/media-sound/mpck/mpck-0.15-r1.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P=checkmate-${PV}
 
 DESCRIPTION="Checks MP3s for errors"
 HOMEPAGE="http://mpck.linuxonly.nl/"
 SRC_URI="http://checkmate.linuxonly.nl/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( ABOUT_FIXING AUTHORS ChangeLog HISTORY NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15-implicit-func-decl.patch
+)
diff --git a/media-sound/mpd-ynca/Manifest b/media-sound/mpd-ynca/Manifest
new file mode 100644
index 000000000000..b346f7cbeb29
--- /dev/null
+++ b/media-sound/mpd-ynca/Manifest
@@ -0,0 +1 @@
+DIST mpd-ynca-0.2.0.tar.gz 12555 BLAKE2B b8fe262dc3abebd134640e4c4472030d9be728c1428629193e5d93e5c80e97335e57f66c444e26530b943f5daa5fbcd3c1dab106517dc23ee4b69f8296a6fd48 SHA512 5a0adac8f4fd01b3adf33c905e29ba23010c9153c27fa30dfbd9906c60e9cf0c26c057cc6d7c68f8538e63e7fda30eba98119a02296cf0c8be019b31d9adef92
diff --git a/media-sound/mpd-ynca/files/mpd-ynca.confd b/media-sound/mpd-ynca/files/mpd-ynca.confd
new file mode 100644
index 000000000000..a042a82ceed0
--- /dev/null
+++ b/media-sound/mpd-ynca/files/mpd-ynca.confd
@@ -0,0 +1,7 @@
+# MPD client connection settings. You don't need to set these if using the mpd
+# service locally. See https://mpd.readthedocs.io/en/latest/client.html for
+# details.
+
+# MPD_HOST=localhost
+# MPD_PORT=6600
+# MPD_TIMEOUT=30
diff --git a/media-sound/mpd-ynca/files/mpd-ynca.initd b/media-sound/mpd-ynca/files/mpd-ynca.initd
new file mode 100644
index 000000000000..d18e3eeaec51
--- /dev/null
+++ b/media-sound/mpd-ynca/files/mpd-ynca.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+export \
+	MPD_HOST \
+	MPD_PORT \
+	MPD_TIMEOUT
+
+pidfile="/run/${RC_SVCNAME}.pid"
+command="/usr/bin/mpd-ynca"
+command_user="mpd"
+command_background="yes"
+
+depend() {
+	after mpd
+}
diff --git a/media-sound/mpd-ynca/metadata.xml b/media-sound/mpd-ynca/metadata.xml
new file mode 100644
index 000000000000..1ce0e8c683b6
--- /dev/null
+++ b/media-sound/mpd-ynca/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">chewi/mpd-ynca</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mpd-ynca/mpd-ynca-0.2.0.ebuild b/media-sound/mpd-ynca/mpd-ynca-0.2.0.ebuild
new file mode 100644
index 000000000000..5493bd5a1c4c
--- /dev/null
+++ b/media-sound/mpd-ynca/mpd-ynca-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="MPD client to control Yamaha AV receivers with YNCA (network control) support"
+HOMEPAGE="https://github.com/chewi/mpd-ynca"
+SRC_URI="https://github.com/chewi/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64"
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	acct-user/mpd
+	dev-libs/boost:=
+	media-libs/libmpdclient
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 62a1ed63dfa1..800fb21c8859 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,4 +1,3 @@
-DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a
-DIST mpd-0.22.1.tar.xz 725204 BLAKE2B 7032472776129c9cb302545d8bdd266a7551df4647d6fc09e9f5e287f25b25158759316dde5bb481a7b87366d7eaa5a91613bbc6679a9f1b768297b63b1fb9fb SHA512 b7c0156bb85bbc551435bbb9a49ed719e51fe0446dcecbaadbe083e705fc16da9d03d83814c7dcc041075a46544473cf63e5d1576dbc3961bfdfa44ef5fb27d7
-DIST mpd-0.22.2.tar.xz 725808 BLAKE2B 5961177dd33b5e008b17131c6a83b8fc61df62317acdfd6bac4e20a9e31111d1307be79223a23fdaa0e2ae0593aa8015ac140648ea4b5b699a8b64632fc589ef SHA512 13ec85bda79d0c2588c50e2ebbf53b733f23c9700abfd7ccd4140db8080a4c496073727c8c04e9a2f8897669beeced0d77caa2bac7e2ca9adb41ad56dcf92aeb
-DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
+DIST mpd-0.23.12.tar.xz 774708 BLAKE2B b218d9f477e92842638e3fba44c84957a3f656adaaf1ece998847db8d64883b8c997703206f74b37043888757f5f628799a3a35b25ea991f9ad00df1c4ad5e71 SHA512 54495b839d86b47ae6e2f6cf4e1baebd0e8eb924742e9db42cc7462ffc4b6f650b83f3eaea291fe905ff5f1975cf875537ffd23a111724013ce58e6df26ce36e
+DIST mpd-0.23.13.tar.xz 776668 BLAKE2B 02907f08cc504d0fbf703179b333b301c7ad8fc8535d85305faa7962dd7faa164f4492286902cb48eaf3db2a1445b541b1261c18a89ca8a73e80016af9581e26 SHA512 1ef2b3a2089aa6078a455e43a2fb9097dc0d5b27b170e6d64e416d5e82349a794eb0acf8db72a975ad024083e872e4a1bd0e0fd51302d327d373b61f01bb819d
+DIST mpd-0.23.15.tar.xz 778384 BLAKE2B 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7 SHA512 12329dbd0c1994c1bd95b88ce2a62a4c1d691b655e9e4fac7e9ef7066d0be3422b26fad3ea6ca144ba9b21add0a7c492c4f74fd2b68a1539bff2e0d2714db709
diff --git a/media-sound/mpd/files/mpd-0.18.conf.patch b/media-sound/mpd/files/mpd-0.18.conf.patch
deleted file mode 100644
index d71056f7cd0d..000000000000
--- a/media-sound/mpd/files/mpd-0.18.conf.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/doc/mpdconf.dist b/doc/mpdconf.dist
-index 470a5c9..9f595a6 100644
---- a/doc/mpdconf.dist
-+++ b/doc/mpdconf.dist
-@@ -10,14 +10,14 @@
- # be disabled and audio files will only be accepted over ipc socket (using
- # file:// protocol) or streaming files over an accepted protocol.
- #
--#music_directory		"~/music"
-+music_directory			"/var/lib/mpd/music"
- #
- # This setting sets the MPD internal playlist directory. The purpose of this
- # directory is storage for playlists created by MPD. The server will use 
- # playlist files not created by the server but only if they are in the MPD
- # format. This setting defaults to playlist saving being disabled.
- #
--#playlist_directory		"~/.mpd/playlists"
-+playlist_directory		"/var/lib/mpd/playlists"
- #
- # This setting sets the location of the MPD database. This file is used to
- # load the database at server start up and store the database while the 
-@@ -25,7 +25,7 @@
- # MPD to accept files over ipc socket (using file:// protocol) or streaming
- # files over an accepted protocol.
- #
--#db_file			"~/.mpd/database"
-+db_file			"/var/lib/mpd/database"
- # 
- # These settings are the locations for the daemon log files for the daemon.
- # These logs are great for troubleshooting, depending on your log_level
-@@ -34,20 +34,20 @@
- # The special value "syslog" makes MPD use the local syslog daemon. This
- # setting defaults to logging to syslog, otherwise logging is disabled.
- #
--#log_file			"~/.mpd/log"
-+log_file			"/var/lib/mpd/log"
- #
- # This setting sets the location of the file which stores the process ID
--# for use of mpd --kill and some init scripts. This setting is disabled by
--# default and the pid file will not be stored.
-+# for use of mpd --kill and some init scripts. This setting is required when
-+# using the Gentoo init script.
- #
--#pid_file			"~/.mpd/pid"
-+pid_file			"/var/lib/mpd/pid"
- #
- # This setting sets the location of the file which contains information about
- # most variables to get MPD back into the same general shape it was in before
- # it was brought down. This setting is disabled by default and the server 
- # state will be reset on server start up.
- #
--#state_file			"~/.mpd/state"
-+state_file			"/var/lib/mpd/state"
- #
- # The location of the sticker database.  This is a database which
- # manages dynamic information attached to songs.
-@@ -64,7 +64,7 @@
- # initialization. This setting is disabled by default and MPD is run as the
- # current user.
- #
--#user				"nobody"
-+user				"mpd"
- #
- # This setting specifies the group that MPD will run as. If not specified
- # primary group of user specified with "user" setting will be used (if set).
-@@ -78,10 +78,10 @@
- # This setting can deny access to control of the daemon.
- #
- # For network
--#bind_to_address		"any"
-+bind_to_address		"localhost"
- #
- # And for Unix Socket
--#bind_to_address		"~/.mpd/socket"
-+bind_to_address		"/var/lib/mpd/socket"
- #
- # This setting is the TCP port that is desired for the daemon to get assigned
- # to.
diff --git a/media-sound/mpd/files/mpd-0.21.4.init b/media-sound/mpd/files/mpd-0.21.4.init
index 72fede85765a..31336a5b1254 100644
--- a/media-sound/mpd/files/mpd-0.21.4.init
+++ b/media-sound/mpd/files/mpd-0.21.4.init
@@ -6,7 +6,7 @@
 
 depend() {
 	need localmount
-	use net netmount nfsmount alsasound esound pulseaudio
+	use net netmount alsasound esound pulseaudio
 	config ${CFGFILE}
 }
 
diff --git a/media-sound/mpd/files/mpd-0.23.12-libfmt10-906074.patch b/media-sound/mpd/files/mpd-0.23.12-libfmt10-906074.patch
new file mode 100644
index 000000000000..7fc5187a54f3
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.23.12-libfmt10-906074.patch
@@ -0,0 +1,102 @@
+libfmt 10 changed the API, requiring a few adjustments to the codebase.
+This backports the upstream fixes for building against libfmt 10.
+
+Bug: https://bugs.gentoo.org/906074
+
+--- a/src/SongPrint.cxx
++++ b/src/SongPrint.cxx
+@@ -24,6 +24,7 @@
+ #include "TagPrint.hxx"
+ #include "client/Response.hxx"
+ #include "fs/Traits.hxx"
++#include "lib/fmt/AudioFormatFormatter.hxx"
+ #include "time/ChronoUtil.hxx"
+ #include "util/StringBuffer.hxx"
+ #include "util/UriUtil.hxx"
+@@ -93,7 +94,7 @@ song_print_info(Response &r, const LightSong &song, bool base) noexcept
+ 		time_print(r, "Last-Modified", song.mtime);
+ 
+ 	if (song.audio_format.IsDefined())
+-		r.Fmt(FMT_STRING("Format: {}\n"), ToString(song.audio_format));
++		r.Fmt(FMT_STRING("Format: {}\n"), song.audio_format);
+ 
+ 	tag_print_values(r, song.tag);
+ 
+@@ -116,7 +117,7 @@ song_print_info(Response &r, const DetachedSong &song, bool base) noexcept
+ 		time_print(r, "Last-Modified", song.GetLastModified());
+ 
+ 	if (const auto &f = song.GetAudioFormat(); f.IsDefined())
+-		r.Fmt(FMT_STRING("Format: {}\n"), ToString(f));
++		r.Fmt(FMT_STRING("Format: {}\n"), f);
+ 
+ 	tag_print_values(r, song.GetTag());
+ 
+--- a/src/TagPrint.cxx
++++ b/src/TagPrint.cxx
+@@ -21,7 +21,6 @@
+ #include "tag/Tag.hxx"
+ #include "tag/Settings.hxx"
+ #include "client/Response.hxx"
+-#include "util/StringView.hxx"
+ 
+ #include <fmt/format.h>
+ 
+@@ -35,7 +34,7 @@ tag_print_types(Response &r) noexcept
+ }
+ 
+ void
+-tag_print(Response &r, TagType type, StringView value) noexcept
++tag_print(Response &r, TagType type, std::string_view value) noexcept
+ {
+ 	r.Fmt(FMT_STRING("{}: {}\n"), tag_item_names[type], value);
+ }
+--- a/src/TagPrint.hxx
++++ b/src/TagPrint.hxx
+@@ -21,6 +21,7 @@
+ #define MPD_TAG_PRINT_HXX
+ 
+ #include <cstdint>
++#include <string_view>
+ 
+ enum TagType : uint8_t;
+ 
+@@ -32,7 +33,7 @@ void
+ tag_print_types(Response &response) noexcept;
+ 
+ void
+-tag_print(Response &response, TagType type, StringView value) noexcept;
++tag_print(Response &response, TagType type, std::string_view value) noexcept;
+ 
+ void
+ tag_print(Response &response, TagType type, const char *value) noexcept;
+--- a/src/TimePrint.cxx
++++ b/src/TimePrint.cxx
+@@ -36,5 +36,5 @@ time_print(Response &r, const char *name,
+ 		return;
+ 	}
+ 
+-	r.Fmt(FMT_STRING("{}: {}\n"), name, s);
++	r.Fmt(FMT_STRING("{}: {}\n"), name, s.c_str());
+ }
+--- a/src/command/PlayerCommands.cxx
++++ b/src/command/PlayerCommands.cxx
+@@ -28,6 +28,7 @@
+ #include "Partition.hxx"
+ #include "Instance.hxx"
+ #include "IdleFlags.hxx"
++#include "lib/fmt/AudioFormatFormatter.hxx"
+ #include "util/StringBuffer.hxx"
+ #include "util/ScopeExit.hxx"
+ #include "util/Exception.hxx"
+@@ -185,7 +186,7 @@ handle_status(Client &client, [[maybe_unused]] Request args, Response &r)
+ 
+ 		if (player_status.audio_format.IsDefined())
+ 			r.Fmt(FMT_STRING(COMMAND_STATUS_AUDIO ": {}\n"),
+-			      ToString(player_status.audio_format));
++			      player_status.audio_format);
+ 	}
+ 
+ #ifdef ENABLE_DATABASE
+-- 
+2.39.2
+
diff --git a/media-sound/mpd/files/mpd-0.23.12-stringview.patch b/media-sound/mpd/files/mpd-0.23.12-stringview.patch
new file mode 100644
index 000000000000..fa0f77f2a712
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.23.12-stringview.patch
@@ -0,0 +1,235 @@
+Backport of upstream commit ec66ee3bfb, which is a prerequisite to
+backport the fix for dev-libs/libfmt-10.
+
+--- a/src/command/FileCommands.cxx
++++ b/src/command/FileCommands.cxx
+@@ -106,7 +106,7 @@ handle_listfiles_local(Response &r, Path path_fs)
+ 
+ gcc_pure
+ static bool
+-IsValidName(const StringView s) noexcept
++IsValidName(const std::string_view s) noexcept
+ {
+ 	if (s.empty() || !IsAlphaASCII(s.front()))
+ 		return false;
+@@ -118,7 +118,7 @@ IsValidName(const StringView s) noexcept
+ 
+ gcc_pure
+ static bool
+-IsValidValue(const StringView s) noexcept
++IsValidValue(const std::string_view s) noexcept
+ {
+ 	return std::none_of(s.begin(), s.end(), [](const auto &ch) { return (unsigned char)ch < 0x20; });
+ }
+@@ -130,7 +130,7 @@ public:
+ 	explicit PrintCommentHandler(Response &_response) noexcept
+ 		:NullTagHandler(WANT_PAIR), response(_response) {}
+ 
+-	void OnPair(StringView key, StringView value) noexcept override {
++	void OnPair(std::string_view key, std::string_view value) noexcept override {
+ 		if (IsValidName(key) && IsValidValue(value))
+ 			response.Fmt(FMT_STRING("{}: {}\n"), key, value);
+ 	}
+--- a/src/command/OtherCommands.cxx
++++ b/src/command/OtherCommands.cxx
+@@ -147,7 +147,7 @@ public:
+ 	explicit PrintTagHandler(Response &_response) noexcept
+ 		:NullTagHandler(WANT_TAG), response(_response) {}
+ 
+-	void OnTag(TagType type, StringView value) noexcept override {
++	void OnTag(TagType type, std::string_view value) noexcept override {
+ 		if (response.GetClient().tag_mask.Test(type))
+ 			tag_print(response, type, value);
+ 	}
+--- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx
++++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx
+@@ -81,11 +81,11 @@ adplug_file_decode(DecoderClient &client, Path path_fs)
+ }
+ 
+ static void
+-adplug_scan_tag(TagType type, const std::string &value,
++adplug_scan_tag(TagType type, const std::string_view value,
+ 		TagHandler &handler) noexcept
+ {
+ 	if (!value.empty())
+-		handler.OnTag(type, {value.data(), value.size()});
++		handler.OnTag(type, value);
+ }
+ 
+ static bool
+--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
++++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+@@ -39,6 +39,8 @@
+ 
+ #include <string.h>
+ 
++using std::string_view_literals::operator""sv;
++
+ class EmbeddedCuePlaylist final : public SongEnumerator {
+ public:
+ 	/**
+@@ -69,14 +71,15 @@ public:
+ 
+ 	ExtractCuesheetTagHandler() noexcept:NullTagHandler(WANT_PAIR) {}
+ 
+-	void OnPair(StringView key, StringView value) noexcept override;
++	void OnPair(std::string_view key, std::string_view value) noexcept override;
+ };
+ 
+ void
+-ExtractCuesheetTagHandler::OnPair(StringView name, StringView value) noexcept
++ExtractCuesheetTagHandler::OnPair(std::string_view name, std::string_view value) noexcept
+ {
+-	if (cuesheet.empty() && name.EqualsIgnoreCase("cuesheet"))
+-		cuesheet = {value.data, value.size};
++	if (cuesheet.empty() &&
++	    StringView{name}.EqualsIgnoreCase("cuesheet"sv))
++		cuesheet = value;
+ }
+ 
+ static std::unique_ptr<SongEnumerator>
+--- a/src/tag/Handler.cxx
++++ b/src/tag/Handler.cxx
+@@ -25,13 +25,15 @@
+ 
+ #include <algorithm>
+ 
++using std::string_view_literals::operator""sv;
++
+ void
+-NullTagHandler::OnTag(TagType, StringView) noexcept
++NullTagHandler::OnTag(TagType, std::string_view) noexcept
+ {
+ }
+ 
+ void
+-NullTagHandler::OnPair(StringView, StringView) noexcept
++NullTagHandler::OnPair(std::string_view, std::string_view) noexcept
+ {
+ }
+ 
+@@ -54,18 +56,18 @@ AddTagHandler::OnDuration(SongTime duration) noexcept
+ /**
+  * Skip leading zeroes and a non-decimal suffix.
+  */
+-static StringView
+-NormalizeDecimal(StringView s)
++static std::string_view
++NormalizeDecimal(std::string_view s)
+ {
+ 	auto start = std::find_if(s.begin(), s.end(),
+ 				  [](char ch){ return ch != '0'; });
+ 	auto end = std::find_if(start, s.end(),
+ 				[](char ch){ return !IsDigitASCII(ch); });
+-	return {start, end};
++	return StringView{start, end};
+ }
+ 
+ void
+-AddTagHandler::OnTag(TagType type, StringView value) noexcept
++AddTagHandler::OnTag(TagType type, std::string_view value) noexcept
+ {
+ 	if (type == TAG_TRACK || type == TAG_DISC) {
+ 		/* filter out this extra data and leading zeroes */
+@@ -77,9 +79,9 @@ AddTagHandler::OnTag(TagType type, StringView value) noexcept
+ }
+ 
+ void
+-FullTagHandler::OnPair(StringView name, StringView) noexcept
++FullTagHandler::OnPair(std::string_view name, std::string_view) noexcept
+ {
+-	if (name.EqualsIgnoreCase("cuesheet"))
++	if (StringView{name}.EqualsIgnoreCase("cuesheet"sv))
+ 		tag.SetHasPlaylist(true);
+ }
+ 
+--- a/src/tag/Handler.hxx
++++ b/src/tag/Handler.hxx
+@@ -24,8 +24,11 @@
+ #include "Chrono.hxx"
+ #include "util/Compiler.h"
+ 
++#include <cstddef>
++#include <span>
++#include <string_view>
++
+ template<typename T> struct ConstBuffer;
+-struct StringView;
+ struct AudioFormat;
+ class TagBuilder;
+ 
+@@ -81,13 +84,14 @@ public:
+ 	 * @param the value of the tag; the pointer will become
+ 	 * invalid after returning
+ 	 */
+-	virtual void OnTag(TagType type, StringView value) noexcept = 0;
++	virtual void OnTag(TagType type, std::string_view value) noexcept = 0;
+ 
+ 	/**
+ 	 * A name-value pair has been read.  It is the codec specific
+ 	 * representation of tags.
+ 	 */
+-	virtual void OnPair(StringView key, StringView value) noexcept = 0;
++	virtual void OnPair(std::string_view key,
++			    std::string_view value) noexcept = 0;
+ 
+ 	/**
+ 	 * Declare the audio format of a song.
+@@ -125,8 +129,9 @@ public:
+ 		:TagHandler(_want_mask) {}
+ 
+ 	void OnDuration([[maybe_unused]] SongTime duration) noexcept override {}
+-	void OnTag(TagType type, StringView value) noexcept override;
+-	void OnPair(StringView key, StringView value) noexcept override;
++	void OnTag(TagType type, std::string_view value) noexcept override;
++	void OnPair(std::string_view key,
++		    std::string_view value) noexcept override;
+ 	void OnAudioFormat(AudioFormat af) noexcept override;
+ 	void OnPicture(const char *mime_type,
+ 		       ConstBuffer<void> buffer) noexcept override;
+@@ -149,7 +154,7 @@ public:
+ 		:AddTagHandler(0, _builder) {}
+ 
+ 	void OnDuration(SongTime duration) noexcept override;
+-	void OnTag(TagType type, StringView value) noexcept override;
++	void OnTag(TagType type, std::string_view value) noexcept override;
+ };
+ 
+ /**
+@@ -173,7 +178,8 @@ public:
+ 				AudioFormat *_audio_format=nullptr) noexcept
+ 		:FullTagHandler(0, _builder, _audio_format) {}
+ 
+-	void OnPair(StringView key, StringView value) noexcept override;
++	void OnPair(std::string_view key,
++		    std::string_view value) noexcept override;
+ 	void OnAudioFormat(AudioFormat af) noexcept override;
+ };
+ 
+--- a/test/read_tags.cxx
++++ b/test/read_tags.cxx
+@@ -60,16 +60,16 @@ public:
+ 		printf("duration=%f\n", duration.ToDoubleS());
+ 	}
+ 
+-	void OnTag(TagType type, StringView value) noexcept override {
++	void OnTag(TagType type, std::string_view value) noexcept override {
+ 		printf("[%s]=%.*s\n", tag_item_names[type],
+-		       int(value.size), value.data);
++		       int(value.size()), value.data());
+ 		empty = false;
+ 	}
+ 
+-	void OnPair(StringView key, StringView value) noexcept override {
++	void OnPair(std::string_view key, std::string_view value) noexcept override {
+ 		printf("\"%.*s\"=%.*s\n",
+-		       int(key.size), key.data,
+-		       int(value.size), value.data);
++		       int(key.size()), key.data(),
++		       int(value.size()), value.data());
+ 	}
+ 
+ 	void OnAudioFormat(AudioFormat af) noexcept override {
+-- 
+2.39.2
+
diff --git a/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch b/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch
new file mode 100644
index 000000000000..e9515c632c7c
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.23.13-ffmpeg-6.1.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/918421
+https://github.com/MusicPlayerDaemon/MPD/issues/1898
+--- a/src/decoder/plugins/FfmpegIo.cxx
++++ b/src/decoder/plugins/FfmpegIo.cxx
+@@ -26,6 +26,9 @@
+
+ extern "C" {
+ #include <libavutil/mem.h>
++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100)
++#include <libavutil/error.h>
++#endif
+ }
+
+ AvioStream::~AvioStream()
diff --git a/media-sound/mpd/files/mpd-0.23.15.init b/media-sound/mpd/files/mpd-0.23.15.init
new file mode 100644
index 000000000000..8a0a18af9b21
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.23.15.init
@@ -0,0 +1,61 @@
+#!/sbin/openrc-run
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: CFGFILE=${CFGFILE:=/etc/mpd.conf}
+
+depend() {
+	need localmount
+	use net netmount alsasound esound pulseaudio
+	config ${CFGFILE}
+}
+
+get_config() {
+	x=$1
+	test -e ${CFGFILE} || return 1
+	sed -n \
+		-e '/^[ \t]*'${x}'/{s:^[ \t]*'${x}'[ \t]\+"\?\([^#"]\+\)[^"]*"\?$:\1: ; p }' \
+		${CFGFILE}
+}
+
+extra_started_commands='reload'
+# Required by io_uring
+rc_ulimit="-l 65535"
+command=/usr/bin/mpd
+command_args=${CFGFILE}
+mpd_user="$(get_config user)"
+mpd_group="$(get_config group)"
+required_files=${CFGFILE}
+pidfile=$(get_config pid_file)
+description="Music Player Daemon"
+
+check_config() {
+	if [ -z "$(get_config pid_file)" ]; then
+		die "pid_file must be set in ${CFGFILE}!"
+	fi
+	if [ -z "$(get_config user)" ]; then
+		die "user must be set in ${CFGFILE}!"
+	fi
+	if [ -z "$(get_config group)" ]; then
+		die "group must be set in ${CFGFILE}!"
+	fi
+}
+
+start_pre() {
+	check_config
+	
+	local pid_dir="$(dirname "${pidfile}")"
+	checkpath -d -m 700 -o "${mpd_user}:${mpd_group}" "${pid_dir}"
+
+	local log_file="$(get_config log_file)"
+	if [ -n "${log_file}" ]; then
+		local log_dir="$(dirname "${log_file}")"
+		checkpath -d -m 755 -o "${mpd_user}:${mpd_group}" "${log_dir}"
+	fi
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --pidfile ${pidfile} --signal HUP
+	eend $?
+}
diff --git a/media-sound/mpd/files/mpd-0.23.15.logrotate b/media-sound/mpd/files/mpd-0.23.15.logrotate
new file mode 100644
index 000000000000..e1e57aef724f
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.23.15.logrotate
@@ -0,0 +1,9 @@
+/var/log/mpd/mpd.log {
+	missingok
+	weekly
+	delaycompress
+	compress
+	postrotate
+	/etc/init.d/mpd --quiet reload
+	endscript
+}
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 621b406d3e23..e745e158e220 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>zlogene@gentoo.org</email>
-    <name>Mikle Kolyada</name>
+    <email>nex+b-g-o@nexadn.de</email>
+    <name>Adrian Schollmeyer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <use>
     <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
@@ -20,16 +24,18 @@
     <flag name="lame">Support for MP3 streaming via Icecast2</flag>
     <flag name="libmpdclient">Enable support for remote mpd databases</flag>
     <flag name="libsoxr">Enable the libsoxr resampler</flag>
-    <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
+    <flag name="mpg123">Enable support for mp3 decoding over <pkg>media-sound/mpg123</pkg></flag>
     <flag name="network">Enables network streaming support</flag>
     <flag name="nfs">Enable support for the Network File System</flag>
+    <flag name="openmpt">OpenMPT decoder plugin</flag>
     <flag name="pipe">Support writing audio to a pipe</flag>
+    <flag name="pipewire">PipeWire support</flag>
     <flag name="qobuz">Build plugin to access qobuz</flag>
     <flag name="recorder">Enables output plugin for recording radio streams</flag>
-    <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
     <flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
+    <flag name="snapcast">Snapcast audio plugin</flag>
+    <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
     <flag name="soundcloud">Build plugin to access soundcloud</flag>
-    <flag name="tidal">Build plugin to access tidal</flag>
     <flag name="systemd">Enable support for systemd socket activation</flag>
     <flag name="twolame">Support twolame MPEG-2 encoding</flag>
     <flag name="webdav">Enable using music from a WebDAV share</flag>
diff --git a/media-sound/mpd/mpd-0.21.26.ebuild b/media-sound/mpd/mpd-0.21.26.ebuild
deleted file mode 100644
index b658891c0356..000000000000
--- a/media-sound/mpd/mpd-0.21.26.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Ddebug=$(usex debug true false)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=false
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.22.1-r1.ebuild b/media-sound/mpd/mpd-0.22.1-r1.ebuild
deleted file mode 100644
index 406e09d68018..000000000000
--- a/media-sound/mpd/mpd-0.22.1-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	doc? ( dev-python/sphinx )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dio_uring=enabled
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.22.2-r1.ebuild b/media-sound/mpd/mpd-0.22.2-r1.ebuild
deleted file mode 100644
index 406e09d68018..000000000000
--- a/media-sound/mpd/mpd-0.22.2-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	doc? ( dev-python/sphinx )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dio_uring=enabled
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.22.3.ebuild b/media-sound/mpd/mpd-0.22.3.ebuild
deleted file mode 100644
index 406e09d68018..000000000000
--- a/media-sound/mpd/mpd-0.22.3.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	doc? ( dev-python/sphinx )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dio_uring=enabled
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.23.12-r3.ebuild b/media-sound/mpd/mpd-0.23.12-r3.ebuild
new file mode 100644
index 000000000000..abec625c27fa
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.12-r3.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+	test twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	qobuz? ( curl soundcloud )
+	soundcloud? ( curl qobuz )
+	udisks? ( dbus )
+	upnp? ( curl expat )
+	webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	dev-libs/libfmt:=
+	dev-libs/libpcre2
+	media-libs/libogg
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (
+		dev-libs/icu:=
+		virtual/libiconv
+	)
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2.4.0 )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-libs/libpulse )
+	pipewire? ( media-video/pipewire:= )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	snapcast? ( media-sound/snapcast )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd:= )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# Backported fixes for dev-libs/libfmt-10. Remove after 0.23.12.
+	"${FILESDIR}/${P}-stringview.patch"
+	"${FILESDIR}/${P}-libfmt10-906074.patch"
+)
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via ${EROOT}/etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	 sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bzip2)
+		$(meson_feature cdio cdio_paranoia)
+		$(meson_feature chromaprint)
+		$(meson_use cue)
+		$(meson_feature curl)
+		$(meson_feature dbus)
+		$(meson_use eventfd)
+		$(meson_feature expat)
+		$(meson_feature icu)
+		$(meson_feature id3tag)
+		$(meson_use inotify)
+		-Dipv6=enabled
+		$(meson_feature cdio iso9660)
+		$(meson_feature libmpdclient)
+		$(meson_feature libsamplerate)
+		$(meson_feature mms)
+		$(meson_feature nfs)
+		$(meson_use signalfd)
+		$(meson_feature samba smbclient)
+		$(meson_feature libsoxr soxr)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test)
+		$(meson_feature udisks)
+		-Dupnp=$(usex upnp pupnp disabled)
+		$(meson_feature webdav)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		$(meson_feature zlib)
+		$(meson_feature zip zzip)
+	)
+
+	emesonargs+=(
+		$(meson_feature alsa)
+		$(meson_feature ao)
+		$(meson_use fifo)
+		$(meson_feature jack)
+		$(meson_feature openal)
+		$(meson_feature oss)
+		$(meson_use pipe)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_use recorder)
+		$(meson_use snapcast)
+		$(meson_feature sndio)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+		emesonargs+=(
+			-Dshine=disabled
+			-Dshout=enabled
+			$(meson_feature vorbis vorbisenc)
+			-Dhttpd=true
+			$(meson_feature lame)
+			$(meson_feature twolame)
+			$(meson_use audiofile wave_encoder)
+		)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		$(meson_feature audiofile)
+		$(meson_feature faad)
+		$(meson_feature ffmpeg)
+		$(meson_feature flac)
+		$(meson_feature fluidsynth)
+		$(meson_feature gme)
+		$(meson_feature mad)
+		$(meson_feature mikmod)
+		$(meson_feature modplug)
+		$(meson_feature musepack mpcdec)
+		$(meson_feature mpg123)
+		$(meson_feature openmpt)
+		$(meson_feature opus)
+		$(meson_feature sid sidplay)
+		$(meson_feature sndfile)
+		$(meson_feature vorbis)
+		$(meson_feature wavpack)
+		$(meson_feature wildmidi)
+		$(meson_feature qobuz)
+		$(meson_feature soundcloud)
+
+		--libdir="/usr/$(get_libdir)"
+		$(meson_feature doc documentation)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+		$(meson_feature icu iconv)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+	fowners mpd:audio -R /var/lib/mpd
+}
diff --git a/media-sound/mpd/mpd-0.23.13-r1.ebuild b/media-sound/mpd/mpd-0.23.13-r1.ebuild
new file mode 100644
index 000000000000..3dcf11ed6998
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.13-r1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+	test twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	qobuz? ( curl soundcloud )
+	soundcloud? ( curl qobuz )
+	udisks? ( dbus )
+	upnp? ( curl expat )
+	webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	dev-libs/libfmt:=
+	dev-libs/libpcre2
+	media-libs/libogg
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (
+		dev-libs/icu:=
+		virtual/libiconv
+	)
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2.4.0 )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-libs/libpulse )
+	pipewire? ( media-video/pipewire:= )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	snapcast? ( media-sound/snapcast )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd:= )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.23.13-ffmpeg-6.1.patch
+)
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via ${EROOT}/etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	 sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bzip2)
+		$(meson_feature cdio cdio_paranoia)
+		$(meson_feature chromaprint)
+		$(meson_use cue)
+		$(meson_feature curl)
+		$(meson_feature dbus)
+		$(meson_use eventfd)
+		$(meson_feature expat)
+		$(meson_feature icu)
+		$(meson_feature id3tag)
+		$(meson_use inotify)
+		-Dipv6=enabled
+		$(meson_feature cdio iso9660)
+		$(meson_feature libmpdclient)
+		$(meson_feature libsamplerate)
+		$(meson_feature mms)
+		$(meson_feature nfs)
+		$(meson_use signalfd)
+		$(meson_feature samba smbclient)
+		$(meson_feature libsoxr soxr)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test)
+		$(meson_feature udisks)
+		-Dupnp=$(usex upnp pupnp disabled)
+		$(meson_feature webdav)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		$(meson_feature zlib)
+		$(meson_feature zip zzip)
+	)
+
+	emesonargs+=(
+		$(meson_feature alsa)
+		$(meson_feature ao)
+		$(meson_use fifo)
+		$(meson_feature jack)
+		$(meson_feature openal)
+		$(meson_feature oss)
+		$(meson_use pipe)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_use recorder)
+		$(meson_use snapcast)
+		$(meson_feature sndio)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+		emesonargs+=(
+			-Dshine=disabled
+			-Dshout=enabled
+			$(meson_feature vorbis vorbisenc)
+			-Dhttpd=true
+			$(meson_feature lame)
+			$(meson_feature twolame)
+			$(meson_use audiofile wave_encoder)
+		)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		$(meson_feature audiofile)
+		$(meson_feature faad)
+		$(meson_feature ffmpeg)
+		$(meson_feature flac)
+		$(meson_feature fluidsynth)
+		$(meson_feature gme)
+		$(meson_feature mad)
+		$(meson_feature mikmod)
+		$(meson_feature modplug)
+		$(meson_feature musepack mpcdec)
+		$(meson_feature mpg123)
+		$(meson_feature openmpt)
+		$(meson_feature opus)
+		$(meson_feature sid sidplay)
+		$(meson_feature sndfile)
+		$(meson_feature vorbis)
+		$(meson_feature wavpack)
+		$(meson_feature wildmidi)
+		$(meson_feature qobuz)
+		$(meson_feature soundcloud)
+
+		--libdir="/usr/$(get_libdir)"
+		$(meson_feature doc documentation)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddaemon=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+		$(meson_feature icu iconv)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+	fowners mpd:audio -R /var/lib/mpd
+}
diff --git a/media-sound/mpd/mpd-0.23.15-r1.ebuild b/media-sound/mpd/mpd-0.23.15-r1.ebuild
new file mode 100644
index 000000000000..70c1356216a0
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.15-r1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+	test twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	qobuz? ( curl soundcloud )
+	soundcloud? ( curl qobuz )
+	udisks? ( dbus )
+	upnp? ( curl expat )
+	webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	dev-libs/libfmt:=
+	dev-libs/libpcre2
+	media-libs/libogg
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (
+		dev-libs/icu:=
+		virtual/libiconv
+	)
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2.4.0 )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-libs/libpulse )
+	pipewire? ( media-video/pipewire:= )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	snapcast? ( media-sound/snapcast )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd:= )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		$(meson_feature alsa)
+		$(meson_feature ao)
+		$(meson_feature audiofile)
+		$(meson_feature bzip2)
+		$(meson_feature cdio cdio_paranoia)
+		$(meson_feature chromaprint)
+		$(meson_use cue)
+		$(meson_feature curl)
+		$(meson_feature dbus)
+		$(meson_use eventfd)
+		$(meson_feature expat)
+		$(meson_feature faad)
+		$(meson_feature ffmpeg)
+		$(meson_use fifo)
+		$(meson_feature flac)
+		$(meson_feature fluidsynth)
+		$(meson_feature gme)
+		$(meson_feature icu)
+		$(meson_feature id3tag)
+		$(meson_use inotify)
+		-Dipv6=enabled
+		$(meson_feature cdio iso9660)
+		$(meson_feature jack)
+		$(meson_feature libmpdclient)
+		$(meson_feature libsamplerate)
+		$(meson_feature mad)
+		$(meson_feature mikmod)
+		$(meson_feature mms)
+		$(meson_feature modplug)
+		$(meson_feature musepack mpcdec)
+		$(meson_feature mpg123)
+		$(meson_feature nfs)
+		$(meson_feature openal)
+		$(meson_feature openmpt)
+		$(meson_feature opus)
+		$(meson_feature oss)
+		$(meson_use pipe)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature qobuz)
+		$(meson_use recorder)
+		$(meson_use signalfd)
+		$(meson_feature samba smbclient)
+		$(meson_use snapcast)
+		$(meson_feature sid sidplay)
+		$(meson_feature sndfile)
+		$(meson_feature sndio)
+		$(meson_feature soundcloud)
+		$(meson_feature libsoxr soxr)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test)
+		$(meson_feature udisks)
+		-Dupnp=$(usex upnp pupnp disabled)
+		$(meson_feature vorbis)
+		$(meson_feature wavpack)
+		$(meson_feature wildmidi)
+		$(meson_feature webdav)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		$(meson_feature zlib)
+		$(meson_feature zip zzip)
+
+		--libdir="/usr/$(get_libdir)"
+		$(meson_feature doc documentation)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddaemon=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+		$(meson_feature icu iconv)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+		emesonargs+=(
+			-Dshine=disabled
+			-Dshout=enabled
+			$(meson_feature vorbis vorbisenc)
+			-Dhttpd=true
+			$(meson_feature lame)
+			$(meson_feature twolame)
+			$(meson_use audiofile wave_encoder)
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	# When running MPD as system service, better switch to the user we provide
+	sed -i \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#group.*$:group "audio":' \
+		"${ED}/etc/mpd.conf" || die
+
+	if ! use systemd; then
+		# Extra options for running MPD under OpenRC
+		# (options that should not be set when using systemd)
+		sed -i \
+			-e 's:^#log_file.*$:log_file "/var/log/mpd/mpd.log":' \
+			-e 's:^#pid_file.*$:pid_file "/run/mpd/mpd.pid":' \
+			"${ED}/etc/mpd.conf" || die
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${P}.logrotate" "${PN}"
+
+	newinitd "${FILESDIR}/${P}.init" "${PN}"
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+	keepdir /var/log/mpd
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+	fowners mpd:audio -R /var/lib/mpd
+	fowners mpd:audio -R /var/log/mpd
+}
diff --git a/media-sound/mpdas/Manifest b/media-sound/mpdas/Manifest
index 0899637ecaaa..6f2d510f2530 100644
--- a/media-sound/mpdas/Manifest
+++ b/media-sound/mpdas/Manifest
@@ -1 +1 @@
-DIST mpdas-0.4.2.tar.gz 15695 BLAKE2B 907417050ab1b3d6577311e633b060dad2ff834b5436b7ed086ab5cb9ef291004916fc07cbe18ba4b80eeec8573775cc8e212b93d4ed103cbab3ce81082a18ae SHA512 cebd3c027002ac5283834edf3a1338b449c4a78261690cb5d25c57f767f1b0b81ff8ca5c64d79d6aecf5e86ba0c7b63a51131f6cc9031f2922e92eeddcada353
+DIST mpdas-0.4.5.tar.gz 19108 BLAKE2B aa5aec147574cc70572cada56ee495415a06ce5a8c4e19db7288ee1e52cb5d1b6f15a31955e46a526f9db1eff94bf282cb9804379dbd4cf979412ee7f575dde2 SHA512 18737f20b408a38424c46a611a1184e8e9ab78d1c3bddddc37423c8437007b87c343dfe03fd989c9c54dcc532ed1f567ba854d2ba8e12f344399267dc83daaab
diff --git a/media-sound/mpdas/metadata.xml b/media-sound/mpdas/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/mpdas/metadata.xml
+++ b/media-sound/mpdas/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mpdas/mpdas-0.4.2.ebuild b/media-sound/mpdas/mpdas-0.4.5.ebuild
index 75709c41d58f..3ef2228a59fe 100644
--- a/media-sound/mpdas/mpdas-0.4.2.ebuild
+++ b/media-sound/mpdas/mpdas-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,11 +22,6 @@ DEPEND="
 	net-misc/curl"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	default
-	sed -i -e 's/@//' Makefile || die
-}
-
 src_compile() {
 	tc-export CXX
 	emake CONFIG="/etc"
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 4f8b64bafb7c..c196f8ada852 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -1 +1 @@
-DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
+DIST mpdscribble-0.25.tar.xz 68732 BLAKE2B 292addab1b84831f5b987976dea21938ead9888de828919a32e5c9be725b90d86b65be57bfc6637d3b5121902d646002890381d75bba385e982e9387088b38a2 SHA512 d22c334865794ca45142b2d8edbaffa69cd79b11de33406d1588ea157941973862d3841145a5fe3d530cb8253af944eb9ecc2b6be4fd57c07600e53b63161e47
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch b/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
new file mode 100644
index 000000000000..a3cbf96df2fd
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
@@ -0,0 +1,29 @@
+From 8e1cf0bc6a6d6e1636d1abe18adbf7b5a76841e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 9 Sep 2021 14:19:01 +0200
+Subject: [PATCH 2/2] Don't install AUTHORS, COPYING, NEWS, README.rst
+
+We install these in ebuilds.
+---
+ meson.build | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index b4cc736..28ade21 100644
+--- a/meson.build
++++ b/meson.build
+@@ -128,11 +128,6 @@ executable(
+   install: true
+ )
+ 
+-install_data(
+-  'AUTHORS', 'COPYING', 'NEWS', 'README.rst',
+-  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+-)
+-
+ subdir('systemd')
+ 
+ subdir('doc')
+-- 
+2.32.0
+
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch b/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch
new file mode 100644
index 000000000000..9e14fdb33804
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch
@@ -0,0 +1,49 @@
+From 8bf74e12a900349cb1ac21c22065a64d09873ff2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 9 Sep 2021 13:54:15 +0200
+Subject: [PATCH 1/2] Unconditionally generate systemd unit files
+
+---
+ meson.build                | 4 +---
+ systemd/system/meson.build | 1 -
+ systemd/user/meson.build   | 1 -
+ 3 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f22b7a3..b4cc736 100644
+--- a/meson.build
++++ b/meson.build
+@@ -133,9 +133,7 @@ install_data(
+   install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+ )
+ 
+-if libsystemd_dep.found()
+-  subdir('systemd')
+-endif
++subdir('systemd')
+ 
+ subdir('doc')
+ 
+diff --git a/systemd/system/meson.build b/systemd/system/meson.build
+index 83c5fe1..dfbdd59 100644
+--- a/systemd/system/meson.build
++++ b/systemd/system/meson.build
+@@ -7,5 +7,4 @@ configure_file(
+   input: 'mpdscribble.service.in',
+   output: 'mpdscribble.service',
+   configuration: systemd_unit_conf,
+-  install_dir: systemd_system_unit_dir,
+ )
+diff --git a/systemd/user/meson.build b/systemd/user/meson.build
+index 5372d3c..72320ee 100644
+--- a/systemd/user/meson.build
++++ b/systemd/user/meson.build
+@@ -7,5 +7,4 @@ configure_file(
+   input: 'mpdscribble.service.in',
+   output: 'mpdscribble.service',
+   configuration: systemd_unit_conf,
+-  install_dir: systemd_user_unit_dir,
+ )
+-- 
+2.32.0
+
diff --git a/media-sound/mpdscribble/metadata.xml b/media-sound/mpdscribble/metadata.xml
index 591f1b938aae..6446ad026cd1 100644
--- a/media-sound/mpdscribble/metadata.xml
+++ b/media-sound/mpdscribble/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mpdscribble/mpdscribble-0.22.ebuild b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
deleted file mode 100644
index 29b2c66fd7d6..000000000000
--- a/media-sound/mpdscribble/mpdscribble-0.22.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An MPD client that submits information to Audioscrobbler"
-HOMEPAGE="https://www.musicpd.org/clients/mpdscribble/"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+curl"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/libmpdclient
-	curl? ( net-misc/curl )
-	!curl? ( net-libs/libsoup:2.4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--with-http-client=$(usex curl curl soup)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
-	keepdir /var/cache/mpdscribble
-}
diff --git a/media-sound/mpdscribble/mpdscribble-0.25.ebuild b/media-sound/mpdscribble/mpdscribble-0.25.ebuild
new file mode 100644
index 000000000000..c193857802bc
--- /dev/null
+++ b/media-sound/mpdscribble/mpdscribble-0.25.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd
+
+DESCRIPTION="An MPD client that submits information to Audioscrobbler"
+HOMEPAGE="
+	https://www.musicpd.org/clients/mpdscribble/
+	https://github.com/MusicPlayerDaemon/mpdscribble
+"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="test"
+# Test program is just an interactive check.
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/libgcrypt:=
+	media-libs/libmpdclient
+	net-misc/curl
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS COPYING NEWS README.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.23-Unconditionally-generate-systemd-unit-files.patch
+	"${FILESDIR}"/${PN}-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
+	keepdir /var/cache/mpdscribble
+
+	systemd_dounit "${BUILD_DIR}"/systemd/system/"${PN}".service
+	systemd_douserunit "${BUILD_DIR}"/systemd/user/"${PN}".service
+}
diff --git a/media-sound/mpdscribble/mpdscribble-9999.ebuild b/media-sound/mpdscribble/mpdscribble-9999.ebuild
deleted file mode 100644
index 639a5eb9e342..000000000000
--- a/media-sound/mpdscribble/mpdscribble-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3 autotools
-
-DESCRIPTION="An MPD client that submits information to Audioscrobbler"
-HOMEPAGE="https://www.musicpd.org/clients/mpdscribble/"
-EGIT_REPO_URI="https://github.com/MusicPlayerDaemon/mpdscribble.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+curl"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/libmpdclient
-	curl? ( net-misc/curl )
-	!curl? ( net-libs/libsoup:2.4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-http-client=$(usex curl curl soup)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
-	keepdir /var/cache/mpdscribble
-}
diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch
new file mode 100644
index 000000000000..364888855198
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch
@@ -0,0 +1,50 @@
+Closes: https://bugs.gentoo.org/921021
+diff -ur  mpfc-1.3.8.1.orig/src/player.c mpfc-1.3.8.1/src/player.c
+--- a/src/player.c	2024-04-01 17:05:09.855312224 +0000
++++ b/src/player.c	2024-04-01 17:08:54.586992161 +0000
+@@ -2673,14 +2673,14 @@
+ 	{
+ 		player_pmng_view_t *v = &views[i];
+ 		int index = v->m_list->m_cursor;
+-		plugin_t *p;
++		general_plugin_t *p;
+ 
+ 		/* Get info */
+ 		if (!v->m_list->m_list_size)
+ 			continue;
+-		p = (plugin_t *)v->m_list->m_list[index].m_data;
+-		char *author = plugin_get_author(p);
+-		char *desc = plugin_get_desc(p);
++		p = v->m_list->m_list[index].m_data;
++		char *author = plugin_get_author(&p->m_plugin);
++		char *desc = plugin_get_desc(&p->m_plugin);
+ 
+ 		/* Set labels */
+ 		editbox_set_text(v->m_author, author == NULL ? "" : author);
+@@ -2688,7 +2688,7 @@
+ 
+ 		/* Synchronize effect checkbox */
+ 		if (i == PLAYER_PMNG_EFFECT)
+-			v->m_enabled_cb->m_checked = pmng_is_effect_enabled(player_pmng, p);
++			v->m_enabled_cb->m_checked = pmng_is_effect_enabled(player_pmng, &p->m_plugin);
+ 		else if (i == PLAYER_PMNG_GENERAL)
+ 		{
+ 			bool_t started = genp_is_started(p);
+@@ -3198,7 +3198,7 @@
+ 	player_pmng_view_t *v = NULL;
+ 	player_pmng_view_t *views; 
+ 	wnd_t *dlg;
+-	plugin_t *p;
++	general_plugin_t *p;
+ 	int index;
+ 
+ 	/* Determine our view */
+@@ -3212,7 +3212,7 @@
+ 	index = v->m_list->m_cursor;
+ 	if (!v->m_list->m_list_size)
+ 		return WND_MSG_RETCODE_OK;
+-	p = (plugin_t *)v->m_list->m_list[index].m_data;
++	p = v->m_list->m_list[index].m_data;
+ 
+ 	/* Change state */
+ 	if (!genp_is_started(p))
diff --git a/media-sound/mpfc/metadata.xml b/media-sound/mpfc/metadata.xml
index 0a33c89e6992..bd0e0d807b1f 100644
--- a/media-sound/mpfc/metadata.xml
+++ b/media-sound/mpfc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild
index 0d64bd78bc89..b7120a8c0b73 100644
--- a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Music Player For Console"
-HOMEPAGE="http://mpfc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://mpfc.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,17 +15,18 @@ KEYWORDS="amd64 ppc x86"
 IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	mad? ( media-libs/libmad )
 	vorbis? ( media-libs/libvorbis )
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	dev-libs/icu:="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-underlinking.patch"
 	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+	"${FILESDIR}/${P}-c99-incompatible-pointers.patch"
 )
 
 src_prepare() {
@@ -34,17 +35,19 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable alsa) \
-		$(use_enable cdda audiocd) \
-		$(use_enable flac) \
-		$(use_enable gpm) \
-		$(use_enable mad mp3) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable static-libs static) \
-		$(use_enable vorbis ogg) \
+	local myeconfargs=(
+		$(use_enable alsa)
+		$(use_enable cdda audiocd)
+		$(use_enable flac)
+		$(use_enable gpm)
+		$(use_enable mad mp3)
+		$(use_enable nls)
+		$(use_enable oss)
+		$(use_enable static-libs static)
+		$(use_enable vorbis ogg)
 		$(use_enable wav)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-sound/mpg123-base/Manifest b/media-sound/mpg123-base/Manifest
new file mode 100644
index 000000000000..1baeb7a33f18
--- /dev/null
+++ b/media-sound/mpg123-base/Manifest
@@ -0,0 +1 @@
+DIST mpg123-1.32.3.tar.bz2 1111054 BLAKE2B 67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359 SHA512 946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc
diff --git a/media-sound/mpg123-base/metadata.xml b/media-sound/mpg123-base/metadata.xml
new file mode 100644
index 000000000000..d86d05aa1cec
--- /dev/null
+++ b/media-sound/mpg123-base/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+      <email>thomas-forum@orgis.org</email>
+      <name>Thomas Orgis</name>
+    </maintainer>
+    <remote-id type="sourceforge">mpg123</remote-id>
+  </upstream>
+  <use>
+    <flag name="int-quality">Use rounding instead of fast truncation for integer output, where possible</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/mpg123/mpg123-1.26.3.ebuild b/media-sound/mpg123-base/mpg123-base-1.32.3.ebuild
index 0a9547accb74..0babb20f5574 100644
--- a/media-sound/mpg123/mpg123-1.26.3.ebuild
+++ b/media-sound/mpg123-base/mpg123-base-1.32.3.ebuild
@@ -1,59 +1,64 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+MY_PN="mpg123"
+MY_P="${MY_PN}-${PV}"
 inherit flag-o-matic toolchain-funcs libtool multilib-minimal
 
 DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
 HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
 RDEPEND="
-	app-eselect/eselect-mpg123
+	!<media-sound/mpg123-1.32.3-r100
+	!media-libs/libmpg123
 	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/libtool
+	dev-build/libtool
 	virtual/pkgconfig
 "
+IDEPEND="app-eselect/eselect-mpg123"
 
 DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
 
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
 src_prepare() {
 	default
 	elibtoolize # for Darwin bundles
+
+	# Rerun autotools with patched configure.ac
+	#eautoreconf
 }
 
 multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
+	local _audio=
 	local _cpu=generic_fpu
 
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	append-lfs-flags
+
 	if $(multilib_is_native_abi) ; then
 		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+		for flag in coreaudio pulseaudio jack alsa oss sdl portaudio nas ; do
 			if use ${flag}; then
 				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
 			fi
 		done
 	fi
@@ -63,7 +68,8 @@ multilib_src_configure() {
 	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
 		use cpu_flags_x86_sse && _cpu=x86-64
 	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
 		_cpu=generic_fpu
 	else
 		use cpu_flags_x86_mmx && _cpu=mmx
@@ -74,13 +80,14 @@ multilib_src_configure() {
 
 	local myconf=(
 		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
+		--with-audio=dummy
+		--with-default-audio="${_audio} dummy"
 		--with-cpu=${_cpu}
 		--enable-network
 		$(use_enable ipv6)
 		--enable-int-quality=$(usex int-quality)
 	)
+
 	multilib_is_native_abi || myconf+=( --disable-modules )
 
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
@@ -92,7 +99,7 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	mv "${ED}"/usr/bin/mpg123{,-mpg123} || die
 	find "${ED}" -type f -name '*.la' -delete || die
 }
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 6c65bea1514e..1baeb7a33f18 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1 @@
-DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
-DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
-DIST mpg123-1.26.4.tar.bz2 1050563 BLAKE2B 1a057f8bf6171f78a2041637b8351ef124f58f160ca237f775ae1aeeee1eeb6e1898b113ca5958acb74d818e706b2825af0b1f93312073742a18134aacb6d5e9 SHA512 425162227aafb99b8723428fe9bd403739a2dd68828b86a2cff7f9928a9f0ab3f67420e56c0abe7c9deeb94bce6c6acd59acaa0606ce24c01716465640564785
+DIST mpg123-1.32.3.tar.bz2 1111054 BLAKE2B 67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359 SHA512 946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc
diff --git a/media-sound/mpg123/metadata.xml b/media-sound/mpg123/metadata.xml
index dcbfeaa686c6..120fdf73ceb1 100644
--- a/media-sound/mpg123/metadata.xml
+++ b/media-sound/mpg123/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/mpg123/mpg123-1.26.4.ebuild b/media-sound/mpg123/mpg123-1.26.4.ebuild
deleted file mode 100644
index 0a9547accb74..000000000000
--- a/media-sound/mpg123/mpg123-1.26.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="
-	app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.32.3-r100.ebuild b/media-sound/mpg123/mpg123-1.32.3-r100.ebuild
new file mode 100644
index 000000000000..3646b181b85f
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.32.3-r100.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="A meta package for realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="alsa coreaudio jack nas oss portaudio pulseaudio sdl"
+
+RDEPEND="
+	media-sound/mpg123-base[${MULTILIB_USEDEP},alsa?,coreaudio?,jack?,nas?,oss?,portaudio?,pulseaudio?,sdl?]
+	media-plugins/mpg123-output-plugins[alsa?,coreaudio?,jack?,nas?,oss?,portaudio?,pulseaudio?,sdl?]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
diff --git a/media-sound/mpg123/mpg123-1.25.13.ebuild b/media-sound/mpg123/mpg123-1.32.3.ebuild
index 634c8ef13f42..79d74c017eba 100644
--- a/media-sound/mpg123/mpg123-1.25.13.ebuild
+++ b/media-sound/mpg123/mpg123-1.32.3.ebuild
@@ -1,43 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs libtool multilib-minimal
 
 DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
 HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
 RDEPEND="
-	app-eselect/eselect-mpg123
 	dev-libs/libltdl:0
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
 	nas? ( media-libs/nas )
 	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2 )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/libtool
+	dev-build/libtool
 	virtual/pkgconfig
 "
+IDEPEND="app-eselect/eselect-mpg123"
 
 DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
 
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
 src_prepare() {
 	default
 	elibtoolize # for Darwin bundles
@@ -48,6 +45,12 @@ multilib_src_configure() {
 	local _output=dummy
 	local _cpu=generic_fpu
 
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	append-lfs-flags
+
 	if $(multilib_is_native_abi) ; then
 		local flag
 		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
@@ -63,7 +66,8 @@ multilib_src_configure() {
 	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
 		use cpu_flags_x86_sse && _cpu=x86-64
 	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
 		_cpu=generic_fpu
 	else
 		use cpu_flags_x86_mmx && _cpu=mmx
@@ -81,6 +85,7 @@ multilib_src_configure() {
 		$(use_enable ipv6)
 		--enable-int-quality=$(usex int-quality)
 	)
+
 	multilib_is_native_abi || myconf+=( --disable-modules )
 
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
diff --git a/media-sound/mpg321/files/mpg321-0.3.2-clang16.patch b/media-sound/mpg321/files/mpg321-0.3.2-clang16.patch
new file mode 100644
index 000000000000..a2d49edf0e89
--- /dev/null
+++ b/media-sound/mpg321/files/mpg321-0.3.2-clang16.patch
@@ -0,0 +1,79 @@
+https://bugs.gentoo.org/860876
+https://bugs.gentoo.org/874312
+--- a/fft.c
++++ b/fft.c
+@@ -148,5 +148,5 @@
+         printf("%i is reversed to %i and maps to %i %i\n", i, bitReverse[i], bitReverse[i] * 2, (bitReverse[i] * 2) + 1);
+ #endif
+-        sound_sample* ptr = &(input[bitReverse[i] * 2]);
++        const sound_sample* ptr = &(input[bitReverse[i] * 2]);
+         *realptr++ = (ptr[0] + ptr[1]) / 2;
+         *imagptr++ = 0;
+--- a/mpg321.c
++++ b/mpg321.c
+@@ -100,5 +100,5 @@
+ pid_t output_pid;
+ /* Not used for the moment. It only works for CBR http/ftp retrieved files */
+-extern http_file_length;
++extern int http_file_length;
+ #ifdef HAVE_ALSA
+ /* ALSA Volume Range */
+--- a/mpg321.h
++++ b/mpg321.h
+@@ -177,4 +177,5 @@
+ 
+ /* network functions */
++void do_basicauth();
+ int tcp_open(char * address, int port);
+ int udp_open(char * address, int port);
+@@ -189,4 +190,5 @@
+ enum mad_flow output(void *data, struct mad_header const *header, struct mad_pcm *pcm);
+ int calc_length(char *file, buffer*buf );
++int calc_http_length(buffer *buf);
+ 
+ static enum mad_flow handle_error(void *data, struct mad_stream *stream, struct mad_frame *frame);
+@@ -199,6 +201,8 @@
+ void check_ao_default_play_device();
+ void check_default_play_device();
++int check_default_play_device_buffer();
+ int playdevice_is_live();
+ void open_ao_playdevice(struct mad_header const *header);
++ao_device *open_ao_playdevice_buffer(struct mad_header const *header);
+ 
+ /* remote control (-R) functions */
+@@ -230,4 +234,10 @@
+ RETSIGTYPE handle_sigchld(int sig);
+ 
++#ifdef HAVE_ALSA
++int init_alsa_volume_control(char *name);
++long mpg321_alsa_get_volume();
++void mpg321_alsa_set_volume(long value);
++#endif
++
+ /* FFT data structures */
+ #define FFT_BUFFER_SIZE_LOG 9
+@@ -243,5 +253,5 @@
+ 
+ typedef short int sound_sample;
+-//void fft_perform(const sound_sample *input, double *output, fft_state *state);
++void fft_perform(const sound_sample *input, double *output, fft_state *state);
+ 
+ fft_state *fft_init(void);
+--- a/options.c
++++ b/options.c
+@@ -45,5 +45,5 @@
+ extern int auth_enable;
+ extern int auth_enable_var;
+-extern remote_restart;
++extern int remote_restart;
+ /*Basic Authentication Arguments*/
+ char *basic_auth = NULL;
+--- a/volume.c
++++ b/volume.c
+@@ -29,5 +29,5 @@
+ int init_alsa_volume_control(char *name)
+ {
+-	char *elemnam;
++	const char *elemnam;
+ 	snd_mixer_open(&mixer,0);
+ 	snd_mixer_attach(mixer,name);
diff --git a/media-sound/mpg321/metadata.xml b/media-sound/mpg321/metadata.xml
index 9f7b457900b6..cbb01564985e 100644
--- a/media-sound/mpg321/metadata.xml
+++ b/media-sound/mpg321/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2-r1.ebuild
index cc2a3e240b6f..3c6648eb9257 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2-r1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+inherit autotools
 
-DESCRIPTION="A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="http://mpg321.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://mpg321.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alsa ipv6"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="alsa"
 
 RDEPEND="app-eselect/eselect-mpg123
-	>=media-libs/libao-1
-	media-libs/libid3tag
+	>=media-libs/libao-1:=
+	media-libs/libid3tag:=
 	media-libs/libmad
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )"
@@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-format-security.patch"
 	"${FILESDIR}/${P}-CVE-2019-14247.patch"
 	"${FILESDIR}/${P}-gcc10.patch"
+	"${FILESDIR}/${P}-clang16.patch"
 )
 
 src_prepare() {
@@ -38,7 +39,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-mpg123-symlink \
-		$(use_enable ipv6) \
+		--enable-ipv6 \
 		$(use_enable alsa)
 }
 
diff --git a/media-sound/mplay/metadata.xml b/media-sound/mplay/metadata.xml
index 8f3a9b367fac..cdf8561177a1 100644
--- a/media-sound/mplay/metadata.xml
+++ b/media-sound/mplay/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mplay/mplay-0.80.ebuild b/media-sound/mplay/mplay-0.80.ebuild
index a3cd7a2a79cf..27fab3d40b0f 100644
--- a/media-sound/mplay/mplay-0.80.ebuild
+++ b/media-sound/mplay/mplay-0.80.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="A Curses front-end for mplayer"
-HOMEPAGE="http://mplay.sourceforge.net"
-SRC_URI="mirror://sourceforge/mplay/${P}.tar.gz"
+DESCRIPTION="Curses front-end for mplayer"
+HOMEPAGE="https://mplay.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/mplay/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
deleted file mode 100644
index 0907346dc3e1..000000000000
--- a/media-sound/mps-youtube/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
diff --git a/media-sound/mps-youtube/metadata.xml b/media-sound/mps-youtube/metadata.xml
deleted file mode 100644
index 2705b7dbbe4a..000000000000
--- a/media-sound/mps-youtube/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">mps-youtube</remote-id>
-		<remote-id type="github">mps-youtube/mps-youtube</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild
deleted file mode 100644
index a98b41c7a2fc..000000000000
--- a/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mps-youtube/mps-youtube.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pafy[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-	|| ( media-video/mpv media-video/mplayer )
-"
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
deleted file mode 100644
index a98b41c7a2fc..000000000000
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mps-youtube/mps-youtube.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pafy[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-	|| ( media-video/mpv media-video/mplayer )
-"
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch
new file mode 100644
index 000000000000..f9efbe4419bc
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch
@@ -0,0 +1,80 @@
+https://bugs.gentoo.org/860879
+https://bugs.gentoo.org/875011
+--- a/configure.in
++++ b/configure.in
+@@ -21,6 +21,9 @@ CPPFLAGS="${CPPFLAGS} -g"
+ 
+ AM_MAINTAINER_MODE
+ 
++# For strcasestr
++AC_USE_SYSTEM_EXTENSIONS
++
+ dnl fix freebsd's broken (?) libpthread
+ AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [
+   AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ])
+--- a/src/configfile.c
++++ b/src/configfile.c
+@@ -48,6 +48,7 @@
+ #include <sys/wait.h>
+ 
+ #include "configfile.h"
++#include "db-memory.h"
+ #include "err.h"
+ 
+ #ifndef WITHOUT_MDNS
+--- a/src/dynamic-art.c
++++ b/src/dynamic-art.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ 
+ #include "configfile.h"
++#include "dynamic-art.h"
+ #include "err.h"
+ #include "playlist.h"
+ #include "restart.h"
+--- a/src/mp3-scanner.h
++++ b/src/mp3-scanner.h
+@@ -74,5 +74,6 @@ extern void make_composite_tags(MP3FILE *song);
+ 
+ /* this should be refactored out of here... */
+ extern off_t aac_drilltoatom(FILE *aac_fp, char *atom_path, unsigned int *atom_length);
++extern long scan_aac_findatom(FILE *fin, long max_offset, char *which_atom, int *atom_size);
+ 
+ #endif /* _MP3_SCANNER_H_ */
+--- a/src/parser.y
++++ b/src/parser.y
+@@ -26,11 +26,14 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include "playlist.h"
+ 
++#define YYPARSE_PARAM param
+ #define YYERROR_VERBOSE 1
+ 
+ extern int yyerror(char *msg);
++extern int yylex(void);
+ 
+ /* Forwards */
+ 
+--- a/src/query.c
++++ b/src/query.c
+@@ -2,6 +2,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+--- a/src/webserver.c
++++ b/src/webserver.c
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ 
++#include "configfile.h"
+ #include "err.h"
+ #include "webserver.h"
+ 
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch
new file mode 100644
index 000000000000..707b7ac3b828
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/716010
+--- a/src/mp3-scanner.c
++++ b/src/mp3-scanner.c
+@@ -378,7 +378,7 @@ int scan_init(char *path) {
+  */
+ int scan_path(char *path) {
+     DIR *current_dir;
+-    char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* overcommit for solaris */
++    char de[sizeof(struct dirent) + NAME_MAX + 1]; /* overcommit for solaris */
+     struct dirent *pde;
+     int err;
+     char mp3_path[PATH_MAX];
+--- a/src/webserver.c
++++ b/src/webserver.c
+@@ -1029,14 +1029,14 @@ int ws_returnerror(WS_CONNINFO *pwsc,int error, char *description) {
+  * and serves it up
+  */
+ void ws_defaulthandler(WS_PRIVATE *pwsp, WS_CONNINFO *pwsc) {
+-    char path[MAXPATHLEN];
+-    char resolved_path[MAXPATHLEN];
++    char path[PATH_MAX];
++    char resolved_path[PATH_MAX];
+     int file_fd;
+     off_t len;
+ 
+     DPRINTF(E_SPAM,L_WS,"Entering ws_defaulthandler\n");
+ 
+-    snprintf(path,MAXPATHLEN,"%s/%s",pwsp->wsconfig.web_root,pwsc->uri);
++    snprintf(path,PATH_MAX,"%s/%s",pwsp->wsconfig.web_root,pwsc->uri);
+     if(!realpath(path,resolved_path)) {
+         pwsc->error=errno;
+         DPRINTF(E_WARN,L_WS,"Exiting ws_defaulthandler: Cannot resolve %s\n",path);
diff --git a/media-sound/mt-daapd/files/mt-daapd.tmpfiles b/media-sound/mt-daapd/files/mt-daapd.tmpfiles
new file mode 100644
index 000000000000..e0923ac06d7c
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd.tmpfiles
@@ -0,0 +1 @@
+d /var/cache/mt-daapd 0755 root root -
diff --git a/media-sound/mt-daapd/metadata.xml b/media-sound/mt-daapd/metadata.xml
index a7b87586932a..cf6521b04ba1 100644
--- a/media-sound/mt-daapd/metadata.xml
+++ b/media-sound/mt-daapd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
index bb376b2c40ab..87746dfd5d6d 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools tmpfiles
 
 DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
 HOMEPAGE="https://sourceforge.net/projects/mt-daapd/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,15 +16,18 @@ IUSE="vorbis"
 
 RDEPEND="
 	media-libs/libid3tag:=
-	net-dns/avahi:=[dbus]
+	net-dns/avahi[dbus]
 	sys-libs/gdbm:=
 	sys-libs/zlib:=
 	vorbis? (
-		media-libs/libvorbis:=
-		media-libs/libogg:=
+		media-libs/libvorbis
+		media-libs/libogg
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/byacc
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.3-sparc.patch
@@ -32,15 +35,24 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch
 	"${FILESDIR}"/${P}-maintainer-mode.patch
 	"${FILESDIR}"/${P}-oggvorbis.patch
+	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 src_prepare() {
 	default
+
+	# parser.y is fixed by the clang16 patch, force regeneration
+	rm src/parser.c || die
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
+	# Incompatible with Bison 3, dead upstream
+	export YACC=byacc
+
 	econf \
 		$(use_enable vorbis oggvorbis) \
 		--disable-maintainer-mode \
@@ -57,10 +69,14 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
 
-	keepdir /var/cache/mt-daapd /etc/mt-daapd.d
+	keepdir /etc/mt-daapd.d
+
+	newtmpfiles "${FILESDIR}"/mt-daapd.tmpfiles mt-daapd.conf
 }
 
 pkg_postinst() {
+	tmpfiles_process mt-daapd.conf
+
 	elog
 	elog "You have to configure your mt-daapd.conf following"
 	elog "${EROOT}/etc/mt-daapd.conf.example file."
diff --git a/media-sound/multimux/metadata.xml b/media-sound/multimux/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/multimux/metadata.xml
+++ b/media-sound/multimux/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/multimux/multimux-0.2.5.2.ebuild b/media-sound/multimux/multimux-0.2.5.2.ebuild
index da2b0b17ecfb..c2395a254d6e 100644
--- a/media-sound/multimux/multimux-0.2.5.2.ebuild
+++ b/media-sound/multimux/multimux-0.2.5.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="combines up to 8 audio mono wave ch. into one big multi ch. wave file"
-HOMEPAGE="http://panteltje.com/panteltje/dvd/"
-SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+DESCRIPTION="Combines up to 8 audio mono wave ch. into one big multi ch. wave file"
+HOMEPAGE="https://www.panteltje.nl/panteltje/dvd/index.html"
+SRC_URI="https://www.panteltje.nl/panteltje/dvd/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
deleted file mode 100644
index 64cd425a9321..000000000000
--- a/media-sound/mumble/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
-DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
-DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
deleted file mode 100644
index 06725553903a..000000000000
--- a/media-sound/mumble/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<use>
-		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
-		<flag name="rnnoise">Enable alternative noise suppression option based on RNNoise.</flag>
-		<flag name="speech">Enable text-to-speech support in Mumble.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">mumble</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/mumble/mumble-1.3.1-r1.ebuild b/media-sound/mumble/mumble-1.3.1-r1.ebuild
deleted file mode 100644
index c462111f1123..000000000000
--- a/media-sound/mumble/mumble-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib-build qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	insinto /usr/$(get_libdir)/${PN}
-	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/mumble/mumble-1.3.2.ebuild b/media-sound/mumble/mumble-1.3.2.ebuild
deleted file mode 100644
index df7176498fdf..000000000000
--- a/media-sound/mumble/mumble-1.3.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib-build qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	insinto /usr/$(get_libdir)/${PN}
-	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/mumble/mumble-1.3.3.ebuild b/media-sound/mumble/mumble-1.3.3.ebuild
deleted file mode 100644
index 0da26f648ad4..000000000000
--- a/media-sound/mumble/mumble-1.3.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib-build qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	insinto /usr/$(get_libdir)/${PN}
-	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
deleted file mode 100644
index 1109a96055d6..000000000000
--- a/media-sound/mumble/mumble-9999.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl portaudio pulseaudio nls +rnnoise speech test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/opus-1.3.1
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-        # required because of xdg.eclass also providing src_prepare
-        cmake_src_prepare
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-Dalsa="$(usex alsa)"
-		-DBUILD_TESTING="$(usex test)"
-		-Dbundled-celt="ON"
-		-Dbundled-opus="OFF"
-		-Dbundled-speex="OFF"
-		-Ddbus="$(usex dbus)"
-		-Dg15="$(usex g15)"
-		-Djackaudio="$(usex jack)"
-		-Doverlay="ON"
-		-Dportaudio="$(usex portaudio)"
-		-Dpulseaudio="$(usex pulseaudio)"
-		-Drnnoise="$(usex rnnoise)"
-		-Dserver="OFF"
-		-Dspeechd="$(usex speech)"
-		-Dtranslations="$(usex nls)"
-		-Dupdate="OFF"
-		-Dzeroconf="$(usex zeroconf)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use amd64 ; then
-		# The 32bit overlay library gets automatically built and installed on x86_64 platforms.
-		# Install it into the correct 32bit lib dir.
-		local libdir_64="/usr/$(get_libdir)/mumble"
-		local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble"
-		dodir ${libdir_32}
-		mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \
-			"${ED}"/${libdir_32}/ || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
-	elog "Run 'mumble-overlay <program>' to start the OpenGL overlay (after starting mumble)."
-	echo
-}
diff --git a/media-sound/munt-mt32emu-alsadrv/Manifest b/media-sound/munt-mt32emu-alsadrv/Manifest
index c34079940fcf..8ae7549df066 100644
--- a/media-sound/munt-mt32emu-alsadrv/Manifest
+++ b/media-sound/munt-mt32emu-alsadrv/Manifest
@@ -1 +1 @@
-DIST munt_2_3_0.tar.gz 418703 BLAKE2B d9c4290f11f4114b26aa45d6591c04a73d56981e7f618c1466db81fd35be3588b2853fb60b9cf65dd523ce8ea120a5a187bd805b58ba2f75719d460929c2e4e1 SHA512 87fe4891628ea33967270fe3c6c3840e40deb14bd7c8d61490d4c0057438af6bc0099c10e24e813ef1613ca9cc9fc1567a0340c7ea1f4254b209f7fc99c8c7a1
+DIST libmt32emu_2_6_1.tar.gz 572860 BLAKE2B 3ba8ec7d9b73a83341eafc990e2c5a2c5c439564ad43ac3d6f9ab3325225c863418fd901e5424e57343b40cb8cc873345003fd299d6a22d02ff3872681ff164e SHA512 888c417cce04b31b45858220a6615105611471567be8cce91c2053885c4b677a09667310bfab702bbf62f4b7230bb7c2357cb480087f6e4daecbd58e464e4212
diff --git a/media-sound/munt-mt32emu-alsadrv/metadata.xml b/media-sound/munt-mt32emu-alsadrv/metadata.xml
index 3ee0e2c84df7..e4cb982a3c5b 100644
--- a/media-sound/munt-mt32emu-alsadrv/metadata.xml
+++ b/media-sound/munt-mt32emu-alsadrv/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild b/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.6.1.ebuild
index 135f9f121553..63bdf8498eeb 100644
--- a/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
+++ b/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.6.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs prefix
 
-MY_P="munt_${PV//./_}"
+MY_P="libmt32emu_${PV//./_}"
 DESCRIPTION="ALSA MIDI driver for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
 HOMEPAGE="https://github.com/munt/munt"
 SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 DEPEND="media-libs/alsa-lib
-	media-libs/munt-mt32emu
+	>=media-libs/munt-mt32emu-2.6.0
 	X? (
 		x11-libs/libX11
 		x11-libs/libXpm
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 056b323faec5..509c4061cb32 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1 +1 @@
-DIST mup66src.tar.gz 2514430 BLAKE2B d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb SHA512 3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
+DIST mup69src.tar.gz 3062560 BLAKE2B cb7456fe52f85a122106675372a5ffabe9466086e730cbb15dbb590ea2485ecfc34e52d8b8c7c3a583d98e4e8e352be07a203e41da38cd145adf11cdf59bad92 SHA512 b3b49177e12b6a8dbd711e88a327826b60e4141a0720c1be4900af2124ac29592572d866d98f2a5b8318fb008fb035371ad83f152601bf22d98a3e7568ecfe95
diff --git a/media-sound/mup/files/mup-6.6-makefile.patch b/media-sound/mup/files/mup-6.6-makefile.patch
deleted file mode 100644
index 0350a6e80447..000000000000
--- a/media-sound/mup/files/mup-6.6-makefile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Fix header/library locations for fltk, respect LDFLAGS, and allow the ebuild to
-handle docs install.
-
---- mup-6.6/makefile
-+++ mup-6.6/makefile
-@@ -80,12 +80,12 @@
- 
- # You can change this if your X libraries and headers are somewhere else
- # (like /usr/X11R6).
--X_LOCATION = /usr/X11
-+X_LOCATION = /usr
- 
- # If you installed fltk somewhere other than $(X_LOCATION)/lib
- # set this to find them, as in
- # FLTK_LIB_LOCATION = -L/usr/local/lib
--FLTK_LIB_LOCATION =
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk
- 
- # The X libraries to link with Mupmate.
- # Depending on how fltk was compiled, you may be able to omit
-@@ -99,7 +99,7 @@
- #FLTK_VERSION=FLTK_1_1
- 
- # The FLTK header files are under $(FLTK_INCLUDE)/FL
--FLTK_INCLUDE = $(X_LOCATION)/include
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk
- 
- # You can use fltk_jpeg or jpeg library, whichever you have
- # or depending on how fltk was compiled, you may not need it at all
-@@ -251,25 +251,25 @@
- 	flex -t extras/lex.l > mup/lex.c
- 
- mup/mup: $(MUP_HDRS) $(MUP_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
- 
- mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
--	$(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
- 	# For Linux console mode support, comment out the previous line
- 	# and uncomment the following line
- 	# $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm
- 
- mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
- 
- mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
--	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
-+	$(CPPCOMPILER) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
- 	$(FLTK_VERSION) -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
- 	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
- 	$(JPEGLIB) $(PNGLIB) $(ZLIB) -lm
- 
- install:	all
--	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide $(ICONDIR) $(LIBDIR)
-+	mkdir -p $(BINDIR) $(MANDIR) $(ICONDIR) $(LIBDIR)
- 	cp mup/mup $(BINDIR)/mup
- 	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
- 	cp mupdisp/mupdisp $(BINDIR)/mupdisp
-@@ -278,8 +278,6 @@
- 	cp mupmate/mupmate $(BINDIR)/mupmate
- 	cp mupprnt $(BINDIR)/mupprnt
- 	cp docs/*.1 $(MANDIR)
--	cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
--	cp docs/uguide/* $(DOCDIR)/uguide
- 	cp $(MUPMATE_OTHER_FILES) $(ICONDIR)
- 	cp $(MUP_LIB_FILES) $(LIBDIR)
- 
diff --git a/media-sound/mup/files/mup-6.9-build-system.patch b/media-sound/mup/files/mup-6.9-build-system.patch
new file mode 100644
index 000000000000..07a7dba237bf
--- /dev/null
+++ b/media-sound/mup/files/mup-6.9-build-system.patch
@@ -0,0 +1,125 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,2 @@
+ SUBDIRS = lib tools src doc mup-input packaging
+-EXTRA_DIST = LICENSE simple.makefile
+-mup_doc_dir = $(datadir)/doc/packages/$(PACKAGE)
+-mup_doc__DATA = LICENSE
++EXTRA_DIST = simple.makefile
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.69])
+ AC_INIT([mup], [6.9], [support@arkkra.com])
+-AM_INIT_AUTOMAKE([-Wall -Werror])
++AM_INIT_AUTOMAKE([-Wall])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+@@ -16,21 +16,21 @@ AC_PROG_SED
+ AC_PROG_MKDIR_P
+ 
+ AC_PATH_PROGS(GS, [gs gs386], [none])
+-test "$GS" == "none" && AC_MSG_ERROR([required ghostscript program 'gs' is missing])
++test "$GS" = "none" && AC_MSG_ERROR([required ghostscript program 'gs' is missing])
+ AC_PATH_PROG(GROFF, [groff], [none])
+-test "$GROFF" == "none" && AC_MSG_ERROR([required program 'groff' is missing])
++test "$GROFF" = "none" && AC_MSG_ERROR([required program 'groff' is missing])
+ AC_PATH_PROG(BISON, [bison], [none])
+-test "$BISON" == "none" && AC_MSG_ERROR([required program 'bison' is missing])
++test "$BISON" = "none" && AC_MSG_ERROR([required program 'bison' is missing])
+ AC_PATH_PROG(PPMTOGIF, [ppmtogif], [none])
+-test "$PPMTOGIF" == "none" && AC_MSG_ERROR([required program 'ppmtogif' is missing])
++test "$PPMTOGIF" = "none" && AC_MSG_ERROR([required program 'ppmtogif' is missing])
+ AC_PATH_PROG(EXPR, [expr], [none])
+-test "$EXPR" == "none" && AC_MSG_ERROR([required program 'expr' is missing])
++test "$EXPR" = "none" && AC_MSG_ERROR([required program 'expr' is missing])
+ AC_PATH_PROG(SORT, [sort], [none])
+-test "$SORT" == "none" && AC_MSG_ERROR([required program 'sort' is missing])
++test "$SORT" = "none" && AC_MSG_ERROR([required program 'sort' is missing])
+ AC_PATH_PROG(CAT, [cat], [none])
+-test "$CAT" == "none" && AC_MSG_ERROR([required program 'cat' is missing])
++test "$CAT" = "none" && AC_MSG_ERROR([required program 'cat' is missing])
+ AC_PATH_PROG(EGREP, [egrep], [none])
+-test "$EGREP" == "none" && AC_MSG_ERROR([required program 'egrep' is missing])
++test "$EGREP" = "none" && AC_MSG_ERROR([required program 'egrep' is missing])
+ 
+ # Need to know if on Windows to install mupprnt.bat rather than shell script
+ AC_CANONICAL_HOST
+@@ -70,7 +70,7 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	# Find fltk-config program
+ 	PATH="$fltk_prefix/bin:$PATH"
+ 	AC_PATH_PROG(FLTK_CONFIG, fltk-config, none, $PATH)
+-	test "$FLTK_CONFIG" == "none" && AC_MSG_ERROR([required program 'fltk-config' is missing])
++	test "$FLTK_CONFIG" = "none" && AC_MSG_ERROR([required program 'fltk-config' is missing])
+ 	# Make sure it is the 1.x API, not 2.x
+ 	fltk_api_version="`$FLTK_CONFIG --api-version`"
+ 	fltk_api_major=`echo $fltk_api_version | sed -e 's/\..*//'`
+@@ -79,13 +79,13 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	AC_SUBST([FLTK_CXXFLAGS], [`$FLTK_CONFIG --cxxflags`])
+ 	# Red Hat/CentOS 7 version of fltk-config doesn't include -lfltk when using --use_image --ldflags, so fix that
+ 	fltk_ldflags="`$FLTK_CONFIG --use-images --ldflags`"
+-	if test "$fltk_ldflags" == "-lfltk_images"
++	if test "$fltk_ldflags" = "-lfltk_images"
+ 	then
+ 		AC_SUBST([FLTK_LDFLAGS], ["-lfltk -lfltk_images"])
+ 	else
+ 		AC_SUBST([FLTK_LDFLAGS], [`$FLTK_CONFIG --use-images --ldflags`])
+ 	fi
+-	test "$build_mac" == "yes" && AC_SUBST([EXTRA_CFLAGS], [-Dunix])
++	test "$build_mac" = "yes" && AC_SUBST([EXTRA_CFLAGS], [-Dunix])
+ 	# Check that libraries that Mupmate needs exist
+ 	AC_CHECK_LIB([fltk], [fl_alphasort], [ ])
+ 	AC_CHECK_LIB([fltk_images], [main], [ ])
+@@ -100,13 +100,13 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	AC_CHECK_LIB([z], [gzgets], [ ])
+ 
+ 	# Programs for Windows icons for Mupmate
+-	test "$build_windows" == "yes" && test "$PAMTOWINICON" == "none" && test "$PPMWINICON" == "none" && AC_MSG_ERROR([Need either pamtowinicon or ppmtowinicon])
++	test "$build_windows" = "yes" && test "$PAMTOWINICON" = "none" && test "$PPMWINICON" = "none" && AC_MSG_ERROR([Need either pamtowinicon or ppmtowinicon])
+ 	AC_PATH_PROG(XPMTOPPM, xpmtoppm, none, $PATH)
+-	test "$build_windows" == "yes" && test "$XPMTOPPM" == "none" && AC_MSG_ERROR([Need xpmtoppm])
++	test "$build_windows" = "yes" && test "$XPMTOPPM" = "none" && AC_MSG_ERROR([Need xpmtoppm])
+ 	AC_PATH_PROG(PPMTOPGM, ppmtopgm, none, $PATH)
+-	test "$build_windows" == "yes" && test "$PPMTOPGM" == "none" && test "$PAMTOWINICON" == "none" && AC_MSG_ERROR([Need ppmtopgm])
++	test "$build_windows" = "yes" && test "$PPMTOPGM" = "none" && test "$PAMTOWINICON" = "none" && AC_MSG_ERROR([Need ppmtopgm])
+ 	AC_PATH_PROG(WINDRES, i386-mingw32msvc-windres, none, $PATH)
+-	test "$build_windows" == "yes" && test "$WINDRES" == "none" && AC_MSG_ERROR([Need i386-mingw32msvc-windres])
++	test "$build_windows" = "yes" && test "$WINDRES" = "none" && AC_MSG_ERROR([Need i386-mingw32msvc-windres])
+ 	]
+ )
+ 
+@@ -122,7 +122,7 @@ AC_FUNC_MALLOC
+ AC_FUNC_MMAP
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([access alarm atan cos getcwd isascii isspace memcmp memmove memset munmap pow putenv select setenv sin sqrt strcasecmp strchr strcmp strcpy strcspn strdup strerror strncasecmp strncpy strpbrk strrchr strspn strstr strtol tan unlink])
+-test "$build_linux" == "yes" && AC_CHECK_FUNCS([kill sleep waitpid])
++test "$build_linux" = "yes" && AC_CHECK_FUNCS([kill sleep waitpid])
+ 
+ AS_IF([test "x$enable_mupdisp" != xno],
+ 	[
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -208,10 +208,9 @@ uguide_files = \
+ 
+ ps_files = quickref.ps uguide.ps
+ EXTRA_DIST = uguide.t quickref.t charlist $(uguide_files) $(ps_files)
+-mup_doc_dir = $(datadir)/doc/packages/$(PACKAGE)
+-mup_doc__DATA = $(ps_files)
+-mup_uguide_dir = $(mup_doc_dir)/uguide
+-mup_uguide__DATA = $(uguide_files)
++dist_doc_DATA = $(ps_files)
++mup_uguidedir = $(docdir)/uguide
++mup_uguide_DATA = $(uguide_files)
+ 
+ muschar.ps: ../src/include/muschar.h ../tools/doc/mkmuscharps.sh
+ 	../tools/doc/mkmuscharps.sh < ../src/include/muschar.h
+--- a/doc/htmldocs/Makefile.am
++++ b/doc/htmldocs/Makefile.am
+@@ -1,4 +1,4 @@
+ mup_html_docs = blind.html faq.html Macinst.html mupfeat.html overview.html usercomm.html whatsnew.html winrun.html
+-mup_htmldoc_dir = $(datadir)/doc/packages/$(PACKAGE)
++mup_htmldoc_dir = $(htmldir)
+ mup_htmldoc__DATA = $(mup_html_docs)
+ EXTRA_DIST = $(mup_html_docs)
diff --git a/media-sound/mup/metadata.xml b/media-sound/mup/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/mup/metadata.xml
+++ b/media-sound/mup/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/mup/mup-6.6.ebuild b/media-sound/mup/mup-6.6.ebuild
deleted file mode 100644
index 2647e954d2c2..000000000000
--- a/media-sound/mup/mup-6.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program for printing music scores"
-HOMEPAGE="http://www.arkkra.com/"
-SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
-
-LICENSE="Arkkra"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/fltk-1.3:1
-	x11-libs/libXpm
-	virtual/jpeg:0
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-	sed -i -e "s:/lib:/$(get_libdir):g" makefile || die
-}
-
-src_compile() {
-	emake CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc docs/{*.txt,README0}
-	docinto html
-	dodoc docs/{*.html,uguide/*}
-	docinto sample
-	dodoc docs/{*.mup,*.ps}
-}
diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9.ebuild
new file mode 100644
index 000000000000..64e1202d55d3
--- /dev/null
+++ b/media-sound/mup/mup-6.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Program for printing music scores"
+HOMEPAGE="http://www.arkkra.com/"
+SRC_URI="http://www.arkkra.com/ftp/pub/unix/mup${PV//.}src.tar.gz
+	ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
+
+LICENSE="Arkkra"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/fltk-1.3:1
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/ghostscript-gpl
+	media-libs/netpbm
+	sys-apps/groff
+	app-alternatives/yacc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.9-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_compile() {
+	emake -j1 CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc README
+}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
deleted file mode 100644
index 64cd425a9321..000000000000
--- a/media-sound/murmur/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
-DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
-DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
diff --git a/media-sound/murmur/files/murmur.confd b/media-sound/murmur/files/murmur.confd
deleted file mode 100644
index 36367c51136b..000000000000
--- a/media-sound/murmur/files/murmur.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# where to look for the config file
-MURMUR_CONF=/etc/murmur/murmur.ini
-
-# run as this user
-MURMUR_USER=murmur
-
-# HOME directory of MURMUR_USER
-MURMUR_HOME=/var/lib/murmur
-
diff --git a/media-sound/murmur/files/murmur.initd-r1 b/media-sound/murmur/files/murmur.initd-r1
deleted file mode 100644
index fe49b32f1410..000000000000
--- a/media-sound/murmur/files/murmur.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-
-pidfile="/run/murmur/murmur.pid"
-command="/usr/bin/murmurd"
-command_args="-ini \"${MURMUR_CONF}\""
-start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" --wait 20"
-extra_started_commands="reload"
-
-depend() {
-	need localmount net
-	use dbus logger
-	after bootmisc mysql
-}
-
-start_pre() {
-	checkpath -q -d -o ${MURMUR_USER} ${pidfile%/*}
-}
-
-reload() {
-	ebegin "Reloading Murmur"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}" \
-		--exec ${command}
-	eend $?
-}
-
diff --git a/media-sound/murmur/files/murmur.logrotate b/media-sound/murmur/files/murmur.logrotate
deleted file mode 100644
index a82cb1a336c4..000000000000
--- a/media-sound/murmur/files/murmur.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/murmur/*.log {
-	missingok
-	notifempty
-	sharedscripts
-	postrotate
-		test -r /run/murmur/murmur.pid && kill -HUP $(cat /run/murmur/murmur.pid) &>/dev/null
-	endscript
-}
diff --git a/media-sound/murmur/files/murmurd-dbus.tmpfiles b/media-sound/murmur/files/murmurd-dbus.tmpfiles
deleted file mode 100644
index 70963d0a575b..000000000000
--- a/media-sound/murmur/files/murmurd-dbus.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/murmur 0755 murmur murmur
diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml
deleted file mode 100644
index 786a950d6d06..000000000000
--- a/media-sound/murmur/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<use>
-		<flag name="grpc">Use <pkg>net-libs/grpc</pkg> to enable remote control capabilities.</flag>
-		<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">mumble</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/murmur/murmur-1.3.1.ebuild b/media-sound/murmur/murmur-1.3.1.ebuild
deleted file mode 100644
index 606e4379065a..000000000000
--- a/media-sound/murmur/murmur-1.3.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
-	fi
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-"
-BDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	virtual/pkgconfig
-"
-
-if [[ "${PV}" == *9999 ]] ; then
-	# Required for the mkini.sh script which calls perl multiple times
-	BDEPEND+="
-		dev-lang/perl
-	"
-fi
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-i scripts/${PN}.service || die
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local conf_add=(
-		no-client
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse ice)
-		$(myuse pch)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	eqmake5 main.pro -recursive \
-		CONFIG+="${conf_add[*]}"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local dir="$(usex debug debug release)"
-	dobin "${dir}"/murmurd
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	newins scripts/${PN}.ini.system ${PN}.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-1.3.2.ebuild b/media-sound/murmur/murmur-1.3.2.ebuild
deleted file mode 100644
index 17d28a117c43..000000000000
--- a/media-sound/murmur/murmur-1.3.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-"
-BDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	virtual/pkgconfig
-"
-
-if [[ "${PV}" == *9999 ]] ; then
-	# Required for the mkini.sh script which calls perl multiple times
-	BDEPEND+="
-		dev-lang/perl
-	"
-fi
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-i scripts/${PN}.service || die
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local conf_add=(
-		no-client
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse ice)
-		$(myuse pch)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	eqmake5 main.pro -recursive \
-		CONFIG+="${conf_add[*]}"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local dir="$(usex debug debug release)"
-	dobin "${dir}"/murmurd
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	newins scripts/${PN}.ini.system ${PN}.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
deleted file mode 100644
index 606e4379065a..000000000000
--- a/media-sound/murmur/murmur-1.3.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
-	fi
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-"
-BDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	virtual/pkgconfig
-"
-
-if [[ "${PV}" == *9999 ]] ; then
-	# Required for the mkini.sh script which calls perl multiple times
-	BDEPEND+="
-		dev-lang/perl
-	"
-fi
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-i scripts/${PN}.service || die
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local conf_add=(
-		no-client
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse ice)
-		$(myuse pch)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	eqmake5 main.pro -recursive \
-		CONFIG+="${conf_add[*]}"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local dir="$(usex debug debug release)"
-	dobin "${dir}"/murmurd
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	newins scripts/${PN}.ini.system ${PN}.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
deleted file mode 100644
index 761b2f65bbb7..000000000000
--- a/media-sound/murmur/murmur-9999.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus grpc +ice test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	grpc? ( net-libs/grpc )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-"
-BDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	virtual/pkgconfig
-"
-
-if [[ "${PV}" == *9999 ]] ; then
-	# Required for the mkini.sh script which calls perl multiple times
-	BDEPEND+="
-		dev-lang/perl
-	"
-fi
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-i scripts/${PN}.service || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-Dclient="OFF"
-		-Ddbus="$(usex dbus)"
-		-Dg15="OFF"
-		-Dgrpc="$(usex grpc)"
-		-Dice="$(usex ice)"
-		-Doverlay="OFF"
-		-Dserver="ON"
-		-Dzeroconf="$(usex zeroconf)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc README.md CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	newins scripts/${PN}.ini.system ${PN}.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/muse/metadata.xml b/media-sound/muse/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/muse/metadata.xml
+++ b/media-sound/muse/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/muse/muse-0.9.2_p20161002.ebuild b/media-sound/muse/muse-0.9.2_p20161002.ebuild
index a2a8c1500450..941e5c7991d1 100644
--- a/media-sound/muse/muse-0.9.2_p20161002.ebuild
+++ b/media-sound/muse/muse-0.9.2_p20161002.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-text/doxygen )"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch )
 
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 508dfd8d69e8..f497d8d80b05 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1 +1 @@
-DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
+DIST musepack-tools-495.tar.xz 148820 BLAKE2B 19e104339fddee49f7082095767228f9ad297e442532c6170c48f7d7ded9df3ce7e2f2afc446055cae4140e7fa0ec52bf5b72d216c2bf932cebf74847fe939e0 SHA512 11e7590280216e4d8706d659be9f9faa25deeb5b1831e03edf7c4615fff06c1c817bc20fb5d6c3f7efd7ccadbb22b32d37ea8070aeb8c126f18e4d67e81c7e1c
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch b/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch
deleted file mode 100644
index 0fb9f5e5eb55..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/706992
---- a/libmpcdec/requant.h
-+++ b/libmpcdec/requant.h
-@@ -47,9 +47,9 @@
- 
- 
- /* C O N S T A N T S */
--const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
--const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
--const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
-+extern const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
-+extern const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
-+extern const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
- 
- #define Cc (__Cc + 1)
- #define Dc (__Dc + 1)
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
deleted file mode 100644
index 5c80531d96f4..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,10 +15,6 @@
- 
- add_definitions(-DFAST_MATH -DCVD_FASTLOG)
- 
--if(NOT MSVC)
--  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
--endif(NOT MSVC)
--
- add_subdirectory(libmpcdec)
- add_subdirectory(libmpcpsy)
- add_subdirectory(libmpcenc)
---- a/libmpcdec/CMakeLists.txt
-+++ b/libmpcdec/CMakeLists.txt
-@@ -1,7 +1,15 @@
- include_directories(${libmpc_SOURCE_DIR}/include)
--if(SHARED)
--  add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
--else(SHARED)
--  add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
--endif(SHARED)
- 
-+add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
-+set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
-+if(NOT MSVC)
-+  target_link_libraries(mpcdec_shared m)
-+endif(NOT MSVC)
-+
-+add_library(mpcdec_shared STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
-+
-+if(NOT MSVC)
-+  target_link_libraries(mpcdec_shared m)
-+endif(NOT MSVC)
-+
-+install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
---- a/mpc2sv8/CMakeLists.txt
-+++ b/mpc2sv8/CMakeLists.txt
-@@ -15,7 +15,7 @@
- if(SHARED)
-   target_link_libraries(mpc2sv8 mpcdec_shared)
- else(SHARED)
--  target_link_libraries(mpc2sv8 mpcdec_static)
-+  target_link_libraries(mpc2sv8 mpcdec_shared)
- endif(SHARED)
- 
- target_link_libraries(mpc2sv8 mpcenc_static)
---- a/mpcchap/CMakeLists.txt
-+++ b/mpcchap/CMakeLists.txt
-@@ -17,7 +17,7 @@
- if(SHARED)
-   target_link_libraries(mpcchap mpcdec_shared)
- else(SHARED)
--  target_link_libraries(mpcchap mpcdec_static)
-+  target_link_libraries(mpcchap mpcdec_shared)
- endif(SHARED)
- 
- target_link_libraries(mpcchap mpcenc_static)
---- a/mpccut/CMakeLists.txt
-+++ b/mpccut/CMakeLists.txt
-@@ -15,7 +15,7 @@
- if(SHARED)
-   target_link_libraries(mpccut mpcdec_shared)
- else(SHARED)
--  target_link_libraries(mpccut mpcdec_static)
-+  target_link_libraries(mpccut mpcdec_shared)
- endif(SHARED)
- 
- target_link_libraries(mpccut mpcenc_static)
---- a/mpcdec/CMakeLists.txt
-+++ b/mpcdec/CMakeLists.txt
-@@ -21,7 +21,7 @@
- if(SHARED)
-   target_link_libraries(mpcdec mpcdec_shared)
- else(SHARED)
--  target_link_libraries(mpcdec mpcdec_static)
-+  target_link_libraries(mpcdec mpcdec_shared)
- endif(SHARED)
- 
- install(TARGETS mpcdec RUNTIME DESTINATION bin)
---- a/mpcgain/CMakeLists.txt
-+++ b/mpcgain/CMakeLists.txt
-@@ -22,7 +22,7 @@
- if(SHARED)
-   target_link_libraries(mpcgain mpcdec_shared)
- else(SHARED)
--  target_link_libraries(mpcgain mpcdec_static)
-+  target_link_libraries(mpcgain mpcdec_shared)
- endif(SHARED)
- 
- if(NOT MSVC)
diff --git a/media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch b/media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch
new file mode 100644
index 000000000000..b62800c594a3
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch
@@ -0,0 +1,95 @@
+From a71b6e2f189e90b272094b8b9cd88752ff96e785 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Wed, 13 Mar 2024 00:34:22 -0400
+Subject: [PATCH] Fix regression causing executables to not depend on libmpcdec
+
+In revision r491 a "Gentoo patch" was merged, entitled
+
+"Fixup installation of shared mpcdec library."
+
+It inherently clashed with revision r467, which *also* renamed the
+target in question.
+---
+ mpc2sv8/CMakeLists.txt | 2 +-
+ mpcchap/CMakeLists.txt | 2 +-
+ mpccut/CMakeLists.txt  | 2 +-
+ mpcdec/CMakeLists.txt  | 2 +-
+ mpcgain/CMakeLists.txt | 4 ++--
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/mpc2sv8/CMakeLists.txt b/mpc2sv8/CMakeLists.txt
+index eea0df0..a4fe93e 100644
+--- a/mpc2sv8/CMakeLists.txt
++++ b/mpc2sv8/CMakeLists.txt
+@@ -13,7 +13,7 @@ endif(MSVC)
+ add_executable(mpc2sv8 mpc2sv8.c)
+ 
+ if(SHARED)
+-  target_link_libraries(mpc2sv8 mpcdec)
++  target_link_libraries(mpc2sv8 mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpc2sv8 mpcdec_static)
+ endif(SHARED)
+diff --git a/mpcchap/CMakeLists.txt b/mpcchap/CMakeLists.txt
+index 743d5b6..50c4ded 100644
+--- a/mpcchap/CMakeLists.txt
++++ b/mpcchap/CMakeLists.txt
+@@ -15,7 +15,7 @@ link_directories(${libmpc_BINARY_DIR}/libmpcenc)
+ add_executable(mpcchap mpcchap.c dictionary.c iniparser.c ${libmpc_SOURCE_DIR}/common/tags.c)
+ 
+ if(SHARED)
+-  target_link_libraries(mpcchap mpcdec)
++  target_link_libraries(mpcchap mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpcchap mpcdec_static)
+ endif(SHARED)
+diff --git a/mpccut/CMakeLists.txt b/mpccut/CMakeLists.txt
+index 7d15ce2..2fbfb7a 100644
+--- a/mpccut/CMakeLists.txt
++++ b/mpccut/CMakeLists.txt
+@@ -13,7 +13,7 @@ endif(MSVC)
+ add_executable(mpccut mpccut.c)
+ 
+ if(SHARED)
+-  target_link_libraries(mpccut mpcdec)
++  target_link_libraries(mpccut mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpccut mpcdec_static)
+ endif(SHARED)
+diff --git a/mpcdec/CMakeLists.txt b/mpcdec/CMakeLists.txt
+index c95f521..a4ca38f 100644
+--- a/mpcdec/CMakeLists.txt
++++ b/mpcdec/CMakeLists.txt
+@@ -15,7 +15,7 @@ add_executable(mpcdec_cmd mpcdec.c)
+ target_link_libraries(mpcdec_cmd wavformat_static)
+ 
+ if(SHARED)
+-  target_link_libraries(mpcdec_cmd mpcdec)
++  target_link_libraries(mpcdec_cmd mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpcdec_cmd mpcdec_static)
+ endif(SHARED)
+diff --git a/mpcgain/CMakeLists.txt b/mpcgain/CMakeLists.txt
+index 5445faf..474f3b3 100644
+--- a/mpcgain/CMakeLists.txt
++++ b/mpcgain/CMakeLists.txt
+@@ -13,14 +13,14 @@ FIND_LIBRARY(REPLAY_GAIN_LIBRARY NAMES replaygain replaygain_static PATHS
+ include_directories(${libmpc_SOURCE_DIR}/include)
+ include_directories(${REPLAY_GAIN_INCLUDE_DIR})
+ 
+-link_directories(${libmpc_BINARY_DIR}/libmpcdec)
++link_directories(${libmpc_BINARY_DIR}/libmpcdec_shared)
+ 
+ add_executable(mpcgain mpcgain.c)
+ 
+ target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY})
+ 
+ if(SHARED)
+-  target_link_libraries(mpcgain mpcdec)
++  target_link_libraries(mpcgain mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpcgain mpcdec_static)
+ endif(SHARED)
+-- 
+2.43.2
+
diff --git a/media-sound/musepack-tools/files/musepack-tools-495-respect-cflags.patch b/media-sound/musepack-tools/files/musepack-tools-495-respect-cflags.patch
new file mode 100644
index 000000000000..5ed2797ab3bc
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-495-respect-cflags.patch
@@ -0,0 +1,27 @@
+From 95ba4fd6c2f2f5bd770d1a100afd65e5c95fa1d0 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Wed, 13 Mar 2024 00:00:45 -0400
+Subject: [PATCH] Respect environment CFLAGS
+
+---
+ CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4d9b78f..3b09d4c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,10 +20,6 @@ endif()
+ 
+ add_definitions(-DFAST_MATH -DCVD_FASTLOG)
+ 
+-if(NOT MSVC)
+-  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
+-endif(NOT MSVC)
+-
+ add_subdirectory(libmpcdec)
+ add_subdirectory(libmpcpsy)
+ add_subdirectory(libmpcenc)
+-- 
+2.43.2
+
diff --git a/media-sound/musepack-tools/metadata.xml b/media-sound/musepack-tools/metadata.xml
index 39626a990be5..cd1cfc033621 100644
--- a/media-sound/musepack-tools/metadata.xml
+++ b/media-sound/musepack-tools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
deleted file mode 100644
index 1bf1cb8f8554..000000000000
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-# svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
-# tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
-
-DESCRIPTION="Musepack SV8 libraries and utilities"
-HOMEPAGE="https://www.musepack.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND="
-	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
-	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}
-	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
diff --git a/media-sound/musepack-tools/musepack-tools-495.ebuild b/media-sound/musepack-tools/musepack-tools-495.ebuild
new file mode 100644
index 000000000000..0c09918a1fbe
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-495.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+# svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
+# tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
+
+DESCRIPTION="Musepack SV8 libraries and utilities"
+HOMEPAGE="https://www.musepack.net"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	>=media-libs/libcuefile-477
+	>=media-libs/libreplaygain-477
+"
+RDEPEND="
+	${DEPEND}
+	!media-libs/libmpcdec
+	!media-libs/libmpcdecsv7
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-cflags.patch
+	"${FILESDIR}"/${P}-fixup-link-depends.patch
+)
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/860882
+	#
+	# Software is dead since 2016.
+	filter-lto
+
+	# Symbols are decorated with MPC_API but visibility isn't wired up to the
+	# build system(s)
+	append-flags -fvisibility=hidden
+
+	cmake_src_configure
+}
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index b9d6b81186b0..64ea10b591d3 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb SHA512 4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
+DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
+DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e SHA512 fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
+DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482 SHA512 db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
diff --git a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
index fd5ade55ed42..a9e871f12d77 100644
--- a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
+++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6437963..2a173b9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -660,7 +660,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
diff --git a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
deleted file mode 100644
index 283ffdc92e21..000000000000
--- a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
-index 94b1aef..6a7b4e8 100644
---- a/mscore/scoreview.cpp
-+++ b/mscore/scoreview.cpp
-@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s)
-                   cv->updateGrips();
-                   }},
-       #ifdef OMR
--            {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
-+            {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
-                   if (cv->score()->masterScore()->omr())
-                         showOmr(!_score->masterScore()->showOmr());
-                   }},
diff --git a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
deleted file mode 100644
index b4e1ad0baf54..000000000000
--- a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/omr/pattern.h b/omr/pattern.h
-index b040497..1b8e0c4 100644
---- a/omr/pattern.h
-+++ b/omr/pattern.h
-@@ -24,7 +24,6 @@
- 
- namespace Ms {
- 
--enum class SymId;
- class Sym;
- 
- //---------------------------------------------------------
diff --git a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
new file mode 100644
index 000000000000..caf9ae67ec70
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
@@ -0,0 +1,12 @@
+Fix misnamed variable causing build failure with USE=-mp3
+https://bugs.gentoo.org/767760
+Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
+--- a/mscore/exportdialog.cpp
++++ b/mscore/exportdialog.cpp
+@@ -77,5 +77,5 @@
+       // Disable .mp3 option if unavailable
+       QStandardItem* mp3Item = fileTypeComboBoxModel->item(3);
+-      mp3Item->setFlags(audioItem->flags() & ~Qt::ItemIsEnabled);
++      mp3Item->setFlags(mp3Item->flags() & ~Qt::ItemIsEnabled);
+ # endif
+ # ifndef HAS_AUDIOFILE
diff --git a/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch
new file mode 100644
index 000000000000..6c299d90da67
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch
@@ -0,0 +1,121 @@
+Unbundling of all dependencies which are currently available as system packages
+and have not been modified (to our knowledge) by MuseScore.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,7 +206,7 @@ if (BUILD_UNIT_TESTS)
+         FULL_DOCS "List XML files outputted by google test."
+     )
+ 
+-    add_subdirectory(thirdparty/googletest)
++    find_package(GTest REQUIRED)
+ endif(BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
++++ b/src/framework/audio/CMakeLists.txt
+@@ -216,11 +216,18 @@ if (ENABLE_AUDIO_EXPORT)
+         ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+         )
+ 
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
++    pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
++    pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
++    pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
++    pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
+ 
+-    set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
++    set(MODULE_LINK
++        ${MODULE_LINK}
++        PkgConfig::lame
++        PkgConfig::libopusenc
++        PkgConfig::flac
++        PkgConfig::flacpp
++    )
+ endif()
+ 
+ if (OS_IS_MAC)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
++++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "mp3encoder.h"
+ 
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ using namespace mu;
+ using namespace mu::audio;
+--- a/src/framework/audio/internal/encoders/oggencoder.cpp
++++ b/src/framework/audio/internal/encoders/oggencoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "oggencoder.h"
+ 
+-#include "opusenc.h"
++#include "opus/opusenc.h"
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/CMakeLists.txt
++++ b/src/framework/global/CMakeLists.txt
+@@ -105,8 +105,6 @@ set(MODULE_SRC
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
+@@ -124,6 +122,8 @@ set(MODULE_SRC
+     ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
+ )
+ 
++find_package(tinyxml2 REQUIRED)
++
+ if (GLOBAL_NO_INTERNAL)
+     set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
+ else()
+@@ -184,6 +184,7 @@ set(MODULE_INCLUDE
+ set(MODULE_LINK
+     ${FS_LIB}
+     ${Z_LIB}
++    tinyxml2::tinyxml2
+ )
+ 
+ if (OS_IS_MAC)
+--- a/src/framework/global/serialization/xmldom.cpp
++++ b/src/framework/global/serialization/xmldom.cpp
+@@ -21,7 +21,7 @@
+  */
+ #include "xmldom.h"
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/serialization/xmlstreamreader.cpp
++++ b/src/framework/global/serialization/xmlstreamreader.cpp
+@@ -23,7 +23,7 @@
+ 
+ #include <cstring>
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+ 
+ #include "log.h"
+ 
+--- a/src/framework/testing/gtest.cmake
++++ b/src/framework/testing/gtest.cmake
+@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQ
+ target_link_libraries(${MODULE_TEST}
+     Qt5::Core
+     Qt5::Gui
+-    gmock
++    GTest::gmock
+     global
+     ${MODULE_TEST_LINK}
+     )
diff --git a/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch
new file mode 100644
index 000000000000..078662a66bdb
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch
@@ -0,0 +1,29 @@
+--- a/build/cmake/SetupAppImagePackaging.cmake
++++ b/build/cmake/SetupAppImagePackaging.cmake
+@@ -85,7 +85,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
+     # Compress man pages if gzip is installed (don't on OpenBSD)
+     # Note: Compressing man pages is normal on Linux but not OpenBSD
+     find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." )
+-    if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++    if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+         message(STATUS "Found 'gzip'. Man pages will be compressed.")
+         set(MAN_TARGET ${MAN_BUILD})
+         set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
+@@ -102,7 +102,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
+             COMMAND echo "Man pages have been compressed ready for installation."
+             VERBATIM
+             )
+-    else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++    else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+         if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+             message(STATUS "System is OpenBSD: Man pages will not be compressed.")
+         else (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -112,7 +112,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
+             COMMAND echo "Man pages will be installed uncompressed."
+             VERBATIM
+             )
+-    endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++    endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+     # Install man pages in either compressed or uncompressed form
+     install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)
+     # Create symlink alias for man pages so `man musescore` = `man mscore`
diff --git a/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch b/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch
new file mode 100644
index 000000000000..0c9c43d11877
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch
@@ -0,0 +1,11 @@
+--- a/src/engraving/style/style.cpp
++++ b/src/engraving/style/style.cpp
+@@ -42,7 +42,7 @@ using namespace mu::engraving;
+ 
+ const PropertyValue& MStyle::value(Sid idx) const
+ {
+-    if (idx == Sid::NOSTYLE) {
++    if (idx == Sid::NOSTYLE || size_t(idx) >= m_values.size()) {
+         static PropertyValue dummy;
+         return dummy;
+     }
diff --git a/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
new file mode 100644
index 000000000000..50b388814680
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
@@ -0,0 +1,119 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,7 +185,7 @@ if (MUE_BUILD_UNIT_TESTS)
+         FULL_DOCS "List XML files outputted by google test."
+     )
+ 
+-    add_subdirectory(thirdparty/googletest)
++    find_package(GTest REQUIRED)
+ endif(MUE_BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
++++ b/src/framework/audio/CMakeLists.txt
+@@ -268,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT)
+         ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+         )
+ 
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
++    pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
++    pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
++    pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
++    pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
+ 
+-    set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
++    set(MODULE_LINK
++        ${MODULE_LINK}
++        PkgConfig::lame
++        PkgConfig::libopusenc
++        PkgConfig::flac
++        PkgConfig::flacpp
++    )
+ endif()
+ 
+ if (ARCH_IS_X86_64)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
++++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "mp3encoder.h"
+ 
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ using namespace mu;
+ using namespace mu::audio;
+--- a/src/framework/audio/internal/encoders/oggencoder.cpp
++++ b/src/framework/audio/internal/encoders/oggencoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "oggencoder.h"
+ 
+-#include "opusenc.h"
++#include "opus/opusenc.h"
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/CMakeLists.txt
++++ b/src/framework/global/CMakeLists.txt
+@@ -111,8 +111,6 @@ set(MODULE_SRC
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
+@@ -130,6 +128,8 @@ set(MODULE_SRC
+     ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
+ )
+ 
++find_package(tinyxml2 REQUIRED)
++
+ if (GLOBAL_NO_INTERNAL)
+     set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
+ else()
+@@ -209,6 +209,7 @@ list(APPEND MODULE_INCLUDE
+ list(APPEND MODULE_LINK
+     ${FS_LIB}
+     ${Z_LIB}
++    tinyxml2::tinyxml2
+ )
+ 
+ if (MUE_ENABLE_CUSTOM_ALLOCATOR)
+--- a/src/framework/global/serialization/xmldom.cpp
++++ b/src/framework/global/serialization/xmldom.cpp
+@@ -21,7 +21,7 @@
+  */
+ #include "xmldom.h"
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/serialization/xmlstreamreader.cpp
++++ b/src/framework/global/serialization/xmlstreamreader.cpp
+@@ -23,7 +23,7 @@
+ 
+ #include <cstring>
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+ 
+ #include "log.h"
+ 
+--- a/src/framework/testing/gtest.cmake
++++ b/src/framework/testing/gtest.cmake
+@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
+ target_link_libraries(${MODULE_TEST}
+     Qt5::Core
+     Qt5::Gui
+-    gmock
++    GTest::gmock
+     global
+     ${MODULE_TEST_LINK}
+     )
diff --git a/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
new file mode 100644
index 000000000000..12bcb0f2f42b
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
@@ -0,0 +1,29 @@
+--- a/build/cmake/SetupAppImagePackaging.cmake
++++ b/build/cmake/SetupAppImagePackaging.cmake
+@@ -99,7 +99,7 @@ configure_file(${MAN_TARGET} ${MAN_BUILD})
+ # Note: Compressing man pages is normal on Linux but not OpenBSD
+ find_program(GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional).")
+ 
+-if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+     message(STATUS "Found 'gzip'. Man pages will be compressed.")
+     set(MAN_TARGET ${MAN_BUILD})
+     set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
+@@ -116,7 +116,7 @@ if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+         COMMAND echo "Man pages have been compressed ready for installation."
+         VERBATIM
+     )
+-else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+     if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+         message(STATUS "System is OpenBSD: Man pages will not be compressed.")
+     else(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -127,7 +127,7 @@ else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+         COMMAND echo "Man pages will be installed uncompressed."
+         VERBATIM
+     )
+-endif(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++endif(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+ 
+ # Install man pages in either compressed or uncompressed form
+ install(FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)
diff --git a/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
new file mode 100644
index 000000000000..56ae1f4fa2d6
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
@@ -0,0 +1,63 @@
+--- a/src/framework/ui/uimodule.h
++++ b/src/framework/ui/uimodule.h
+@@ -24,6 +24,7 @@
+ #define MU_UI_UIMODULE_H
+ 
+ #include "modularity/imodulesetup.h"
++#include <QtGlobal>
+ 
+ namespace mu::ui {
+ class UiConfiguration;
+--- a/src/framework/ui/view/interactiveprovider.h
++++ b/src/framework/ui/view/interactiveprovider.h
+@@ -26,6 +26,7 @@
+ #include <QVariant>
+ #include <QMap>
+ #include <QStack>
++#include <QEventLoop>
+ 
+ #include "modularity/ioc.h"
+ #include "../iinteractiveprovider.h"
+--- a/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
++++ b/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
+@@ -34,6 +34,8 @@
+ 
+ #include "log.h"
+ 
++#include <QXmlStreamReader>
++
+ using AccidentalType = mu::engraving::AccidentalType;
+ using SymId = mu::engraving::SymId;
+ const static std::map<mu::String, AccidentalType> smuflAccidentalTypes {
+--- a/src/importexport/videoexport/internal/videowriter.cpp
++++ b/src/importexport/videoexport/internal/videowriter.cpp
+@@ -32,6 +32,8 @@
+ 
+ #include "log.h"
+ 
++#include <QPainter>
++
+ using namespace mu::iex::videoexport;
+ using namespace mu::project;
+ using namespace mu::notation;
+--- a/src/learn/view/learnpagemodel.h
++++ b/src/learn/view/learnpagemodel.h
+@@ -23,6 +23,7 @@
+ #define MU_LEARN_LEARNPAGEMODEL_H
+ 
+ #include <QObject>
++#include <QVariant>
+ 
+ #include "async/asyncable.h"
+ 
+--- a/src/project/internal/exporttype.h
++++ b/src/project/internal/exporttype.h
+@@ -23,6 +23,8 @@
+ #define MU_PROJECT_EXPORTTYPE_H
+ 
+ #include <unordered_set>
++#include <QList>
++#include <QVariant>
+ 
+ #include "containers.h"
+ 
diff --git a/media-sound/musescore/files/musescore-9999-unbundle-deps.patch b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
new file mode 100644
index 000000000000..bac09d7eaa82
--- /dev/null
+++ b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
@@ -0,0 +1,120 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,7 +206,7 @@ if (MUE_BUILD_UNIT_TESTS)
+         FULL_DOCS "List XML files outputted by google test."
+     )
+ 
+-    add_subdirectory(thirdparty/googletest)
++    find_package(GTest REQUIRED)
+ endif(MUE_BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
++++ b/src/framework/audio/CMakeLists.txt
+@@ -268,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT)
+         ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+         )
+ 
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
++    pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
++    pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
++    pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
++    pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
+ 
+-    set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
++    set(MODULE_LINK
++        ${MODULE_LINK}
++        PkgConfig::lame
++        PkgConfig::libopusenc
++        PkgConfig::flac
++        PkgConfig::flacpp
++    )
+ endif()
+ 
+ if (ARCH_IS_X86_64)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
++++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "mp3encoder.h"
+ 
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ using namespace mu;
+ using namespace mu::audio;
+--- a/src/framework/audio/internal/encoders/oggencoder.cpp
++++ b/src/framework/audio/internal/encoders/oggencoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "oggencoder.h"
+ 
+-#include "opusenc.h"
++#include "opus/opusenc.h"
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/CMakeLists.txt
++++ b/src/framework/global/CMakeLists.txt
+@@ -112,9 +112,6 @@ set(MODULE_SRC
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/tinyxml2.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/tinyxml2.h
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/mu_patch.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
+@@ -132,6 +129,8 @@ set(MODULE_SRC
+     ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
+ )
+ 
++find_package(tinyxml2 REQUIRED)
++
+ if (GLOBAL_NO_INTERNAL)
+     set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
+ else()
+@@ -213,6 +212,7 @@ list(APPEND MODULE_INCLUDE
+ list(APPEND MODULE_LINK
+     ${FS_LIB}
+     ${Z_LIB}
++    tinyxml2::tinyxml2
+ )
+ 
+ if (MUE_ENABLE_CUSTOM_ALLOCATOR)
+--- a/src/framework/global/serialization/xmldom.cpp
++++ b/src/framework/global/serialization/xmldom.cpp
+@@ -21,7 +21,7 @@
+  */
+ #include "xmldom.h"
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/serialization/xmlstreamreader.cpp
++++ b/src/framework/global/serialization/xmlstreamreader.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include "global/types/string.h"
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+ 
+ #include "log.h"
+ 
+--- a/src/framework/testing/gtest.cmake
++++ b/src/framework/testing/gtest.cmake
+@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
+ target_link_libraries(${MODULE_TEST}
+     Qt5::Core
+     Qt5::Gui
+-    gmock
++    GTest::gmock
+     global
+     ${MODULE_TEST_LINK}
+     )
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index 0a5292967923..bb8981f3fa8a 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -10,11 +10,13 @@
 		<remote-id type="github">musescore/MuseScore</remote-id>
 	</upstream>
 	<use>
+		<flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag>
 		<flag name="osc">Enable OSC remote control protocol</flag>
 		<flag name="omr">Enable PDF import (OMR - optical music recognition)</flag>
 		<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
 		<flag name="sf3">Enable SoundFont 3 support using  <pkg>media-libs/libvorbis</pkg></flag>
 		<flag name="sfz">Enable experimental SFZ sampler</flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
+		<flag name="video">Support exporting scores as videos using the command line</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/musescore/musescore-3.5.2.ebuild b/media-sound/musescore/musescore-3.6.2-r1.ebuild
index b8137e72faf0..c5afad3d5f44 100644
--- a/media-sound/musescore/musescore-3.5.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
+inherit cmake qmake-utils xdg check-reqs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
@@ -39,6 +39,7 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtquickcontrols2:5
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
@@ -62,8 +63,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${PN}-3.5-lambda-capture-this.patch"
-	"${FILESDIR}/${PN}-3.5-remove-duplicite-declaration.patch"
+	"${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
 )
 
 src_unpack() {
@@ -83,13 +83,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
 	local mycmakeargs=(
 		-DAEOLUS=OFF # does not compile
 		-DBUILD_ALSA="$(usex alsa)"
 		-DBUILD_CRASH_REPORTER=OFF
 		-DBUILD_JACK="$(usex jack)"
 		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
+		-DBUILD_PCH=OFF
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
diff --git a/media-sound/musescore/musescore-4.0.2-r1.ebuild b/media-sound/musescore/musescore-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..b2186e4cc9ea
--- /dev/null
+++ b/media-sound/musescore/musescore-4.0.2-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+VIRTUALX_REQUIRED="test"
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+else
+	SRC_URI="
+		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug jumbo-build test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/tinyxml2:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtnetworkauth:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5[widgets]
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+	dev-qt/qtsvg:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/alsa-lib-1.0.0
+	media-libs/flac:=
+	>=media-libs/freetype-2.5.2
+	media-libs/libopusenc
+	media-libs/libsndfile
+	media-libs/opus
+	media-sound/lame
+	sys-libs/zlib:=
+"
+# dev-cpp/gtest is required even when tests are disabled!
+DEPEND="
+	${RDEPEND}
+
+	dev-cpp/gtest
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-uncompressed-man-pages.patch"
+	"${FILESDIR}/${P}-unbundle-deps.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		unpack ${A}
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+
+	# Make sure we don't accidentally use bundled third party deps
+	# for which we want to use system packages instead.
+	rm -r thirdparty/{flac,freetype,googletest,lame,opus,opusenc} \
+		|| die "Failed to remove unused thirdparty directories"
+}
+
+src_configure() {
+	# confuses rcc, bug #908808
+	filter-lto
+
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local mycmakeargs=(
+		-DMUSESCORE_BUILD_CONFIG=release
+
+		-DBUILD_CRASHPAD_CLIENT=OFF
+		-DBUILD_AUTOUPDATE=OFF
+		# Jack support has been dropped in 4.0.0,
+		# but its remnants are still in the build system and cause trouble.
+		# https://github.com/musescore/MuseScore/issues/12775
+		-DBUILD_JACK=OFF
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DSOUNDFONT3=ON
+		-DBUILD_UNIT_TESTS="$(usex test)"
+		-DCMAKE_SKIP_RPATH=ON
+		-DTRY_USE_CCACHE=OFF
+		-DBUILD_UNITY="$(usex jumbo-build)"
+		-DUSE_SYSTEM_FREETYPE=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Hack to not install bundled libraries like libogg
+	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
diff --git a/media-sound/musescore/musescore-4.2.1-r2.ebuild b/media-sound/musescore/musescore-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..9e3eb5ad3fc8
--- /dev/null
+++ b/media-sound/musescore/musescore-4.2.1-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD=3500M
+VIRTUALX_REQUIRED="test"
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
+else
+	SRC_URI="
+		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="jack test video"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/tinyxml2:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtnetworkauth:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5[widgets]
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+	dev-qt/qtsvg:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/alsa-lib-1.0.0
+	media-libs/flac:=
+	>=media-libs/freetype-2.5.2
+	media-libs/libopusenc
+	media-libs/libsndfile
+	media-libs/opus
+	media-sound/lame
+	sys-libs/zlib:=
+	jack? ( virtual/jack )
+	video? ( media-video/ffmpeg )
+"
+# dev-cpp/gtest is required even when tests are disabled!
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
+	"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
+	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+	"${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		unpack ${A}
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+
+	# Make sure we don't accidentally use bundled third party deps
+	# for which we want to use system packages instead.
+	rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
+		|| die "Failed to remove unused thirdparty directories"
+}
+
+src_configure() {
+	# confuses rcc, bug #908808
+	filter-lto
+
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
+		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_SKIP_RPATH=TRUE
+		-DMUE_BUILD_CRASHPAD_CLIENT=OFF
+		-DMUE_BUILD_UNIT_TESTS="$(usex test)"
+		-DMUE_BUILD_UPDATE_MODULE=OFF
+		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
+		-DMUE_COMPILE_USE_CCACHE=OFF
+		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+		-DMUE_DOWNLOAD_SOUNDFONT=OFF
+		-DMUE_ENABLE_AUDIO_JACK=$(usex jack)
+		-DMUSESCORE_BUILD_MODE=release
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build lrelease manpages
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Hack to not install bundled libraries
+	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 42039a19c047..2479f5aa8f21 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
+VIRTUALX_REQUIRED="test"
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+	EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
 else
-	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
@@ -24,41 +26,54 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
+IUSE="jack test video"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
-DEPEND="
-	dev-qt/designer:5
+RDEPEND="
+	dev-libs/tinyxml2:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtnetworkauth:5
+	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5[widgets]
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
 	dev-qt/qtsvg:5
+	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
+	>=media-libs/alsa-lib-1.0.0
+	media-libs/flac:=
 	>=media-libs/freetype-2.5.2
+	media-libs/libopusenc
 	media-libs/libsndfile
+	media-libs/opus
+	media-sound/lame
 	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
+	video? ( media-video/ffmpeg )
+"
+# dev-cpp/gtest is required even when tests are disabled!
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
 "
-RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
+	"${FILESDIR}/${PN}-9999-unbundle-deps.patch"
+	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+)
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]]; then
@@ -73,40 +88,52 @@ src_prepare() {
 	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+	mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+
+	# Make sure we don't accidentally use bundled third party deps
+	# for which we want to use system packages instead.
+	rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
+		|| die "Failed to remove unused thirdparty directories"
 }
 
 src_configure() {
+	# confuses rcc, bug #908808
+	filter-lto
+
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
 	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
+		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_SKIP_RPATH=TRUE
+		-DMUE_BUILD_CRASHPAD_CLIENT=OFF
+		-DMUE_BUILD_UNIT_TESTS="$(usex test)"
+		-DMUE_BUILD_UPDATE_MODULE=OFF
+		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
+		-DMUE_COMPILE_USE_CCACHE=OFF
+		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+		-DMUE_DOWNLOAD_SOUNDFONT=OFF
+		-DMUE_ENABLE_AUDIO_JACK=$(usex jack)
+		-DMUSESCORE_BUILD_MODE=release
 	)
 	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
+	cmake_build lrelease manpages
 	cmake_src_compile
 }
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Hack to not install bundled libraries
+	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
diff --git a/media-sound/music-file-organizer/metadata.xml b/media-sound/music-file-organizer/metadata.xml
index 915f00227065..4d1e1ea205c7 100644
--- a/media-sound/music-file-organizer/metadata.xml
+++ b/media-sound/music-file-organizer/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zx2c4@gentoo.org</email>
diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
index 8dc5c9a5cd75..e06a380cc914 100644
--- a/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
+++ b/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,10 +10,13 @@ SRC_URI="https://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="media-libs/taglib dev-libs/icu:="
-DEPEND="${RDEPEND} virtual/pkgconfig"
+RDEPEND="
+	dev-libs/icu:=
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_postinst() {
 	einfo
diff --git a/media-sound/musique/metadata.xml b/media-sound/musique/metadata.xml
index 451f4c376053..d34918e7487b 100644
--- a/media-sound/musique/metadata.xml
+++ b/media-sound/musique/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">flaviotordini/musique</remote-id>
 	</upstream>
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 0bf169a9d632..3c2aa611ee2b 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,2 +1 @@
-DIST ncmpc-0.34.tar.xz 227892 BLAKE2B 19d9d9abe3d85cb2567a222c8ce108889d4517272e2bb82f4064ef76af68d610ff4c7516102b976f66380e0e3d3ee7ed00023116cb6b2d1628e3d38796705a09 SHA512 e206cc2d61799a97edf1182de4cee1c0fa447bd1fac136dc48670cb624a7efc903c693b0c541fbc00fcb94e055c83be1ca6370386c99131a1b571f47b67c35f4
-DIST ncmpc-0.39.tar.xz 242968 BLAKE2B 1b270ed52aa884cecd3e1ce60bb2ed628ef79480697f388b48a09e0f22068dbbb7623b01171e5cfae9556446e404530f93c84ca3c3d5cc481c8431f37786c2f4 SHA512 bfadc58bf8b66bff08608f561f689a50fd412b87975998ce23751fd312fa009eeba4b48b4afe96391b2ecb184c00c366262e9b96e24d2ce2ab2af6a4002721d9
+DIST ncmpc-0.49.tar.xz 296012 BLAKE2B c87c07bcf107e20224982a99fdedb09468ed510f7e6138e6e35386c636bdf62a3fd79e609670f7931966e3be09de668d1119ade950f2b8e4cd7c546d47a405be SHA512 9913f08d90b229af59c8da0ac737445661dc69f0174f996dedbd0c9d9c4833004dbd9319f6bc08dc8b35a191ae167c090a3f31b43167e1918c5fad8f044a4c17
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 43e440230e03..7c2caa2a3f95 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/ncmpc/ncmpc-0.39.ebuild b/media-sound/ncmpc/ncmpc-0.39.ebuild
deleted file mode 100644
index cad4074e5d6f..000000000000
--- a/media-sound/ncmpc/ncmpc-0.39.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-RDEPEND="
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
-	lirc? ( app-misc/lirc )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
-"
-
-src_prepare() {
-	default
-
-	# use correct docdir and don't install license file
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "s/'COPYING', //" \
-		-i meson.build || die
-
-	# use correct (html) docdir
-	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
-		-i doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dasync_connect=$(usex async-connect true false)
-		-Dchat_screen=$(usex chat-screen true false)
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dhelp_screen=$(usex help-screen true false)
-		-Dkey_screen=$(usex key-screen true false)
-		-Dlibrary_screen=$(usex library-screen true false)
-		-Dlirc=$(usex lirc enabled disabled)
-		-Dlocale=$(usex nls enabled disabled)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Dmouse=$(usex mouse enabled disabled)
-		-Dmultibyte=$(usex nls true false)
-		-Dnls=$(usex nls enabled disabled)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dregex=$(usex pcre enabled disabled)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/ncmpc/ncmpc-0.34.ebuild b/media-sound/ncmpc/ncmpc-0.49.ebuild
index 94de1e83a067..327075ddcd81 100644
--- a/media-sound/ncmpc/ncmpc-0.34.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.49.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -12,21 +12,20 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
+IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
 "
 RDEPEND="
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
+	media-libs/libmpdclient
+	sys-libs/ncurses:=[unicode(+)]
 	lirc? ( app-misc/lirc )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
+	pcre? ( dev-libs/libpcre2 )
 "
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
@@ -63,6 +62,7 @@ src_configure() {
 		-Dregex=$(usex pcre enabled disabled)
 		-Dsearch_screen=$(usex search-screen true false)
 		-Dsong_screen=$(usex song-screen true false)
+		$(meson_use test)
 	)
 
 	meson_src_configure
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 0b6159ba9e28..d546f39f4293 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,2 +1,2 @@
-DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-DIST ncmpcpp-0.9.1.tar.bz2 474436 BLAKE2B 89f6a6d68baf54b0a0eca6d3df96dcd5bcd1346e6f93d0a580f2fbbe4b4246218b62e5332f3db2567c9a91ee30ceb367039a328fa7f491c2a756c2c03fed76c3 SHA512 8fa9f512ac09c144eab4e4721a9c54f3f411593fe13c26db12fbaa3ccf6b08d7cd54923e1e4148b2db45dc69431280611b2be2d153513c0d38eaf92af8ceb9fb
+DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
+DIST ncmpcpp-0.9.2_p20221231.gh.tar.gz 229678 BLAKE2B edb03554a14b90fbb5a4c99cb46ed73ffd702ff2fa417765d4e4bdaddd6bc40554f18aae10db81af87bbc8c91a4f966785fefdf43cfc97b18fc950c1aa59a370 SHA512 8affb5115c7531ee005544f002068b0b13b6aa41c5e11213ba8c979373a5328f298612903e531b6d384749469d6fa0ddb0d06ac4dac5ab2ca5485c7814db32a3
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
deleted file mode 100644
index 466abceecfe8..000000000000
--- a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 399e0f47008b487df3505476c959b4f42d8bc1b1 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Sat, 9 May 2020 14:31:52 +0200
-Subject: [PATCH] Fix build with GCC 10 by adding missing include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following error:
-./mpdpp.h:438:15: error: ‘runtime_error’ is not a member of ‘std’
----
- src/mpdpp.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mpdpp.h b/src/mpdpp.h
-index a2bb79eb..abd3666c 100644
---- a/src/mpdpp.h
-+++ b/src/mpdpp.h
-@@ -25,6 +25,7 @@
- #include <exception>
- #include <random>
- #include <set>
-+#include <stdexcept>
- #include <vector>
- 
- #include <mpd/client.h>
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
new file mode 100644
index 000000000000..3a3c55e923d9
--- /dev/null
+++ b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
@@ -0,0 +1,56 @@
+From 8796a4469795dfb067d02e19ddb3ae380d9b2fc3 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Thu, 10 Nov 2022 23:58:33 +0000
+Subject: [PATCH] Check for taglib with pkg-config before trying taglib-config
+
+Programs like taglib-config are not good when cross-compiling.
+---
+ configure.ac | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ef0c52b7..193840e6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -257,19 +257,30 @@ PKG_CHECK_MODULES([libcurl], [libcurl], [
+ 
+ # taglib
+ if test "$taglib" != "no" ; then
+-	AC_PATH_PROG(TAGLIB_CONFIG, taglib-config)
+-	if test "$TAGLIB_CONFIG" != "" ; then
+-		CPPFLAGS="$CPPFLAGS `$TAGLIB_CONFIG --cflags`"
+-		LIBS="$LIBS `$TAGLIB_CONFIG --libs`"
++	PKG_CHECK_MODULES([taglib], [taglib], [
++		AC_SUBST(taglib_CFLAGS)
++		AC_SUBST(taglib_LIBS)
++	], [
++		AC_PATH_PROG([TAGLIB_CONFIG], [taglib-config])
++		if test "$TAGLIB_CONFIG" != ""; then
++			taglib_CFLAGS=`$TAGLIB_CONFIG --cflags`
++			taglib_LIBS=`$TAGLIB_CONFIG --libs`
++		else
++			if test "$taglib" = "yes" ; then
++				AC_MSG_ERROR([could not find taglib.pc or taglib-config executable])
++			fi
++		fi
++	])
++
++	if test "$TAGLIB_CONFIG$taglib_LIBS" != "" ; then
++		CPPFLAGS="$CPPFLAGS $taglib_CFLAGS"
++		LIBS="$LIBS $taglib_LIBS"
++
+ 		AC_CHECK_HEADERS([taglib.h], ,
+ 			if test "$taglib" = "yes" ; then
+ 				AC_MSG_ERROR([missing taglib.h header])
+ 			fi
+ 		)
+-	else
+-		if test "$taglib" = "yes" ; then
+-			AC_MSG_ERROR([taglib-config executable is missing])
+-		fi
+ 	fi
+ fi
+ 
+-- 
+2.38.1
+
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index 9730a091cab3..9f24a3207164 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
+		<email>nex+b-g-o@nexadn.de</email>
+		<name>Adrian Schollmeyer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="clock">Enable clock screen</flag>
@@ -29,4 +33,7 @@
 		* ability to browse and add files from outside of MPD music directory
 		..and a lot more minor convenient functions.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">ncmpcpp/ncmpcpp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
index ae5b5d47d37e..88dfc6c7e3b7 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
@@ -1,46 +1,54 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
+HOMEPAGE="
+	https://rybczak.net/ncmpcpp/
+	https://github.com/ncmpcpp/ncmpcpp/
+"
 SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
-	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/boost:=[icu,nls]
 	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=[unicode]
-	sys-libs/readline:*
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/readline:=
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
-	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}/${PN}-taglib-pc.patch"
 )
 
 src_prepare() {
 	default
+	eautoreconf
 
 	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
 	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
 }
 
 src_configure() {
+	# --with-lto only appends -flto
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
+		--without-lto \
 		$(use_with taglib) \
 		$(use_with visualizer fftw)
 }
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild
index b5189ed27301..4f310241770f 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild
@@ -1,43 +1,51 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+inherit autotools
+
+NCMPCPP_COMMIT="9f44edf0b1d74da7cefbd498341d59bc52f6043f"
+
+DESCRIPTION="Featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
+SRC_URI="https://github.com/ncmpcpp/ncmpcpp/archive/${NCMPCPP_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
-	!dev-libs/boost:0/1.57.0
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/boost:=[icu,nls]
 	dev-libs/icu:=
+	media-libs/libmpdclient
 	net-misc/curl
-	sys-libs/ncurses:=[unicode]
-	sys-libs/readline:*
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/readline:=
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+S="${WORKDIR}/${PN}-${NCMPCPP_COMMIT}"
+
 src_prepare() {
 	default
+	eautoreconf
 
 	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
 	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
 }
 
 src_configure() {
+	# --with-lto only appends -flto
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
+		--without-lto \
 		$(use_with taglib) \
 		$(use_with visualizer fftw)
 }
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 74f29afe4abf..83a7d42906c9 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools git-r3
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
+HOMEPAGE="
+	https://rybczak.net/ncmpcpp/
+	https://github.com/ncmpcpp/ncmpcpp/
+"
 EGIT_REPO_URI="https://github.com/ncmpcpp/ncmpcpp"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS=""
 IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
-	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/boost:=[icu,nls]
 	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=[unicode]
-	sys-libs/readline:*
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/readline:=
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
@@ -39,10 +41,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# --with-lto only appends -flto
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
+		--without-lto \
 		$(use_with taglib) \
 		$(use_with visualizer fftw)
 }
diff --git a/media-sound/ncspot/Manifest b/media-sound/ncspot/Manifest
new file mode 100644
index 000000000000..e0ee7d0fe17e
--- /dev/null
+++ b/media-sound/ncspot/Manifest
@@ -0,0 +1,656 @@
+DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST aes-0.6.0.crate 86774 BLAKE2B e687f2839b53adc3ef990da8221705a462015aa0ea004a6e15dba7e7ecc008d9d13cad6222b03244dc48bd1717a442e7aa5aaab6e97bba1d3be28c1d914e464e SHA512 65349285e429f9b8815743d86b3ebdececd48ce556a08b6ec5ec89bf966bc9b187a7df4fbe1f3b25172db3aab219b23f8040c1160359868e9f71d67a767c90c9
+DIST aes-ctr-0.6.0.crate 13217 BLAKE2B 5097ce1767bf980d4181885a7a117e41d0c81d2b5e9793e7d6949d9c1cff143d300b0abaf5d0640f2195a7f7655cb5d1446de81f9702a70224310bb41060600a SHA512 1f5967a82bef4f6bfe690f71a37650f727a4c9fcd96e8b005d11d47033f368bb54009054fde84353e11e100d3be4905e416852cbbe5b60e3fbdccbcae7d55733
+DIST aes-soft-0.6.4.crate 99980 BLAKE2B a4b3838e0348ed3d7468f9d0e19d8dd45071ec54d54d538943d5afabd3f88db139c459574e6694e7fa86e4d77eaa3f75c11e3a9376f45429848c91889530980b SHA512 620b38b2a6437caf393e84625beb27afdf448acb52d7adbc9cba1152ea385bdf05a68795eee0f48fd90b5edfc25fd9cc3d42a0f2593dfa2f90d4f4f9cc893ebe
+DIST aesni-0.10.0.crate 100248 BLAKE2B 2dba6f1004495a725acf171eeae5a6e393475323e8974eff2e4667194ac147dc3a52a9bed1b00cf7735d3671b6a2bd135cbb4dbde822d7c8c21af23692d3e71f SHA512 726e5213a81ea021d4be7c5220d952cb6f0cb0ecb6cc840b542e9f75539e37fc5d6378ad4f4d6a2bc7e7642ea07a18202ed32d3b6a212777bd7abca735c6707c
+DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
+DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
+DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
+DIST alsa-0.6.0.crate 68171 BLAKE2B b692d929e49765c59ae2fae7bbe8bef4393c393e384c5d84133f018123cfe1044c6fe6c1915423614957fe622553aaf9cb5c38a41d3ff93afa2c4f162a828252 SHA512 a63354da0e643a68e28e32293d48f866c071332b1d17cf8349a79f28e45d6b9566d22f30c3001a862ea26c2b757aa9440b3f52c826a40b29c7881d12416f599b
+DIST alsa-sys-0.3.1.crate 32748 BLAKE2B 0c4da9c343d622ddd521fe9332acf97c1ee4a202a909c7a0014a507148ab6ff82d5098660dcba847d938b296adde416ae420d454d6982c33a0456f37840d716b SHA512 6523d909c500fee433f934eedfdc200cfc52e1b55be09434665210c16bb9af3593d8b1346ace184b171c7135a7aa65fdac5ca8c68e64f9d20436e1d8fac961fe
+DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
+DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
+DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09
+DIST anstream-0.6.14.crate 29160 BLAKE2B 1120895a51ed7a285c5d5a03d2f7e26dc956d95f39cf500ba9f547d71a62ed0326f519860ddcf8db77cb09e9119e914a62693369eca51cbf9c01ef874ade9112 SHA512 65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34
+DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
+DIST anstyle-1.0.7.crate 15709 BLAKE2B 872e0ed09e7e94c6f6b812349e39f949aff4d7cbb87744ab26fe49f57a7d330e0f79447213374f7f862ea276aab2dd1077dc8df3f7c5f34079ef30c4d17eeeba SHA512 e20d49f7d148e03f7b127be7802e0b6b7a2b05720614d46c2ade5e440ce322b44ddd3a9239b897886faa03ed1cb30f947ee27d3811fa83dffba10b3975eba7ed
+DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
+DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430ac37293e61b6b6309b37bbb8bdb78ec11ca9c0fd270098af5e5ffb2f5660cfbfda949d20fd2efd336ed1c143215b2 SHA512 c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a
+DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
+DIST anstyle-query-1.0.3.crate 9742 BLAKE2B cfcba0a2773f07b9292279afd70832c5d4eb441ed61bcacdbeeda9184c63b7e01af70a8744d6efceb7f74a2c2dfa5672b873255cc1d273bd6a2d3d7ee08c2d2b SHA512 38637f49e547836a4958d9f528cb270abfc81c5ca644d6d43b0f3aaef8c6f1301a8bc30a23afec5e71722c3afe7eb0f48f9fdea88b73e36f597b74531da84226
+DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
+DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
+DIST arboard-3.3.2.crate 45916 BLAKE2B 4d4b39d9447e7043cc30b6989fdd9955dd6028ec2aea77566ad24d91c31d4bf01306bffefa412d5b494f021dd8a3e51e61036dc64377f86c5ef1ffb1e27ecb4c SHA512 cba3917b302f4f4630275cf64d31d4052a2f7aee1b179bdcef95d5153cf92a9a46f139b76ffdfddab525c1ea36ef8e7fef78ac704222d4fb33fecaeaa8d3af50
+DIST arboard-3.4.0.crate 46785 BLAKE2B e866343f8d7d40ece483dac28600d931d76b0c138772c0f39e9a9eb65fecb72f24e3898f0af3082d8a71162950c905c23a55ad21bb112e8de923d5d4cadb6fbe SHA512 1950b99a90f6b7447aec97d395b221bc0a68613df87087aa3f9c59a2d97a38be24270f4c10bbbd98407eb66508055203f9988984a90e739305049653324e0576
+DIST async-broadcast-0.5.1.crate 20134 BLAKE2B a45a7ff0b05eaab687f0912b2fdd0c3d9379402d5ccb8269568fbf77e235b42db0f741b4743438511fc00e7e1c6ec09c7b2f6e37b4b9a4df07846ae582e9c812 SHA512 48de28fad3fa8258b61f1adc0f13e69698f0fc3e11c68eb6b6d2df11784dc5c1e09f6f2c03dd12679d9888171b87cff3362ee06b910833e55d278738ab7508ae
+DIST async-broadcast-0.7.0.crate 20852 BLAKE2B 5848b71ced51d2a8ba7c5d9e1102b626b450c5412d35362903beecdcb7a7fc89ef33ebc3aa233fa1ae8bdf2da2768b541d16b91dc21c0435751bdda9e1bdce7a SHA512 d1a452db233cd9c1776b0d5931727d8d96a5e7779088fc410eae897a174c5dd80900c86385e270c62f164f340951a5f83860be970e37cd4910cf8a85dd78d89f
+DIST async-channel-2.2.0.crate 14307 BLAKE2B 7973ff2e6d64d033b648b5d8dc91c25fe28d815371f6d22a2ed6342cff116862f2ecd3ba97f8724b30bfef4b80cba38a7452419742daea85793dd776bb8bdf37 SHA512 1fb9af56299f4379c013371c36874c26c59bb6daf53cc552d5138c32da7e3e306200cf6d51d9acde074302dc1c4b720d1487f815a9bf840a8f5d5dbd10c6b4d3
+DIST async-channel-2.2.1.crate 14326 BLAKE2B ff89c3c0daf1b682c6eef8efba42e9fd29a374b6508cf254e69c8e503eb6ae10d96d129baf0c5033af4a9826210c57a6f826eb62241108ca4448f8dc438ad33a SHA512 706aa51402267ee2e7b8995efea8fb950a88d5db5e86302d554850074a2ecc541b02db3b9b28f068d4143de41300f75a405c0f2b9e83cd848ffc98a1d336da71
+DIST async-executor-1.11.0.crate 24767 BLAKE2B 02e396acc8aae8f83fe6652b78765c6845a212ec231fedac817f0b0e4076b1a756e0613544e82c29c5276b6538ecb0f8789e221c8f182f0cff0d9c70b1324027 SHA512 a966e235a6f73c92ac8aded01315f2b309c8fd69fc3b92c189f33ad7b2e9790c09bd3ba6e4fd4f46017fe803299629ede6bb490341e6a7acaeae0d4fbab19dce
+DIST async-executor-1.8.0.crate 21870 BLAKE2B 85e24330e50d971239e4b2f7c8f7e524cc41fd51a9a795481286e5dbf932de4b9034c1e1138bf0a53408dab4d613f52349f4ca2c383ee869bb107b6dd34a6fdc SHA512 285361d42c34331b3ef67d9d768f62bc72077046766d44802a7e769d5e56718505751d9019b0867b2c28c08273038ca18a936430ff44b7714b780fe520adface
+DIST async-fs-1.6.0.crate 16506 BLAKE2B ddb7a86d6e294a07f0d494448d0bbea31df320e5d5734222ce3949753fb686b15ba5811c5dc7fa5e77d1be62154447e2cd096c7b7f7021450c5c75c59d45a8b2 SHA512 18d226cc21e5c8c96c269c883b6d5784bbaa45be5b883908d7f2cc61ae8797441a9b3786a02ce9664013d406beb679c5a8e89e6ab82d11bc2b981b600b3d6830
+DIST async-fs-2.1.2.crate 17071 BLAKE2B 7b8a67fdab5d9d964af7d45a03a3ef405f9590b556249a35897f14a231f2b781d90df48c8296965e941f8c259c4c13a57691c81f09c20ce81406d5d2e7962731 SHA512 a671374a59c7804d26bf22d9617fc329cfa0cb38413ac05cb2f6ff192c5275a8ba41f1a088fb1978e61a66693c85f9c6b08486d44e30b7fa158568e41dc005a1
+DIST async-io-1.13.0.crate 37191 BLAKE2B ec27c5a49550f9a2cda66df0a6c54e5a64191e6c1ebade4e47a3164cd04fe7fff60d225788983f55e47a785dd57c74a22f2a3455349d2d451646e4d0e7f4ffcb SHA512 b37a13fdb1d29e2e8852ab6f24589718a88aa39bf532145ae7541d61c3f49f731f890764dd945845eef6c8b5af1042bac2c04cdabc00b36dc4350fa1c62ce54e
+DIST async-io-2.3.1.crate 49279 BLAKE2B 342daab31d51a3040cd35863f7d9c5dd8653187413d5340cb7929d926e2fc458bfdef1f08bc819a776480760ec3d84fa0f41a76ed0a9c2260803b61bd291379a SHA512 8dff4265b650199292e43a8cb24ece49991d17586ea57bb013d734a2c05e8787a47bbabd60cdeb557521fee376c9310e907aad0fa5ad178f5c6ab0495502e387
+DIST async-io-2.3.2.crate 49298 BLAKE2B cf01d97782405c56261d54800fcefe97c914850d50b49ce2902eda3cfacfbe6800dc0ec9b418f4bc51f579a9d0dca8b2842b17d97c3e046667e539ac67f72a57 SHA512 a7f04de21cd2eea933d7bdddaa548c92ed9a96d4f910d0aebd2ea9ddb7fe75de5f142df7aa4f7afc23b6877a20e68d3376db2e801e2a258e74b3f0ad674630fd
+DIST async-lock-2.8.0.crate 29944 BLAKE2B ebb35437caf6bc8db154b21fd17bbe1973490fec06cd34e7385d9028440b0960407d674beaa707a01becb227ef1107686165953658f490902e13d0732a4e80b4 SHA512 f48732dd8e5de0228f56780adb87e4d9870496ddbfe4cc7c6aace8d4cd7198627a05ff0358fb33ed57480c7ac886b57253fc73b2bbcd3e8cfe65624b51847ae1
+DIST async-lock-3.3.0.crate 33286 BLAKE2B 93e66c16a6b1cb759378e198927d2df8ff9f7839a2bcda49d8e013ec7b9b175bb4199864bff585282a471cab6d4f88b70141636413dbcaa7b0453d35f08a94d6 SHA512 0f9e0940e610744fa97c6d2ece9220a2ad91f09155eda66703c2aaf4959f85c17f2cb55ef5fdf29013d4dcd84f8cdb6b16e8692ec7724744b57bf11a86f22f5c
+DIST async-process-1.8.1.crate 22758 BLAKE2B ec395b0b2041c44a8d7b15433447d044d53944a71bd4912e052f59eea1dc7cc5b1555aede4778c773f6241cdc27cab058499143fa65f23348b43549e91beab5c SHA512 ce0dbcd0f893d93ed83915d7ed9661c0d5ef867115c051df2a298cd07e531a2b0f63fe58cbcd25820cd810d81759a6f467635201659d34994c04edfba8a8187c
+DIST async-process-2.1.0.crate 24505 BLAKE2B 4acd4f44d3e7825523f138dc8ec84a58198dc337dc81e473aec52117da7517bda78533ae9e05505af30a72026dbadb2951378aa608aa041a7190bdf205a37b83 SHA512 a81c2081106753ba09807d833c2c0575a8aa0f73c7a50abcdac88c3c9d2d34a4ed67920842c8f86a26bda0ef89302ceb5e9d05516353d793bcf29dcfb7f7d79b
+DIST async-process-2.2.2.crate 27641 BLAKE2B 4d223bf845583dfa9eb670bebd4731b5d82738fbbbdce162db212b32e166c7ebc1d8471c2651a20dbd5c8d087e182dea932f4fc09af85d080adeaa5945f96bfe SHA512 d65fa85fa06230fc1fb554171cb2dd31c32334f413968027b04745752b10de5d780036a8924eedc1c826d181b55c19a807dbfde6b4b2597aa11f1b1d556d5ef6
+DIST async-recursion-1.0.5.crate 11890 BLAKE2B 106bc70beb0fba67ac3843a100d6fb7771b4e79ccb212cc6eb787631baa051c69efa986b21cf8f9bdd715596f52466f9171529cad19c0ace6262626b38c11cb3 SHA512 83ad19459e54014d22fa0bbdc2b4427421dd4e9b105d479641ee8b147b6b55dd34cae31a794f7f6ffb7de8e5cc0d0a8d50855569c9c773d5aac9e6dfe2e4b90f
+DIST async-recursion-1.1.1.crate 14874 BLAKE2B 6260dffdfa9fe00cc1a63c8cb103a3f210611627bbc75c2658e7cd732c504791c6577d7033af3c5afa875f90cb370b7f216979e0bdb62dab4acd61786cb5239e SHA512 e3acd07a35be546ead68c7792963c7bf1876b3e5d6a20c2be73d2f030d26d68e2a318999937d4fe253e39d8254e12e42c66314f40a3b230c5d258f34dc0d9027
+DIST async-signal-0.2.5.crate 16743 BLAKE2B d767437ec634911781b883450b7a32d6b3c40f52a18840c1d14c2d7cc0984fb25789d3b66e1b3ef776c693337fdbbf2f32f2cb75721864708aafe094f0826ccf SHA512 0529f5bfe74f8ab16e1597db31e997dfb9d6185f96cda3c988cfdb1cde95291533da5ed2934456a2527d5530bc2972effdd34ec955f3bd94a34fde892726b3f0
+DIST async-signal-0.2.6.crate 16696 BLAKE2B ddfc789706ab39dac25436db39fe73c7e35504a8ae18f4ce9e75515d363c3cce1f4170315210ff172ba138a7241a7dee56d5aae854af69ebdbf3740e3534bb17 SHA512 a65ca9f77f9fa8251b84a5856fbd9856b632cba3e4a2276fbc680b16bbe2efb7e1278e6d4e33f2fcc1bfa43146deed43774080336d70101778389f9737d2275e
+DIST async-task-4.7.0.crate 38906 BLAKE2B 6dc02149a64f6ff8d605e74fb7db4fd0e48e6f0b57b0aef27959a7c654f25cfd1f76a403541ad8abf948a2a15bbefacf30c9f5145e2ce276222c53c62e0b30af SHA512 9267434c8785869dd281346adfa2ed79e55e97c6a889db3be8e05597420331596cc9d87547cb1305b172e434359c2d4dac6da6453cdb4e1f1dd4fbc989ee0a3d
+DIST async-task-4.7.1.crate 38077 BLAKE2B 200f3c2eff92afeffb34404bd9b02af39226024d309137c3835342ab6631c09f14f47abc5d25d77e73cbd133274e731fc88e7e94d8456f690b0f1056bae8dd95 SHA512 8495436d0739a2ce83b372ae13ff24ca1487c92e032948d5830af19c3ba411d7cd004634fa10bc2f748f8a82de27c12cbfacaac92cd0012e1fae024eca9e78ca
+DIST async-trait-0.1.77.crate 29986 BLAKE2B f678cea4defa1cc7c0f1571e71f87392c0fdca8ba175bd94be68b92adaf2b4afe13fac9020bd27bfbb2af9a7d5f2f7047e3bbd0b080a7213354a8175e6ccd455 SHA512 7ddadfe6c434267cbb22de62f09373ea83ec3c4eceb7781e0bc438ce422266f30193730e0215411f1c7c9c6d5cc589ed9bbbd71c836e440bbcddf8afd3d8950f
+DIST async-trait-0.1.80.crate 28775 BLAKE2B d95384a8828c9273e0f295d3c3826b3a8716cd0c4ab39bdb43d65ec57fe886f7c5926c1666a76ca25b1536eedef61b0d92c78ff9c8a52a0515900360b66b0f13 SHA512 3e92bc8d38feea49ebb5011303e55853bbbf5d0fb7c4f6ed6aa471b9000a2a0ea5475619f98831641e8ee484beaa6fd8880770a96b8a5a7df26e392c1b4b3a19
+DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
+DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244
+DIST backtrace-0.3.71.crate 86553 BLAKE2B 15ed93574fb9e8e28d5ad901bb1f94013b5fec7a79aa96d17f13f6f11a02d29a274ec14ce51a9f515574839aa41232e5aaf6e6fa3ad9c0483591055bd0a78c8a SHA512 5d9307757349e860fb4cab7e9ba1c9d0f1faf49ebcd935ba879b85fed2a9812786c7458abb59a742842a0796fc29ce9921cf575792402486ecdbd9a2568cdd89
+DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
+DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
+DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
+DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
+DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
+DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
+DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
+DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
+DIST block2-0.5.0.crate 24095 BLAKE2B f73c9c2c04768213966e8421317e0263fcef5cb124baea027f92dc7aaa91b92dc7326f694fff221eb64f9a56af6cd3d2a3cce9d06e1b6a56d17b66b3a0d48a0f SHA512 0339b13e9167974f357cebfa94438f42e47b84d8868f0883f9fa4af3b839a8eb9075cc262fc77fc949137b5f5d5080e8a9776dc23b6b8160e5f240bf79d404f6
+DIST blocking-1.5.1.crate 17277 BLAKE2B 0eb9ca486e2eaa790b2b74bb32208e5a7df2053b045f5928c78f9b461c964cb8d38737c1a83cecd8f42495b7101a2378883533dd747f2ffac6744551ec164f4c SHA512 b12916db3975a1aefc36fc2a8824a89f5c0eafd83d83e458d1b6b35ddc3acfa92374cf0b5cd82825eec0182bb4ca97b048edf3b8a80cbbe0daa1c07875131ce9
+DIST blocking-1.6.0.crate 17696 BLAKE2B 5efab89514a712044ca5eb67410cd3e2996f3a6f798e9bce2e3ec3c68bb134bf163d7d11e02f6a749baa94922b6d1b7cc2a8641a8044b4ea892698e069817109 SHA512 6b45de329933067d62c6848d14b17d64fbc7918daff5a4c307698530388e856dcb787e9b59178551589cfaf54cdeb972b3a3825e8a6ef8ee1fd76c5aee6392e5
+DIST bumpalo-3.15.3.crate 84438 BLAKE2B b76885372dbf91d3991fe5428c187bf4f66f3a8ed7ae44932d7479cc154ae0f03356d3f4fe56ccb5cb54f1690a3b21c4def5081228e778a5e64071023a73db97 SHA512 0871115264dd63ea9b636481bcc6f7fbe1c9f7579bb7cd69622ae79a3df216a639cda2f91af370f84d3e8a8bd615d894906ad614a20f94b9ece954d31df5dbc1
+DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
+DIST bytecount-0.6.7.crate 14642 BLAKE2B eabbc141f2a277d07fd002869d1746e7f743b96c3dc72b8708308e826d3934ecb01407e77653ef46d06b3bdd9d931e121c9c66a784d46116a9e6b98e992512f4 SHA512 afd46ec3f60022a173b57dd954a06c7c86f21fc153a0ee6fc2052ada5a630515a386bc8344680ced57dd19a205480c694b9a04a6da0660b6e854b4a712604d53
+DIST bytemuck-1.14.3.crate 47032 BLAKE2B 7364a8b474013fd1ffd1df66e47f4f3fa516ab762e10e7b31d9135c5a811ebd87d368b1e723ef41095d17a05465b80128893cb76af310c52fd1fb04b57f7e1f2 SHA512 f01f21142273c53daf07bd168068661ab763f4696a39543a73d9341335f6da6f2e3c88e8859bb06ab3c1ddfddec9bbebf00f4cbd42ad49d77618dea612523c13
+DIST bytemuck-1.15.0.crate 47672 BLAKE2B 49f2d92cfd5abfbe3fd94e7e4c9a3d4ac22c67b58e73947f461cf8e5022738b7d38c790de2a1717b731d658f1646066bee2f936a1575e2995e6de39d20f918b2 SHA512 5b6886f252945449c4546c181bbb6c95597e498aba6b1faf81c5a4af69bcb9e3e024d7d6e849d347682e8ca72ecaa9a70d13fb06c174e17846f0c85bb4810433
+DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
+DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
+DIST bytes-1.6.0.crate 60605 BLAKE2B 3e4cd094443969c6062b51917ad9df314b61ec9ddcb0336cf2621d8966c568d5b1fdbf16b11b5e2fab01b43ea76f6609f753eb5c2380a5e4aa8fb6e807a2ff5d SHA512 6507bc4274204d0a19b6a95c3284c52245c71cbf5f2dfb5cd372193d989e49869ec557c0c4e449e96ed4e3028c90606dfb0dcdc1d72bb234a36bc5f344c0a7a8
+DIST cargo-xtask-0.1.0.crate 821 BLAKE2B 7a1c4c5f3b8f96c7247154edf3868cf25f44d8ea90845c673e6b097b8093304885cbba96b4dec30072e138002ba585985ed2615b2d6ff49881146eaf97d50bd0 SHA512 fb310f39d1eb64c6c487b677cfb98ae0c3aa9b71600c55d916d7b5de027a69547094f3b6fc06dcea1593dfff334f4ab22fab263bc7374b08b0b01a2b7d24dbd1
+DIST cc-1.0.89.crate 73707 BLAKE2B de2642a885c2124b786a996789364466f23b8e74c7389bee02ff92d097bb8d383f9afc1d732e4f247f9082d980cce7003759603297998c811031585bcb7695f7 SHA512 93b4648d783edd8ead6fb976d4990ea67bf38e313c2df2933d8282dd66ae305c029eec015556822527d2f34aaa036f96dec754c6c1880c71a8d1a91f8f092627
+DIST cc-1.0.97.crate 76951 BLAKE2B ec2e65797dfe13223b64f28bf6d143e00362f8bdd14e4df3d16ec2c5b68b8c603968f8cf6e7ede95b527ef16a748775bf247e8bf11010a326bbac4b296d72eb5 SHA512 119d1769530ec2fcc643b9b4a0f2a45db6f0772e4df882b832f961824bbb41d101d4a507573b4e05b4627d647fa823e81bc66dafdde40146878616af96b24143
+DIST cesu8-1.1.0.crate 10555 BLAKE2B 4fe369d1247c3b30ff9beb644dbe2a517d78632191f3216bb83d632bc8857f9541a1b60d0bb583cf3fc0ae974f7c9d2b07fca5efe2057d9ef281de76fe810a49 SHA512 2d902b624c7ccfe3633c7bcf99b833b120c0ed7760ea825bfb2fa03ae90df543e637efd46e0743782b81e468e0fd3b534956ffca81f9bdfbf742ff3beae8f8b8
+DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
+DIST chrono-0.4.34.crate 228932 BLAKE2B a2feab8d8b079209f8661fd8c5069f2a5fc3e5b0a6233187ace16f8f2ad8b4a147253e47af306cb31aacd82bdf490a8c8a171ad702b8dc22f9b934205d080c55 SHA512 2aaccde5e5ecaec744613429f807b3c34b92632973de7fdbdafd7ca510b917a23a0abc92a6497754d0d3368d684305648aec1fa2a0a61c88a100a20fab2348f1
+DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
+DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
+DIST clang-sys-1.7.0.crate 42088 BLAKE2B d1ed314a910c1b676eb780fc1c96f5ac391217ec135480d0a91b11d6f447ad06484b48966ae99115e35d921a506caf6aa7ffbc4ed86aa64367dca321678cfd7d SHA512 e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81
+DIST clap-4.5.1.crate 55389 BLAKE2B ed23a9d14663a974b14c53b3abc91daae349cae6277664283c27ef201e53969b7ddde1cbd83dee796c9e248e88a622ab1753563ffe474a8b48c1351a7e21ad7b SHA512 b777ed43aea510e789ed76514825ca3a27fac7e386c58a88a1d5c74d0d72fd720e0d97777ddc49ae2e060d76af3ca554f3b9cf6a5f10b944f044d2554a7a4d35
+DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
+DIST clap_builder-4.5.1.crate 163569 BLAKE2B b3300cefbd190c6a23bc8e5b9f5a7f763b0bca47691011a11769383296fc99da8f7424af2272eb1d2d748d8ab6401bfc285c71aafe3f4d1dbb514151e234c9d0 SHA512 336ccf8d3f0fe43a9cad6f49939aa87cef9fb33451f5ae09e79c399680b94b84bf08f9974b0bc7a90f5c6727cdb26540e3b74ad47eb1bc0a5bc2358385825874
+DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
+DIST clap_complete-4.5.1.crate 37823 BLAKE2B 0cf64989041e0773ee0d4ea767dc781d9cfaa68c3edfbf2b04874f24064aab762223b50b5fb511a09583191fddf03f5bc7afc443c213871eb24f94695fcfe004 SHA512 c815e6f8fe190b0cfab85e739973b8a40fb23586fd329f96cc21a5ecfa9108ad5bb4a5a6cc5e00983e704d4272c87433b426f582ee44dcc9fc59d9a7784f9334
+DIST clap_complete-4.5.2.crate 37850 BLAKE2B bfaae6107890319a9717d96f5616012016fd5439c7ac7dcfb0082d797a335c7c926459c8c1db0cc0652f700366c83956d8e0447bb3e990c183133b8f26d64301 SHA512 1c9db70159681dd23011df6e804fa193f67f3dee874b2583a5c9da90db1c7283a13b330befecca91de260f70b974168652b450cf8b519a79957ac7a6373992b3
+DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
+DIST clap_mangen-0.2.20.crate 14861 BLAKE2B 68fc1a18d0c2df088b4c11ba2bd4de73b8d272f888f9c1e7da73493012bab26a47cf178769fa657e4b893bd11eeda038135dd7a606a31b86e03bbbe57422deb5 SHA512 f651d0c044cea804c469a59a6f4e3024546cd018d73aa4dedc4f2ddd78c04fe0cf6790d442fc16968146068cd61c685819e5f39fef6320aeaf6dc210f61582c2
+DIST clipboard-win-5.2.0.crate 19036 BLAKE2B 395d8609cd92fcb918480ea87ecf32cf91eaf7019a9a88168962c716ed671c6d53216f20d93101f255be6c8a62406fe005f90f4129de6f300701b5ca1745b0f6 SHA512 6bd4d400075a409a29480b8a2e882d16b5e59acea35b9172140339b617f1991e9d63568fce1f50a36956905f96359401e2a981f8a10ff97ebc245b11ed2fabdf
+DIST clipboard-win-5.3.1.crate 19921 BLAKE2B b0b3b9e30bf4bd897fe6db78cb68a906e8dcaf79f0f4218428f5707f89aa60450d3aed272de10e81ef708e2ddf4737393380593cbd34fae5b1abf87a9119d85d SHA512 bea2c0858d6d4d7e5e49bedb83d032fd7b23b62e042e173f4acafa262b4946dbf4b8026f47befa1484c7d478db6a818e6cb0f549ce29a7f027f75828e9ba35f8
+DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
+DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
+DIST combine-4.6.6.crate 132428 BLAKE2B fb52e724a52f1a551255591fedc134178080ea5efc0c488efbc369e6272f7f2b87dd7d0ce63361754d8ff0cf1b0a59bbc7b0396c50c53210f3e2c28ac965e0e6 SHA512 ff9ef9329de2cfc103271a25ad1fcb7e478f3328843bd8a65653e80b74112728ad4a33326a58ed7ef8cf39eec7c3b797fc287295ba149ee0dccb1de9721b5819
+DIST combine-4.6.7.crate 134808 BLAKE2B 1f3ea9962f4ed4177a9c028d04934b5e261df405c1c0282c74609e0e6a1490a92b262ad26d1d21dae977cff8795bfa3c1f85aa43fab13a88227394d61d93861d SHA512 b8232b0e1f94039cef3ad4a0a35a972eb49f4f198749d2fe50aa3fd2a77614f2d24e51f3b4465243ce9140aed6bd048aaaae189a7ba864e3d23843e9be0c437f
+DIST concurrent-queue-2.4.0.crate 20244 BLAKE2B b30b97eeaabf0205bbd8f4eddcc57e59b6863f18969731be66b134cdc5bcac9eb543493c54b17bb394b6e227e808f016e4f3c1da2fd6b40269b9b24a5c433f7f SHA512 5821bb396a73692e5b033d8406c2996bc4318cebf8807e596e441a2bdc28715fc6bb8eb29b575ea318f84b748ce47341a8d23f5c4de65660f86056e99b6a8b78
+DIST concurrent-queue-2.5.0.crate 22654 BLAKE2B b490e76804e45d6a7af6bb4ec074fb370d9ec7cd67c7ecfb55d5ed53b9b437c174e678add915303559e902ac81c8751dccb2c5ef0543d5961713372fd2b08d3c SHA512 235704f9161dfac60d2a6d2cf96425e39c097dcde2f005187c1f044704eec66d8303d59352cd414a81a3ed0eed60421054b0070a9b8f69065a79a2519e913e5a
+DIST cookie-0.17.0.crate 36545 BLAKE2B 55ca885f4ec63da16c795ac1ab223b41af425506f0597e4c1fe743443cdb95a8644bc035e0c8af70125afbf080d81a3610548da4572c7f67c1b143db1091dca7 SHA512 a0f8e6458b97dcfb70e2046ed121cec35a291666880d39a2acde32781ce55ae24218c5db9cd804f93523392de27071281c89224f9f332d4c9eabc061d7a11e47
+DIST cookie-0.18.1.crate 43551 BLAKE2B 64a0ae8a2cbcec4c75558ed7244b82212078dd4e6fe672d30f71532e8d9193cfb0725352aba19b49d3b64cd175dd53b542c8e8f627c5eb3f594af957efec06b6 SHA512 be7c4a6919db8521a548950ce593427b9aafff0e53ae659f7e73f523d8c38bb18a142ec7ca17e6278c2073a90145f7553ae91d5cd1695d51644418f1554a185e
+DIST cookie_store-0.20.0.crate 31374 BLAKE2B c9adddf2ee5f0ee146fb813536d7793a5ca1f9e70529e1a8ce84a50a605223c909e02d8b87e2c560b069ad87eabaf12230c56addb5d06e5aa194d1c4309658d3 SHA512 c2da6bd8e42c52ce91ef2a1a5c68bfdfa6a0125847cd5d3a8dc49ff9e46ac865ce5d10f9d4376ba640e4c0efbd6868ac88dcfa9ca85d91cedaea37d30be452e4
+DIST cookie_store-0.21.0.crate 31495 BLAKE2B 243287485b8f527f40d8303031ca4392e032a9e7a65cc9e038076794458756106ca73280c861457cf42357735b4d6892aa2aa23f7b5f743eb6867ed47426f6b2 SHA512 169b413b78e47da093046b3c3e2d1c72be02ba161f8c5a24296d85cadbdeb4d544615d61d9db329a081b24339171dc2d9d87e33a24fcb4e800ca0b5c04f0e203
+DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
+DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
+DIST core-graphics-0.23.1.crate 30714 BLAKE2B 291e5cc4cfcf1a6507dc0e4dbeb304fb445530c60d7bef79dbaa53524233fc453d1ee977e7ed43513319e1d5641e756749f43b536535fee730308322190462e8 SHA512 2b0e2c00900d4a9e09c718197692ab2aa0d009a43fc03a30075eb33ed7648f6ef640bc2d827fd9cf17f752b810eaecb77107096aeb1daa0348b3b7e17ae47fe4
+DIST core-graphics-0.23.2.crate 30763 BLAKE2B 6cf9d7d1e933bf06175699eae7ee1e7dae993e390cf9b509a756123cdff78a42d7aa9a59ae2f48d251d6dbeea5479e95694c38700f4ca93751dfc664d4c7af34 SHA512 40ac912fd8bbf25488f665091e974d9b5c40a2a20aa1abe0393c9f39a77b6f3b13761719cbfde067e5e078fe8ec55dca51777ff3ffdff4aeecca6e4789069d1b
+DIST core-graphics-types-0.1.3.crate 7063 BLAKE2B a2bb17838745a28a59e85d884ea60069c33f548d41f98548956eaca4178409c74556039a5a731a9c1e9f26de8c69d45f458a90a3f7b358065202b660c62431eb SHA512 e56b96662fcb892b73bae3292478a9ba4c7e92f5967b6438546f229fce115b09f997734c40f8f776be6ede2c6512e837632eacc8ec15b5c3311f9f24fd22a397
+DIST coreaudio-rs-0.10.0.crate 34487 BLAKE2B 30c2273082266de0e4fe7f7f6ea56673d954efed518e522a4ea73ffec12781cdfc92df3b98e836f407ead18cae441c37f2a32d30f585ef066acee3314965eb84 SHA512 efcf47cb4337b8b17c12419be9b024687da129b24320c7da7c4875279543a622855ea100797818065710017a2f195db817f3ba1cdd4826ed70315a50244abc1e
+DIST coreaudio-sys-0.2.15.crate 5532 BLAKE2B c7c3f67a6db3b9d9b604989812b45d75b02a04565d1dfcca4698abdf540d1deef1c93b6a9b02a3689a32f033495411a5dc11efe4871e907f8bc0fec6b5fc4f25 SHA512 060379c57ee110ac413fbd24b48edef283ffba17692672f9ea3f6f0a627cad8f827ae2d375c341b0180bd4de7b3b5d55a06ed7b171fcf3cc20264826f2489436
+DIST cpal-0.13.5.crate 93790 BLAKE2B 9e1b6f6d385ac48a7534c716a332c6c15b77556253fbfe27153f1e68bf702f84b6450a915ba79d229443beec2c4419bf7ebe7f856a0c95278a3447236500c1b9 SHA512 ad1ee6ed7473474df716300eb6b1e5db8a4a0f9844a5bebb6704e1acaf102c4dcd495d559ef6be99db652ccc0ea2a9c2d2a266e865389ce08aa6f60ba06e1c8d
+DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
+DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
+DIST crossbeam-channel-0.5.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c
+DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
+DIST crossterm-0.25.0.crate 116533 BLAKE2B d39cdd1f4df716974cd0929ca40073ac6e17b2dd73f27b48c7b2bcd7cb4545bce544b2e8459812b866936c03a27162b309848e6a92290960619c4efe2a1e0502 SHA512 fdf2b5b4bdcbc8c7dc4e8c5e0cdf68cacdb97886b52087dde1f1be9b869c00965c0cf9db64b700801b0d1274b913703ade66a92d47aa8da604121693b8701201
+DIST crossterm_winapi-0.9.1.crate 16027 BLAKE2B ea63abf751aeab203f326e77260cfbd1de286be26acf714a083ae1262b0cc2a35b5cb6d0bd54f45b33c1942eb22f916141c5870aab34149fdb30faccf4d4642e SHA512 48eee242f477f43b69c00e3a5d4d255de2ce1774f6e73d869c5472b35d85af0b63f3a607097da8ace437b1e52a524ded4106767b83d4ec53c30c2e37ac4b46a7
+DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
+DIST crypto-mac-0.11.1.crate 9551 BLAKE2B 81140107f394d969d85b77050447e7d4dbfe7b2df8164293fe9a2cca04c1ed3cd245988482a232103c2ed9d35601ec6332669bd8598d903d305935dfc09af887 SHA512 3090a7a3fdb7d94b2b14841e37733d863f2e4d24d7da3c63df1726612abdd1c1df7179bba4e344eb63a94053e59a93b0988ecd1e2e5a5db0e18a4b602be4aaa9
+DIST ctr-0.6.0.crate 17092 BLAKE2B e54c7d452944d928d5777e1744208ffa4531b85a4fd0b294d26a93f1390900de97df808ab92ef9b838e8a0c59b98a16884fc3b4c081960dbc7034694fe91525c SHA512 c58c7b44de1746e560596a9409ba542eef1b33147f8ee842da6e7c9c062046044a0f4cd432d0876928f036a590d9e6c007d4372a043aa5d8317fffdd605ac993
+DIST cursive-0.20.0.crate 74475 BLAKE2B e319e43c357270624ef046f2b8e68fbc78ea94161a7412d38f5c2b915b73284a7243a3ae877e0fa91a4e142c928f6d406cd01466315c81d492b65a9e7db9a2ef SHA512 3a4d9a29daf882eafce2b33d3147d546e53f21afcae3c79a2d5030b3ef647a28041fd76cef0b82763b62418ac66c6337632ed1cea342796c33eeac62ef4a712f
+DIST cursive_buffered_backend-0.6.1.crate 6420 BLAKE2B 821c835255f7a6232c5de3dcdf227461b66fde46e07ead65d39fffc3bbc657d4c2d3a20f80e84185aa873593547b7cd8f7b86e2fc7a4dcfdc67ba10ab7bdac03 SHA512 71d3e1512e8999b5d384a838f9f6b8b7779163b9e14232b2fa86737b475ad387e86672ed7445776cd26e0f8ca8d58666be259b59db0cfb292243f1d16226a7dd
+DIST cursive_core-0.3.7.crate 159235 BLAKE2B eee0f2ca959e742446a659a4182204d5e4f65d30b3c126cef563f2e47cc12214c5b1743fc4e7de3d0eddac7a6f0ba2ddadf96446abc2997e907d74439dc0e606 SHA512 2c19b2726422094158c70af4a1e656666a279f0d60beab6d8ea11be1cf937a7f13794058d7b1f6a46241a13e60fc0e96c95fda8331000198813d3a4d6ba1e3b9
+DIST darling-0.13.4.crate 20895 BLAKE2B 76675c20937450c47c1bda80170140930fc626d27d58b7dad3db33dce2e69457e2262189853141bdabeabf257d05d954f7dc1dbfa344276e05ee6dedfc8a2dab SHA512 7392896b97b80ad24d76a985f4b950668ba351498f48ef0722c783c28d43c4a4828f5f6eba7e754ca554b6662fc419e73bcb65d4b20037285a16e345fec9ef75
+DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3
+DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589c869ffc974427924605b92436ef06f21c7ea748e97d9b719aa7156b3024e788968ac0cc6144d58eeace658b62a08f SHA512 96d431ebfb9d13aaff2c50f7ad7d5ac5e95813fac851e3e1d7739d1fd5b366fda32172829af88cabadb475f83b4500199167ede54bc802ca1e52137cf6c16c0f
+DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751
+DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555eb4c0ac7f1000fdc8f8e9d1bc0ecfeb65b78f81438b097946aed8e37835f82028c1b16c1d466a124998139ae854df1 SHA512 908ea6459110da16e4ec6ac843659664ed4fa3fb2ea9b92274a738ff5994cf81fbb48403db609b9a70f39c3e288da4358ce369c66821122e3a6a0940473da94c
+DIST darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0
+DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
+DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
+DIST derive-new-0.5.9.crate 7733 BLAKE2B 3f0a19b794c10e529da5b3618cfeaa4e575ee31597d2ff1f95618eb5163568c6c8836c5a634323dda65f448bf3fba2bbf066df5f815feb07f59ff99d1f46da26 SHA512 9ce0991fe63d8339a88d9552fcd8cc744d8bbc2c6525f60959faf519e1ffa84256c773291df2101912483c0d9accd4fe5f7dbb199dbd36d299ceae8f607e0b30
+DIST derive-new-0.6.0.crate 7694 BLAKE2B 8c7f33653f01961eb8df131e9f61422a54b3fed986a4116b7174693649e8762ec60e5251e9a34713a8e0126e4e2fb2fefe1d6e8c5591d806b1dcd480512cb153 SHA512 2f603df3765657e1dc857012610d849705002c8f710136ddf4717cde5d7f827d7d886074a08ec75d4678601c17b8cac83961db25bd10e49840777a4e89c4f7cd
+DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
+DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
+DIST dirs-next-1.0.2.crate 12979 BLAKE2B 2db0cedff487fba530fcb16c87943ef8c9d724147e9cc7915b14ab182d7ee5bca9e57446ac4da9fb91753d9acf480abfaeae5a1ec06914d559bcb12f61ec4ed1 SHA512 a985ec0e9dd98668b72c65396eeb8a13eaf86b9d4d841c1adfc3ce3a1054787a94145c590e84e0fb8bdae6f5b20759ae9636aabb31da4fdd498bc377fe3d514a
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
+DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
+DIST dlib-0.5.2.crate 5806 BLAKE2B 2a8be2d76c44c95d5b1b9a5439a99a75daa703a341980d8af1c050d6096d45fb748f0acee7f7de2f9433f97ec19faec9e028f57c8149229eecb1827a1ef8eb60 SHA512 4a8f1c09007ecce1d7c829899aafb90081fe4fd89cfac3550638018760e24f63985e3060c4056b55bf58cf4622b1b31595e1c524a75b1b4354b8f3c35fc267ae
+DIST downcast-rs-1.2.0.crate 11670 BLAKE2B 7d44d708c1ac068a02ea5d72dd3caa8a7f6d18b7ee653d520600acc9c52365824f5b8d3c68143d1d13aa438a18b16ff9975e15131cac7ec48b2d995184673d37 SHA512 b80b72f30b42c5e6b2bd33287f2dd22be5673b2fa5c1a8c75c5de224fc7eca46a55f2fce63c02d225dfbc94ac3462b4b2fec53d63331c70da6307ebcdcc6cb14
+DIST downcast-rs-1.2.1.crate 11821 BLAKE2B e8a78afcd8d2f17c9505973359e2151d59b233e1757b4c7019047f148b1c8a4f28dc3a0d6eff6cc7f4a7ed986bf592ccf0481dc112768a9751475e1b0dbe27f2 SHA512 f37804c1b1e2cb0ecf2460fd6ab274c843c43e94aa7dfbf4e3c53529cca9b5624c4ea5ab5ceaafd72481165c7335f3cd1f846ae43deaabd18f363572825a5f86
+DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432
+DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff
+DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc
+DIST encoding_rs-0.8.34.crate 1378166 BLAKE2B 528692170cdb1d74ffb0b122a5aee61f50a2a7e4ce6db049ebea4a185e5c43d4ed99e515f08524053a110e061f788f861e62e0b04eb016e7a9e2678235a04577 SHA512 e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6
+DIST endi-1.1.0.crate 4872 BLAKE2B 8bbffc45ceb70777c6606714a7bb8f9b26ff33a295fd722958a5e9c556d5bb1e97a34e216514e5acaea51811d78fb4aac927c1f8315fcfd8000fda3741c53b4e SHA512 1a4b65cf77f530a2d15cfe968aecfcc9120957d23d2b442cd3d8f23d7039e832e7d6ab29aa5ad8570468421095650e26fa07f29bf75ae361416072241726c61a
+DIST enum-map-2.7.3.crate 21792 BLAKE2B 5cee4f4f5b3f29c5f73197de22a7559fd6264fbc3b146c683d93579d5d2e5e208ba0d6965a028aedb9536620b089fab81e7899a5be631217f193648f6ced32ef SHA512 cafb9346ef17ebc8940efc542d5613c32f13775a684db186f30a632daca1c17feef6e0e77ecede646fc688e1cd1b189ac0914e79c0263333a75bc50c1c6a9568
+DIST enum-map-derive-0.17.0.crate 10781 BLAKE2B df77d362cfee0cfbcd9354f65530424af9b501351544d97d5cf04c4a4fbd5f1862968bce42b719b9159892490e69c06c47d9fe1be4ecff16212e26906329e572 SHA512 270f2e9130e5c0124be707b7b4f642992768d2dde3b429cd86a192410c3618cabe24a914ffa79578f14cce72c28a55d5a44df8d66ccf3178c4c68bf4da61c065
+DIST enum_dispatch-0.3.12.crate 22400 BLAKE2B c8a3da572bd8fcff5afe8aba87d0b40d5c759ed2c69d8391d61b43bec8de2eff02cfce0de60abbbe821dc103cda41bc4abdeb9de5a0426fcafd2382bc2403eb4 SHA512 576d682255313ea284934a1c9bf80532a1b39a85eb6201b821eefe5fe37576544b28247ed1d27e019e1e664b2e81207fd161dc9d70e2d0e10bfea1071f508dfb
+DIST enum_dispatch-0.3.13.crate 29876 BLAKE2B 8fa66a72b1f35e174abcc8266e8a36e835923a1b31aa2fbbbbefe3bcf1287bb01b456597915c0a36a9ab7e6a6cd0ce7ebae38c09028ceb9109b7d18f26f023df SHA512 9ff73db5852d8c515f8f3beae0e62ac3845b42fb39a2ecdcda50e44535e9183790406652024e3f968ecbf4413488a02344831c45498294ba97c345b31e1d0782
+DIST enumflags2-0.7.9.crate 16555 BLAKE2B fc9d888285be03c9b47c6f2192467361bd4e67d41053a046508d0d431ac15b8cba69c265123a5403cdeac213d6c3ace8a94130267bd891e576b6d4cd34ffb082 SHA512 3899b6af180e239673d10cef2b02c848c79325f50dc40ce1ed07d00775d157679f1aee83b3fb79b8e432419810309d3ffd1bdde8c866aff723c2a3cc9d4c735b
+DIST enumflags2_derive-0.7.9.crate 7901 BLAKE2B e71ecdabe6c4e5ff7e01b1a820da948b000d614fb9ca6dd53c2a6dee215269d392a1e15c724ded3caae3b08dfdf796e1f61e04fc4a887956eeed8666fbf25868 SHA512 4bb89eba5b22cef199b19cd0d92605b5a11ec3738002b4fc2426c6aefbe6017f8b7156b3ac83fa7ecbb5abe54643b3456a8700ec831cf1dc27a518e621446be0
+DIST enumset-1.1.3.crate 26976 BLAKE2B 4e40cec8a6db10a04b598eed3aa7b9a81235ed95e433571ee4c92a699c4687a004dffb94721aafceadc4a6c68dcf08fd622385a802ad330208d55f7c0cea0436 SHA512 1fcc39050a75d73febf9f1976913872269f41916fbfe936b7ab67d7d61bd67de9ffc71a1cbf34eef92b2fdb0313b5c77ce9dc7adafae5992fbeb6fcf7b31c180
+DIST enumset_derive-0.8.1.crate 12711 BLAKE2B 752eeac1d1215a041962e3386ac95c1b8673921b76bc4ecb14acd98895f01ed3be24a95b5ac127af9f4fbacf65bb5035e60b989e3cc7d732db6015d92106ef38 SHA512 9ff87a0a5dbee945b58987f9d26200efa5e8d5c085ceda6e44ff9cc1b05bd903cdda632e459b26415e7e2195af79aa51b8e95fb9ee7917fc74a6102f220e5148
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
+DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
+DIST error-code-3.2.0.crate 7569 BLAKE2B 815e83d67a1f257b4e9b3058ff849b3c37a44a0339b8a3ba175b7c3cf4794ffbc76369ddb433ec278002200702b83e32042d62e5603af5010ad4df4c9364c501 SHA512 d3a6dbfdbc1626d9502964dd4615fa5d39f8507996fe6e727bc694c1da54c1760b000d4827bca7a2190db5f04b8549c6345f262702eaca88d8b83a43649c37e2
+DIST event-listener-2.5.3.crate 15392 BLAKE2B c56ed5eafa64014141e869dcf952e86f755eb35ed1722f8139260cb502ba226351ed1bea301618e94c9ca7f3309747057eb5f7d7986cfcdb7f6b79d13d52b439 SHA512 ddd67c1139ffe2aba95d763b73db0e2a9985dd2e57cf8f72030047d53d46d833df4b4192730cf0af4e060ce52e4f2df23aab6509abb94a6cd02e0d8cc3559d22
+DIST event-listener-3.1.0.crate 38793 BLAKE2B b26a13ca1172531145e8ae1e7990beb8719b99828d38ba3291b80d0bec59faba38b754debe3f64950f587304986ca9bc3c8edc1ea1d4323f094306943379c046 SHA512 e341cb624bfbbf0c58ae177e6a0bf462a7bbccdfff839f04051b7bc6338c6c504f3c6593e69f5cdad3592202e11979fa0b9986794272856b746ffdcfc7fb3154
+DIST event-listener-4.0.3.crate 39784 BLAKE2B 2924aa196726f3a6404536dbf494a52d266014b2097ea1f4a42e0f5d54bc2d14d6722deb4e40f1b1fb539ec12af7348275a75a9fe3e619a7f6a6a9156e0d30ac SHA512 2ed4f1624fde0643fc8eaf3275dfe77c15f936e1eeaae43d205f68d90e2a8dd3eee3b39e953a221cd19a88e8b947eabd5b8477dabaf8f30de328c0c13d132d7b
+DIST event-listener-5.2.0.crate 40217 BLAKE2B e353e1d18f50055ccdc4b061e86f809eb0543422cf67384f8e5dff7345b409d5f5cc3b27aa6bd7370e68a35fc6e924839cbafc73381316b6f48e6102eeac68ab SHA512 fefaf5cdfcad5493fd6f76011881204252b187ad1a1c8d57c567be94c81343490ef992d28538ee47314d6890fbcd288529d776ca9c2c94ef365868d324e9a4c5
+DIST event-listener-5.3.0.crate 43084 BLAKE2B 0876bf059b3d4798cf4a273f784a4d4461c933e6982805b44e997ae244a5996566acff08ccba2fae6bad6ba2b536fe90f554943d1f735f5638a37bcf0a74139e SHA512 b31b6ef4de7c062900845bd7d0e940045b641f7b02898eba2fcf42ac98241a696777e4e1fa740aa52fb80454b5adcff4e1511705d9a593c882f9ccd13437bc8d
+DIST event-listener-strategy-0.4.0.crate 10225 BLAKE2B cedf057e73b7d26ce691c3a5523c7492ba6fea65393ba20ca80ed091d3c4b392c85caf5a526647886547cca22bd703b0a01aaa8d018b07731ef909bc3281243a SHA512 02e8253ce8b680d9df72b786115d8894147483c5b44d530adb600718213424b2d87c899517ddacefe73738ec9c8904d042341d4aab8076fd19876e89972061e9
+DIST event-listener-strategy-0.5.0.crate 10616 BLAKE2B 532e5e73bd6bc8071d0dcbdb13e5b9a3ef1f0930b2d0a27183a9e203b54b0aa8b526f35393147c46c334a793764c338002b00a8df9428d3a7640d713b4f2f774 SHA512 553d7dcc86a9bcca01ff67e5f60bee536d208eb61cc28de1c40d30a8e7488177b8e5e3d50523d055e64da3d9051dccc02b984788f33f8de048fd23b6e964506e
+DIST event-listener-strategy-0.5.2.crate 10697 BLAKE2B f49faa8a2cda551b65e29b9dc98e4e55dabff7f2b330097bf5f6a5a5927804a99cb699d1f693db9c7cbd92ecb44f6c1b51be2b86810d3e3fbfd5eebcfad1a241 SHA512 7b3759d07c7936b53351172e38623658cbe642f079426c99e7f9187ba1d7f8cbbe7530c056cc760909cda4e70281a50577caa41426164b4c8d6c3f4cbddb2626
+DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
+DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
+DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
+DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf
+DIST fern-0.6.2.crate 304626 BLAKE2B 7dbfc8a1cf0adc288732a1dcc23e30bfea6668b01e162b60e867b67b995b7eeea5399b9e9a630510e3f56c8f36b79b34913342b7c8834783ddacb2cd7b94e140 SHA512 f9c44d1387f803b567b7254d91cd942c55d30a1c3cd37786101d7d49d346bc2bbc593fa8a3b2e59711c5320c1496354e8d2f3ecf0967030ac1e5199650523fba
+DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
+DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
+DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-0.5.0.crate 7824 BLAKE2B 01a5111a11e48462914f9877d3228008590093633e957883fdafd3a7017e144c14fbbe713bb8b0061ebae78d20a49978191ce416a4e28317b67ec69e38acb879 SHA512 d07c92cf99c99419a3ebe05ba9154e396ab88116f46af736ffdd958c8e47741bca5d9f478f6719d5361360e844375968c1cbf6ac40995d47128a5e5fda3f6c82
+DIST foreign-types-macros-0.2.3.crate 7635 BLAKE2B ee89f576f2d892209c0f344dcab9dd85a671c976c8034b33dc984b93a5c872ff0353311657fa1dafc499243e55d3293a7bfc532ba55894a719a50ddaa6957589 SHA512 c3965e058d15159f789a8ab1597770ff6325e8ac9e6914c98450225ce27af849698646d53326e07b13eb3a9730452d926b73fd76e5a1fbd8ae4a6083bdce3367
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST foreign-types-shared-0.3.1.crate 6006 BLAKE2B 27c26518e0de0a298df2996da4959727dcc6a21bb4efa6c28869a9affe7ee3b427d1bae25ed6928477d07959bd143d5d4fa27325f8f5a5cb0ddd3cdb9e5314df SHA512 c68da34b55230941d6655f6a52d5dcb8ee02149f25c25a5ef782402f9a18b33047905f28b70183a5f45b45977c011a5320cf7283b7901c76ede4d82082ca4c9e
+DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
+DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
+DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
+DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4
+DIST futures-executor-0.3.30.crate 17744 BLAKE2B 927abec40eab31251409149179baa95a8d025f9cdb848afa83f95439c4768abbf6da8e2163291a086ea0b83b0b650d1e19cb8e15f70369b70efdc70eb3121f6b SHA512 fa65c038e5eeee695b2673cd65cf7529713bef47da373290595b554bc287267ee5cd015ddeda5a22169cc8828717987364584a91a69685cdbfc0fc779abd764f
+DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2
+DIST futures-lite-1.13.0.crate 37058 BLAKE2B e1151b6263adfc96494ced26c377eb6582c4529f1c6347c1f920623400d317f6466d11e03c1ed70dd4172c57340b13b1fb1cfceedf430e3b95879bfa120d8e59 SHA512 2c007c62294c86108eba30a850a341e8fb369892bcbacfcd4b7ca39f949bc9a20624c3bb21630706d8240e27dcc402cec542480dbae8867ff933375e4be15fef
+DIST futures-lite-2.2.0.crate 38029 BLAKE2B a66919e5fe30a9b44af7363c5550fe8f91735c37ad8bbe2d65a3d3a6c8aca9ea1fc6291a5602e68dfe5ec1e0c3376c64c02fb33d485fd817850f1c7132362e00 SHA512 f507b58537c5ec48ba22d61415fde260ef9393ca4151d2d47b9ecebb5f736d8e1f0f838e0f133b051ef8bee5c32b4c5fdcbc4c4deeaffb35dc3a48f92802ae90
+DIST futures-lite-2.3.0.crate 39181 BLAKE2B 0e4c510d7b640efc6ca8e8b00f4cd51b05b727ce5d25d76e317fd5aec2f515d3b1dac57e4058c323fdd0c5d125ebc4073a9ab1f2ee21aee0e5aa0f9bf2e049ac SHA512 057de40b58d5ae06104c480a0e20a0ee4a962a93af615b04a9a34cd08135359c1f49f1b61577f15277fa73e9b7a93d2a659d3203b490ca4295b88fde2316bc7f
+DIST futures-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28eec9da850c47ffd9235c4baef5e5f1c72155f49573b2dc942a9cf246949b79c7d35200d04f91a13b0205cbd33d96c0 SHA512 220b5cc61c744617479d7e8ef9888785a17b9bc26c517c9c4445a39e8be21f111f77e53bfb3d143df18dfde23feccee17e349a84b897eb4d86f94d7ae4f714cc
+DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
+DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d
+DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
+DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
+DIST gethostname-0.4.3.crate 9336 BLAKE2B 12be5fdca0b6e3788cf3d67a4a80f283d240611b4fd37b6d1c37eb2503e4a7025b17bbb70adf421ac840d8f952434bdedf4691f31362780a267e21e8c4d3a006 SHA512 8c5dc404132f2ecf9bf82d8b89cbd698b4cb6d43141c47a60b95401da2e8c314347ab0a0ad5fba50cf98f01a621faa68293cb78f48977d3ddfe6e6f21926abf7
+DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
+DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
+DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25
+DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
+DIST h2-0.3.24.crate 167814 BLAKE2B df25fee9f6e39f8ddcb9c1be4775d055328606b3454786a397c50564e3e8340d72d0fd58581239063e29fb80acf92444e1d588b0672817b12cc5c1322652189d SHA512 4741e2732f08c6388c112877f52d6f859088026f75bf928f90b06a521d43e8e8c10f14d088f8a17b42a0a613ee43009882077a68df9300d17365d936400f1695
+DIST h2-0.4.4.crate 168905 BLAKE2B aa71ad20ac387054449bce337d9097822d583c5daf7bc3f703f1a8dd204cd616f0f690ca39eb5e3b623b5694ca9c5c070f829d461a1f6fef0b94882b142806e6 SHA512 469ea1d854a70fa8a0510437626b0e0b2fb5409c6eefb0f5a89be5cf24d9082654be6cecba3d817a19604e8778deca6fb10762bb29e0d1bfcf8548031e3ef4e5
+DIST half-1.8.3.crate 41624 BLAKE2B 101550482bacf9762d850234daa49917510e0061cc8b729c0da434d5530bca88d694850ad5865cbdf47434383ad5d68abfa768610a50878deff9ac84ab0d28ba SHA512 9ba1341edc6aa1c2edebd77ac76cc95851d3387e189a8d5a66dfc0974e79ba8610af8463c2bcee38d4dc96f82316ed7041ca31ccda8863de5a90b4f85f3a529a
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
+DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
+DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
+DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1
+DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
+DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
+DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
+DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
+DIST hmac-0.11.0.crate 11385 BLAKE2B 850527040c0fef278175f35a0c8bf77bc005708539af8ec5a85111f83e9c94a912741a2b24965c026fd75db6c58fc82a46a9c5de9454540400c9f19341561b4c SHA512 82d83071d1cea14603b1f1a85d564c78e28d982025a029779d8d83522fd5c56583303dd3a902d8023b5e9df2ddb5c5d9a5fc88000d41dba45dc026239ec81d0d
+DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
+DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685fe5204bc6efa87b667d00b28f59cae667115fe45ae332d8542e7a0c2c7c42fdeb302302f89b00cb716f380 SHA512 e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58
+DIST http-1.1.0.crate 103144 BLAKE2B 7a8c4ffd3ce664e1f575bf4042ac0f15ff42b200fa8c6aa27a6686d77be2de7cd3df242e36f8cb45cdb822bfa96011d5d5dd7bb03122ae5bdcaa15bbf9d40051 SHA512 1c29f25a8895a69d815e21df427dfff7924e9040d01c55cc3256dd0b5e72b670fe75b1414223fb971c16082e4b26217142628be5e0905994da4f08b52e7f4a33
+DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462
+DIST http-body-1.0.0.crate 5411 BLAKE2B f560b45bfb1525fbdb209982740dc2da5688034912377b88a1f0e069a003bd3fba3d3f248bae98dde043e6f797f256a219228611e9b8035e6181f4c84381f823 SHA512 b351df7a2ec991787a57232229f80a29a648433de25efc1db2c9453d5a09b75c2e8b0101268b6753251c686a2af9ce346e08bd016f4e93891534f428c1d80183
+DIST http-body-util-0.1.1.crate 11930 BLAKE2B 7e8388c2e15f7cd2d4e4630bd1af25bea49efc2444b18aaecd5fe191d913c7922a34efcf48b69811e1c64923bb7dc1e3aae9a2ca2daa1b1a5c9e12c679dcf787 SHA512 bb3750ab98dcaa7024c1b5a90b3865b303fac8f723dd037960f12815c6e0d1e68ab5e09dad0b7ab3154a820e7ec4a5bc7b39be104e5721c7ef1fb36416fd9b24
+DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
+DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
+DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7
+DIST hyper-1.3.1.crate 148763 BLAKE2B 50727f12dc4fc3ac605b19f92c30815a059364674b57dc0d8fee1aac548ba9474a9c0f23c32c537ef1b814a6eef10608dd442c579e37b102c249356c715f3cb7 SHA512 a7158d887593e29885c0d62a482916d50e14b69d7a4136be6c29e262d739d742d551446507bed27f7e6d7b142faac9907ed7b590e6f84175092c52f176598806
+DIST hyper-proxy-0.9.1.crate 10317 BLAKE2B f9d00182507e6ac917adb73c0fc9b58fab95998e2e22d8c129e51e9e39239e58086ccdfd862713dbc615b8ea736f68e72ae7fa834c7af44c2c62f5203bb9a50b SHA512 4a8c5e79475d9fb09f7bb1bf54b97e7879037ab4f97626fcb5ee788e8480dc617fa686cf43379a87bb90d0b96d91c13cf496ae07b527c06cceb6ac337e90556a
+DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
+DIST hyper-tls-0.6.0.crate 15052 BLAKE2B 2d9baa91bb89078e58b6a3af87af6796c110cc26f79604d56552836b3fc770ea63b215b44623a57394d1d60382d65f9ac0502e68700ccef4a2d4b19414497545 SHA512 6b99b08669e689005a27f2ca70a12aa51298a6a4226de072cd84fb15275339dde8e2054838541096484d732a1d2d913bfa945ff3003054eb62ac4c2d0a8ecbd8
+DIST hyper-util-0.1.3.crate 61647 BLAKE2B 25821f66f7576e89b5c7a5207a4179a7e86f024b04acd1e8c7cdc8be3bc8c9222df1efdb14de087a0db50029370a84ba5d48ae2a0d85d04c1322bc1701a4c2df SHA512 fa68ae79e56a40beef318ec1b3fa6683ecd49371a64b123e55cb311a739d44226bfd526afbbab661785ce4302ef4bb1bcbff80ae3c6af26a4db62e9d4792a114
+DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722
+DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
+DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
+DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
+DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
+DIST image-0.24.9.crate 9261055 BLAKE2B b4d95a88fa2fdca01e5d89ba9975be22269e3a5d90d24bc31d5f1168007508a0337d0acc5347be012c2b98de02e4f481a573f012f47a1f1e365d26d89df236d8 SHA512 3f858efceeed54e21543eee065ca6008f40c568e1ece1016b38040eff5625c9fb6de77c7e950c08c9e82b9fcbd4c4ec2f8c4c1157ed5d232bc8e35b4850420d2
+DIST image-0.25.1.crate 9176733 BLAKE2B f7daa1982ec510de79c925157f2e1a861c89a92f1cc043617469f3c95cc9158f1ffcf274513556993bbc4bd5ee5f86bcccd406cfec06d98b0330bfc10687acac SHA512 4252672cb5b5fde61e9c7fce1712997ea082e3e7d5350970d597c0a1421b21078e1b4c3088474c4b500f396bce604d0749085fe4cdfe1c3b5f3d1ffcd39c1b04
+DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
+DIST indexmap-2.2.5.crate 81498 BLAKE2B 8914a50344951aad58766fbfebe8780298098e3a7c923287e3a84f6de41e2924a6a3bb3ee91ceae9b5b49654b83ddc7516a4cfa6253584b0657995d7c8f63a89 SHA512 84fbb6e61756d5ff746f6ffb2c3c8552f96d3af205075a381f06df85258c7597ce24b0d193127a797f975a3fddc1fa92110738227babc73a7fa37505331f8d78
+DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
+DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
+DIST ioctl-rs-0.2.0.crate 4214 BLAKE2B 046f3ac4177d8f3934e96d0765d93a7ba9ccd7fc471f8736446a7959a08cba5d56294d023a6f24ba24145f668614a693b5824db3517eeb8ef29b7df5519dc05b SHA512 110bd5239f37327892c272791c87b038fc9041cf67c6ee41c671f5c5d22f070b921fbc23695ded9219caddac1097f47c78c0eae3930adb3d38a6ffdcbe14a4de
+DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
+DIST is_terminal_polyfill-1.70.0.crate 7451 BLAKE2B 9efe76f14d61a5af6d3cd30d5e64209971d4292d8d2c12f4a621ef65324a5bccbb7e1d79d5efa75ea7456431241d6325cdeaa0af802b1480c6cd9c1bc5a35994 SHA512 c07d5076978e4c5d8d6a191d8880fb62643161979c473564881feb17726cd9ac8da25c40094ff12727dbdb064fe88fbda1867120a2c3fda1051bcc39380645d6
+DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68
+DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
+DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
+DIST jni-0.19.0.crate 65890 BLAKE2B 78f93688f80f123027a5b800b0c3e8fa714a1a06b59ab36de73ab2d02f1f9ae3ceb2d3d4fd19c8d6d951394eb85f986f303987ad1e23b2fc451a237a04a9ef4e SHA512 75b48cd05ffbfa6e220dc4ffce3f37eb89105d42b0ac4e108930ed81c3525c4ee3d1c069342cee203c401c9f2e9bb2c53382fb61155da922ea9585d4fff9b212
+DIST jni-sys-0.3.0.crate 10232 BLAKE2B dd6334daa6db9fae6cf1b31b9c13f09f9dc3f6a0e227bf6779880a6e197189d91583cd463b9876125cf892ffa5f8417dcc51aa010cdb8c99bb4f969990e969b1 SHA512 1e47582ed4dcf608ffd218549f1eef5ee3c87a89e28c65eeb5bba801edd6cabc0f095e213e8df606e050a57608653a59ced6f01a8bc76a5eb32ba1a337a63321
+DIST jobserver-0.1.28.crate 25543 BLAKE2B 90fb1d8696b575b16b5b12d6fa4e7bc7890f5f09110b147d65eef8888a16ace1446a789f8079a3706f0252be8a04061d989bc8fc53e6c004d6b8a4094baf1642 SHA512 8ffb33b8c162935de1226e0ca4048f36e6e90bd1731cc7f06110bc97e2adef904f777df0ca4ed48b3b8ee4f2c243b2f883f6897427867904aa3385098abcbcee
+DIST jobserver-0.1.31.crate 27306 BLAKE2B 08ed4a90dfdad5bd7d67b8e15cf61bccb4a9669dfe4a479680c481e7066c70d833cd199b56a4ce7d1180cc9fef565d0afe722a13a436b86326cdfc8c10fb0424 SHA512 0488e5eafc5a99583d4626ae8900d49082aa09228b35a8992d8e715b5a39aade47f51562dc4db8ac41305e069988c4c63e1c78e92d65561e3e8a09d4dfa5fe25
+DIST jpeg-decoder-0.3.1.crate 744364 BLAKE2B 0ccc3a7f42e471fc1fc7995fa99573b798da89911667e477a310d10b95745708e583d53776467b9d54a399047b727a3fd4c26a1387382c226f6594770b21ba05 SHA512 103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00
+DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
+DIST lewton-0.10.2.crate 68807 BLAKE2B 348af2eb2cf9a8d3e2277d5c63a34430910b7ce0c470b4aafb41c6dc2289702b5726cbdd4e390b9d5b88df594bd4d168dd0647a64342e8fd3677fec96d89b3ea SHA512 8868d1347f75099d40dfdeecb17ec1aa26540d3d9dda88ae62329e35b30cc7cc2869420592d777810a7df1e5e2c7a9518e7895f885921d68ff66ecf3417d28dd
+DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
+DIST libc-0.2.154.crate 743304 BLAKE2B 25ff132ec29b78dec455f0a1fc9fbfc744ee0d6eb410aba05ec6b1b08af9d83ec61e56f840f86cb833f590e8cdec7f67ce6e7b630ee227a36581650c81298b84 SHA512 891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61
+DIST libloading-0.8.2.crate 28422 BLAKE2B 3547acca23090dbf27b58296a4b2a07a454e550a4621079922c9962044e26a1da9e38863afea823fbc14037f978d91a3f84693c59252f99ff77c9bc3a41de19e SHA512 0acce8e1271dd14fc8106046a744d055f67b8743ed821ecfbc3b029e6388d07520769890971c74c63338b01240f13f13341c001ced59c601d803370a37e71af8
+DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9
+DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
+DIST libpulse-binding-2.28.1.crate 130637 BLAKE2B 3b5490c5bbd3d60e8deb70d2a5561437770694c0616dc655dfb7d8368cb30b58b1ad6c05d60d6d1c04cbc7e6c895b8ce7bf77d0d63df0d5de5f4acad8ee30fb1 SHA512 224e8e6dada41084d5cb238715af7ed9e057df6ccdd37736a6b8bd8305fa66c2878884a9c66063ff337ef26e441de8fd7ba148be0f73c6196d2442aa3b25465c
+DIST libpulse-simple-binding-2.28.1.crate 12265 BLAKE2B a64a054503e3fb312a06466ec5709ae9d4f273eb3bf51ce71051dc8fdafefd9768dec9fce00ece74f464fab4d7510d8bab7d3bc0e92af2979a7e8d5d1f574eee SHA512 676fa1a92fd1946fa3579f4d0c08bf9faa1d3ce291fb40b437b88412635ba9ff48080a62a824c9ad78affe39a806edaab1fad538ae22bfb96ae473ca0bdc0094
+DIST libpulse-simple-sys-1.21.1.crate 10465 BLAKE2B 929246968f53ccc169b5f1862675288693e40f3e8cf82fb91075276b9886576700436df01d950fb36dd8bfce8d71f839efc87a07667ea063c2e6c56c1b54c007 SHA512 953f4f4659aa218a19a8fd684a0e7cc8c4ac1bdde2fa1fa4dcecadffcbdc346dea565d0f2f7b645ab71f124a89801e3b29e2f73e65cd729b365d9997fd3e0d2d
+DIST libpulse-sys-1.21.0.crate 35899 BLAKE2B d230d20d9e029458b8b43498282cd1cd0838a05393010f322fe7311d5a1d474f9c7cc25cddec280fb27ab0459d2051bbc62950e235c77d14d424c656509056da SHA512 74b9725742f7dcb3abf49dc3adde2621c7645b372bbcaec6c23caeaeb73b939b47d1f4a9dbc180a37de633408e2c478d979a25574df9605b545a41b5751ad212
+DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
+DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
+DIST librespot-audio-0.4.2.crate 10621 BLAKE2B 5186a36ad0d24f2f9a9d2dcd5b297da6b1e4fab30867853901880f6c6d81712cb7b474f105cd31d2878afaabbd5c69e1b79a9f0be756d2aeb6285e5a0674fa2f SHA512 948e762e995351d5fd38e345cb46b2dfd4636f3233991cea37938f854173debf97a306e4e3af4b99c479da1cd8d2bed1fde571a62b071142ab7f0952933c7767
+DIST librespot-core-0.4.2.crate 25197 BLAKE2B 15e9b3815fc0851b9a38902612eedea44a0cd2a5247b9352c25d8ec0ee100d23eba9e2790c6b3b50b5e55200be5cf3d0e72db407c7b77e5c021a2bb29b5152f6 SHA512 13215105d12b9fe61fdeccbe049d6d8466a5a231e1f6983d0bdbbb59a5a1b39aa8d4fb2cba91da0f9dc32337dbd95313756e075aac0faf61dbfaba0db335ce94
+DIST librespot-metadata-0.4.2.crate 3850 BLAKE2B c6dbc60565fbbf989787b3173cd5586d727d83c7d08f6ec0f12344dc0a66d93647d7b54acc2942b51a4ed4961b220cb4d389f4e90bc77703a06fb5f8a217d903 SHA512 eab90ae89d4207487ff074312dbc8291f616d7f422a5d8120a72772d25550bfc7f090bce4f0510ac37db031bfdacb6763f0720321338dd8627dfcc21237bb396
+DIST librespot-playback-0.4.2.crate 39168 BLAKE2B b8d527e35e80c10388afd9d9e02de3c6fc7edc8df87bc28df4ed676fc2601c8b3861ae748f0bbbd302d6aa6f21b90958243ad62ac32292351c0a1f719289881d SHA512 88f773c35267e6b70b75caa21c3bbb55e1c4a609a5b96d1817fed755ef52286cf0951d32e43368e18538b1345017ee3a4e014c4d76b16291744160c5f2e6f67b
+DIST librespot-protocol-0.4.2.crate 12192 BLAKE2B 21c299e6869000380e424c5acfc21fe3e3cd9f58aa56eb2d7b306555d34e8cd13865ebe80f9328459eeec53ea5cd4ee05070d877ec4a7d5ad985f77e50e9586f SHA512 098d336ff7ffedbd930ce382ab80e6243860df3a28c85a7cd29c8a6e5cacf8b5aa454dc21ed5bcea03e7840fb279be88b2698eba5bb46989b9d910ba7673b3f3
+DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
+DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
+DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
+DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
+DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
+DIST mac-notification-sys-0.6.1.crate 12242 BLAKE2B 473afa3ec0349f967b92b38d4fc1431d9b9b45ba23fd22aea6386de3ddcabc161adc672dbe6b394a5a11f9f012f3be1c84a48ff59c336c49221b5ae6dcf1e314 SHA512 76c202a10e1ad5ca7c892885048f07cf83c8acc45adc297d622c1f51fa706193bdb7a901ac127b0b96d97c03955feb3715ff83e08bd292e477124f4793488cf1
+DIST mach-0.3.2.crate 19611 BLAKE2B 683aba7d140a3697933835efe4e2e5a6a107f0a6122ce4533bd9079c0de4346dd1a817abeca4372a44a85406a424af9deff87496e79359df4c8d9ff89daab7e9 SHA512 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26
+DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
+DIST maybe-async-0.2.10.crate 22107 BLAKE2B 2b8bea636cc271574bad08313b86d5b3a2163199addb0b6320630655a8b238d811db302f1c9c7168bed5963f0b55a90554627c48f59ec2ccfd5674303b1cb344 SHA512 c41fc42385a47706167fa9c51fbd2e4dac74683c362d66f71705de4125dd639a518207a2ae4cc3e5f913279ea205d260b0ed3fe2edbce68f27ddaa9e9989e59b
+DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
+DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
+DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
+DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
+DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
+DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
+DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
+DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
+DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
+DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
+DIST ncspot-1.1.0.tar.gz 255190 BLAKE2B 5f330654f755e61407e229de0b0f9ad3364d54c1dd180f26b83dfe6836601bcbebf940d545d54d886098c2c9e12e9a312f4ffc82999f226dc6b8767ca1c9bf7b SHA512 e07e119e682649428aeabebd2ae882b0111a83e0f1bc3c47843f38351a9d833c7cbace48f777bca3edbebe58b9dd55e8135becbdc4693560a307667fd0f2b2e9
+DIST ncspot-1.1.1.tar.gz 254968 BLAKE2B 3c637c3426df7f2ac9e7f6fe5835fa2b0e691c2a67c207f75cacb2813a3570549447dc5a30ba2c4c678b512c895553c7a007bc22547a883ae42b94a40628bcf3 SHA512 1cbdd166da3e620b3ab9eaebac7f75b2ee07fb04190ee08db70b88054311ec61b03364676279c35783671c12318ac594b28f8d4db1995842055a43decb35e49e
+DIST ncurses-5.101.0.crate 26027 BLAKE2B dde9d01bf611720c2cdafd7136c974a9eb5fbca566e0b5c8cdf60c1f5979a6cb0a4b6b47170819eca78d6448978b4b19e81fd0ef0ae61eab2932859b45a8a787 SHA512 e73513a28706dce70296af28170e8c124b9ab105dcc6509f2d65114f0f8f948b775cb4b459293a399bbf748f06bb60e5906818d928b4f0078c96531d8ab050e7
+DIST ndk-0.6.0.crate 39828 BLAKE2B cf59da1e11fed905b245520c7fb00012c194379aad9a8d75e39e771e3df629824c17bc04121b4899bd7f13e9546cde3877593f0b4f3e66d6876f9ee6625285fb SHA512 62af40a702784a35bd3517131aa5c5fe22da81091e45a8c8639fa8f1f8b3fed117991db9518dcf55878cbd6222f696d09e0bfb28e161aa47d77b2825ad2e1fbb
+DIST ndk-context-0.1.1.crate 2205 BLAKE2B 6c1013410459ee13357877654303a04c2ee674eae77911d8c35dc7ebf3df2e8632440c26273f994f90f083fe20b4923240e3b9eaa2ae90faccc7e2f0021b6e0a SHA512 3e15db351492b3f1935424a4c119d878f5d771d6ca0cb6161e4105b263178e96e41cdf1e927e5f3c81a281f55dee25929a9cee911eeb4ff307dcd31fc400398b
+DIST ndk-glue-0.6.2.crate 5227 BLAKE2B e1b10ef9a622d8a1fbedebc5bb81e7359fe099712e1f30e4253cab71e5cbcfc35d8b1afffa4e114cb3f17b95e1037f67b7853d1834fb90d8ddd51d4aeccfce91 SHA512 0e7e82eae7104ef8c4279c5d93938d4d6270a133255429ed3b4fa307096d363f4831569f45c403d32c1564d6daced04212ad65a45fcb4ca513fefb93728c8082
+DIST ndk-macro-0.3.0.crate 4884 BLAKE2B 97f7cab83e5fcf16bd5d852327107f0f7964f5c3f7674b7764cb369ffc2554c4c550a2be57eb7253b9da26f7921c49735333497bb74a09672655ed8f76e2fbf9 SHA512 240f8b7ec5b72a450874dd6b9eefb2825714e4aa83074efe13a958313193d491e6b4547ce62d2f727afc552d9d8c009c9489a808da54d5967fb29da7eac22d3f
+DIST ndk-sys-0.3.0.crate 282815 BLAKE2B 29342ed697feb1a02cda4ed23108c090206fe67715214de0f03dc81b7b787a40302917af7fb8f45e4510d1d1cd43d369d938af4c14f7424fb229bf97a24cbdfe SHA512 9d85898d812be7c61c7bbf4ef7a6088fa427f4ba334d491a17e5d1e8cf0ef9e37fa277008dbb940d1127c385749ca2b4665521e677388f6b01a2243fce310485
+DIST nix-0.23.2.crate 242042 BLAKE2B b44292d87e9379debd1676952cde1175568cae88f64435cf2e347ae624ecbfd3bc08a9cd7de1c50b23a416754dff4b7cb51983fae06a66f7f16089cde94f440d SHA512 8617a5d99c9aa729f35b42b3797ea46e3c1779c234a836c7460cabdc7d4229b79c8772098b1b95f8b444351bcddd2729515a0433f68ea035087ef6a93033ce93
+DIST nix-0.26.4.crate 279099 BLAKE2B 41debf1f21427ad6c25c6cd26b7867feb8ba46366028c4b74073307e902e526543f536fc0a66db2cdc5a52fbbf9166a6a4843aba57e5e5caada3d914286ddd60 SHA512 cc68ff8e3e8ea8635c6fd4c0a866cf42121aa3e25165666ef3b97b5b2c1d9273cba6f689e80eb812b55b5ee513390924a926d95fce45de0a74b98764dd1fa27d
+DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
+DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
+DIST notify-rust-4.10.0.crate 55713 BLAKE2B a4ec476b6880f2068e9f88a996db9c711756036c206da7d090ef5776e060ca6437033aef4cdaaae1b0ce5348ecfe301a7b4f43a469326550ae2e7a3e6e5e4c42 SHA512 93f0646a8f2d1c662196c454cafcdd81faa7faadf4150eda0a9163b510bc4f85a4eac6faa60c788da641a85351cbf6d3d8ed1c4f5e9e69d62815fbe0709289f5
+DIST notify-rust-4.11.0.crate 59658 BLAKE2B 7f014935db7c8561ad4671bd399960ff34854abba599711720f7afc79a2de7ed0eea5f82d7c812206be03d96300b59673abca69b4288a6f0d5ff40b45e5e25a7 SHA512 c13474ed7992c9b3870aa618e0bf43d8625ba2dd3f7c9d184998ba2bcdff9d7b7c0c50229af59e19026ed927688c23596724bc67b77aa040cc23a06fe8d74295
+DIST num-0.2.1.crate 9082 BLAKE2B d82bf8cf2f53ad30cee1364d65358e8421aedf66126184936d575e359307373ede66358e7672e1eedf3b8ec6a997439a077943c6f20045aa24a89bcdeb611e70 SHA512 9d094e0a29b2bb42d382d5167150418bc2ed81e8deb3c6636c99c86ca14abf5f69b82a49f1678dd110119eeaec2f476fe7a5d57e60558473a6b7c710dec7f778
+DIST num-0.4.1.crate 9522 BLAKE2B a7235566f657ea9dd3c15d4cf5ce85ac94f9f0e15ef5f4dd4f6bc7f8f09b9f654635a61785dfafef56dea980ee1f7441ea6fa366e51b9db707992a6b9d036bf9 SHA512 ea3b49c1b7a361266ee44213cd65765e58bfc51b9e805bdc71bed120a3b43f87ca60ba81b231a2c9a0ced617e10024d4e0961d8a3a52f26dbce1a22d550b7a84
+DIST num-0.4.3.crate 9575 BLAKE2B ccf8b2bc0fb93ad75353ab93839344f1621e79a916b2cfee42e1332808608a5cc0552066c46c0608364c22df09b69651fce911448085782bab2ba08c90e4781e SHA512 766ba6b7a012f7272979ed02942acdabf9c5a97f553732e241c05a1075f4367651ac0bca58a512c22857f5df20dd9060a7829715e45e3b16de650d4fe4818c81
+DIST num-bigint-0.2.6.crate 87275 BLAKE2B a7da84e705f8aa287b6704a42ae1822ac1555d25e7f51e69b4288a808557dba2c0c15552085a67f3cbd445d518fc8d4f668f7264237263acc4248d3dd1a2c0a3 SHA512 19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8
+DIST num-bigint-0.4.4.crate 99369 BLAKE2B 09a44754e3a3d4f949b3714d96ddd7f3915164d611036675e3df421d6c0863e368eb0180978a4ec27fbfff529b4999d2593e411903516670c24c08fbed6a79de SHA512 0dcef3344a933509fdfe87d6adb0bb1bf67af3c692ccaeec5663a8f18ad0a251199ef9c7a24c25b95d1b255b413947e70f0a205669d549b13e54b6f4864ab3b5
+DIST num-bigint-0.4.5.crate 102281 BLAKE2B a25880f907caeb948d0a8619180be7e1e66d0644819a842fd1413a1ecc8d7cd873b4a55a684e8a98f6bc1b74612e20d3d01389c6753389cd9f4cf7f754125fdd SHA512 0d3b1da7f37a441cae0bc276b5b9b8aaad2f5a7ddc3a1c9b6c6e09be70147f7430604c74c57a79dce12d32c242393c8031ec7bbe9b1cc6fb6e496d6fd151474e
+DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
+DIST num-complex-0.4.5.crate 29614 BLAKE2B 32277724d5336443768a299c835cba63906ac91b85c57ff0e57338902e32731a0e67a93c647e6a57ae53a1b4a961c8b9ca2f6937a275e51a58089378a9646e8a SHA512 7b607f240773e4f4ff1954f46b2ee85be1a4f012e2d290343f6178543d10b69c0e9e1a93b0df8efa013c3914ad48321e1d96a4578092ae4d359acdc239ce1ebf
+DIST num-complex-0.4.6.crate 30352 BLAKE2B b9f0465d53e8e16edc44187f8efa40681377e75fc4bbaec2c9fd8b8f5384044c3a989106ed3cdb740cb86e19659b34e4b38e7cfd7bb01904e137ddeda3d0b6b5 SHA512 11ca2c28ffbd15aacb7e184b7f3e09cbec9c955738568c1e0760c256c72b230cae7152403d834c8ed9358e42b724269e99313dde9a23027a6963ca176ca45615
+DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
+DIST num-derive-0.3.3.crate 14545 BLAKE2B 3af73d35ced61f8e4fa2f2bef695f72a3cf1f1a67c77982d3518d9383331f34c1222dd7d72802cec22baa108ae08a87805a11942132c565ab8439c4983e99871 SHA512 e0f4d06fff26c2d2b140ff5ec1ba655a46c8d8fda484f03a8ad4910e8cf1392f0130d5c0bfbbe3bfb95da1f93e964f73364de6551fddd81e6fc27bfa35c15053
+DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
+DIST num-iter-0.1.44.crate 10249 BLAKE2B 9e70a4ee02e784c5eafb033dd321f70ee92582c2a75871688ad43970a1313ffbcd49c26a8c6787e537f041ac60fd269131e157bb61ff2bef09e5ccfa372b2a09 SHA512 f7cff4e6ceee82aa6de469b9db834a45b50a3b73cb068ea714fe237f74fe4875a33881f3421a71ed31c47dca847e3f3b7e21cdaaec52f0aafe6dfb8927f39f42
+DIST num-iter-0.1.45.crate 10320 BLAKE2B 9f2a60a819e31a6e7e048ae86f7fa029015a73888348676e54ec6fdfe76abe94b632a49a82b53b86488ea5af1031f677b0eed8ba7c5e843ce804c6d6af123622 SHA512 6195c7bd5f904e9f0aeee3ce17b42c0383d053f9d37954a9ce3b4ff0a048afa121c9a37aa9c74b9ace7353d7fd9f57a7d04c7a18e1456fc2c4c298d8ecfd0172
+DIST num-rational-0.2.4.crate 21694 BLAKE2B 6e8dbb873b1c62046c3fc45eeea0533a8375224fee6537e369a6042a42f98865c010635f3723c8116c32b365f8dd553831efeac4a1fb2bd0cbb169c90d7035cd SHA512 06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93
+DIST num-rational-0.4.1.crate 27889 BLAKE2B c6db5b2165eb341268cc8b81df44caf25a18242d0ff1cc0959444ed9a51ba9985c1238d6d79433c3927267ceb181da6d491bf282560db6bafd7768b79ec65842 SHA512 a7547ca663543e9da9e18dd079762cde371b85d55874a54d6b343ba775a9373392c85cebad511c53b5af5db298bd5d57ccef6161c1c28587a6c9fa2c5962a0bd
+DIST num-rational-0.4.2.crate 28159 BLAKE2B 653e05b9ea621a92dbac090339d9e0ae0b3f952b332e3a54f27ba8f5209a4e9957b014ef18355555cea0caa63432de0ec0be7ea6798389aae46402f789432554 SHA512 0999130db45e5d877d1e2232c8900cc633bd39e749186b2ef4ac4343b958dcc80edcc2247df5f229546dcb3537fd45984a7a459a9bd8f62aee69a0239fce0b62
+DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
+DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
+DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
+DIST num_enum-0.5.11.crate 16772 BLAKE2B 4f032e0605730dbd72d2e7d6e06085211e885f66ff43193b32c7860905fb85070030371544ad1ce0f926e93ce13a1aad6f70f4c300abeed447373f40a46d02b3 SHA512 962e0e05e7c0eeb8e7520a699066f2b0af2ad0d5d8b4ff174c93aecb609051a1d45992c0cb6a62cbea0ed391d716656047966d5bf4c3467adacd2c5550f33578
+DIST num_enum_derive-0.5.11.crate 15552 BLAKE2B 35ea9ca8b1a4e7b40b7c9193f57a466d4436945a8ca1e11e40fafaefff8de6229957594db72e6632dfb49382c52cddac3c0198e9ea063299502ead3b6d958900 SHA512 c2f89d0642c41faf6baf6b718b52b8b09cd17b6753c0098649eb8333cb253c8a166e1f1ebf1be99039e1d7d9c50541a8741645d630df8285905ebff7b26759af
+DIST num_threads-0.1.7.crate 7455 BLAKE2B 282514d1c6ebe67ab2c30f91efd5b6c8880baa078265e22d5d7200eca4f96702aad8b537ba772e5d4e680a6e90fa6919fecfcf37a060668b2a618bb01bbabf2a SHA512 60eecfe49c1afca8efa320c5f4d0cd794f6adf8924193682c903307f484ca0a1ddb56102a772232aca040f29651bbe26ddc1c4939e1f030e229d179837e06bda
+DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
+DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
+DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
+DIST objc-sys-0.3.3.crate 20519 BLAKE2B c18653020b190f7a60075aacd238cf404b959b7e3580d0907ce7ef3659fdf610c5cf3e151b474697f0450a115e7f503e1c3307c43e53c65be65f17b0cc448f9a SHA512 29e0a516c1a3237671d165feb1ef934afc041635023b26515ac7a06b462acc3f4e25823a142339fa4b9e20fc9a369141c31527c6b17821ce403a72dbba68d4a3
+DIST objc2-0.5.1.crate 193188 BLAKE2B c81ce2b043231d6bd3c357e3402c74876af4c9ea2311835736849ed00e854f068e5822fc8c9ff2777c85bccd438ca8561ff714afaa3ad742ba2ad993db9e6894 SHA512 7d43c4b3bbcf424e7a94bab3166df7fff9894795f6ee53c5a65a3592929b7d0dd946fab49c915d6ef9c174329ad1a5b1d109ffe0448e26eafd97aa5f1c9f2e63
+DIST objc2-app-kit-0.2.0.crate 328831 BLAKE2B 70e67596393e736904202b45d5dfc8ce56e0f901ff94ab7a2cfe7f57e056217a9c3c82f23747d0cdb1d70f144c3b43a498db48779f30a95f7adf7754c363bc23 SHA512 020b491edde2b0af5c7b1ec0a26d0e1dc83e1505f721d76ce7475d79091ac702e92036561135384c831ad58f4c0b0d7a77a88db1f338a22ce160b7ef926ed33f
+DIST objc2-core-data-0.2.0.crate 30048 BLAKE2B e8fab39a8aaf2c3e61c54dd976bd522a6069ae816fe08bf6d94eabfdeaf3d02b8cfb7e4904ef1d593b71a258b68ce87a2cc35cb0d0978e00a9fb2fe72ba9e0a9 SHA512 f97e256ef0f7d56a23a1d4c66f4c80b9f10d6ac5fc6768afeefb86cc4ef368bfc2189c26f456657b1a4312c9480bbaaa6f0cc45eab92b3b813aa298c65c6babc
+DIST objc2-encode-4.0.1.crate 18592 BLAKE2B fdb189a9035588ed28b65bac5b2c028309160d662dac2f68bb27d40c47f013f79f634796981c7a575eb9081c43f47281d1827c79e2b43820a844aedbbd0860d4 SHA512 4ce8c73d77d9d95db6f141e087fbb4b38b576917709e6d633d012ebf6528f52a07cd4a50690ecaa8c9d3577cd1d38c7be036d978d5d5cc0ffefc7792364469c0
+DIST objc2-foundation-0.2.0.crate 242960 BLAKE2B 3fad756221e1de85ddcc61c274084fd3d1bcc0e1f63a52cf6d04d6d9a47df57b19fe72198ab34bbed3ee649a5bf2781d968d4928147c5bb7909fd84dc32f5cea SHA512 5376c1c22e02890b6ac4127de923736a4885a7517a4fe15adfa6bd0f3229579bfd1d47915f30c437fbe011d757f02c53edeb1ad20a1ca6880ead63303d51955f
+DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
+DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
+DIST oboe-0.4.6.crate 24067 BLAKE2B a3e1c3ba6534fdc2159ead7a301c6b54718b19ce2e3357ce3bcb58b31c1ee3b86b427f4470564b2e8a3e8b0120b33c25ac069bca922dfdd0a1478ece5b398f40 SHA512 bfd792bb8cf2254030e2750b09a87da70defc4fc65882d94ca70469b175e04175787bd89707cd4dee876dba127b8f3b8ad9c5eee32ef5ff0cad49b046b29a793
+DIST oboe-sys-0.4.5.crate 140656 BLAKE2B 26fdb4ea66dbf2f74ccf38beb280262715642ef22b87076d16f0b8e7f7b8d284714d8c7207567e51cbc421d22224b664f0b1051a0eed3c78c16d825ccc8a1d1e SHA512 b8e31b5cfcba10d43b9e373793427341175b7e84f8805fd18a8be387bae407801a0f196d0910103175c23e41b193c4eded2a4597b958128c29e401a27d9b4474
+DIST ogg-0.8.0.crate 27128 BLAKE2B 11b8d47fd7c34bafe0b5261bc9be101599bb19e4ba7d919fddc4aba5a87cb1c642accffbf2e0f5e134a7a45b1d9e1dbf22e69e8aecaa93d69bf3bce364dd7356 SHA512 d5ea03e00ecade8713a8bf31e34bc45cba94b812c26dd46b579d85d61ff502ba501626b64d3cfa066a47343819f65d27c478372439b758cb7ab31ebce81f48b1
+DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST opaque-debug-0.3.1.crate 7066 BLAKE2B dc1dcadbb5654a5f69c59b84faeb3095f008a6eb4f63e3cff95bd4e97f803201e2f16f59a65f8ea21b662e77e3fed0d0870eb1db7f5a4f95cc02422907732951 SHA512 f325214d604e74197ddd9209a596851c5bf0c0f3299b79b6267c35e0ff6351205b628fb5086279684fbb29fd07746c91ede4f45019657e761d8400fef2b3d8bf
+DIST openssl-0.10.64.crate 272306 BLAKE2B a8b618aa403cdb06a7f135cd966775f21c99739365c55aabde2680a6154d03c7d554bfae6c62a069841c70ed82ece6c3f0cd589da8c26022b7022c3c4d79a6d8 SHA512 a1fa9f71cfebbb37ed9d4a902360f2cc95a78f55b5da5d51eef69db38cef016fc03236485158d689ccf054e04937b8cddf88e3f0f31672997fb30c6cac73cbf6
+DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c
+DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
+DIST openssl-sys-0.9.101.crate 68568 BLAKE2B ad80cf56a33c71d6889470e4aaa0b314e67f75ac7921a63d87a94becf9203f4980b6e17b230c0954c126ab8df3c499444ab196958fa645ac9248ea8c245fa34a SHA512 33400053919f7fb2298b84bead88d82231640da6db4efe3dd21a837d0ddb50b2bb21be5befe1734bda15107a9e23cc9f8392647413ceb77451bc36034831b684
+DIST openssl-sys-0.9.102.crate 68622 BLAKE2B 0d3d3c9ef8e2542c7f35db1d8feaf512cc7313481bfcc99354d601e8d6332adfc2e7ee8b35599a9241de35c163efd840186e904375bdc9c65ee743abbc154cba SHA512 7ecfaa0b49cea5c60f6f063fe5217252a65b27c5e6d1185e0aa1bb4b59c4cf9bf326840e8795a870a537c18ee5a987feedaaf2dd767cd6f1380f25468a1622bd
+DIST ordered-stream-0.2.0.crate 19077 BLAKE2B 581285d32136bb9c2134f405c5a2d67c952a36eb3613912be029f2826b847919188e1b479506b46f20e0b63d371f476b99d9e7e1ee8d47ddef7b4f48451b0e3e SHA512 99976f90637f0daedeae05d4270d33bc03fad1c06a85bcf2cd7140b149f76c7560d5e60becf05a633a62dc82f7f65900eb8f510c62aea4e630b78c45dc76d83e
+DIST os_pipe-1.1.5.crate 11430 BLAKE2B 45abc371ddd363d193817a339f9e1894ec6fd275b9c9d190283347bb023ec7686e3ca6a5f2bf09cd7ee6abb8843ae52410c203af2310bf3e35c280c5b9874ea5 SHA512 d862484e9a0594f31e45531fac9a892fe247c1003a9c365a28083c0b5132719fe6fcd7ed996716a4baddf1f8ec4857d62d05663d3fd7ecee5802005c55368048
+DIST owning_ref-0.4.1.crate 12658 BLAKE2B 42bda4584b2f017e7b48bfc1fab9aaf59d49b8942eceaff6f6d95e5e1fd456d952693ef70ca1a496c48d3bfbf69604dd47adb97af31fdd803a6119f11503920d SHA512 15ecf5c53a675f7c96f850f54bea5fde63f8cfe22ad5c01941f67695154a39950087bd72bbd9a2f9e76825a3fb8dd1d20ba92335f265f4aa273e1086773b918c
+DIST pancurses-0.17.0.crate 34656 BLAKE2B ef4ee7e07c5cbe75a108d0972049bb571a02405d835f2c6fd461e9dec3ced7c0f08f9d92c0b7e5205dc754b718b255538d10adfbbecbe6a75b686dd7ff2a733d SHA512 048740f35324f6c702bb98a608c6497b77415bdeeb4a83978d85dd66bd0b352a952adbd50546021b039fb30be3a47dfeb3022f92fc1a96126a5069d5ebb14b1a
+DIST parking-2.2.0.crate 9730 BLAKE2B c6da9ea4d8c0a488a64510781b025ce07f283814a09703c58e8d46c625cd74e2c55d7e28a4c09b0886fe4ab415b128bd3114f8283d4c903398e12a11d65489b6 SHA512 184a4514322279ed093a27a9bcad5fce808900a9ebbfb624216dfcb90a5483e8bcc054d82a0bba4da3809364ad1ed0a623328cf983bec3751e4503c9670a3f9a
+DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
+DIST parking_lot-0.12.2.crate 41723 BLAKE2B 7c9a4f483b09f4e4bb25fc758c80e8259cb02960b791695a061fe595cd6ed9b13f62903513cefb595bd633488b23254dee054a98282162fc4664301ce04853c0 SHA512 42794b06d410771d1ffdfdd4a9cab136cfb80cf95385876a580fc45739fa41f0769adfbf16be54a9a931632e02d2464278c5395092a1d6107703875e9ad112b2
+DIST parking_lot_core-0.8.6.crate 32567 BLAKE2B 9943244f813879ab85eae0b9a6bd8f8f0070fe190bc43148a832b217ad546bc97e58707a3987072965a79ae8bc2fa839aebac272f2de00993b8ac1ca0c5fc5ef SHA512 906241f8e2d71784d572fb78978c9550b19af9c4e32fe3b2da751287806d0faeba61f5bd36f7aab026970b2bffaaa1f62ddc10c64dc348eae61bf7b51297ef80
+DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
+DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
+DIST parse_duration-2.1.1.crate 9451 BLAKE2B 05ba93090a1c968a9e9a03a17e780212ac0dad468a1573e34069b686b8ef1ebac9af590e7a69a7f0b5f574c05959b0ecf9190a7545bad5d86a845ec38582fb7e SHA512 783f29677ee1d740d799bba65f4a35dc1b74efa236da1bed62bfbdc65db68c3ad0c7ab59a4bca7f3e3e999df166d65f0101f5c923b2ffa95267eeb5a9758719c
+DIST pbkdf2-0.8.0.crate 12328 BLAKE2B 0ed3109330ba0b7b2cc236d3277a001ecf92ae1ba6cadf64f95a51e2e7568c7baf385bb15c369ee04f381aecf3ce87884e1e553b2e555089ad1826f0f459ac7b SHA512 a36e17e8c09f4bee22784fd357bed80c3895dadecc8bd106722cad12cdcef0aad954c821303f3f4bff4db01d8737bf6343ba6bfe6dd99fed87b7eb6b46f60701
+DIST pdcurses-sys-0.7.1.crate 454031 BLAKE2B d46fc2390fab9c9eecbf8271fada0081aff7da3133881635813bdcbbd003f65e45a1730145ac294efc9574a686764157a99e70916a463f84c879f761932c2cf2 SHA512 9e502b33d7b25dd534cd62ccbd59c283fb59e5945416be92d63fe09c4a66bf5f0eccc1e6c6cc73f536035239b729313c3677c5319a73244c0b8ede744cf61f58
+DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
+DIST petgraph-0.6.4.crate 185895 BLAKE2B 9ddfb2796c461d2820db8227753113b02024e5dcb694a0bb2826bc1f375f028d8b98a3bd67555485db7fab88eb86043f5b768585dbe0c60703cc655976030a2c SHA512 b5a21572526387af3151dd4f864bd95c94f65eaf0612d96f99926faf646214df205bcc652b98d3b281f2e270779a4c1fdd6a32614ed60b3612e5d594b2bf3f20
+DIST petgraph-0.6.5.crate 710970 BLAKE2B 7f590e93fb44f1bfb8920e512402edc1cb087ff9d5dac7bc4be965f64ffacf9c1c503eab4156cd2005f41099f6b34f51e49b21dfa217271fcc0d4ee16ae85366 SHA512 454e9805731374abf1085f1a8a72aaed85e83cd30ab9601bcfe0e46882ba6656242284bdf32b6e75c2f5ebdd1325d5f8873d5f720aabf297822ca97311afb677
+DIST pin-project-1.1.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c035882237620fc87aa3919bfd360745b587ab84cce3cd0db24f4f15bd358a46af1cfd196c2071836f4d300be998b6bbcf7 SHA512 103e58f1779cd2d6c63053e9448d0f53edc7f08f29540fe0de2dded1dd0b7de50cd62d31ecaf6cf30b1a7f1f5e4728beb2cab3e40dacf8ad5d5a7a6254527578
+DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032
+DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee
+DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST piper-0.2.1.crate 15878 BLAKE2B bf63206c72b08a87da7ec5949124bb2742ec0aadb116f4c2ea86b09adeec4f741479b64e92f824a3df87ae9dba07ebdf812cbb6622853f9223f8ed90ee6dc389 SHA512 86d2195b8811bc2d30050e977925a947b175ca674e99497b7202dd8c515e09fb83e42f389ed3c6b554dc2c6480892bfd26c91fee463115ef1c710aaea858afe1
+DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
+DIST platform-dirs-0.3.0.crate 6744 BLAKE2B e6f2419e990938fa1837f4a491401ec09d121c68bb0190a330936879ffce56465bdc463a22205533e2722b290470e4b713e8ba797e4f28e44d7d5896cbb33fbb SHA512 b17deeab45bd3c89fec90c028ca9b4bb80a51d2a3c0e8f3121f0fcf6f12ea5d951591c097cf4fcb3a484a987fad97b722dfa1c0b90017a5cad3b56de2e555857
+DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84
+DIST polling-2.8.0.crate 43554 BLAKE2B 8fc5986db7c34989954bbe84bd69d1f61c59b890d4e5fd21a20f3861bad750aafe2d1a89b3181df97f3659f1a6c980a92e43dcb9ef9e1de3881518024caa6f58 SHA512 c22dc35f39f374f21483c987d43108472dbfc291508e3f5e1d76e2c466f40b396b1ba7c222db5e5a2c0e670e83b4c34e0fbb5c3e93d86435b8a2ebb0890471a2
+DIST polling-3.5.0.crate 56439 BLAKE2B 5a86c9889410c26a667a70a68a0a37f1949a2b74d8256586f0f210a20fa4d4573251303d0282efd63af2809e123cfcc7e782edfde9201d87fd2a542e4eb041cc SHA512 0d9e3e8a2141e1e2796a2a41c076c3e2baa4905b8a7828a52bc557e4a702b600e299e0d9b44c76729d1380975a6654f7a1b2afc5a625332e9be396af15b1400e
+DIST polling-3.7.0.crate 58381 BLAKE2B b18c2de920feacd907b1a93b3bcc5419a147a086c2fc19dbd09b408ee56bc93fc58968e5a92458454a13c82a1e8d66d1e4253d2da229d1a52909a9254bb34822 SHA512 912669f12c81f5b33c02d39ccf6f3f40bf87d1c646f3013447247335d93fa99fa1188a078e03af44068bf4bb7f0ef88355bcf271a8c96ac1bdc7fba292dffc2c
+DIST portaudio-rs-0.3.2.crate 13267 BLAKE2B fc47e0d51d7aadb9358c1602659f823a70fe5addb75fc628fea78e08904cceabc8d9b7cfab738f21b054cbf6dd104036d8a7fbfa3b1ff82106749a278dc45a2d SHA512 cf2b9250fec8aba6a5095b0838279e39beab5cb5f077330e6185dc146e049c6a8580aba883493fe497ca20c2b64db24851c81de43e48fe19ab876418d3b910d2
+DIST portaudio-sys-0.1.1.crate 2327 BLAKE2B 2b2b3312138c2e23ebbec4ac120e7f93eb535325b95fc4cdadab96e82b1fdb3d541d62c8563ce85b5a46c22ef364907177a2de943f697600d98dd99b27500fbe SHA512 221ba8f669048ed4eed4006b5eda45b8289e05fbf0b133809c64ed6c9b65714dc62a867edde3ef960ae5f644b91a0ab4f65b5bf259e8c4b75d63f58009c3abd4
+DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
+DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
+DIST priority-queue-1.4.0.crate 33872 BLAKE2B c313509f663318033d93afaaf1a9507dc3ca091992c00029184a070fb8a29e91ca907a7d5f80c815b87d1e79570d329c8399cd95886ddf9839a0a3c2c2c7fa7f SHA512 de3ff208bdbbe3b9868f7c7e3524efa70b575031271a1dafcb19d699ee025e1d020dacfedf55592623f1f7f58fd6c7b98549d55355ea94befd646f91b540d3a8
+DIST proc-macro-crate-1.3.1.crate 9678 BLAKE2B ed617a1930bf28a26e865f6477229566a0c4ade7f2c1e8f70d628c5536985f03c7533c561490415e207c0f58b4885367e7f54ddcf10b058711829f78a34d68a9 SHA512 5306f017933ffa89eb6111ee00b0536179c5cfab56529440630a0bec86b62194ff16f57ebb471b233e88cd886b7b9871de8402ed29073b23e5ca98193e513659
+DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
+DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
+DIST proc-macro2-1.0.82.crate 48452 BLAKE2B c01f60b788c1395d1041d7eb55fe9519ae4e78f86e3dfa732458747767ff801fcdd5a19a81ee9a8d8cd2457eb0a2bb7cec118299a5a9a64d65b5cf06b9d81165 SHA512 3726463868483243adce01c319c1deb1ab153188f1adcb083b53bff838fa80371091bb8e20ce88709ea850ab3ef74dcd99ca5aa95fa375b330841fd4230c842d
+DIST protobuf-2.28.0.crate 167541 BLAKE2B 3db5e11d458f54fe0e121fda6ed4c1949f8fb0488148c48e512e05cdb3ca3e2fea4a0a0e4f22b312eefb75d3bdf0ef30fcf3d865ab5c06caa8d11a8b96f44b32 SHA512 14e87f5e4039eb98d473055634102e7d8f79d294de0e04e0c0423dba6e34abbb28b1f94bc2d96ab16d3e02e770fe876b4c8c3af8835a43a8448514efd0b02312
+DIST protobuf-codegen-2.28.0.crate 40826 BLAKE2B 0e581fc7b1b2d2b28aa10a00493c79053d5b1e507200961cd26a548d4bc46bd56717ffa00b0f2ad5b92059b2fcb39ba18bd4a85449a87943fd623bbe1e8213f2 SHA512 5b23b4987f2a7a080dd93842e63ab58e8b95e4a2d78de3e4af7ef863f8d6c359b989cbc6c0a6e0853803d903f66a43021598814efbe85a8d712320e38f9485eb
+DIST protobuf-codegen-pure-2.28.0.crate 58102 BLAKE2B 32617f212d0a7642661363dcadb8c0c8acd18d4241576bf7a336fa301faeba52e98c66e54413a917571e5dec6911177e987f11521f7afe6b8a93bd4657e3f581 SHA512 f09f04fd04ef06259ca60f1a9ab254cfba27a1ef468a91f29e70bf44ebb1a33632eeaa3b7d0405d12ed2206263d750bb48711ead7d1d51804b043d2cf46c3d07
+DIST quick-xml-0.30.0.crate 161923 BLAKE2B 5b9bfd3248f038aa2c085ce045e9f0cbbec757d7b4457db66a5a611d52d0e42082ae68953f08706d1e102164ceac80c7caeb40f0f9f494c8daf470c35471644c SHA512 e731f9c6795da7ad705c96544b39560dc27e2ea3c468c3dffe9589bb314074e96acbc0ab454f94556e0d9569c55d6cd8d1c7be2c823a77bbb3165ec8393d9aee
+DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de
+DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
+DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST rand_distr-0.4.3.crate 58255 BLAKE2B c93a4db62e1c27bde51c77423e15674c4bafd04a63424ee8b8863e4eb27e56f774136949edc8b05ff4189dfab1f0dffc92855706f4a612be897523e7712ee830 SHA512 e5209a78b8ca1af97ac6c6add858ee6d91e67c1edd124bb297f787d37218a5f1afd570252da2eb25738b8d77482df4e93aa1eb3c4a8165f90219410dba495cda
+DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
+DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460
+DIST redox_termios-0.1.3.crate 3240 BLAKE2B 3aa7360c9e982faf433b527605fab4cc01f74eac5f1f4698b5c7f43e5a7645fcddb39bd639c8f6935fb82db5a065630ee788fd8b111cca80be15db1a08d0b3fe SHA512 a221afea8eb1c7efe848e270a6ad5b65a97af945b4f64d3aa5346f5a61a9daaac1993446ddd78c1923b798e1659518856d7260d9d30651d91897850b0a1950d8
+DIST redox_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269
+DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
+DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d
+DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
+DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
+DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
+DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
+DIST reqwest-0.11.24.crate 160972 BLAKE2B 7afd1594ff5a146fbcf864f8f03e4f2404d31ad8ee2b56af87b0d056ac36b890af343fddbab6a81bf687765eaecdf3789caa02de5279c25cb5f06f7095544ddb SHA512 cadb9d44f3e82da2ab69eb5cf669a44302b737072632d4ddbb5f11924814acefc318dc13fcc690e581606353344bace46f7f1d3759b9ab968e857dfc622a768f
+DIST reqwest-0.12.4.crate 170627 BLAKE2B 7aeb2cbb9ce8a7ff28d7befb727e5be36f7ca03ab3d449f82cc93ae511467f0fa078202eb1f239bfda38739320e4fc0c994b5bb99febe15c81227fbca7895847 SHA512 fec388a448df03919563c007e83b565a8a88dfa4b208cf5ec9701eaa1d9dd1b6767b03e76b60324598f875f8d5ac971ad2ce3fa3ee032375c0fcc43a731f8cc8
+DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
+DIST rodio-0.15.0.crate 7414161 BLAKE2B 89fb7543b3fdf24d5099bf6a46fa50e7fc386071337bddde4ec4100482cf04e31605490c8bf48a11b644aa1c370627f0602b541ada9dd62441944a19cddb3db9 SHA512 5a138ccb096f5f86c556c53d26ca794b9b519b6e4e556ec30ef8822e92ae04849af58767b7a36806fd7a6e8f18fd01ed852da8c19e2fe43bc2ec9c2ae9a9707d
+DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
+DIST rspotify-0.12.0.crate 2443982 BLAKE2B 780d98b04f1d00b68673a55c63b7585e214011357744edf412432695d6934b2b3ebf72957afc14b5980216f048fcc08994d2e8af832dd348ba1ebd1db05f2ccd SHA512 6e6fe98ea1242aa3671e68099b05fc51693b29cf8b78e9509144cb290273ba30009aeee4fd0268b756530a039cdfb9935ae0ccfa929a3257f488b0d77abf1f99
+DIST rspotify-0.13.1.crate 2447916 BLAKE2B 6887b256cee5de490ebd18b7bc49828ded4c246bf701242560375e47f83515d86ff6463428790e0432888b8e05ddf9323b82c35ccf700b4e1c4659f049b7e534 SHA512 827a203139a0f84945711394abf90d133a7623b5106c9ba19349ee6c20ec30020754732654d3ff12c3077f9f23f814ff3c6c688c00d202e608e24bcb8b01268a
+DIST rspotify-http-0.12.0.crate 6145 BLAKE2B e5fb5430f837ac10b33477fbffa45898e3f5ac36220e53ccbe253df8b8ff6bb90488a8fbdf2ee5b80eae1b99bade7e0e9d3ad7ded59985b09837bc33e4ab55dd SHA512 abf0afba2c85547907028cf51cc0d5b20525a3e19dcbd7adf8f77d41988fec65c71769c1a43bc96e0ad7f9cfa42be5d9dfb154cacc5890537ebaab98bf385fb7
+DIST rspotify-http-0.13.1.crate 6444 BLAKE2B 65e0ba4e8a6f9c8daf7d0271efdff1d9f60fe85b1daa00085012e9fb4aa2c14ed261c8bcdc0a7f52b93e64e6e96830cd969feaeb14b46783498803a95fa85851 SHA512 b50728432bc1e28f9aaf07d2a1af255c21c1179d32318271cfd2ad3151de6c2799fc3878cb74a9d788f1fdb7f6ef6cde246de6233e824a6a05eb4186414e0b4c
+DIST rspotify-macros-0.12.0.crate 2753 BLAKE2B 211d3cb3d4f03b9aee4d36a23c34e1092f722308fe541af4bf2ab58493e85d8ccaab79f376530283add68371e12b456d9207a1bddb657b7ee79bcd3bd5493077 SHA512 faa21a44aa056f4c01b23431ade8b437524bb1e6f70c9ef1ea15e15c080208636e36856cfcee718717cb5b7d87822342653a078ea498c97ffd5aa16ed525ab97
+DIST rspotify-macros-0.13.1.crate 2837 BLAKE2B d3f43cc5c7f87068d9cfe483b8f576fbbe5bb7f0e86fb1ae6d4c7cb1f154f9ffda5ab927d7cf715457081fab167ea5c6480b861de4e1eb7783604962b42ecbff SHA512 5e0264dcf80c34e531a5d51c5011336b1d7892778e1da29e9e6b3257941ac14b8afeaf80793084cb70c6bcef7023051dad9a07abc84cae719cefb15ae69693ab
+DIST rspotify-model-0.12.0.crate 23442 BLAKE2B edc4ec5ac14bd37ca657efebc541a3f10c94f331ccdb59bbfe8bed76c817ae6b26a50f3a6fb62dc2cad4013eeca45ba564de14e0f628bacf3150157f4f89e169 SHA512 2730cab77e83ca1b17170dfaaa3bbdcdbdd02f677c9aae20f8186d8a3f2fac57fee74e3d051fe78d6bb9b9ec43c28951113026848d5219a5708d58cd65dc543f
+DIST rspotify-model-0.13.1.crate 23402 BLAKE2B 0a755ea4df38e9d90ff0064bb216660d329409225301a5bfc58fbac7f7c322d8ad6ffb67815da06320f8e26647d48dd68be9570d98065a413612b112cb724b33 SHA512 573558a00291bf0bc285f5d1b71f9c9e91f6e88cf373217eebf05ededa9057c46f1cba51b77f6546a95255fa554d04f12278861767515f5c474ef41219cc9fa5
+DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
+DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
+DIST rustix-0.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e
+DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
+DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
+DIST rustls-0.21.10.crate 284920 BLAKE2B eb4628b6e0384fa7cbb5468c75c11512eb111a8a7dc7c655c6ac6beac72fc3025b1a590324ec3275ba66b632dab14dd78da4d62c1c66b2c2502099ad153900f5 SHA512 3bfcd137e6d4d86c716e8afe75450a39ca055d44557fd1a8d4b6ad4d7c58e2d5fb86ba92c3825a667c9daf5bd7a89a779ffcf8c23d6cd0af05ad47ad437da139
+DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37
+DIST rustls-pemfile-2.1.2.crate 25928 BLAKE2B 790545dd6347badda8f67bbe67b8d4d7de9f24c134857840d7ba2335f2755cf03c05b26c16c8b1e397b3257cd39a6d3a333103c2c3ea32ccf4118bc3d42995c2 SHA512 35127c68250c31f2fd6924355ec37d5318d8a86ad38da48e68b3ea6e241deeb019eb967c510e95230be6d6c3357b0a85aa022942d21a50423632f8e2496177cb
+DIST rustls-pki-types-1.7.0.crate 29555 BLAKE2B 9da5d853671e2e33f46434509e7c83edf487a6a940e1bc8937c3ed7900cac590674bf2c5a5edac6055a2bdf763b132d4624a8c51caf0250d5055ce5e8f4bc5eb SHA512 5502795aebd7058084d0e30d6c09befc4182493113207f539a8d42006d4189158e9028245aa627d6943a88514b6292fbd56b5ea1abef8c83a429bf6d641f6f11
+DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
+DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b
+DIST rustversion-1.0.16.crate 17510 BLAKE2B de8af0ef28cb5739188eaf19a7d813b6ab303955ee21fbc4e641dbbb9190a9816b16174db14a1e1d13e801f90d5329e3b52ca736db9c06bf18bc50bde2812ae1 SHA512 d1c290879c18db18103619356d88d18e8f93ae3b2e8e60682a5de2572ca0ac5b5e42217672f0b2a187c4d8cd3844012ad141f9fe01c34158e7f8cc9134332b8d
+DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
+DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
+DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
+DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
+DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e
+DIST security-framework-2.11.0.crate 80191 BLAKE2B 23515556ff935e7a19f282f7dcdb28bcc93ff1b14fae069d1e1be35abd5651a38c7c71594eae085c8385e48b25fb84b6f5fbc44636b5d1badb15e89ec6acfcbc SHA512 7a1a1d1b807cfcc0c87b27a13aa0007d5c29560a45f20963cc84fc705385554b969b4062c7f8b15fe793291ab624fb2a5257c05d140c53200c2eb344547652be
+DIST security-framework-2.9.2.crate 79295 BLAKE2B 96be139f2d2b9bc2fec7805c9e90f19f68fb6cf3f09a879f1d5952b502951900fd6889451c6866e53394859a0f8a842b4a674c4bfa82cd71f48195c0af365475 SHA512 fdc58c1c12ff849af3acf34208411caee50f30b9d55e20ef9d3922ee37664c606abcf90c4b415e5c22498dff2116fe2b2f374a0bd382c837ae7d281cd1a0a54a
+DIST security-framework-sys-2.11.0.crate 18718 BLAKE2B 4fd8e8eabdc910f656cbed6d6f941992eebc2ebe29c1d85e4ee2de5aee2e4840f2952ffa0b0f9ae88329a2b16d66c3575796f476b873c6bb3c3efcc8d119ab6f SHA512 e3848a45391ebd98026ecafb0777852aa826b465613ef184cc33cdbaa75fb91053d46d417dfda6398339abd3b67788a567562e99b3c509b676b7ee5a4372acd8
+DIST security-framework-sys-2.9.1.crate 18284 BLAKE2B f1484b6b691f3616192ab363c81eb3d6279ad0bae6bb7fbc4eadfd9fc6b6bcd5ce42fb8edab1eb8934f40a1d42714eeb8ca3616871e8f80c90318834901e8ca6 SHA512 3118d1e982d94c5fc6e8ad6270ba398da98a042c7a2060eafb3b78a54491091c46529bec30d4f871744431f01b828ba2a795f695cd20d008441839f3c4350462
+DIST semver-1.0.22.crate 30446 BLAKE2B b77a951d959a3685b0373c80b9991a8567f8926d093b23b7b8fab48595b5d565acf7408fbfc8f4d58331f39e316a8068885d28bcd70c1476d1cda436a2dd88b2 SHA512 7dcf9b6a02650d71d6c9ab3c29e44fdef95af296208f26aa7be6fd6e16773e5e5e66418c303a0589d1165df6dbfd46ad6ebf9eb5b3adab25a51f340947b2d949
+DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
+DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
+DIST serde-1.0.201.crate 77725 BLAKE2B 3cef32b1c026215e83d84dc7867e93b3c76dd683be0519ea17de25ea030d8cbda9031a54636f254026ddd30d96033d217cd81a8bf50cd7b3a936000bd47a3736 SHA512 d422f16277b59d756f7e85e6c589a28f4134ee221968eedb48bde430b63c3cf6d379ae8f03249439f984c66e0a9639238159b42879a9fa03fc49b167870ce35d
+DIST serde_cbor-0.11.2.crate 44570 BLAKE2B facc8d16886dde89125b7d69e9e77ff586c61993c3493fe4089ff03c53e6c0808c6da45a83337d3be7414dd82f3d6a7f3d43167473e49e586a7e817d47ef3014 SHA512 12ddcbd5de0d85f2da6e078e3ccfdf2115125084d57eb93d7e9b45bca6a86daf79dcc79c8e54260c56240c3b5e814b1481ac28c3aa1d1b4b982ef5956b5cc3cd
+DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
+DIST serde_derive-1.0.201.crate 55865 BLAKE2B 2ab2a02a7819a12ebe44697d97d24ed61cbff872e3a1df7a33671165619619a1826e80a948a85f7508db024d4480ae1e91ead5944eed3d011fb0f449d1983738 SHA512 925b7238cdd833dc3eebab162e4f18eab9fd533178b957a7a3149079a10a0eee598a3048ddab6f16113467e8eef78604e3bdb26ec7e30184aa0202b1f4267cf8
+DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436
+DIST serde_json-1.0.117.crate 146921 BLAKE2B fda4f87c300762c24163cceb449bb27fc96b089d5ee869b89f204dbeeec704231cdea7a14bc303cb40b621288fcb1a2b03f50552767e32a73c982d459762624b SHA512 363443af23e8e03dd17c0efc94b376f0d89b596c74d70d0437471e78bc20c6beb61da59404ff150af52000162f6df728ce73475feb828c453e58ea43e66ca056
+DIST serde_repr-0.1.18.crate 9974 BLAKE2B f6a8b2c8bc759bc8cfb3826489faf67da13b1cbe2432c30ec877036924869b9cf7c1ead2809b8e5852e352b51c91f40fa892ca68832ea567e4a7df29f8590a98 SHA512 09d77ccc60a748f8c95998632459f52268cf45949c0e22250f751eeaceb7336c03a457587af7bdc6fbc188cea4e15e77c8bf63d9741a9ae31fd0b8e787cabcde
+DIST serde_repr-0.1.19.crate 9997 BLAKE2B 1bfc8e94b8c3cf897813f4749d6a1112c1097c2c257821eb366073a41ac46084a21bdc0ee4e3b99d82444619a894472e24fccb60cbd8a41ab7d5b0469cad7c41 SHA512 678216a62702b3300fef850f10ee60d88f31de1fbeb7300e3fbbdc4e4a9cbc95c6890c8e7b9385223ec837d9504edd53e69b620f80609e54579c0994ed1ab0a1
+DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354
+DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
+DIST sha-1-0.9.8.crate 14029 BLAKE2B 80fa6903880ee36841375345d1763672ae8c3b790965b0bfc7cec7ecc69744be3a35a890a6f52b2a25f9ed1b91ce6986dd04b00ee455563b00218f8acd4b6ce5 SHA512 d4708a762d5f3dfd902ed335f0383cf63b442f95b1aebbaca3643606ed2480060d2ed04f123d0c44496147ecbb06a093980b435f9d3ff9e0f5c908389736aa9f
+DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
+DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
+DIST shannon-0.2.0.crate 3503 BLAKE2B 141db8dce783af786effa0955963d59dcd07ca783043056d38d1738a77b8b19a88fea1e0a9d0d978859764134f0ba027702bc5526138086c6531eabe7a8a75b9 SHA512 1357ab46f32c4a732fb5373166b1fafce53d1292f6a259d770c1514686f39af9ffc2399dbed405c360270aec8ba6e2faeea3844fab385f3b52bd2b0d29b0a3c6
+DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
+DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298
+DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
+DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1
+DIST signal-hook-registry-1.4.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d682ce867c1f6295a0c5f49e492f95dd1c457f20b56207a74221df1fd9d744b24c6260e28f705777e3c7d47b7bdd36f1d57fb SHA512 16362d232b1d301007c069198d7716848aa73d898ef92e050422b36c09001b4334390dc95a6650e5315377fd8960d4336e5ae869b0a305e8525e977b8327c508
+DIST simd-adler32-0.3.7.crate 12086 BLAKE2B 8e0ae18603b344fd8a6573cc3fe1f8594ad542619a6e0d6e8f62e356a3a97409f4de3a215d561b8ed0e063ab431d81b63967a5a0b6561c45537a27ee84eaa362 SHA512 2976bb7fa153854ecd0d68ccdc108bf81d5da374839d53ce9dfb27e80d8db258bb817ea3dac73921e408541d75e2797b6d20fa63c42c1e8a935b6d75dee14bac
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
+DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d
+DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
+DIST socket2-0.4.10.crate 45697 BLAKE2B 1af475724e47f0d7889ee092c4bb5ed34cd3a34885bb3d65a7c11428ad224174be94c617f5215ed1a1656973e112e40bc56ed50666543743371a65d61bf3257b SHA512 eeb0bdb86ad969f3cce4735c99aa812a867b11a5ec88a53fc7f5e399c510b47ab14d06bbfba63398fec0a0f65835edaedb7eca7fe36aeaf4805843aa9f0dd5ce
+DIST socket2-0.5.6.crate 55270 BLAKE2B 10eb32486b9a2908e05ab24620ad7a79243e59c2c2db5a7793f87f32765745b21746423d5b3896ef37d3dc9e76410fba97826cc64cafb7dd45adb485900c2282 SHA512 10f14ce7bcb9fabac56f98bd34ccd6368dcf4ca245ba2df80fe0f1157e177056eeffc6fcfb1d1fea6e89c0eaafb99d8056fbd10101031d3ccabb98950ec563dc
+DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
+DIST socks-0.3.4.crate 13172 BLAKE2B 02fa5e950aae0ae6fadb11f27c455da2ca3ce5db3b63f27ea720bb748e03652038a599c036941240edba0286b61a35699bef8db07716ada851c1077b0592b7dc SHA512 531ab43f277e2dfc6aaefcb584c5fdf910cba51cc5fee73256ef00dae714ace844251cb53ca090fd3e8258115cebbcf65843476913fadba8535cb44166294eb8
+DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
+DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
+DIST stdweb-0.1.3.crate 90221 BLAKE2B b8072c7be865327b47facaeac68373ce3085474d7a694f2e7f371024b5c4c0c616b8215a75e71b72b0e7aa534c9f8172593c7ec648c32049288ddfac1b0764cc SHA512 d7119427aae5d37336b8cf0002bae9c0d76a87a6865dbc9cc4c1f9abe64efe8d861c149b3975c6b3481a804e20be4fa28619257c233d3ea3d550ebd550ca5fa6
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST strsim-0.11.0.crate 13710 BLAKE2B bdc748ffab302c8e1d3412663e300c399ba13bfc0e15b07101a680394204af2df8897ba784dbe57b95c4fa9e732439d0f5aabb090b1b1c81f066bfa125919419 SHA512 ef4165dabaf8cbdd6c58420043cff9c0d1f4bc3ed53de5973b654bd71ac7d462fecaa6e1b750fbcbb8e19b35f6e6b73641a17656b20f5562b6ba7d84e69de226
+DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
+DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881f6280ad92847b99fca6fb08b0d395ab1b2a66e25c8374cd18866d8436540538e3c0f1f047fd2235971b40 SHA512 a3522df79547e94518f25a0e29248f67f1d7e2586a7a424d7d996cb6bfe5d98fcc4fc44da7ddcd4e35a1127b2816bee55107f30cb2a559f5b9bbb1346139544a
+DIST strum-0.26.1.crate 5861 BLAKE2B dbcfb1e1ae7dd18e26cdcee4be8837a3e94bdc5d86b0cfdc98026e77f120f29d69425e50f24b219df9ae2cf35473fe03370aa5edfa2f953e7d20102206806b1f SHA512 e285c10fb927b5373f0dd64131ea425c5a86b5ba4e60f131fa26f0d8427a99e58192b8a44bb87b76153d67e9625575b699147b966d505e59c7649ebc8ca1d584
+DIST strum-0.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b81ed9c2d600c8d2496077c09bdc8dfd78a636c18b9f522808b2ea54cf8b669419b0c89fcb6b232eade617 SHA512 819cfddb3028d5267842cdeaf17d37569eb18c957cb78a055b25d9ee1b8461026dab9bd980da4a89ac7b2858ff22880e40b46a72d7695a5135b84c4b7e5026f3
+DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62
+DIST strum_macros-0.26.1.crate 25326 BLAKE2B 2f52389676e1581abf42995a54d7725b0ece50ba8da2ecba700c359a4bc3dfa3c48440908a57d8f25334a1ab6a844093e131dc351182ecec1cab9bff1b04c407 SHA512 f41fc17aaf84385437605ffa751a9f03d19d230780855f86d60b53de4bd1891519a3550c41a31d44312f44b59c3c184286d9181e40c3fdda3aec0c2806385455
+DIST strum_macros-0.26.2.crate 27056 BLAKE2B c9df13a91dd08f8bba0dfeec4fc03b59cd74eafaace7d2d228b8636264a9ea11137d0be741a936f7290e09525586818726000f07ed84a5ae711b89d61f52e89e SHA512 519bc654adcf131d85d1ef83f62be2429f7472df25cf962fdc1cf5070d33c39dfe71f08fbf296df9b85fdfcda95cf2fea27e8e52e9ae93de27bb8fc4a5b55dd1
+DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
+DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
+DIST syn-2.0.52.crate 254728 BLAKE2B 1e56e49de8fee8ed47e89a0791bb0188ee8f0dac127f6e17a1c91a3cb8744a61a6e3b8d3a7fa5cc450a453e9ba7c9ed844302d23cb6e6cd8ca8c624ca475b32e SHA512 a0fb277a4d4611c465d76adf83040a6ac4375275d9f9414fddb34f577573b0f5890b94773bd57660e9af4b65778888ddf34c99d829fe4f58a966484cd8dd9b05
+DIST syn-2.0.61.crate 257199 BLAKE2B d2133732d9a7f16c47729be1b4c18c05ffdcb9cb1395ca9b8e0ee68098c746e92b82b7fe02d33b70985a04c943b38895996da115489c712011f7cfb4820d4f1e SHA512 368f5b5eff3988f6408be59ed4861397d532f6b0225abaac8befb458e87d4f48a92977d986b1a994bb7fc80d9ab455529bcbe5e2ec4e16d0e4810a1e66bd3042
+DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
+DIST system-configuration-0.5.1.crate 12618 BLAKE2B fa75a24f8db6eafe578bcbf162fcd110ca059c58af24916acd64959b48d8541e0aa95ce2c929a8a50c62e7e8a967de9101640d1da7805fce2f76b7c5c86c4544 SHA512 af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f
+DIST system-configuration-sys-0.5.0.crate 6730 BLAKE2B e40c4b5e7897cfe30b2fb6daa9b44fe2b83eb2a12d798a1ad8908b51abc735566becb0e001f52f5f8a0d3596f62a9eec631341c3a9cbd132a4f650f988c74b93 SHA512 764168ee5efe1ba82e847ed74a14d1f5f1892735e98657c3ecaafcb4b405d4f779592dfaade252f6a577ca2cfd5cd5e467c0b6326bbdcfa573c3ab01cdc8fc34
+DIST tauri-winrt-notification-0.1.3.crate 42440 BLAKE2B 023e8a0066c8baafca5e1de65b9fff2b004ec4447bd5de99615c957bfe49cda0a161a3c582d5e1b0a3fc5387479ca78a8f3cb6ca8607ebf226a8e0f92e0be6f5 SHA512 a77e900a25faa4484db605b1b6bb41f4a121e8067fab007d689062e98c8641bd292f2c60487eb440af5f82031014472f2623c9935b5e151548b82c3f245b0677
+DIST tauri-winrt-notification-0.2.1.crate 42232 BLAKE2B e85297cd712f8eb45494430005885bacea72f31c711f24ab733d2e624b3bb1a38ffa8faba9590438f12530162f34397943420a0392fc24ce7ad0f0a408e2a895 SHA512 1d5ffa9815a7b886122b7998039b191002f729f903684cde5e3ef821e5f64e69315c8ccbf4d6085fb546dd56a80050dc56cad427b2a657b72734639c9b659f1d
+DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
+DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
+DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
+DIST thiserror-1.0.57.crate 20993 BLAKE2B 4eb90b8ee027e39102d6c030176db94510180f2bd2966503501ff89ca6b49afd61e6d9e1ebf18c08d374ff9de4e958dfcb3da8740fdfe31cceace5be456bfe4b SHA512 0ff7e48c3696f4f4c6af29f3142f0a7bb88a07b7a9877ec243e3ea15d89c48f1898b731311da5d4a7c88060628cae3eeea6a4eccf25bd851cb3075920cb1a936
+DIST thiserror-1.0.60.crate 21247 BLAKE2B 433d54b0938451a4458da709576f78e957d243bd7a27619f070c05f395fa6717566fa3d40be61f85e3b95edb11391107b11be3945bc6ee8a70bb9f55c17f08e3 SHA512 4fbd8770fed56da490436a018d5bcc00075493e9772b8249e72bb7213262766574b83743469fabc602d417ca0a787ee43f539dd9f08d87e9ec73c6c65768381f
+DIST thiserror-impl-1.0.57.crate 15639 BLAKE2B 2838235c5536fcb16d19382fe286850d6fb882b1d77ca4ade6a62e1d4727ef89f69cf0383cf330996f9e2303226d5fd709557331a45c9a91393db1788fbf4422 SHA512 a850806f09b232546d1e0df5e35cd961a8aa32f1d8ac3b24df360981da53b75325a46dc788c994042c95a5887fdc77234b9f6ee5851242f734a613e579548e3c
+DIST thiserror-impl-1.0.60.crate 15787 BLAKE2B e83014f3cfed1e0c54d7854787a6bcc5a099af33fd14431831e607884f1658339e5e1f9d666d6d92d362a285337ac5f170c71bbdece96a343bd80007e73009d4 SHA512 607356d744e1becf7b7070878b8738d853978d28ef4a589bae739f1c3cebde90e8d70e7ec79d67588f6d024784a0fe91c21658befbfeeb71d33f5eaea9416325
+DIST thread-id-4.2.1.crate 9100 BLAKE2B b342989d20b2b16939dda3b8bf6eeb378a94e5821c0d8f3c0528a720bf912f52e36604cdf6a6165c4521cc8f5e726cb19c20f71ff94915b72953f437bb3cf012 SHA512 91b07c01dbcf9a0b3edd6fd14f9f60ea26ed0cc8b21972e40fa2e34a0fa4abba1c71106994972929a99d9542bb186cc814406ee7979212526a69c5a8a49950c2
+DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
+DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
+DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
+DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
+DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
+DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
+DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
+DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
+DIST tokio-1.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848
+DIST tokio-1.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85
+DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
+DIST tokio-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914
+DIST tokio-stream-0.1.14.crate 35881 BLAKE2B ae77512f93bb58c33036c1c0e7b8f29dd1d56274b6168a51b262c39184f0a3d366375414a3fca2a7c6c836f618e236189fdea3dbec39a861155409ffc9a77d3f SHA512 b600ef2dd90e0f46d21e94cd04baba91ec3f586832125cc2f51f350b47e7f9cc1ff5bc7529843347fc60043a61243e5b846d8db8406014969a8935385f161303
+DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b
+DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c
+DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360
+DIST toml-0.8.10.crate 50667 BLAKE2B 815c850d4e2b8f107729c24ff82a6be81160649fff726f07a2c6e2af0283298fd5eadcc5811ba4ef20ce12914ecb43da79fa1840fea8d1572ca59f02f9e2c310 SHA512 24f3b44244d7e91ae50eaf20bde40c177352592aadd2dac697a831a5de9305ac1c93c8dc407579b9bbd8d9984fe34cfdc42c3243cd0057ad83db14bd899bb546
+DIST toml-0.8.12.crate 51145 BLAKE2B bbd5b7c536c16b23f26bc520298172a61a61cf72195191d1d3eddcf54ef0ceef781902ad2c0033fab5aed11229400ec537e3cf86c24645a6d111b387ca8d54c7 SHA512 dd8054e20aac5320a2a6a7d47640cc56e48c2b6db01069786382fe5ae19e9b307fe7f4811ce5b8fd283a307c0aabb2b7f57101e05edadf79636785128b5cc265
+DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6
+DIST toml_edit-0.19.15.crate 95324 BLAKE2B f989f96d571693ff81572af6c05a6f51b673e478f22d20a6b166c45909902ac80280ea92ec5c3567327df90100a47fb7504845fc39bbcff6756af6c1a89e2221 SHA512 46d6bd2fea957392ae0ad7e687dad7743b76ee8e8ec76c80d6374ea294d3d09b6f73df0a82c821b9ee3b5268987a4136aa825034309f3cbc1947dbd1af1505dc
+DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
+DIST toml_edit-0.22.12.crate 104416 BLAKE2B 8f1f670ae986b900e141ed359f8ec1300dd91c3b0c204c8f3d6bcb44bd11ed06dda87535a6a8b94efa604a323e2a714ddfb382633b1ee3605e1f91488d9f2e56 SHA512 723b9cf08b1262c3e28c227ab363fec0122e23c3c9854f428d1aa117dc87564be2e22f368f9ee63cfe7abafa563c2ea51c00909d44eaa067bf1fd8c985d25965
+DIST toml_edit-0.22.6.crate 103304 BLAKE2B 93f14ec5e0765673b4621216707605d7c2afef82d0ad9fe1e0c660be62fb65a59e91db3144c7bf04c71cf5848dc970447b3b31255125d3a2be94ababb3d82692 SHA512 9816338008f2727fd53d34164c0be16621b61e22ac4838752839af4bd09e4d361f319bbd188c5732c1af140358d73d645e05faf4d655eb295d6c331293b7f2d2
+DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
+DIST tower-layer-0.3.2.crate 6023 BLAKE2B 3450211e07a40419526cf1afe063c56357dd5add53470a4146ced3d294edeb95dbd645ab46ae0e42e4877dde63b1577adb21d9cf50116c4cfe4165e115d54ea9 SHA512 d5429b40569f67937e752c2d61c39a474af32bea5ba3940dbdf5a4037fde1ef7173cbd8fcdb87d0ea15c01bf84f2d55abd51fefbab2f27aa54e656eb1748c43e
+DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
+DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
+DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
+DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
+DIST tree_magic_mini-3.0.3.crate 15406 BLAKE2B 84b8761c1496e1d771bb7d884a0afd48d1a457b87db26edc23f0db63aeb5780966f330662e9725570bffb0122b8544a4e0828e48cdf7ebb892d70f43aaa1145f SHA512 6299f42c3286a9a4b38a1503810b0eee302e99cfd386256dde275bd5df402ba6800cf94b4bb94444b011898657d687f89642634d20f6f07e2a7719c27188d684
+DIST tree_magic_mini-3.1.4.crate 14548 BLAKE2B b7161ae0eb7a7445a979b5f3232db45aea35a9ed9be8262de6d962afd6d423b8ec9220830fab6f5451b422097ac5a79a7a3e9c2789e97d9e4dbdaecea8fd1970 SHA512 f1cccd8e4231fbfe53491195eb48e652c66ceb88e1d2ce76e3b18094ab7bd2f83867058019ffd5a5d7c2227d57eda6bd7a1227c7db68f406e40843f80a64b187
+DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
+DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
+DIST uds_windows-1.1.0.crate 17040 BLAKE2B c77914e150d2f0afc5c55680e28ba242238f4f1291948ae492fe63c16791e443ef33bafa6686cb753e53361ce452f2df27d2bf4088fb1ae203a47df3c55856bf SHA512 092c41f6fac2aacd5b83009b4aabe2cfc487cc1ad5ebc8237d9804aff0c5c823d3c079d99748e9ec3bb1c02b8a51f6a22e41441ec9a72c50600c08b1efdeb0ca
+DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
+DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
+DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
+DIST unicode-width-0.1.12.crate 24062 BLAKE2B 61afd22353d46a8a77519af9b3580d75dafc7965967f7724cb740f1ee199c7742b3549ad6c67776b876dbda5b8f27c634431f68517e29a72ade1622da9fde446 SHA512 0bafd7a69bdf49c849e7c063ebf0487eca8a76244e3bc18c9a5f4609465dc0e5d482daceb6a9a6f4125b801bf7063cb8225fdb55173e5dc55e7bf278300df1b4
+DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
+DIST ureq-2.9.1.crate 114348 BLAKE2B d605db0134ead8a77c9b9fc8b06573e82d701ded485f0d88bcd64f6ea1a5232d67bcab47d0b430bb13c79ce249304ecbb7f67d4a3c789f451b9639ada5b3f0a4 SHA512 a8c580f624300e6e1d068814c38719f3624ed63274bc0c4fe06d6ea30023b3e79ad3241fed2ed9f008a8040b49fd2d2271fb0221db1e657369f37060251e3eb6
+DIST ureq-2.9.7.crate 113834 BLAKE2B e80ea64d610ab01d129527a120878ac3eb38248885c772aead6fb983f777b7469f7debd042ce93c0bfb6adeeb7ed476f7dd96c62de386ec2d64dbed28973a829 SHA512 33893aa1df316b5987571ce6b46373c625ed89e452a313f9490d63896f144e56ee0c35c1eaec77eb8d2a66e7726f3dae6e96bd2ee0db7c0604485105fc69bef4
+DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
+DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST uuid-1.7.0.crate 42627 BLAKE2B 493f6a3a643d3493a2bd7e0e92a1ccfb7bd722e3a1fc8deb7df0ddc875a822daead1cdd35dc3ac6f26346844100a671318d71e5ad760c9587471d4f05bbb0c69 SHA512 2ea704d082b725d98717d772e1af84fe743929ee32658ebeb111c6fa2395ff5f44558b7e375087617f91c6f7bc242f2db96e80a631071722de6fe15af845e856
+DIST uuid-1.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
+DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
+DIST vergen-3.2.0.crate 16897 BLAKE2B 1a83f338f13cd55aed1d57db05e6454d1c86937f5d3a9a7b5b14bfc72a891671b70665ef388590ddd0a19ac8acad8251990bd81b9fcedf80898ed5d327f9d373 SHA512 d582ade1ed57f5067b4b24376d0164405a7a5a587e12c09b724fe0773b03d4eee95694fbe9f43d0f34bf6145dc297850e05039c81ac6df27670e326b7a254c09
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST waker-fn-1.1.1.crate 6323 BLAKE2B a6b60c11d72aa5991ba57036bff589f73ddb5c15c399b8510a7e4d2993af67fcfb9c0d3a85b0ed27a772a98d068b0748f4b43145475e46e4a5ee1ce290875a09 SHA512 293321481eba0b72a4a37b158c76b0a783f0e5e4677d9609e43aafb703d44162e4abfb6b50bed1adda5bd1bff95a3b658fb542cbaa6c684a1bc7a8e8cf4135c8
+DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
+DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
+DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
+DIST wasm-bindgen-futures-0.4.42.crate 15380 BLAKE2B a20ba9f2bc814d7aac031f1cbaec90289f63893b76c60b536a65af85379771e102d6c3d949a8528328587ac776d7a3b684c12a217f9e186bf10046a1fcb34652 SHA512 0a77203499381b6bc4e9258480d7ef499d9c26b195baf38d0b7b228872f844d24c827cd57c8e2b0176927fd5957428084f53fe80cf60b35b7ba02d02b27a4682
+DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462
+DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7
+DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07
+DIST wayland-backend-0.3.3.crate 70455 BLAKE2B 9c6bbb5c8982411b8d63305cd109d5dba3b396ea1c130e0327dc31d4f6d0df56e8d8fe5992fc80c000bb8127ad4e8d32d2ef5e7fec925fe3b0b508e63b4149d9 SHA512 fb3c7f25074747954b5dbf8455c2faa92862ae53864599f49ed64b74e5f114d7e578ed388cb3b7240fac3fff98a5d231a977154bbe976354938d66fc5da5b8e4
+DIST wayland-client-0.31.2.crate 62976 BLAKE2B f7c4e1f581bace8b491c7ffd393106db44b7be028c136b1ab99c9f091f828c6ff6e5157234882a7926da5cc0de22c1ce14dda7e00ccd5e2ecc5e3356dec86e71 SHA512 1f15b1f8787e1b25b90369106ac6119f208a60ab9c3fe851287fa9c7c8d9fb03217c3f33ffb1dfba5df4f2a749be19402d25ed80e1ed9d7301c1c40e847911b8
+DIST wayland-protocols-0.31.2.crate 147062 BLAKE2B 62d5ea52833d9edc661d405c83159f97c5bdbc41bdefbc9418a08971236cb74d317efe11e2e23ed6d96f0be27e4a830b4d47bf27d5b269e30e5a4cb97c469c8b SHA512 8f295413b20f308fbf337d8d6e2b6905061d32baa0aeea2aac55edeceadc754a121c56b8b96ca218aa902cfb26fa168c84334ef5033f8cc72e1505f1cfba06fa
+DIST wayland-protocols-wlr-0.2.0.crate 25804 BLAKE2B 226af653146d7eef2ee0a7b6d1484048c5f8b1d2618d3bb9d33eca7e019579c9868d42e5488ba8dc830457ca186a0aa07599accef22902b982d653e381b2f4ef SHA512 b1e5025dbe50a9b90bfd7a38d7564ea8a02c84c8c802d2200864dc604847a4b0979f8a0e05d8d76c2b7c1e198c7847e4d59ad49311b00ab2d4d36eceb776a16a
+DIST wayland-scanner-0.31.1.crate 35419 BLAKE2B adaf9d19f395c5b11e35113ef31b5e11e76fda4929365e61f5a40fbc3f8505e68cacc4e31eb0137da2a07edaca898a2835a22e7236affddf7fea012f087197b7 SHA512 61521f39f414bce7bf372656544294382676649a42d3e2751b6a33874bf12ea3fe87d55c9389799197bbbab36fade2f386a6a83437434d4e0175347b232f7f62
+DIST wayland-sys-0.31.1.crate 8577 BLAKE2B 9252740742340e1f4a4192f610c3c8e6788e08e9c37528c97371762a8949d5eedcc9c052f2b74edf23218e8a6dfce3c63adea0da769ff805e3f68d689d041fab SHA512 79d6feda8a2a4307218ad51b292efd7d0e80707630908a9ae9bca6c0ceed57af874f3b6467915fefd078279ff4f7d39291d84d6250312f692305d38d7f0bed3e
+DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b
+DIST webpki-roots-0.25.4.crate 253559 BLAKE2B 737f608323fec02b77c47a40f8b2f9bf44f1b29d32b936fd7bd8c1066efd8916451b96ffab8949f5b5ba537bb1ed6300143bf51d1ef8663ce5a9a7a33947e81d SHA512 4891aa5c6a5bb8a4d6bd730fca5ab5bbddb5a39b9267c81951ca8d3ff0dbcd305b498328f99b2da79ac65cdc9dfa42c40631a4f8d6975ac6f4ed9c85a8d2178e
+DIST weezl-0.1.8.crate 42175 BLAKE2B 2a8dc84f018a4364ef814044a590477724b79655cd01d605e02442bdc8de1f7df3003946041dbcc17bc82315f0c11e7fc3c3b0b0375f65436f53bcac11b2bc71 SHA512 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
+DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-0.51.1.crate 12250614 BLAKE2B 7e856073d18746dd23eb1b77077eba4d38f59f8b53cb49e4e251bfdaffc4509306e772584959fff9e4eafdb45bd6aa99f8c7a98fa49e792f18574ee63430a970 SHA512 ccb118175cba992c567fdde85c729daceb121c97e31c1d95339bdf6c8a3a16e069f86ad3695e8450fd112a6bd60d4b37c443eeb29da78f43474c1bf52b46a9ad
+DIST windows-0.56.0.crate 10807828 BLAKE2B 8c4f9b1698852d375891e9e7728f899281be518fdf10353f7d1c1f3de12db706c10b97f64177765105fd25d2b0a13003a5da1722b2158a1ddfcb8ab7482314e7 SHA512 ad5a1cd4705e295fa3fbc63bd9661dde28b4bc718fed4ef7b12f33d233c364aadb790d7409988e0173548f1f1b1d6bfc3e6c5999a44613913d4b848027430333
+DIST windows-core-0.51.1.crate 42364 BLAKE2B 0227e8cc033f40b644879ce4a86f17b9552076378eb6cc6c8cedaa15602ef3ce0deb1ca48c6a7b4276af2bc2e0434e76193649051d7a2f78695f60400d00ccff SHA512 90615ed84f11fdfe0725a4a8b112e45f93ae6cb7e65c16636f85217369fd8b708553ae5bd28aff66e18b180ffa3c0f6820a94022fc5eb202b4f8358f8926fde6
+DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36
+DIST windows-core-0.56.0.crate 45084 BLAKE2B 757a386d54b805de2f28979561536473d21e057f676d47d4b9068210cf0b3833956c65ddd5291d6852ad3c7af5a048c0d70896816678f11077b794cd8689b0bd SHA512 db6edbd14ef477d71a56869ac4d5eeeeef5a991a336c30c6da9960f1c9eca067c06f597dbc58f3e21c40cf19e2a28dc45ed09826c8fc17cdb57f35b0f3492793
+DIST windows-implement-0.56.0.crate 9157 BLAKE2B bde09ed367b9d31d5c392f78cf6d9d98afe343bde120b38ae412969e5fa9141ad3f478d05556d27b41a0feccfe1ddeccb9f7136defd14f12d07c22e719957518 SHA512 e472fce92d6eca17f75c075f87aa52c9b985febd83986ff811f0dc615f75cbe5fcaa13b2d2c96720211314549f0f76fabd2197119bbfd1b28d60823a889a5ef1
+DIST windows-interface-0.56.0.crate 9834 BLAKE2B d7cbec43c154ec5d8d91e02bbdad8bcc821537b303893244c819e2ace4b0d05d155d1b41fba8cc16566d5b2ad97da71177796f460e45367b53aa39d71e43ff65 SHA512 0ceb89df6d0a45281a5dd77c25efbd1bdb72f0965a4b6cc11f5f8249400297effb77e42a1ec2613fe7ce82a831559a5d1c8c6ebc45b419aa0aa96e84f01c8184
+DIST windows-result-0.1.1.crate 10460 BLAKE2B b65ae2b95414fde488570e47daa40f5b0aee3f9b90c906751e85e35dd63044ff6b72ae3451d94c70ef64610325d0fef6880ca5fd55ec14d83587871bebf113ab SHA512 4aebab689ebc9333f9c430c186f886c25faa954cd154fd9fea960073669f0db6d88002f025c31fe37c64f0298a0736f6fad5b4c4e59869239da2156c90b8ffce
+DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
+DIST windows-targets-0.52.4.crate 6310 BLAKE2B 0393bf3e7f8823edc455055e9977798bd6cdc1e523127cf840ee1b9e36febe40e01dcad9875a06aea283dd55443d02f643d42752103a5ec1de933285fe410b17 SHA512 4b2c26468df54b9801e6badd120dcffc15429fc78a614f45efa16d5fed1a36983198fbb621cc3beb4a4f9f0161ef8ddeca3a5c6a6ac48b5589681936f4d2bf50
+DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee
+DIST windows-version-0.1.1.crate 7201 BLAKE2B 5e77bc27682c15cdd9ca0272bfe17dee7645f03add65a239e9a97105691e85b109c7cdfd74c5257f8eb783fb68991d1488bcf25e6cb87ed4eacad08507512549 SHA512 06a22e00f7b11dfbe9124f39c87235ce28bfd3dd361af928b0a9b99793ffb7a8b8473c198825f1f47c2efade0617d99160eea3b3d3d76c818c400327e77b412d
+DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
+DIST windows_aarch64_gnullvm-0.52.4.crate 433373 BLAKE2B 5678cf2371e4c566b7ff0dd1fabcae92d12ce9f97670524c93fd8c34bf6b09d054e7de2f852302b8d994f52c81015b7cc8a74f529490c7bdd17a3b5d2c88a12e SHA512 dbb914a866873892a8cffecd4ed4977fe6c3fc48a58bb9f88655d86e7f8969cc27e6f5bb7d40eee41ae7d78f6f4be65d46650719321a7697c7b5b99a0f07a5dd
+DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d
+DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
+DIST windows_aarch64_msvc-0.52.4.crate 828055 BLAKE2B 3088f2f66fc91ad698906315eae7e6c0dd7da5414c28cfa25b24e138fc4a7da40535be09129cd37b8e331d8d6e8c41d0106fba1ef9e5b4ac561140653e9ded4d SHA512 dcc538d0a9c276e7ec415575ec1392bf476219348984d9567f56d5cc7af0f9beeac523a9a6651f763dd4f50f89535a3ea2275d5321ec022c2ee8814e4e84e95b
+DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d
+DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
+DIST windows_i686_gnu-0.52.4.crate 875736 BLAKE2B 31ee3017a6db246b0d5fc02e10cdb517a69ceac3dbbc9d41b4051f5dfa1196e4a46e7b3f5f90935560c03bb139b897e5dce69989a3698d9c88ebae923e24ef30 SHA512 9d57260744607eb63453040c532bf3693cf3d8d93c56543ee00aa66adf3a71919e72bdef7811f287167403ade893248f189b797a5d2dcb24ef4e6f3d915a88c6
+DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2
+DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b
+DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
+DIST windows_i686_msvc-0.52.4.crate 895530 BLAKE2B 87ec4628472beec8697317662fd599a8ea0ba5a11a0cad6b23f2481f39b3a4e0546d37fade4d715ad06a4798cf7faa6435bafa1e5054105c064cb560468b6025 SHA512 0d5526b21bfb96ab352b5181dcf84ff31007ce338245a374b3b413805239359a689b1a21de56ae998cc13444e40867bc30c4200454b84ef9ffa7117318baef1e
+DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634
+DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
+DIST windows_x86_64_gnu-0.52.4.crate 831627 BLAKE2B 64d29f6e0837be822d89cc8aaea2514382d2c03b33deb5684df1d6b81573b3817add39d99f66181a762fae7c155e60a8c070affe43a0f2e247fb0c5ddcc7afd9 SHA512 96c673fb330af597fc3c71b53b9b66cacc9f3f64f05dc7cfe4a77447b7545280f065df22b7d91a6b7cf681a442d8b71c9d2dd128e76580664d8598c481cbb95e
+DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
+DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
+DIST windows_x86_64_gnullvm-0.52.4.crate 433358 BLAKE2B ffd55fba15ef713bd48caec5ed5f32936e05ac4897b721bd2b041229bc8c7beeca77ca018c3258dcdb09495629aa359d1dadaaf5112d38e7ea54670309d0ddf4 SHA512 f153d86b01e47f17ef08271b69becf7883bab92f96d40cdb1d74432f2bc6a7a65aa4ed931d8f6f4c2679e360bbd8d12037dc2a74a6a444fcaec5e4c784c54c74
+DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
+DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
+DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
+DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
+DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
+DIST winnow-0.6.5.crate 159316 BLAKE2B d28c6a069e3d557335c09ae04f1d90a9086b1744d711e259da230c031a0302e270e304f8f9e8bc690c01cedcf07b46e05938ab3468b3e388ae8c51ac361b6408 SHA512 5395db16797beb158e9458099279abf53c5ea62c65584bbb9e0111213ab21c88cd0b0674062757e57ceb6c762a349f22db6ef60deef866fe15ebb0818287ab99
+DIST winnow-0.6.8.crate 159453 BLAKE2B 36ae0b096ab916c1d925d51ce9b4fa072fd687022c3578debf4be852eeed046fd73003c8be2f6e3b0abbd2d3952a23100e79a8e432f516a0ddab2ac7aba4b034 SHA512 64652527221385a1278efb66d25ebbab86cb64d2f71fbf9bc9956dc548ae9d028b998f3aa851a94dba66853da7fbf1bdfcf2dae02ed60b2562869569acf2b583
+DIST winreg-0.5.1.crate 17693 BLAKE2B 4bb51f04c7e86e4c563c58c3caf9a69ab1880cd895edac9565ec2b89e5a3b7ea9028e94839afa2eae0cb33ef90d1211c1100010433b720a5c1e27d60b3a9ff91 SHA512 03c2350e4aa6c41956f493018136f0b016d36c587e6f27d57dddd29a55391286be4805962c4247bb59821c3031ec75f9a63c140536c13aac894c07e914380f7f
+DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787
+DIST winreg-0.52.0.crate 30148 BLAKE2B 7b458d356ed1385b23ace88d8a7e2a4e2e3211ba4bd22e6488b60fe508ab2b5f6d93c7547e45e0564f512391a8fbc2af1bbd3e3e3a773865d87adff67b5b2fb5 SHA512 50659afe4fa9671696bb5c6a50d62e493ef5359a324a71f7877e2ff0b522560ad65196ac6d2f7f4117edb2e47e84adce7d1de5ed2ce273f132cb2d5006472e25
+DIST wl-clipboard-rs-0.8.0.crate 32847 BLAKE2B cc6cef635784d3a14b14b31b5acae436fb9ae556387203c12aabc8664c715d79008cb69c74dbfcd0046c19b98c464557bb59e53d8c86ece85345b18ad0f47460 SHA512 ba08c62cf721e1150761cdde5d6c18369fe9f51d892b14999436b68a4599082602aaea429e8682aa03b43c63d9d27bb3d6e35fc754a75eefda848df22f114221
+DIST wl-clipboard-rs-0.8.1.crate 32835 BLAKE2B 3b542e5f7fba1ce659d94a682ec3b46ff9def98ac34563b7e3021987c6792e993b1f2f96421a58293270a68d10e64b57d856648a3ee796f7ff16e0621d8c3d9e SHA512 3113f079064eb0a23b3c8d02561b2d7ca0111b0c02e3f45819dcd4feac8342004860d8e936cb0bde9dcaaff897a2531213d3e4ed7b28731592a9bcffd7574fab
+DIST x11rb-0.13.0.crate 222396 BLAKE2B 279dd73a1b342d773097cbbac7ce3ce198ee503c809f6d3b89c2c69b2e40dd21005e47cde708c0e9b12f2d944c0c1965a815eee774b86d9620d4dd51289cf0fa SHA512 9e86c7fab70d20193804a85608aaf46697b56f3d78eec50dd835c4ddd4a45ff56c0819309b443baa4a58f93e7d37f303e29ef279dbcd5d8c917c559751ca00b8
+DIST x11rb-0.13.1.crate 223916 BLAKE2B 1663b0d4eb059924f9c2dbfa2fff01ee9c7a90bb6652d6e6a1519676e36ef7cca5fd079e39f45137350f595bca592ae9098b93877cdad9540131063379fad2ed SHA512 652f499857aff45053e2ffe1a2e3463323bcf3cf546482dcef4d2805e90a898a12f647da9181fcf02d7234bebdfc424f8a4e0e256dfd49aba4b643284308404f
+DIST x11rb-protocol-0.13.0.crate 507838 BLAKE2B 11955c1908fef177bef859c1207f8fb9e644a8841ccbef885446a021152cb37a113bcb988a0d645e8b9289dc760d03d66ea0a6836e28bc25717e6ba571d02cb0 SHA512 36f412ed83634c402cfb3fea3fc64b9782b348fde3e98617a6c478867a0e93bacd9a69b1feb8d7ee5c01de578ddb85fff1ab86dfaaf88391c3e03dc7aeb3dca7
+DIST x11rb-protocol-0.13.1.crate 508522 BLAKE2B abd88b4175e2fadebc44f232262b71261fac9b1289ee749d31fbd4a9d9c8ff426ccf9edef8eced4b41e4fba3401cd81d109fbf8aef1c99b4529f57910d000a8d SHA512 5c1a40fcbc77aa6e3357ac64af37958ac54aa3a78af354c1ea5f8e8b28f352c6e5d8b4762d8c4eb93fa8a1a122184b89c9b1c95a53d35b08819654dbd4cc4db0
+DIST xdg-home-1.1.0.crate 3600 BLAKE2B 9ebd05881f0b835ad8647691d05b168f0cc807ccd02bbeff4da9db0a4f6b9c5458a891d6df2867f8597f70789d7e4d49d4b81dcd266ed05d1c3d4b67ad9f11f6 SHA512 3f4d6d81b84beab8eb549e124c9dcf5dbcad8b6471cd87edcebf5c0011371667718104c7ea6eba7301fde7524137b18484621c820c75b182bafd7b9b2972957a
+DIST xi-unicode-0.3.0.crate 87001 BLAKE2B 1d44488a32dc9bd9284df6ee26f0f05c5145c458dc76943cfab88f2f2544762477bbe1378bc1f5e365cd5a5ecf79e41fa66140190047f37ea5dfe678c97a542e SHA512 39875839dcf90b391e76a6b2c2efb2e6f8bfdfdaa59c4815bab8f24412f840c6b01232b5bd79a8f8c6bf7733333e5915c2a7235d27f890b883d6658094bf6271
+DIST zbus-3.15.1.crate 151565 BLAKE2B 8cbf86b26886fa8239ff5f7950d7c591cc3b65a0e6faa8a57daa428d6278919918e8b772d094103c4bd35adb18f4347a2034bb7be6d2e152be06be10dd09c312 SHA512 a33a2b2cc8e23e42690785aaa407c0339dd9bda04d02eb4be9512140d8eb1e50c3ff501aec6b1366cdfe9a1ca75fb06b6a42a680adcb6bf1c1cb46708286a56f
+DIST zbus-4.1.2.crate 153356 BLAKE2B c6ca76de9305bcb9d1d8f0b21236feeee339aa1b0ce021336953df858fd3655045bffd7d8d95878d35db19bef264f719f0a74b0585b15a13bec2d612a597502e SHA512 2ac175d2ab04d3ac53567f44420d8cc61d2c67907072b9b08673ec776a6c6e0fc07c776e3893429ae6a488c79b7b382ecf242933803a55bad09b4fb1256f40c7
+DIST zbus-4.2.1.crate 157271 BLAKE2B 93aee295c56c0fd93c66ccf3e17c542f5cd7f6c96b6c6879b47c19111a291f6d401ef1e8d66d973cc5657090b75b56ee0b957ffd97de452d455b3c74b46bf1f1 SHA512 31d4232e966b74e1fd7104f006543fe2331472adcc163f56d22f1765418c8446e71b2e93884e9a046422cd83996f44452512ffc14b12bc83a1376be8fd7d73a6
+DIST zbus_macros-3.15.1.crate 25878 BLAKE2B 7d1d88e221afd428e2b982d38a285ab626e65fef17aa625ac0b247eb7b57332eff1f396c99f4679c4562adbaa2f7a19c073db3a33417f0522854b4f120d4925b SHA512 1172b8ad0e40e3ead1378126024f300e845320599003fe0f34d486c2cec8fd01c14f4e18dca7a574f9b5aca7acfa4c6deff1d7357b6a4f29501a5976f22d4c16
+DIST zbus_macros-4.1.2.crate 28306 BLAKE2B eb65d96bcb1f28e8cf7ce3196c6a1679d187229cbf66183c10315bed34c5d5f660e0e2920be0522f19aa0ec42ae32ee8f1748c129ee76d8dd42fd7d764b5f992 SHA512 394dcc0ef553e18e4dbed66f480bd444a24160d95498784615dc30c8611cb08a419a34324e8d761580d1c38e7da0489f9479b63b76b968f210590ff06fae85aa
+DIST zbus_macros-4.2.1.crate 28865 BLAKE2B d85346cedf2a2c8fc81c7d183e23a9efc9d9c012b63bd96b8730cf12652878555d8613b330f725473d1febe99eca5c69f485ddefbf1d5b5347151ba4c501b357 SHA512 65a25f5b75c92f5c8849254495eb0bc02c378e7046e0a8274ffe7b02bf6c6a1dc1216c583e022cba08c0f794ed27f16db5c0ddc41ce9c551f4b4e836820cab76
+DIST zbus_names-2.6.1.crate 9640 BLAKE2B 72626c31b7fd363942ade39c8b688810dace1ee3414090d678f3a0eb04b1fb5e16fee93c1fe24c4abd4e19c1a7ec0b9c2e7b9a6df7454618e15cc5fe7a3686cc SHA512 9bec9a7a03d0306b05e248dc70897313a7cba1ed9db4b4b44ba3ac4db1c0ab9cf5a3ce1fda516a14badf36ba62f182b0c0fad3087842ec5942897cbd59e72125
+DIST zbus_names-3.0.0.crate 10650 BLAKE2B 0c8a0ee67c9236ef51a1add3038d5ac5a9f00dccd9df059b16454754db44e7c5ac66b74f3f98c317ee73a1c982b8439d6a92995d984b9b9d744c3c9203edbed3 SHA512 e0ebd468f152ef8063faa547f60b58d2d87948e24741d1cec0e97eef1817653d524ce5519795db64a3a7d9101ee2c6b67f0bf2bade894c57b5c37aee19fc82ab
+DIST zerocopy-0.6.6.crate 47473 BLAKE2B 234279a161f5e136fb3ecae263274dceaa878c0da180b070d679d090c498385841670783824739ce8b2c0db10e8470bdc3993e1b2460064bc44d80526937e94e SHA512 2933bc6560c117e4574334da24eeb53d02ce8b158f46fdd77cd7dfe8bbd108b3b95318df4b0b59718ab696349649111c06a8d3960cc5f52223abe2c9dc335dad
+DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
+DIST zerocopy-0.7.34.crate 151177 BLAKE2B 30b65131370dfa4f41d3c2705d3b75da9b76f2a4ed723dec66345939de8bafe2c181ab6c98036c25a30739cae1720d927e27e5fa5587442d5cfb7f39a7018c8f SHA512 4d27b1230ebcea4e9d4c15f38a979aa3fe8b23833e95df781a0a67054e920637642b89345596fe331907edc27abab83c766967f2a04399a6fe0a4e89fa0dd148
+DIST zerocopy-derive-0.6.6.crate 522443 BLAKE2B aa3626428c9d79a4bf6f593da0fbe42c77cebff8a0c1c4b22bbe2a5aa63f6e30771681887565905fd62241c2d396eefb32435ed1c01d3d165cc1989d12c42401 SHA512 c91144a6d5c85a0917dd34302a7518b98780c06377399831a777a0d4da7826c70f66e3ec9eeadf1bd5f63be36a75345d49257cca1ba15db0f6d9f129d7f0c1b4
+DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
+DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
+DIST zvariant-3.15.1.crate 75402 BLAKE2B f3b4637eecc51e6d9e56bafb48be1224248418ec51ebe4151d99e31e441304559cef669b89583c5cdd960864f73796f04bbf544e8b31164cd6fd33a63163fd16 SHA512 a7f1447e2580f5d9496f9a9b4cd21029e18db26cec74c5fa7c4cad068679ff471b6b536bbd93ef7d8c69e37eeb563c69673abbfedd70a33f70e4ccb740285fab
+DIST zvariant-4.0.2.crate 81443 BLAKE2B 5bf2cb6b2e2b34c2397d9579a60ea7cf28a060456e8dc86498e07c9d1bbf8313d5c2235cadd5be8ec30646cf9e224312efff49ed3c41e010678ec498ed586ae9 SHA512 2811d3b9da164d3848684ceb74ce928f5951b135a40be11502a67f8a6506342efcab0e9c4f9401b5ca0d7b7a14df02f6f4f1c4375c418e5a20ec5faf2a878a3e
+DIST zvariant-4.1.0.crate 81950 BLAKE2B 894cbc6686e0006e14f83d9e320264b5c56fba61b32bc4912ea7824a1610fb2c23a8a89911a14b06af82775b070fca728c3f67c49127ea02a243ea7583bb146f SHA512 8be60d4d2ada5fa1f0ef93f8c6714b2b9a6bf3c4a36a4c3f203d32267bfe2736360bd4a05918373a8785b2c803816d0b973cc0234164566bf116adbc1e9a73b7
+DIST zvariant_derive-3.15.1.crate 10935 BLAKE2B 4135f61de4748717ac73a3710b632fad97cc009b4d79d4f43e93f079a7531deba50c74fca9085ebc8c5404c2fba432b593972596a6343bc3f78500a684c893fc SHA512 dfdbe9466af44a991bf75c0f73472163f68001b7918797eabd634cb9132e95fff0d294ef4e055be2f6a87763c36c47b977ee42c59f5437b06f8f4fbf47e1ead7
+DIST zvariant_derive-4.0.2.crate 10974 BLAKE2B ae6c23021ded15d76305e9b3f3fa3a65d4e68f369cc3300e1d17206ca44c632b5ea624affb2df302f955f08a344b235cf01602168618980bc489bf490f3811a1 SHA512 87c17ad302c5f30f7677cc15b8db5b939e579b6bc0261534bb7321440266bfba9f43bbcf19e65603cdca8077bda8a4f3b7c7d4f177cd89980e2bfec39c98409d
+DIST zvariant_derive-4.1.0.crate 11025 BLAKE2B 1d1c691ce08386bc68d640f9df116a3e2a881541e782be02a6598d090f689d9c16f28838eb4f62d701ab9d6fe70055ea41611e3348310fca4191f9976132a272 SHA512 9246706df8fe81c3cd8ba26bac50589a89b36f0245d3a10e382d9e91618b1f5763cfc9920154571075aefbc7c6c02e9809cbb3b5efe8c4b2f38998a6a36880aa
+DIST zvariant_utils-1.1.0.crate 6858 BLAKE2B ed117144cdd1b3351cddb0403b7b8fa3290e097dc527456ca7580910a0ad07b323c5c221f2c796eefd8dd5c7945e594c5bffe6b72caf26f2d416b58889b8cc34 SHA512 5ab70e347a3251c029688b0e8060f640168da3d20d1f0ceef054096209b9101fbb48ba74eb04aabd4c39f4c8090eb94a0594750b85d9955542f0bf7732a66aa7
+DIST zvariant_utils-1.1.1.crate 6859 BLAKE2B 91c6cfc14b7cbdab9d662ea2f7db1506037ff8dfc58599e7e220fb44cef5260783117223251ea4a3dca03ea739c80eab2baa933fee3bfd1d78f0ae721ea36a97 SHA512 4ee75536e57aa6f05e9739c1a3bb037ebc276d22206c0a3ddc3c245395aefead5f8197af1e659e33780df968715101831c286ef28513aaf7f2a5e4a43767cdc3
diff --git a/media-sound/ncspot/metadata.xml b/media-sound/ncspot/metadata.xml
new file mode 100644
index 000000000000..db41e945280a
--- /dev/null
+++ b/media-sound/ncspot/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="clipboard">Use the system clipboard to e.g. share a link</flag>
+    <flag name="cover">Support displaying the album cover</flag>
+    <flag name="mpris">Allow ncspot to be controlled via MPRIS API</flag>
+    <flag name="ncurses">Use cursive/ncurses-backend instead of crossterm or pancurses</flag>
+    <flag name="notify">Show what's playing via a notification</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">hrkfdn/ncspot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/ncspot/ncspot-1.1.0.ebuild b/media-sound/ncspot/ncspot-1.1.0.ebuild
new file mode 100644
index 000000000000..787cc670d983
--- /dev/null
+++ b/media-sound/ncspot/ncspot-1.1.0.ebuild
@@ -0,0 +1,588 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6
+
+EAPI=8
+
+CRATES="
+	addr2line@0.21.0
+	adler@1.0.2
+	aes-ctr@0.6.0
+	aes-soft@0.6.4
+	aes@0.6.0
+	aesni@0.10.0
+	ahash@0.8.11
+	aho-corasick@1.1.2
+	alsa-sys@0.3.1
+	alsa@0.6.0
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	arboard@3.3.2
+	async-broadcast@0.5.1
+	async-broadcast@0.7.0
+	async-channel@2.2.0
+	async-executor@1.8.0
+	async-fs@1.6.0
+	async-io@1.13.0
+	async-io@2.3.1
+	async-lock@2.8.0
+	async-lock@3.3.0
+	async-process@1.8.1
+	async-process@2.1.0
+	async-recursion@1.0.5
+	async-signal@0.2.5
+	async-task@4.7.0
+	async-trait@0.1.77
+	atomic-waker@1.1.2
+	autocfg@1.1.0
+	backtrace@0.3.69
+	base64@0.13.1
+	base64@0.21.7
+	bindgen@0.69.4
+	bitflags@1.3.2
+	bitflags@2.4.2
+	block-buffer@0.10.4
+	block-buffer@0.9.0
+	block@0.1.6
+	blocking@1.5.1
+	bumpalo@3.15.3
+	bytecount@0.6.7
+	bytemuck@1.14.3
+	byteorder@1.5.0
+	bytes@1.5.0
+	cc@1.0.89
+	cesu8@1.1.0
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	chrono@0.4.34
+	cipher@0.2.5
+	clang-sys@1.7.0
+	clap@4.5.1
+	clap_builder@4.5.1
+	clap_complete@4.5.1
+	clap_lex@0.7.0
+	clap_mangen@0.2.20
+	clipboard-win@5.2.0
+	color_quant@1.1.0
+	colorchoice@1.0.0
+	combine@4.6.6
+	concurrent-queue@2.4.0
+	cookie@0.17.0
+	cookie_store@0.20.0
+	core-foundation-sys@0.8.6
+	core-foundation@0.9.4
+	core-graphics-types@0.1.3
+	core-graphics@0.23.1
+	coreaudio-rs@0.10.0
+	coreaudio-sys@0.2.15
+	cpal@0.13.5
+	cpufeatures@0.2.12
+	crc32fast@1.4.0
+	crossbeam-channel@0.5.12
+	crossbeam-utils@0.8.19
+	crossterm@0.25.0
+	crossterm_winapi@0.9.1
+	crypto-common@0.1.6
+	crypto-mac@0.11.1
+	ctr@0.6.0
+	cursive@0.20.0
+	cursive_buffered_backend@0.6.1
+	cursive_core@0.3.7
+	darling@0.13.4
+	darling@0.20.8
+	darling_core@0.13.4
+	darling_core@0.20.8
+	darling_macro@0.13.4
+	darling_macro@0.20.8
+	deranged@0.3.11
+	derivative@2.2.0
+	derive-new@0.5.9
+	digest@0.10.7
+	digest@0.9.0
+	dirs-next@1.0.2
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	dlib@0.5.2
+	downcast-rs@1.2.0
+	either@1.10.0
+	encoding_rs@0.8.33
+	endi@1.1.0
+	enum-map-derive@0.17.0
+	enum-map@2.7.3
+	enum_dispatch@0.3.12
+	enumflags2@0.7.9
+	enumflags2_derive@0.7.9
+	enumset@1.1.3
+	enumset_derive@0.8.1
+	equivalent@1.0.1
+	errno@0.3.8
+	error-code@3.2.0
+	event-listener-strategy@0.4.0
+	event-listener-strategy@0.5.0
+	event-listener@2.5.3
+	event-listener@3.1.0
+	event-listener@4.0.3
+	event-listener@5.2.0
+	fastrand@1.9.0
+	fastrand@2.0.1
+	fdeflate@0.3.4
+	fern@0.6.2
+	fixedbitset@0.4.2
+	flate2@1.0.28
+	fnv@1.0.7
+	foreign-types-macros@0.2.3
+	foreign-types-shared@0.1.1
+	foreign-types-shared@0.3.1
+	foreign-types@0.3.2
+	foreign-types@0.5.0
+	form_urlencoded@1.2.1
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-lite@1.13.0
+	futures-lite@2.2.0
+	futures-macro@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-util@0.3.30
+	futures@0.3.30
+	generic-array@0.14.7
+	gethostname@0.4.3
+	getrandom@0.2.12
+	gimli@0.28.1
+	glob@0.3.1
+	h2@0.3.24
+	half@1.8.3
+	hashbrown@0.12.3
+	hashbrown@0.14.3
+	headers-core@0.2.0
+	headers@0.3.9
+	heck@0.4.1
+	hermit-abi@0.3.9
+	hex@0.4.3
+	hmac@0.11.0
+	http-body@0.4.6
+	http@0.2.12
+	httparse@1.8.0
+	httpdate@1.0.3
+	hyper-proxy@0.9.1
+	hyper-tls@0.5.0
+	hyper@0.14.28
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	ident_case@1.0.1
+	idna@0.3.0
+	idna@0.5.0
+	image@0.24.9
+	indexmap@1.9.3
+	indexmap@2.2.5
+	instant@0.1.12
+	io-lifetimes@1.0.11
+	ioctl-rs@0.2.0
+	ipnet@2.9.0
+	itertools@0.12.1
+	itoa@1.0.10
+	jni-sys@0.3.0
+	jni@0.19.0
+	jobserver@0.1.28
+	jpeg-decoder@0.3.1
+	js-sys@0.3.69
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	lewton@0.10.2
+	libc@0.2.153
+	libloading@0.8.2
+	libm@0.2.8
+	libpulse-binding@2.28.1
+	libpulse-simple-binding@2.28.1
+	libpulse-simple-sys@1.21.1
+	libpulse-sys@1.21.0
+	libredox@0.0.1
+	librespot-audio@0.4.2
+	librespot-core@0.4.2
+	librespot-metadata@0.4.2
+	librespot-playback@0.4.2
+	librespot-protocol@0.4.2
+	linux-raw-sys@0.3.8
+	linux-raw-sys@0.4.13
+	lock_api@0.4.11
+	log@0.4.21
+	mac-notification-sys@0.6.1
+	mach@0.3.2
+	malloc_buf@0.0.6
+	maplit@1.0.2
+	maybe-async@0.2.10
+	memchr@2.7.1
+	memoffset@0.6.5
+	memoffset@0.7.1
+	memoffset@0.9.0
+	mime@0.3.17
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@0.8.11
+	native-tls@0.2.11
+	ncurses@5.101.0
+	ndk-context@0.1.1
+	ndk-glue@0.6.2
+	ndk-macro@0.3.0
+	ndk-sys@0.3.0
+	ndk@0.6.0
+	nix@0.23.2
+	nix@0.26.4
+	nix@0.28.0
+	nom@7.1.3
+	notify-rust@4.10.0
+	num-bigint@0.2.6
+	num-bigint@0.4.4
+	num-complex@0.2.4
+	num-complex@0.4.5
+	num-conv@0.1.0
+	num-derive@0.3.3
+	num-integer@0.1.46
+	num-iter@0.1.44
+	num-rational@0.2.4
+	num-rational@0.4.1
+	num-traits@0.2.18
+	num@0.2.1
+	num@0.4.1
+	num_cpus@1.16.0
+	num_enum@0.5.11
+	num_enum_derive@0.5.11
+	num_threads@0.1.7
+	numtoa@0.1.0
+	objc-foundation@0.1.1
+	objc@0.2.7
+	objc_id@0.1.1
+	object@0.32.2
+	oboe-sys@0.4.5
+	oboe@0.4.6
+	ogg@0.8.0
+	once_cell@1.19.0
+	opaque-debug@0.3.1
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.101
+	openssl@0.10.64
+	ordered-stream@0.2.0
+	os_pipe@1.1.5
+	owning_ref@0.4.1
+	pancurses@0.17.0
+	parking@2.2.0
+	parking_lot@0.11.2
+	parking_lot@0.12.1
+	parking_lot_core@0.8.6
+	parking_lot_core@0.9.9
+	parse_duration@2.1.1
+	pbkdf2@0.8.0
+	pdcurses-sys@0.7.1
+	percent-encoding@2.3.1
+	petgraph@0.6.4
+	pin-project-lite@0.2.13
+	pin-utils@0.1.0
+	piper@0.2.1
+	pkg-config@0.3.30
+	platform-dirs@0.3.0
+	png@0.17.13
+	polling@2.8.0
+	polling@3.5.0
+	portaudio-rs@0.3.2
+	portaudio-sys@0.1.1
+	powerfmt@0.2.0
+	ppv-lite86@0.2.17
+	priority-queue@1.4.0
+	proc-macro-crate@1.3.1
+	proc-macro-crate@3.1.0
+	proc-macro2@1.0.78
+	protobuf-codegen-pure@2.28.0
+	protobuf-codegen@2.28.0
+	protobuf@2.28.0
+	quick-xml@0.30.0
+	quick-xml@0.31.0
+	quote@1.0.35
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	redox_syscall@0.2.16
+	redox_syscall@0.4.1
+	redox_termios@0.1.3
+	redox_users@0.4.4
+	regex-automata@0.4.6
+	regex-syntax@0.8.2
+	regex@1.10.3
+	reqwest@0.11.24
+	ring@0.17.8
+	rodio@0.15.0
+	roff@0.2.1
+	rspotify-http@0.12.0
+	rspotify-macros@0.12.0
+	rspotify-model@0.12.0
+	rspotify@0.12.0
+	rustc-demangle@0.1.23
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustix@0.37.27
+	rustix@0.38.31
+	rustls-pemfile@1.0.4
+	rustls-webpki@0.101.7
+	rustls@0.21.10
+	rustversion@1.0.14
+	ryu@1.0.17
+	same-file@1.0.6
+	schannel@0.1.23
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	sct@0.7.1
+	security-framework-sys@2.9.1
+	security-framework@2.9.2
+	semver@1.0.22
+	serde@1.0.197
+	serde_cbor@0.11.2
+	serde_derive@1.0.197
+	serde_json@1.0.114
+	serde_repr@0.1.18
+	serde_spanned@0.6.5
+	serde_urlencoded@0.7.1
+	sha-1@0.9.8
+	sha1@0.10.6
+	sha2@0.10.8
+	shannon@0.2.0
+	shell-words@1.1.0
+	shlex@1.3.0
+	signal-hook-mio@0.2.3
+	signal-hook-registry@1.4.1
+	signal-hook@0.3.17
+	simd-adler32@0.3.7
+	slab@0.4.9
+	smallvec@1.13.1
+	socket2@0.4.10
+	socket2@0.5.6
+	spin@0.9.8
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	stdweb@0.1.3
+	strsim@0.10.0
+	strsim@0.11.0
+	strum@0.25.0
+	strum@0.26.1
+	strum_macros@0.25.3
+	strum_macros@0.26.1
+	subtle@2.4.1
+	syn@1.0.109
+	syn@2.0.52
+	sync_wrapper@0.1.2
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	tauri-winrt-notification@0.1.3
+	tempfile@3.10.1
+	term_size@0.3.2
+	termion@1.5.6
+	thiserror-impl@1.0.57
+	thiserror@1.0.57
+	thread-id@4.2.1
+	tiff@0.9.1
+	time-core@0.1.2
+	time-macros@0.2.17
+	time@0.3.34
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.2.0
+	tokio-native-tls@0.3.1
+	tokio-stream@0.1.14
+	tokio-util@0.7.10
+	tokio@1.36.0
+	toml@0.8.10
+	toml_datetime@0.6.5
+	toml_edit@0.19.15
+	toml_edit@0.21.1
+	toml_edit@0.22.6
+	tower-service@0.3.2
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing@0.1.40
+	tree_magic_mini@3.0.3
+	try-lock@0.2.5
+	typenum@1.17.0
+	uds_windows@1.1.0
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-segmentation@1.11.0
+	unicode-width@0.1.11
+	untrusted@0.9.0
+	ureq@2.9.1
+	url@2.5.0
+	utf8parse@0.2.1
+	uuid@1.7.0
+	vcpkg@0.2.15
+	vergen@3.2.0
+	version_check@0.9.4
+	waker-fn@1.1.1
+	walkdir@2.5.0
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	wasm-bindgen-futures@0.4.42
+	wasm-bindgen-macro-support@0.2.92
+	wasm-bindgen-macro@0.2.92
+	wasm-bindgen-shared@0.2.92
+	wasm-bindgen@0.2.92
+	wayland-backend@0.3.3
+	wayland-client@0.31.2
+	wayland-protocols-wlr@0.2.0
+	wayland-protocols@0.31.2
+	wayland-scanner@0.31.1
+	wayland-sys@0.31.1
+	web-sys@0.3.69
+	webpki-roots@0.25.4
+	weezl@0.1.8
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.6
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.51.1
+	windows-core@0.52.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.4
+	windows@0.51.1
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.4
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.4
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.4
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.4
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.4
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.4
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.4
+	winnow@0.5.40
+	winnow@0.6.5
+	winreg@0.5.1
+	winreg@0.50.0
+	wl-clipboard-rs@0.8.0
+	x11rb-protocol@0.13.0
+	x11rb@0.13.0
+	xdg-home@1.1.0
+	xi-unicode@0.3.0
+	zbus@3.15.1
+	zbus@4.1.2
+	zbus_macros@3.15.1
+	zbus_macros@4.1.2
+	zbus_names@2.6.1
+	zbus_names@3.0.0
+	zerocopy-derive@0.6.6
+	zerocopy-derive@0.7.32
+	zerocopy@0.6.6
+	zerocopy@0.7.32
+	zvariant@3.15.1
+	zvariant@4.0.2
+	zvariant_derive@3.15.1
+	zvariant_derive@4.0.2
+	zvariant_utils@1.1.0
+"
+
+# xtask crates:
+CRATES+="
+	cargo-xtask@0.1.0
+	clap_mangen@0.2.20
+	clap_complete@4.5.1
+	clap@4.5.1
+"
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 cargo desktop optfeature python-any-r1
+
+DESCRIPTION="ncurses Spotify client written in Rust using librespot"
+HOMEPAGE="https://github.com/hrkfdn/ncspot"
+SRC_URI="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}"
+
+LICENSE="BSD-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="amd64"
+
+IUSE="clipboard cover mpris ncurses +notify pulseaudio"
+
+RDEPEND="dev-libs/openssl:=
+	sys-apps/dbus
+	clipboard? ( x11-libs/libxcb:= )
+	cover? ( media-gfx/ueberzug )
+	ncurses? ( sys-libs/ncurses:= )
+	!ncurses? ( sys-libs/ncurses )
+	pulseaudio? ( media-libs/libpulse )
+	!pulseaudio? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="/usr/bin/ncspot"
+
+src_configure() {
+	local myfeaturesdef=""
+
+	use clipboard && myfeaturesdef+="share_clipboard,share_selection,"
+	use cover && myfeaturesdef+="cover,"
+	use mpris && myfeaturesdef+="mpris,"
+	use ncurses && myfeaturesdef+="ncurses_backend,"
+	use notify && myfeaturesdef+="notify,"
+
+	# It always seems to link to libpulse regardless of this setting if libpulse is installed.
+	if use pulseaudio; then
+	  myfeaturesdef+="pulseaudio_backend,"
+	else
+	  myfeaturesdef+="alsa_backend,"
+	fi
+
+	local myfeatures=( "${myfeaturesdef::-1}" )
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cargo_src_compile
+
+	cargo xtask generate-shell-completion || die
+	cargo xtask generate-manpage || die
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+
+	domenu misc/ncspot.desktop
+	newicon -s scalable images/logo.svg ncspot.svg
+
+	dobashcomp misc/ncspot.bash
+
+	insinto /usr/share/fish/completions
+	doins misc/ncspot.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/_ncspot
+
+	doman misc/ncspot.1
+}
+
+pkg_postinst() {
+	optfeature_header "Optional runtime features:"
+	optfeature "MPRIS song scrobbling support" media-sound/rescrobbled
+}
diff --git a/media-sound/ncspot/ncspot-1.1.1.ebuild b/media-sound/ncspot/ncspot-1.1.1.ebuild
new file mode 100644
index 000000000000..ccb723f345c1
--- /dev/null
+++ b/media-sound/ncspot/ncspot-1.1.1.ebuild
@@ -0,0 +1,580 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6
+
+EAPI=8
+
+CRATES="
+	addr2line@0.21.0
+	adler@1.0.2
+	aes-ctr@0.6.0
+	aes-soft@0.6.4
+	aes@0.6.0
+	aesni@0.10.0
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	alsa-sys@0.3.1
+	alsa@0.6.0
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.14
+	anstyle-parse@0.2.4
+	anstyle-query@1.0.3
+	anstyle-wincon@3.0.3
+	anstyle@1.0.7
+	arboard@3.4.0
+	async-broadcast@0.7.0
+	async-channel@2.2.1
+	async-executor@1.11.0
+	async-fs@2.1.2
+	async-io@2.3.2
+	async-lock@3.3.0
+	async-process@2.2.2
+	async-recursion@1.1.1
+	async-signal@0.2.6
+	async-task@4.7.1
+	async-trait@0.1.80
+	atomic-waker@1.1.2
+	autocfg@1.3.0
+	backtrace@0.3.71
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	bindgen@0.69.4
+	bitflags@1.3.2
+	bitflags@2.5.0
+	block-buffer@0.10.4
+	block-buffer@0.9.0
+	block2@0.5.0
+	block@0.1.6
+	blocking@1.6.0
+	bumpalo@3.16.0
+	bytemuck@1.15.0
+	byteorder@1.5.0
+	bytes@1.6.0
+	cc@1.0.97
+	cesu8@1.1.0
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	chrono@0.4.38
+	cipher@0.2.5
+	clang-sys@1.7.0
+	clap@4.5.4
+	clap_builder@4.5.2
+	clap_complete@4.5.2
+	clap_lex@0.7.0
+	clap_mangen@0.2.20
+	clipboard-win@5.3.1
+	colorchoice@1.0.1
+	combine@4.6.7
+	concurrent-queue@2.5.0
+	cookie@0.18.1
+	cookie_store@0.21.0
+	core-foundation-sys@0.8.6
+	core-foundation@0.9.4
+	core-graphics-types@0.1.3
+	core-graphics@0.23.2
+	coreaudio-rs@0.10.0
+	coreaudio-sys@0.2.15
+	cpal@0.13.5
+	cpufeatures@0.2.12
+	crc32fast@1.4.0
+	crossbeam-channel@0.5.12
+	crossbeam-utils@0.8.19
+	crossterm@0.25.0
+	crossterm_winapi@0.9.1
+	crypto-common@0.1.6
+	crypto-mac@0.11.1
+	ctr@0.6.0
+	cursive@0.20.0
+	cursive_buffered_backend@0.6.1
+	cursive_core@0.3.7
+	darling@0.13.4
+	darling@0.20.8
+	darling_core@0.13.4
+	darling_core@0.20.8
+	darling_macro@0.13.4
+	darling_macro@0.20.8
+	deranged@0.3.11
+	derive-new@0.6.0
+	digest@0.10.7
+	digest@0.9.0
+	dirs-next@1.0.2
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	dlib@0.5.2
+	downcast-rs@1.2.1
+	either@1.11.0
+	encoding_rs@0.8.34
+	endi@1.1.0
+	enum-map-derive@0.17.0
+	enum-map@2.7.3
+	enum_dispatch@0.3.13
+	enumflags2@0.7.9
+	enumflags2_derive@0.7.9
+	enumset@1.1.3
+	enumset_derive@0.8.1
+	equivalent@1.0.1
+	errno@0.3.9
+	error-code@3.2.0
+	event-listener-strategy@0.4.0
+	event-listener-strategy@0.5.2
+	event-listener@4.0.3
+	event-listener@5.3.0
+	fastrand@2.1.0
+	fdeflate@0.3.4
+	fern@0.6.2
+	fixedbitset@0.4.2
+	flate2@1.0.30
+	fnv@1.0.7
+	foreign-types-macros@0.2.3
+	foreign-types-shared@0.1.1
+	foreign-types-shared@0.3.1
+	foreign-types@0.3.2
+	foreign-types@0.5.0
+	form_urlencoded@1.2.1
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-lite@2.3.0
+	futures-macro@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-util@0.3.30
+	futures@0.3.30
+	generic-array@0.14.7
+	gethostname@0.4.3
+	getrandom@0.2.15
+	gimli@0.28.1
+	glob@0.3.1
+	h2@0.4.4
+	half@1.8.3
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	headers-core@0.2.0
+	headers@0.3.9
+	heck@0.4.1
+	hermit-abi@0.3.9
+	hex@0.4.3
+	hmac@0.11.0
+	home@0.5.9
+	http-body-util@0.1.1
+	http-body@0.4.6
+	http-body@1.0.0
+	http@0.2.12
+	http@1.1.0
+	httparse@1.8.0
+	httpdate@1.0.3
+	hyper-proxy@0.9.1
+	hyper-tls@0.6.0
+	hyper-util@0.1.3
+	hyper@0.14.28
+	hyper@1.3.1
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	ident_case@1.0.1
+	idna@0.5.0
+	image@0.25.1
+	indexmap@1.9.3
+	indexmap@2.2.6
+	instant@0.1.12
+	ioctl-rs@0.2.0
+	ipnet@2.9.0
+	is_terminal_polyfill@1.70.0
+	itertools@0.12.1
+	itoa@1.0.11
+	jni-sys@0.3.0
+	jni@0.19.0
+	jobserver@0.1.31
+	jpeg-decoder@0.3.1
+	js-sys@0.3.69
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	lewton@0.10.2
+	libc@0.2.154
+	libloading@0.8.3
+	libm@0.2.8
+	libpulse-binding@2.28.1
+	libpulse-simple-binding@2.28.1
+	libpulse-simple-sys@1.21.1
+	libpulse-sys@1.21.0
+	libredox@0.1.3
+	librespot-audio@0.4.2
+	librespot-core@0.4.2
+	librespot-metadata@0.4.2
+	librespot-playback@0.4.2
+	librespot-protocol@0.4.2
+	linux-raw-sys@0.4.13
+	lock_api@0.4.12
+	log@0.4.21
+	mac-notification-sys@0.6.1
+	mach@0.3.2
+	malloc_buf@0.0.6
+	maplit@1.0.2
+	maybe-async@0.2.10
+	memchr@2.7.2
+	memoffset@0.6.5
+	memoffset@0.9.1
+	mime@0.3.17
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@0.8.11
+	native-tls@0.2.11
+	ncurses@5.101.0
+	ndk-context@0.1.1
+	ndk-glue@0.6.2
+	ndk-macro@0.3.0
+	ndk-sys@0.3.0
+	ndk@0.6.0
+	nix@0.23.2
+	nix@0.28.0
+	nom@7.1.3
+	notify-rust@4.11.0
+	num-bigint@0.2.6
+	num-bigint@0.4.5
+	num-complex@0.2.4
+	num-complex@0.4.6
+	num-conv@0.1.0
+	num-derive@0.3.3
+	num-integer@0.1.46
+	num-iter@0.1.45
+	num-rational@0.2.4
+	num-rational@0.4.2
+	num-traits@0.2.19
+	num@0.2.1
+	num@0.4.3
+	num_cpus@1.16.0
+	num_enum@0.5.11
+	num_enum_derive@0.5.11
+	num_threads@0.1.7
+	numtoa@0.1.0
+	objc-foundation@0.1.1
+	objc-sys@0.3.3
+	objc2-app-kit@0.2.0
+	objc2-core-data@0.2.0
+	objc2-encode@4.0.1
+	objc2-foundation@0.2.0
+	objc2@0.5.1
+	objc@0.2.7
+	objc_id@0.1.1
+	object@0.32.2
+	oboe-sys@0.4.5
+	oboe@0.4.6
+	ogg@0.8.0
+	once_cell@1.19.0
+	opaque-debug@0.3.1
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.102
+	openssl@0.10.64
+	ordered-stream@0.2.0
+	os_pipe@1.1.5
+	owning_ref@0.4.1
+	pancurses@0.17.0
+	parking@2.2.0
+	parking_lot@0.11.2
+	parking_lot@0.12.2
+	parking_lot_core@0.8.6
+	parking_lot_core@0.9.10
+	parse_duration@2.1.1
+	pbkdf2@0.8.0
+	pdcurses-sys@0.7.1
+	percent-encoding@2.3.1
+	petgraph@0.6.5
+	pin-project-internal@1.1.5
+	pin-project-lite@0.2.14
+	pin-project@1.1.5
+	pin-utils@0.1.0
+	piper@0.2.1
+	pkg-config@0.3.30
+	platform-dirs@0.3.0
+	png@0.17.13
+	polling@3.7.0
+	portaudio-rs@0.3.2
+	portaudio-sys@0.1.1
+	powerfmt@0.2.0
+	ppv-lite86@0.2.17
+	priority-queue@1.4.0
+	proc-macro-crate@1.3.1
+	proc-macro-crate@3.1.0
+	proc-macro2@1.0.82
+	protobuf-codegen-pure@2.28.0
+	protobuf-codegen@2.28.0
+	protobuf@2.28.0
+	quick-xml@0.31.0
+	quote@1.0.36
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	redox_syscall@0.2.16
+	redox_syscall@0.5.1
+	redox_termios@0.1.3
+	redox_users@0.4.5
+	regex-automata@0.4.6
+	regex-syntax@0.8.3
+	regex@1.10.4
+	reqwest@0.12.4
+	rodio@0.15.0
+	roff@0.2.1
+	rspotify-http@0.13.1
+	rspotify-macros@0.13.1
+	rspotify-model@0.13.1
+	rspotify@0.13.1
+	rustc-demangle@0.1.24
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustix@0.38.34
+	rustls-pemfile@2.1.2
+	rustls-pki-types@1.7.0
+	rustversion@1.0.16
+	ryu@1.0.18
+	same-file@1.0.6
+	schannel@0.1.23
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	security-framework-sys@2.11.0
+	security-framework@2.11.0
+	semver@1.0.23
+	serde@1.0.201
+	serde_cbor@0.11.2
+	serde_derive@1.0.201
+	serde_json@1.0.117
+	serde_repr@0.1.19
+	serde_spanned@0.6.5
+	serde_urlencoded@0.7.1
+	sha-1@0.9.8
+	sha1@0.10.6
+	sha2@0.10.8
+	shannon@0.2.0
+	shell-words@1.1.0
+	shlex@1.3.0
+	signal-hook-mio@0.2.3
+	signal-hook-registry@1.4.2
+	signal-hook@0.3.17
+	simd-adler32@0.3.7
+	slab@0.4.9
+	smallvec@1.13.2
+	socket2@0.5.7
+	socks@0.3.4
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	stdweb@0.1.3
+	strsim@0.10.0
+	strsim@0.11.1
+	strum@0.26.2
+	strum_macros@0.26.2
+	subtle@2.4.1
+	syn@1.0.109
+	syn@2.0.61
+	sync_wrapper@0.1.2
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	tauri-winrt-notification@0.2.1
+	tempfile@3.10.1
+	term_size@0.3.2
+	termion@1.5.6
+	thiserror-impl@1.0.60
+	thiserror@1.0.60
+	thread-id@4.2.1
+	tiff@0.9.1
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.2.0
+	tokio-native-tls@0.3.1
+	tokio-stream@0.1.15
+	tokio-util@0.7.11
+	tokio@1.37.0
+	toml@0.8.12
+	toml_datetime@0.6.5
+	toml_edit@0.19.15
+	toml_edit@0.21.1
+	toml_edit@0.22.12
+	tower-layer@0.3.2
+	tower-service@0.3.2
+	tower@0.4.13
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing@0.1.40
+	tree_magic_mini@3.1.4
+	try-lock@0.2.5
+	typenum@1.17.0
+	uds_windows@1.1.0
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-segmentation@1.11.0
+	unicode-width@0.1.12
+	ureq@2.9.7
+	url@2.5.0
+	utf8parse@0.2.1
+	uuid@1.8.0
+	vcpkg@0.2.15
+	vergen@3.2.0
+	version_check@0.9.4
+	walkdir@2.5.0
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	wasm-bindgen-futures@0.4.42
+	wasm-bindgen-macro-support@0.2.92
+	wasm-bindgen-macro@0.2.92
+	wasm-bindgen-shared@0.2.92
+	wasm-bindgen@0.2.92
+	wayland-backend@0.3.3
+	wayland-client@0.31.2
+	wayland-protocols-wlr@0.2.0
+	wayland-protocols@0.31.2
+	wayland-scanner@0.31.1
+	wayland-sys@0.31.1
+	web-sys@0.3.69
+	weezl@0.1.8
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-core@0.56.0
+	windows-implement@0.56.0
+	windows-interface@0.56.0
+	windows-result@0.1.1
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.5
+	windows-version@0.1.1
+	windows@0.56.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.5
+	winnow@0.5.40
+	winnow@0.6.8
+	winreg@0.5.1
+	winreg@0.52.0
+	wl-clipboard-rs@0.8.1
+	x11rb-protocol@0.13.1
+	x11rb@0.13.1
+	xdg-home@1.1.0
+	xi-unicode@0.3.0
+	zbus@4.2.1
+	zbus_macros@4.2.1
+	zbus_names@3.0.0
+	zerocopy-derive@0.6.6
+	zerocopy-derive@0.7.34
+	zerocopy@0.6.6
+	zerocopy@0.7.34
+	zvariant@4.1.0
+	zvariant_derive@4.1.0
+	zvariant_utils@1.1.1
+"
+
+# xtask crates:
+CRATES+="
+	cargo-xtask@0.1.0
+	clap_mangen@0.2.20
+	clap_complete@4.5.2
+	clap@4.5.4
+"
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 cargo desktop optfeature python-any-r1
+
+DESCRIPTION="ncurses Spotify client written in Rust using librespot"
+HOMEPAGE="https://github.com/hrkfdn/ncspot"
+SRC_URI="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}"
+
+LICENSE="BSD-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD Boost-1.0 ISC MIT Unicode-DFS-2016
+	|| ( LGPL-3 MPL-2.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="clipboard cover mpris ncurses +notify pulseaudio"
+
+RDEPEND="dev-libs/openssl:=
+	sys-apps/dbus
+	clipboard? ( x11-libs/libxcb:= )
+	cover? ( media-gfx/ueberzug )
+	ncurses? ( sys-libs/ncurses:= )
+	!ncurses? ( sys-libs/ncurses )
+	pulseaudio? ( media-libs/libpulse )
+	!pulseaudio? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="/usr/bin/ncspot"
+
+src_configure() {
+	local myfeaturesdef=""
+
+	use clipboard && myfeaturesdef+="share_clipboard,share_selection,"
+	use cover && myfeaturesdef+="cover,"
+	use mpris && myfeaturesdef+="mpris,"
+	use ncurses && myfeaturesdef+="ncurses_backend,"
+	use notify && myfeaturesdef+="notify,"
+
+	# It always seems to link to libpulse regardless of this setting if libpulse is installed.
+	if use pulseaudio; then
+	  myfeaturesdef+="pulseaudio_backend,"
+	else
+	  myfeaturesdef+="alsa_backend,"
+	fi
+
+	local myfeatures=( "${myfeaturesdef::-1}" )
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cargo_src_compile
+
+	cargo xtask generate-shell-completion || die
+	cargo xtask generate-manpage || die
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+
+	domenu misc/ncspot.desktop
+	newicon -s scalable images/logo.svg ncspot.svg
+
+	dobashcomp misc/ncspot.bash
+
+	insinto /usr/share/fish/completions
+	doins misc/ncspot.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/_ncspot
+
+	doman misc/ncspot.1
+}
+
+pkg_postinst() {
+	optfeature_header "Optional runtime features:"
+	optfeature "MPRIS song scrobbling support" media-sound/rescrobbled
+}
diff --git a/media-sound/nickvision-tagger/Manifest b/media-sound/nickvision-tagger/Manifest
new file mode 100644
index 000000000000..3ca5a1a8f793
--- /dev/null
+++ b/media-sound/nickvision-tagger/Manifest
@@ -0,0 +1 @@
+DIST nickvision-tagger-2022.11.2.tar.gz 2829711 BLAKE2B 308a7f66f4b79d8c01d546760d290b419e1ed901a3c8fff06827577215b363fc41fa5cfa60ef6abb2c04148624f9c63553d3e805b128694153fc11f366f8f103 SHA512 49420109d228c65fb7ff9b65cd1dbb60466840d439b9ca47ee45e3778159f953ffa32b7516146e6ae7b2df7ee8dd87458f780e83379e31978a0d7919fb109fcf
diff --git a/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-fix-narrowing.patch b/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-fix-narrowing.patch
new file mode 100644
index 000000000000..96803ca9d692
--- /dev/null
+++ b/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-fix-narrowing.patch
@@ -0,0 +1,27 @@
+From a4c1dcc823d5294e32859a5b7f44d8dd31f7a43a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
+Date: Tue, 28 Feb 2023 18:57:14 +0100
+Subject: [PATCH] mediahelpers.cpp: use an explicit cast
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: https://bugs.gentoo.org/898372
+Signed-off-by: Maciej Barć <xgqt@gentoo.org>
+---
+ src/helpers/mediahelpers.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/helpers/mediahelpers.cpp b/src/helpers/mediahelpers.cpp
+index 47c563d..dbebf92 100644
+--- a/src/helpers/mediahelpers.cpp
++++ b/src/helpers/mediahelpers.cpp
+@@ -35,7 +35,7 @@ std::string MediaHelpers::durationToString(int durationInSeconds)
+ std::string MediaHelpers::fileSizeToString(std::uintmax_t fileSize)
+ {
+     std::vector<std::string> sizes{ _("B"), _("KB"), _("MB"), _("GB"), _("TB") };
+-    double size{ fileSize };
++    double size{ static_cast<double>(fileSize) };
+     int index{ 0 };
+     std::stringstream builder;
+     while (size >= 1024 && index < 4)
diff --git a/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-meson-install.patch b/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-meson-install.patch
new file mode 100644
index 000000000000..5d231d503e27
--- /dev/null
+++ b/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-meson-install.patch
@@ -0,0 +1,12 @@
+--- a/meson.build
++++ b/meson.build
+@@ -12,8 +12,7 @@ taglib = dependency('taglib')
+ subdir('src')
+ subdir('po')
+ 
+-executable('org.nickvision.tagger', sources, dependencies: [threads, adwaita, jsoncpp, curlpp, taglib], install: true, install_mode: 'rwxrwxrwx')
+-install_data('fpcalc', install_dir: 'bin', install_mode: 'rwxrwxrwx')
++executable('org.nickvision.tagger', sources, dependencies: [threads, adwaita, jsoncpp, curlpp, taglib], install: true, install_mode: 'rwxr-xr-x')
+ install_data(resources, install_dir: 'share/icons/hicolor/scalable/apps')
+ install_data(resources_symbolic, install_dir: 'share/icons/hicolor/symbolic/apps')
+ install_data(resources_actions, install_dir: 'share/icons/hicolor/scalable/actions')
diff --git a/media-sound/nickvision-tagger/metadata.xml b/media-sound/nickvision-tagger/metadata.xml
new file mode 100644
index 000000000000..0f6860fd9fe6
--- /dev/null
+++ b/media-sound/nickvision-tagger/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    Edit tags and album art of multiple files, even across subfolders, all at
+    once. Support for multiple music file types (mp3, ogg, flac, wma, and wav).
+    Convert filenames to tags and tags to filenames with ease.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/nlogozzo/NickvisionTagger/issues/</bugs-to>
+    <remote-id type="github">nlogozzo/NickvisionTagger</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild b/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild
new file mode 100644
index 000000000000..a52cef4d5091
--- /dev/null
+++ b/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+REAL_PN=NickvisionTagger
+REAL_P=${REAL_PN}-${PV}
+
+inherit meson xdg
+
+DESCRIPTION="An easy-to-use music tag (metadata) editor"
+HOMEPAGE="https://github.com/nlogozzo/NickvisionTagger/"
+SRC_URI="https://github.com/nlogozzo/${REAL_PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${REAL_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+DEPEND="
+	dev-cpp/curlpp:=
+	dev-libs/jsoncpp:=
+	gui-libs/gtk:4
+	gui-libs/libadwaita:=
+	media-libs/taglib:=
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/chromaprint[tools]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-narrowing.patch
+	"${FILESDIR}"/${P}-meson-install.patch
+)
+
+DOCS=( README.md )
diff --git a/media-sound/normalize/metadata.xml b/media-sound/normalize/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/normalize/metadata.xml
+++ b/media-sound/normalize/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/normalize/normalize-0.7.7-r1.ebuild b/media-sound/normalize/normalize-0.7.7-r1.ebuild
index dbc8ff6009f1..ad112ca664f8 100644
--- a/media-sound/normalize/normalize-0.7.7-r1.ebuild
+++ b/media-sound/normalize/normalize-0.7.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="audiofile mad nls"
 
 RDEPEND="
@@ -41,3 +41,9 @@ src_configure() {
 		$(use_enable nls) \
 		--disable-xmms
 }
+
+src_test() {
+	# .sh tests missing a dep on ../src/mktestwav but ancient autoconf/automake
+	# so too mmuch hassle to patch, bug #740488.
+	emake -j1 check
+}
diff --git a/media-sound/ogg2mp3/Manifest b/media-sound/ogg2mp3/Manifest
index f8602034d97b..ec3e2f731d17 100644
--- a/media-sound/ogg2mp3/Manifest
+++ b/media-sound/ogg2mp3/Manifest
@@ -1 +1 @@
-DIST ogg2mp3-0.6.1.tar.bz2 12424 BLAKE2B 6a43814adc2763bc4ccefdcbdbc6e1bcc4bb2d245af51be1f1c949c8fa29cefcbe3175d89a1a34299f7ae0b71b24e62a65e0f4ed8b0011f23a733960c549baaf SHA512 ba4be78b14c3647af52c0c64c95949e75998847391612f6d66fa281e15283929d6ae3e5df15b0c242d2930b3941e68653934261f6d9804c576f77c8304ef4f14
+DIST ogg2mp3-0.6.1.tar.gz 13257 BLAKE2B e3cdfe4de8134a2dbb86615f96606befe985f8aeddf77bd7e3f62b9364596ccdf0c9e5fe542bd2c7e459cb12bcb8f6dbb4782cc4934391ef98edacca88c83080 SHA512 24f24ba342631fbb4743153dc8f4c2b809b744ce01ec99fda442d2a39bf3a774ad2540fd35b6b7940516e63353979fcc30a14214100bb80c9a486ea65ae95999
diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
index 5571068144eb..2393aeb4f689 100644
--- a/media-sound/ogg2mp3/metadata.xml
+++ b/media-sound/ogg2mp3/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>james.ausmus@gmail.com</email>
     <name>James Ausmus</name>
   </maintainer>
@@ -13,12 +9,11 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
   <upstream>
-    <changelog>http://www.gitorious.org/ogg2mp3/ogg2mp3/commits/master</changelog>
-    <doc>http://www.gitorious.org/ogg2mp3/pages/Home</doc>
+    <remote-id type="github">fithp/ogg2mp3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/ogg2mp3/ogg2mp3-0.6.1-r1.ebuild b/media-sound/ogg2mp3/ogg2mp3-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..ce4c6570fe3b
--- /dev/null
+++ b/media-sound/ogg2mp3/ogg2mp3-0.6.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=f3bee47c3bce01a33b5bce88fa70bd9ecadca0ad
+
+DESCRIPTION="Perl script to convert Ogg Vorbis files to MP3 files"
+HOMEPAGE="https://github.com/fithp/ogg2mp3"
+SRC_URI="https://github.com/fithp/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/String-ShellQuote
+	media-sound/lame
+	media-sound/vorbis-tools[ogg123]
+"
+
+src_install() {
+	dobin ogg2mp3
+	dodoc doc/{AUTHORS,ChangeLog,README,TODO}
+}
diff --git a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
deleted file mode 100644
index e62c87864b42..000000000000
--- a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A perl script to convert Ogg Vorbis files to MP3 files"
-HOMEPAGE="http://www.gitorious.org/ogg2mp3/pages/Home"
-SRC_URI="http://www.jamesa.com/projects/ogg2mp3/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-sound/lame
-	dev-perl/String-ShellQuote
-	media-sound/vorbis-tools[ogg123]"
-DEPEND=""
-
-src_install() {
-	dobin ogg2mp3
-	dodoc doc/{AUTHORS,ChangeLog,README,TODO}
-}
diff --git a/media-sound/oggtst/metadata.xml b/media-sound/oggtst/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/oggtst/metadata.xml
+++ b/media-sound/oggtst/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch b/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch
new file mode 100644
index 000000000000..2e117687a443
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch
@@ -0,0 +1,374 @@
+--- a/p_ac3.cpp
++++ b/p_ac3.cpp
+@@ -30,7 +30,7 @@
+ ac3_packetizer_c::ac3_packetizer_c(unsigned long nsamples_per_sec,
+                                    int nchannels, int nbitrate,
+                                    audio_sync_t *nasync, range_t *nrange,
+-                                   char **ncomments) throw (error_c) : q_c() {
++                                   char **ncomments) : q_c() {
+   serialno = create_unique_serial();
+   ogg_stream_init(&os, serialno);
+   packetno = 0;
+--- a/p_ac3.h
++++ b/p_ac3.h
+@@ -40,7 +40,7 @@
+   public:
+     ac3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+                      int nbitrate, audio_sync_t *nasync,
+-                     range_t *nrange, char **ncomments) throw (error_c);
++                     range_t *nrange, char **ncomments);
+     virtual ~ac3_packetizer_c();
+     
+     virtual int     process(char *buf, int size, int last_frame);
+--- a/p_index.cpp
++++ b/p_index.cpp
+@@ -28,7 +28,7 @@
+ #include "p_index.h"
+ #include "vorbis_header_utils.h"
+ 
+-index_packetizer_c::index_packetizer_c(int nserial) throw (error_c) : q_c() {
++index_packetizer_c::index_packetizer_c(int nserial) : q_c() {
+   serialno = create_unique_serial();
+   ogg_stream_init(&os, serialno);
+   granulepos = 0;
+--- a/p_index.h
++++ b/p_index.h
+@@ -33,7 +33,7 @@
+     ogg_int64_t granulepos, packetno;
+     int         serial;
+   public:
+-    index_packetizer_c(int nserial) throw (error_c);
++    index_packetizer_c(int nserial);
+     virtual ~index_packetizer_c();
+     
+     virtual int     process(idx_entry *entries, int num);
+--- a/p_mp3.cpp
++++ b/p_mp3.cpp
+@@ -30,7 +30,7 @@
+ mp3_packetizer_c::mp3_packetizer_c(unsigned long nsamples_per_sec,
+                                    int nchannels, int nmp3rate,
+                                    audio_sync_t *nasync, range_t *nrange,
+-                                   char **ncomments) throw (error_c) : q_c() {
++                                   char **ncomments) : q_c() {
+   serialno = create_unique_serial();
+   ogg_stream_init(&os, serialno);
+   packetno = 0;
+--- a/p_mp3.h
++++ b/p_mp3.h
+@@ -40,7 +40,7 @@
+   public:
+     mp3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+                      int nmp3rate, audio_sync_t *nasync,
+-                     range_t *nrange, char **ncomments) throw (error_c);
++                     range_t *nrange, char **ncomments);
+     virtual ~mp3_packetizer_c();
+     
+     virtual int     process(char *buf, int size, int last_frame);
+--- a/p_pcm.cpp
++++ b/p_pcm.cpp
+@@ -29,7 +29,7 @@
+ pcm_packetizer_c::pcm_packetizer_c(unsigned long nsamples_per_sec,
+                                    int nchannels, int nbits_per_sample,
+                                    audio_sync_t *nasync, range_t *nrange,
+-                                   char **ncomments) throw (error_c) : q_c() {
++                                   char **ncomments) : q_c() {
+   serialno = create_unique_serial();
+   ogg_stream_init(&os, serialno);
+   packetno = 0;
+--- a/p_pcm.h
++++ b/p_pcm.h
+@@ -37,7 +37,7 @@
+   public:
+     pcm_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+                      int nbits_per_sample, audio_sync_t *nasync,
+-                     range_t *nrange, char **ncomments) throw (error_c);
++                     range_t *nrange, char **ncomments);
+     virtual ~pcm_packetizer_c();
+     
+     virtual int     process(char *buf, int size, int last_frame);
+--- a/p_textsubs.cpp
++++ b/p_textsubs.cpp
+@@ -29,7 +29,7 @@
+ 
+ textsubs_packetizer_c::textsubs_packetizer_c(audio_sync_t *nasync,
+                                              range_t *nrange, char **ncomments)
+-                                             throw (error_c) : q_c() {
++                                             : q_c() {
+   serialno = create_unique_serial();
+   ogg_stream_init(&os, serialno);
+   packetno = 0;
+--- a/p_textsubs.h
++++ b/p_textsubs.h
+@@ -30,7 +30,7 @@
+ 
+   public:
+     textsubs_packetizer_c(audio_sync_t *nasync, range_t *nrange,
+-                          char **ncomments) throw (error_c);
++                          char **ncomments);
+     virtual ~textsubs_packetizer_c();
+     
+     virtual int     process(ogg_int64_t start, ogg_int64_t end, char *_subs,
+--- a/p_video.cpp
++++ b/p_video.cpp
+@@ -31,7 +31,7 @@
+                                        int nheight, int nbpp,
+                                        int nmax_frame_size, audio_sync_t *as,
+                                        range_t *nrange, char **ncomments)
+-                                       throw (error_c) : q_c() {
++                                       : q_c() {
+   serialno = create_unique_serial();
+   ogg_stream_init(&os, serialno);
+   packetno = 0;
+--- a/p_video.h
++++ b/p_video.h
+@@ -35,7 +35,7 @@
+     range_t         range;
+   public:
+     video_packetizer_c(char *, double, int, int, int, int, audio_sync_t *,
+-                       range_t *nrange, char **ncomments) throw (error_c);
++                       range_t *nrange, char **ncomments);
+     virtual ~video_packetizer_c();
+     
+     virtual int            process(char *buf, int size, int num_frames, int key,
+--- a/p_vobsub.cpp
++++ b/p_vobsub.cpp
+@@ -34,7 +34,7 @@
+                                          char *nid, int nindex,
+                                          audio_sync_t *nasync,
+                                          range_t *nrange, char **ncomments)
+-                                         throw (error_c) : q_c() {
++                                         : q_c() {
+   char buffer[50];
+   serialno = create_unique_serial();
+   ogg_stream_init(&os, serialno);
+--- a/p_vobsub.h
++++ b/p_vobsub.h
+@@ -43,7 +43,7 @@
+     vobsub_packetizer_c(int nwidth, int nheight, char *npalette,
+                         int nlangidx, char *nid, int nindex,
+                         audio_sync_t *nasync, range_t *nrange,
+-                        char **ncomments) throw (error_c);
++                        char **ncomments);
+     virtual ~vobsub_packetizer_c();
+     
+     virtual int     process(ogg_int64_t start, ogg_int64_t end, char *subs,
+--- a/p_vorbis.cpp
++++ b/p_vorbis.cpp
+@@ -30,7 +30,7 @@
+ #include "vorbis_header_utils.h"
+ 
+ vorbis_packetizer_c::vorbis_packetizer_c(audio_sync_t *nasync, range_t *nrange,
+-                                         char **ncomments) throw (error_c)
++                                         char **ncomments)
+                                          : q_c() {
+   packetno = 0;
+   old_granulepos = 0;
+--- a/p_vorbis.h
++++ b/p_vorbis.h
+@@ -37,7 +37,7 @@
+ 
+   public:
+     vorbis_packetizer_c(audio_sync_t *nasync, range_t *nrange, char **ncomments)
+-                        throw (error_c);
++                       ;
+     virtual ~vorbis_packetizer_c();
+     
+     virtual int     process(ogg_packet *op, ogg_int64_t gran);
+--- a/queue.cpp
++++ b/queue.cpp
+@@ -21,7 +21,7 @@
+ #include "ogmmerge.h"
+ #include "queue.h"
+ 
+-q_c::q_c() throw (error_c) : generic_packetizer_c() {
++q_c::q_c() : generic_packetizer_c() {
+   first = NULL;
+   current = NULL;
+   next_is_key = -1;
+--- a/queue.h
++++ b/queue.h
+@@ -36,7 +36,7 @@
+     ogg_stream_state  os;
+     
+   public:
+-    q_c() throw (error_c);
++    q_c();
+     virtual ~q_c();
+     
+     virtual int              add_ogg_page(ogg_page *, int header_page,
+--- a/r_ac3.cpp
++++ b/r_ac3.cpp
+@@ -55,7 +55,7 @@
+ }
+ 
+ ac3_reader_c::ac3_reader_c(char *fname, audio_sync_t *nasync,
+-                           range_t *nrange, char **ncomments) throw (error_c) {
++                           range_t *nrange, char **ncomments) {
+   int          pos;
+   ac3_header_t ac3header;
+   
+--- a/r_ac3.h
++++ b/r_ac3.h
+@@ -36,7 +36,7 @@
+      
+   public:
+     ac3_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+-                 char **ncomments) throw (error_c);
++                 char **ncomments);
+     virtual ~ac3_reader_c();
+ 
+     virtual int              read();
+--- a/r_avi.cpp
++++ b/r_avi.cpp
+@@ -55,7 +55,7 @@
+ avi_reader_c::avi_reader_c(char *fname, unsigned char *astreams,
+                            unsigned char *vstreams, audio_sync_t *nasync,
+                            range_t *nrange, char **ncomments, char *nfourcc,
+-                           char* nav_seek) throw (error_c) {
++                           char* nav_seek) {
+   int            fsize, i;
+   off_t          size;
+   FILE          *f;
+--- a/r_avi.h
++++ b/r_avi.h
+@@ -67,7 +67,7 @@
+     avi_reader_c(char *fname, unsigned char *astreams,
+                  unsigned char *vstreams, audio_sync_t *nasync,
+                  range_t *nrange, char **ncomments, char *nfourcc,
+-                 char* nav_seek) throw (error_c);
++                 char* nav_seek);
+     virtual ~avi_reader_c();
+ 
+     virtual int              read();
+--- a/r_microdvd.cpp
++++ b/r_microdvd.cpp
+@@ -56,7 +56,7 @@
+ 
+ microdvd_reader_c::microdvd_reader_c(char *fname, audio_sync_t *nasync,
+                                      range_t *nrange, char **ncomments)
+-                                     throw (error_c) {
++                                     {
+   if ((file = fopen(fname, "r")) == NULL)
+     throw error_c("microdvd_reader: Could not open source file.");
+   if (!microdvd_reader_c::probe_file(file, 0))
+--- a/r_microdvd.h
++++ b/r_microdvd.h
+@@ -35,7 +35,7 @@
+      
+   public:
+     microdvd_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+-                      char **ncomments) throw (error_c);
++                      char **ncomments);
+     virtual ~microdvd_reader_c();
+ 
+     virtual int              read();
+--- a/r_mp3.cpp
++++ b/r_mp3.cpp
+@@ -60,7 +60,7 @@
+ }
+ 
+ mp3_reader_c::mp3_reader_c(char *fname, audio_sync_t *nasync,
+-                           range_t *nrange, char **ncomments) throw (error_c) {
++                           range_t *nrange, char **ncomments) {
+   int           pos;
+   unsigned long header;
+   mp3_header_t  mp3header;
+--- a/r_mp3.h
++++ b/r_mp3.h
+@@ -40,7 +40,7 @@
+      
+   public:
+     mp3_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+-                 char **ncomments) throw (error_c);
++                 char **ncomments);
+     virtual ~mp3_reader_c();
+ 
+     virtual int              read();
+--- a/r_ogm.cpp
++++ b/r_ogm.cpp
+@@ -60,7 +60,7 @@
+ ogm_reader_c::ogm_reader_c(char *fname, unsigned char *astreams,
+                            unsigned char *vstreams, unsigned char *tstreams,
+                            audio_sync_t *nasync, range_t *nrange,
+-                           char **ncomments, char *nfourcc) throw (error_c) {
++                           char **ncomments, char *nfourcc) {
+   off_t size;
+   
+   if ((file = fopen(fname, "r")) == NULL)
+--- a/r_ogm.h
++++ b/r_ogm.h
+@@ -62,7 +62,7 @@
+     ogm_reader_c(char *fname, unsigned char *astreams,
+                  unsigned char *vstreams, unsigned char *tstreams,
+                  audio_sync_t *nasync, range_t *nrange, char **ncomments,
+-                 char *nfourcc) throw (error_c);
++                 char *nfourcc);
+     virtual ~ogm_reader_c();
+ 
+     virtual int                   read();
+--- a/r_srt.cpp
++++ b/r_srt.cpp
+@@ -62,7 +62,7 @@
+ }
+ 
+ srt_reader_c::srt_reader_c(char *fname, audio_sync_t *nasync,
+-                           range_t *nrange, char **ncomments) throw (error_c) {
++                           range_t *nrange, char **ncomments) {
+   if ((file = fopen(fname, "r")) == NULL)
+     throw error_c("srt_reader: Could not open source file.");
+   if (!srt_reader_c::probe_file(file, 0))
+--- a/r_srt.h
++++ b/r_srt.h
+@@ -35,7 +35,7 @@
+      
+   public:
+     srt_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+-                 char **ncomments) throw (error_c);
++                 char **ncomments);
+     virtual ~srt_reader_c();
+ 
+     virtual int              read();
+--- a/r_vobsub.cpp
++++ b/r_vobsub.cpp
+@@ -72,7 +72,7 @@
+ 
+ vobsub_reader_c::vobsub_reader_c(char *fname, audio_sync_t *nasync,
+                                  range_t *nrange, char **ncomments)
+-                                 throw (error_c) {
++                                 {
+   char *name;
+   
+   if ((file = fopen(fname, "r")) == NULL)
+--- a/r_vobsub.h
++++ b/r_vobsub.h
+@@ -42,7 +42,7 @@
+      
+   public:
+     vobsub_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+-                    char **ncomments) throw (error_c);
++                    char **ncomments);
+     virtual ~vobsub_reader_c();
+ 
+     virtual int              read();
+--- a/r_wav.cpp
++++ b/r_wav.cpp
+@@ -50,7 +50,7 @@
+ }
+ 
+ wav_reader_c::wav_reader_c(char *fname, audio_sync_t *nasync,
+-                           range_t *nrange, char **ncomments) throw (error_c) {
++                           range_t *nrange, char **ncomments) {
+   uint64_t size;
+   uint32_t samplerate;
+   uint16_t channels, bitdepth;
+--- a/r_wav.h
++++ b/r_wav.h
+@@ -41,7 +41,7 @@
+      
+   public:
+     wav_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange,
+-                 char **ncomments) throw (error_c);
++                 char **ncomments);
+     virtual ~wav_reader_c();
+ 
+     virtual int              read();
diff --git a/media-sound/ogmtools/metadata.xml b/media-sound/ogmtools/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/ogmtools/metadata.xml
+++ b/media-sound/ogmtools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r3.ebuild
index 28fb209d7f3c..818583eb094e 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,10 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="dvd"
 
 RDEPEND="
+	media-libs/libogg
+	media-libs/libvorbis
 	media-sound/vorbis-tools
-	dvd? ( media-libs/libdvdread )"
+	dvd? ( media-libs/libdvdread:= )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -25,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-vorbis_verbosity.patch
 	"${FILESDIR}"/${P}-summary_length.patch
 	"${FILESDIR}"/${P}-fix-autotools.patch
+	"${FILESDIR}"/${P}-gcc11.patch
 )
 
 src_prepare() {
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index c148f1b0bf4c..cfc60458f2f2 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1 +1 @@
-DIST libopenmpt-0.5.4+release.autotools.tar.gz 1470690 BLAKE2B fade97324b350a4c6191b21f6e87cb1f04ac010aaf3c52ce8e66b3382e27e46bfaa99cdd044a7bc8859ea355a5ca82c53844272345439961ef50cf7a5ac1a233 SHA512 2acb5f04bbca84dc01e0aa0e002924e3cd41c0d3516d3f896705c2906d8b2f8646c45d3dca609ffc94972629b887fd63da383e3d0127b2420731de20e4590b5a
+DIST libopenmpt-0.7.7+release.autotools.tar.gz 1660204 BLAKE2B 4b6ee75036c97ac2dce7e66776b36df09847db2c482cb22b052569385c06eb954d1cfae5cb00d415a6b18fd11663b2af43c94361dc9c0c84595c0d530e2bb355 SHA512 88d68bd32e696c01c070abd7156645c2969d389d6fb660f4f45d9e5e16ff9c25c3084d30cef208578080ee8a2da5c6045e5b1d93db7e2c456d42b91daaa02199
diff --git a/media-sound/openmpt123/metadata.xml b/media-sound/openmpt123/metadata.xml
index 334feada06c3..507f30f6fc1c 100644
--- a/media-sound/openmpt123/metadata.xml
+++ b/media-sound/openmpt123/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/media-sound/openmpt123/openmpt123-0.5.4.ebuild b/media-sound/openmpt123/openmpt123-0.7.7.ebuild
index e80baefa2b25..d3819b92551d 100644
--- a/media-sound/openmpt123/openmpt123-0.5.4.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.7.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib
 
@@ -9,15 +9,16 @@ MY_P="libopenmpt-${PV}+release.autotools"
 DESCRIPTION="libopenmpt-based command line player for tracked music files (modules)"
 HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
 SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="flac portaudio pulseaudio sdl sndfile"
 
 RDEPEND="
 	~media-libs/libopenmpt-${PV}
-	flac? ( media-libs/flac )
-	pulseaudio? ( media-sound/pulseaudio )
+	flac? ( media-libs/flac:= )
+	pulseaudio? ( media-libs/libpulse )
 	sdl? ( >=media-libs/libsdl2-2.0.4 )
 	sndfile? ( media-libs/libsndfile )
 "
@@ -25,8 +26,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
 
diff --git a/media-sound/opus-tools/metadata.xml b/media-sound/opus-tools/metadata.xml
index 39626a990be5..cd1cfc033621 100644
--- a/media-sound/opus-tools/metadata.xml
+++ b/media-sound/opus-tools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/opus-tools/opus-tools-0.2.ebuild b/media-sound/opus-tools/opus-tools-0.2-r1.ebuild
index ee26eaf5e0db..4ab2dc22f66e 100644
--- a/media-sound/opus-tools/opus-tools-0.2.ebuild
+++ b/media-sound/opus-tools/opus-tools-0.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools
 
 DESCRIPTION="Royalty-free, highly versatile audio codec"
@@ -18,7 +19,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE="flac"
 
 RDEPEND="
@@ -26,7 +27,7 @@ RDEPEND="
 	>=media-libs/libopusenc-0.2
 	>=media-libs/opus-1.1
 	>=media-libs/opusfile-0.5
-	flac? ( >=media-libs/flac-1.1.3 )
+	flac? ( >=media-libs/flac-1.1.3:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch b/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch
new file mode 100644
index 000000000000..603b6767f250
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch
@@ -0,0 +1,87 @@
+Bug: https://bugs.gentoo.org/897794
+Some replacements for making it possible to be built with clang-16
+Some of the functions (for eample binary_function and bind1st) are removed in C++17
+--- a/kkconsui-0.1/src/texteditor.cc
++++ b/kkconsui-0.1/src/texteditor.cc
+@@ -791,7 +791,8 @@ void texteditor::showline(int ln, int startx, int distance, int extrax) {
+     const char *p;
+ 
+     if(!(cs = (char *) curfile->lines->at(ln))) return;
+-    char cp[i = (strlen(cs)+1)*4];
++	i = (strlen(cs)+1)*4;
++    char cp[i];
+     char buf[i];
+ 
+     eolstart = i;
+--- a/kkstrtext-0.1/kkstrtext.cc
++++ b/kkstrtext-0.1/kkstrtext.cc
+@@ -167,7 +167,7 @@ string toutf8(const string &text) {
+ }
+ 
+ char *unmime(char *text) {
+-    register int s, d;
++    int s, d;
+     int htm;
+ 
+     for(s = 0, d = 0; text[s] != 0; s++) {
+@@ -185,7 +185,7 @@ char *unmime(char *text) {
+ }
+ 
+ char *mime(char *dst, const char *src) {
+-    register int s, d;
++    int s, d;
+     char c;
+ 
+     for(s = 0, d = 0; src[s]; s++) {
+--- a/src/cdtrack.cc
++++ b/src/cdtrack.cc
+@@ -45,8 +45,12 @@ int cdfd = -1, numtracks;
+ string cddbquery, cdid, cdtitle;
+ bool ejected = false;
+ 
+-struct istracknumber: public binary_function<int, const track*, bool> {
+-    public: bool operator()(int n, const track *c) const {
++struct istracknumber {
++    public:
++		using first_argument_type = int;
++		using second_argument_type = const track*;
++		using result_type = bool;
++		bool operator()(int n, const track *c) const {
+ 	const cdtrack *cdt = static_cast<const cdtrack *>(c);
+ 
+ 	if(cdt) {
+@@ -104,7 +108,7 @@ vector<string> cdtrack::getstatus() const {
+ 
+ 	r.push_back("CD: " + cdtitle + "; " + buf);
+ 
+-	it = find_if(plist.begin(), plist.end(), bind1st(istracknumber(), subc.cdsc_trk));
++	it = find_if(plist.begin(), plist.end(), bind(istracknumber(), subc.cdsc_trk, std::placeholders::_1));
+ 
+ 	if(it != plist.end()) {
+ 	    cdtrack *ct = static_cast<cdtrack *>(*it);
+@@ -332,7 +336,7 @@ bool cdtrack::loadtracks(const string &fname) {
+ 
+ 		} else if(param.substr(0, 6) == "TTITLE") {
+ 		    ntrack = strtoul(param.substr(6).c_str(), 0, 0);
+-		    it = find_if(plist.begin(), plist.end(), bind1st(istracknumber(), ntrack+1));
++		    it = find_if(plist.begin(), plist.end(), bind(istracknumber(), ntrack+1, std::placeholders::_1));
+ 
+ 		    if(it != plist.end()) {
+ 			cdtrack *ct = static_cast<cdtrack *>(*it);
+--- a/src/streamtrack.cc
++++ b/src/streamtrack.cc
+@@ -283,8 +283,12 @@ string streamtrack::makerequest(const string &url) {
+     return reply;
+ }
+ 
+-struct equals_url: public binary_function<const char *, const track*, bool> {
+-    public: bool operator()(const char *aurl, const track *c) const {
++struct equals_url {
++    public: 
++		using first_argument_type = const char*;
++		using second_argument_type = const track*;
++		using result_type = bool;
++		bool operator()(const char *aurl, const track *c) const {
+ 	const streamtrack *st = static_cast<const streamtrack *>(c);
+ 
+ 	if(st) {
diff --git a/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch
new file mode 100644
index 000000000000..9665d342b6f2
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/715698
+--- a/src/mp3track.cc
++++ b/src/mp3track.cc
+@@ -33,6 +33,7 @@
+ #include <sys/stat.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdint.h>
+ #include <stdio.h>
+ #include <netinet/in.h>
+ 
+@@ -55,8 +56,8 @@ static int cpid = -1, trackcount = 0;
+ static FILE *fpread, *fpwrite;
+ static char cbuf[65535];
+ 
+-static u_int32_t extract_bitfield(unsigned char *h, int start, int end) {
+-    u_int32_t hdr;
++static uint32_t extract_bitfield(unsigned char *h, int start, int end) {
++    uint32_t hdr;
+     memcpy(&hdr, h, 4);
+     hdr = ntohl(hdr);
+     hdr = hdr << start;
+@@ -237,7 +238,7 @@ void mp3track::readtag() {
+ 	11025, 12000, 8000, 0
+     };
+ 
+-    u_int32_t aux;
++    uint32_t aux;
+     int i, filelen;
+ 
+     if(f.is_open()) {
diff --git a/media-sound/orpheus/metadata.xml b/media-sound/orpheus/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/orpheus/metadata.xml
+++ b/media-sound/orpheus/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r4.ebuild
index cd2786b8a7b5..010af859f45a 100644
--- a/media-sound/orpheus/orpheus-1.6-r3.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,7 +12,6 @@ SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 RDEPEND="sys-libs/ncurses:0=
 	media-libs/libvorbis
@@ -28,6 +27,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-bufsize.patch
 	"${FILESDIR}"/${P}-gcc47.patch
 	"${FILESDIR}"/${P}-constify.patch
+	"${FILESDIR}"/${P}-musl-stdint.patch
+	"${FILESDIR}"/${P}-fix-build-w-clang-16.patch
 )
 
 src_prepare() {
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index bb947b2e9df9..29aed1f0f4c0 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -1,2 +1 @@
-DIST pamix-1.5.tar.gz 16902 BLAKE2B 4f7612cb870f84110b8cc31a061afecb7c2aeb8d073887cde671bbaf8702db83b8cfe4e7b06e9260c6925c4334c1cb46175612f87d4ed625181179f615b6e954 SHA512 51516664c5f5d8d0c70565c5cdd7a91e7d40c83a49d75ca76c38286d937a737da28f9070e9d0185545d8e74999894e3afa9f1d2f8c22658f83af5c1c161f7938
 DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
diff --git a/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch b/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch
new file mode 100644
index 000000000000..61c34f0a4202
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch
@@ -0,0 +1,23 @@
+From 1e45f226ef35b649cb2889e23ad90ad39d0db947 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sat, 14 Mar 2020 03:11:58 +0100
+Subject: [PATCH] Use 25ms as escdelay
+
+By default ncurses will use 1000ms, which will cause freezing.
+Fixes #44
+---
+ src/pamix.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pamix.cpp b/src/pamix.cpp
+index d5f7ead..368639d 100644
+--- a/src/pamix.cpp
++++ b/src/pamix.cpp
+@@ -206,6 +206,7 @@ int main(int argc, char **argv) {
+ 	initscr();
+ 	init_colors();
+ 	nodelay(stdscr, true);
++  set_escdelay(25);
+ 	curs_set(0);
+ 	keypad(stdscr, true);
+ 	meta(stdscr, true);
diff --git a/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch b/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch
new file mode 100644
index 000000000000..6e4b94d05669
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch
@@ -0,0 +1,23 @@
+From c15831c99bbef1a25710e5a34208809dc9160e86 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sun, 1 Dec 2019 16:23:12 +0100
+Subject: [PATCH] fix bug preventing entries from being scrolled.
+
+resolves #41
+---
+ src/pamix_ui.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pamix_ui.cpp b/src/pamix_ui.cpp
+index 16a2e34..c1acb2b 100644
+--- a/src/pamix_ui.cpp
++++ b/src/pamix_ui.cpp
+@@ -265,7 +265,7 @@ pamix_entry_iter_t pamix_ui::getSelectedEntryIterator() {
+ }
+ 
+ void pamix_ui::adjustDisplayedEntries() {
+-	if (!m_Entries->empty())
++	if (m_Entries->empty())
+ 		return;
+ 	if (m_SelectedEntry >= m_NumSkippedEntries && m_SelectedEntry < m_NumSkippedEntries + m_NumDrawnEntries)
+ 		return;
diff --git a/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch b/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch
new file mode 100644
index 000000000000..7de00460316d
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch
@@ -0,0 +1,45 @@
+From 72d8189b942f6e95d8c946fea2faaee9a74f4b35 Mon Sep 17 00:00:00 2001
+From: nilninull <nilninull@gmail.com>
+Date: Wed, 3 Jan 2018 16:32:27 +0900
+Subject: [PATCH] FIX: default XDG_CONFIG_DIRS directory
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38605f2..7677e43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ ELSE ()
+ ENDIF ()
+ 
+ add_executable(pamix ${pamix_SRC})
+-install(FILES pamix.conf DESTINATION /etc)
++install(FILES pamix.conf DESTINATION /etc/xdg)
+ install(TARGETS pamix DESTINATION bin)
+ install(FILES man/pamix.1 DESTINATION share/man/man1)
+ 
+From e3bf53d9a841c3559880863c8c29c2919ab5b425 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sat, 6 Jan 2018 07:05:23 +0100
+Subject: [PATCH] change default XDG_CONFIG_DIRS value when searching config
+ file
+
+---
+ src/pamix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pamix.cpp b/src/pamix.cpp
+index 3ea2730..d5f7ead 100644
+--- a/src/pamix.cpp
++++ b/src/pamix.cpp
+@@ -130,7 +130,7 @@ void loadConfiguration() {
+ 
+ 	char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
+ 
+-	path = xdg_config_dirs ? xdg_config_dirs : "/etc";
++	path = xdg_config_dirs ? xdg_config_dirs : "/etc/xdg";
+ 	path += "/pamix.conf";
+ 	size_t cpos = path.find(':');
+ 	while (cpos != std::string::npos) {
diff --git a/media-sound/pamix/metadata.xml b/media-sound/pamix/metadata.xml
index 88f381f7a09d..b62d7c2c323f 100644
--- a/media-sound/pamix/metadata.xml
+++ b/media-sound/pamix/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">patroclos/PAmix</remote-id>
   </upstream>
diff --git a/media-sound/pamix/pamix-1.5.ebuild b/media-sound/pamix/pamix-1.5.ebuild
deleted file mode 100644
index 261d33492f6d..000000000000
--- a/media-sound/pamix/pamix-1.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit autotools ${SCM}
-unset SCM
-
-DESCRIPTION="A PulseAudio NCurses mixer"
-HOMEPAGE="https://github.com/patroclos/PAmix"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+unicode"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-else
-	SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/PAmix-${PV}"
-fi
-
-RDEPEND="media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]"
-DEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable unicode)
-}
diff --git a/media-sound/pamix/pamix-1.6-r3.ebuild b/media-sound/pamix/pamix-1.6-r3.ebuild
new file mode 100644
index 000000000000..72606c883207
--- /dev/null
+++ b/media-sound/pamix/pamix-1.6-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	S="${WORKDIR}/PAmix-${PV}"
+fi
+
+DESCRIPTION="PulseAudio NCurses mixer"
+HOMEPAGE="https://github.com/patroclos/PAmix"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+unicode"
+
+RDEPEND="
+	media-libs/libpulse
+	sys-libs/ncurses:=[unicode(+)?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ncurses_pkgconfig.patch"
+	"${FILESDIR}/${P}-xdgconfigdir.patch"
+	"${FILESDIR}/${P}-fix-output-scrolling.patch"
+	"${FILESDIR}/${P}-fix-ncurses-freezing.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	if [[ ${PV} != 9999 ]] ; then
+		sed -e "/^include(CMakeGitDefines.cmake)/d" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_UNICODE="$(usex unicode)"
+	)
+	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_VERSION=${PV} )
+	cmake_src_configure
+}
diff --git a/media-sound/pamix/pamix-1.6.ebuild b/media-sound/pamix/pamix-1.6.ebuild
deleted file mode 100644
index f77264e2b207..000000000000
--- a/media-sound/pamix/pamix-1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit cmake-utils ${SCM}
-unset SCM
-
-DESCRIPTION="A PulseAudio NCurses mixer"
-HOMEPAGE="https://github.com/patroclos/PAmix"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+unicode"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-else
-	SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/PAmix-${PV}"
-fi
-
-RDEPEND="media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]"
-DEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ncurses_pkgconfig.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_UNICODE="$(usex unicode)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index 1e8fad344924..e1631975ab6e 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -1,38 +1,44 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
 	inherit git-r3
+else
+	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/PAmix-${PV}"
 fi
 
-DESCRIPTION="A PulseAudio NCurses mixer"
+DESCRIPTION="PulseAudio NCurses mixer"
 HOMEPAGE="https://github.com/patroclos/PAmix"
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="+unicode"
 
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-else
-	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/PAmix-${PV}"
-fi
-
-RDEPEND="media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
+RDEPEND="
+	media-libs/libpulse
+	sys-libs/ncurses:=[unicode(+)?]
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	cmake_src_prepare
+	if [[ ${PV} != 9999 ]] ; then
+		sed -e "/^include(CMakeGitDefines.cmake)/d" -i CMakeLists.txt || die
+	fi
+}
 
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_UNICODE="$(usex unicode)"
 	)
+	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_VERSION=${PV} )
 	cmake_src_configure
 }
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index eccaf6aae1dc..8f541ccabdac 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1 +1 @@
-DIST paprefs-1.1.tar.xz 69144 BLAKE2B 9809bb73156be1e4020679637c1203524a0ccc5f5e1fb3696724925bb196cd397e433c22e993e7353cfaadd38260980676af6ace2cac795c0b615298d1d85805 SHA512 4203fcb485b40223a5c8672fdbbd2875a25d05d85366773015728f54a17020098ee9e9fd1c02180c01799e100b99389c970855fc1bd69921d32d8e43c749ce76
+DIST paprefs-1.2.tar.xz 74820 BLAKE2B 5b4e3b2e4e0e940a7685dbff287cf42951931da1aad6f011a72115a8393bae11f6e80dc09a3e5724afaaac0e6580dcc7a37a9b9b4ab6fc6a53f29647d9980a4d SHA512 2bc50116528c150060711899c66976179e433f6be36f6b7806f0fd3f66346ce14037875e7f119dc205d2047c3998d78105fa7d7c397dfcf02fb8d3bfec34154c
diff --git a/media-sound/paprefs/metadata.xml b/media-sound/paprefs/metadata.xml
index c870d0eef0ab..6ccd47b263d4 100644
--- a/media-sound/paprefs/metadata.xml
+++ b/media-sound/paprefs/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">pulseaudio/paprefs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/paprefs/paprefs-1.1.ebuild b/media-sound/paprefs/paprefs-1.2-r3.ebuild
index 7c72a37b0939..b6b63e2495f1 100644
--- a/media-sound/paprefs/paprefs-1.1.ebuild
+++ b/media-sound/paprefs/paprefs-1.2-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit flag-o-matic meson xdg-utils
+EAPI=8
+inherit flag-o-matic meson xdg
 
 DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
 HOMEPAGE="https://freedesktop.org/software/pulseaudio/paprefs"
@@ -11,14 +11,13 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
 
-RDEPEND="dev-cpp/atkmm
+RDEPEND="dev-cpp/atkmm:0
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
-	>=dev-libs/libsigc++-2.2:2
-	>=media-sound/pulseaudio-12.0-r1[glib]
+	dev-libs/libsigc++:2
+	|| ( media-sound/pulseaudio-daemon[glib] media-video/pipewire[gsettings(-)] )
 	x11-libs/gtk+:3
 	|| (
 		x11-themes/tango-icon-theme
@@ -32,16 +31,9 @@ BDEPEND="
 
 src_configure() {
 	append-cxxflags -std=c++11 #568590
-	local mymesonargs=(
+
+	local emesonargs=(
 		-Dlynx=false
 	)
 	meson_src_configure
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index a3b0c5299e2e..0c50cc40d7c0 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,3 +1,2 @@
-DIST pasystray-0.6.0.tar.gz 53835 BLAKE2B ef5abab45a17f6445e8cbd1e37c300aa2c1c25bee3d684d05263b02a507badb1d5ce7a1c76bed94d255e4f2d5e2f18bdfd749e83e98273a52d42ffb12a32f115 SHA512 51fdb5aab22ad10ffe73f6de68115ee1559f09f58cfe4d5201a2f262323ca3476a8b09c7fc02c4144414f44444661edd25d2d39b3de54ed4c662660867da622c
-DIST pasystray-0.7.0.tar.gz 56014 BLAKE2B cba947895fc71a18a43c314486ec3513e844b1df426d0104f321c8ecd28199b6b4adf69f5c10146470a74c5e6f74f505833bd00c4541399a162ddcfb8aac4701 SHA512 a98dae85640c0640f921173cf5a794963e974af64a7a972bbc2a53e69060895b55494934bc1fcfd957f0c94ca90e4d52634bf444e841b2a0a57434e05500161b
-DIST pasystray-0.7.1.tar.gz 56041 BLAKE2B 5f7cae7a55580bf3dfe294e95bbda372c3a679bec000d222964b4027ced2462dfb4a8446d0683f8910e96ab98e1541b3fa9fafc36da530c92d2285f00a1beb65 SHA512 2af5176e6a5bf6d74baf0a0b52b731b7a3b54f787c4e89d945357aab4e186a35e0f77288d69d66743bf4e21f758e0d961cc1f9b339ce513eb4eb2bcab0d754bb
+DIST pasystray-0.8.1.tar.gz 59383 BLAKE2B 0d110b7625537d71b12a3ce9d89a32857fc66071bfabdfcc6409900ca13b92c1e2cfe9f7c27a33ae5ea3a89fe10d4c222f3bf60fcb498f07498a2a5497d9b51b SHA512 a9924b5b17833df4862f7c2bec5b518a3d8b6f2f80fe494c38a0cc07965095fb3155fc2181eb071f9acaf4629d81a908f2f622107c31346502293bfd4fa291a8
+DIST pasystray-0.8.2.tar.gz 59654 BLAKE2B eedf92d13181eef15b6a416c6cf9c478df91766c81e4d19430a2f37305966999f6f21150a2ee40e3b5d783180a0f9ae152bbc1c8a22056d5ceb0763a3da017f0 SHA512 a4c2c257678c161ed2daf53249bc4acf50002cd8485ce031fe98d20540ec684011651fc0e5e66cd925131629630371a834660b0da69c53dbd14521ed268d13ef
diff --git a/media-sound/pasystray/files/fix-missing-gint.patch b/media-sound/pasystray/files/fix-missing-gint.patch
deleted file mode 100644
index 7eeded9284f1..000000000000
--- a/media-sound/pasystray/files/fix-missing-gint.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/notify.c b/src/notify.c
-index adec0ca..8b54808 100644
---- a/src/notify.c
-+++ b/src/notify.c
-@@ -23,11 +23,13 @@
- 
- #ifndef HAVE_NOTIFY
- 
-+#include <glib.h>
-+
- #include "notify.h"
- 
- void notify_initialize(){}
--notify_handle_t notify(const char* msg, const char* body, const char* icon){ return 0; }
--void notify_update(notify_handle_t h, const char* msg, const char* body, const char* icon){}
-+notify_handle_t notify(const char* msg, const char* body, const char* icon, gint value){ return 0; }
-+void notify_update(notify_handle_t h, const char* msg, const char* body, const char* icon, gint value){}
- 
- #else
- 
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index 0fc6cc1825ed..b0e1619517a8 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lmiphay@gmail.com</email>
 		<name>Paul Healy</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/pasystray/pasystray-0.6.0-r2.ebuild b/media-sound/pasystray/pasystray-0.6.0-r2.ebuild
deleted file mode 100644
index d4c1899f2812..000000000000
--- a/media-sound/pasystray/pasystray-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils autotools vcs-snapshot xdg
-
-DESCRIPTION="PulseAudio system tray"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libnotify zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.2
-	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
-	zeroconf? ( >=net-dns/avahi-0.6 )
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/fix-missing-gint.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notify) \
-		$(use_enable zeroconf avahi)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pasystray/pasystray-0.7.0.ebuild b/media-sound/pasystray/pasystray-0.7.0.ebuild
deleted file mode 100644
index 2a40a2718dc9..000000000000
--- a/media-sound/pasystray/pasystray-0.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils autotools xdg
-
-DESCRIPTION="PulseAudio system tray"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libnotify zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.2
-	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	zeroconf? ( >=net-dns/avahi-0.6 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notify) \
-		$(use_enable zeroconf avahi)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pasystray/pasystray-0.7.1.ebuild b/media-sound/pasystray/pasystray-0.7.1.ebuild
deleted file mode 100644
index b9732e0f3ecd..000000000000
--- a/media-sound/pasystray/pasystray-0.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils autotools xdg
-
-DESCRIPTION="PulseAudio system tray"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="libnotify zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.2
-	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	zeroconf? ( >=net-dns/avahi-0.6 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notify) \
-		$(use_enable zeroconf avahi)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pasystray/pasystray-0.8.1.ebuild b/media-sound/pasystray/pasystray-0.8.1.ebuild
new file mode 100644
index 000000000000..4c38b5b213e6
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.8.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+IUSE="libnotify zeroconf"
+
+RDEPEND="
+	dev-libs/glib
+	|| (
+		media-libs/libpulse[glib]
+		media-sound/pulseaudio-daemon[glib,zeroconf?]
+	)
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	zeroconf? ( net-dns/avahi )
+	libnotify? ( x11-libs/libnotify )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notify) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/media-sound/pasystray/pasystray-0.8.2.ebuild b/media-sound/pasystray/pasystray-0.8.2.ebuild
new file mode 100644
index 000000000000..a65f9c6aac73
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.8.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libnotify zeroconf"
+
+RDEPEND="
+	dev-libs/glib
+	|| (
+		media-libs/libpulse[glib]
+		media-sound/pulseaudio-daemon[glib,zeroconf?]
+	)
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	zeroconf? ( net-dns/avahi )
+	libnotify? ( x11-libs/libnotify )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notify) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index 36496ca31be7..29743404e30c 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,2 +1 @@
-DIST patchage-1.0.2.tar.bz2 586298 BLAKE2B db52e267dc6ecc246ca5a30d88976c426b607c47c10cf041fe3bb0ab2d6b22d7b3c55a704be0d2fb6b87b3d23d26f15dd49b3d151d3d1dc084f290f4e7ccb01d SHA512 8d59bf4a71c2b41a1c9d8f72da30046568573c6cedaca69815b279fd1c24d44267da6846e219449d47f43157663abc331ef89f241d94dd16e666e06da9f81e12
-DIST patchage-1.0.4.tar.bz2 661824 BLAKE2B 3e56b7513e19e0acb1ef524ba7d7754699abdb6a968547f7a545c8651f23a33c209b9728dae01d839022ec380185a1673ff58733c1553007a6a3b7c889aa7f03 SHA512 665d81ca16c1052f71c3037d2ad8f9a6120b09a323999468484dda1b4c4b567c36728ebe38c54152406b63a4107f04764d0dede52302bc7a7b124e82132749fb
+DIST patchage-1.0.10.tar.xz 341164 BLAKE2B db7e17acc483b1fec27c80a3bedf3b546d303d8ce4f90f7f7669a4e4e1dcb526881d949d91edfdd6283dff3d9382c4c3534972065e2769a43e9e4b982b0dfbec SHA512 c6c43afc50978db02517282c1e8c7aad131e30f6255e79e65ea17edcee0b470ec3172da2c057abe4cf4bb12a081a92165ac322cfc4ec77382bb992e74827831b
diff --git a/media-sound/patchage/files/patchage-1.0.2-string.patch b/media-sound/patchage/files/patchage-1.0.2-string.patch
deleted file mode 100644
index fe63be714d8a..000000000000
--- a/media-sound/patchage/files/patchage-1.0.2-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Patchage.cpp
-+++ b/src/Patchage.cpp
-@@ -743,7 +743,7 @@
- 	for (int c = 0; cmd[c].uuid; ++c) {
- 		std::string  command = cmd[c].command;
- 		const size_t index   = command.find(var);
--		if (index != string::npos) {
-+		if (index != std::string::npos) {
- 			command.replace(index, var.length(), cmd[c].client_name);
- 		}
- 
diff --git a/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch b/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch
deleted file mode 100644
index aace519e630d..000000000000
--- a/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
-index 23c12f2..f49a522 100644
---- a/src/JackDbusDriver.cpp
-+++ b/src/JackDbusDriver.cpp
-@@ -24,6 +24,7 @@
- #include "SignalDirection.hpp"
- #include "make_jack_driver.hpp"
- #include "warnings.hpp"
-+#include "AudioDriver.hpp"
- 
- PATCHAGE_DISABLE_FMT_WARNINGS
- #include <fmt/core.h>
-@@ -61,7 +62,7 @@ namespace {
- class JackDriver : public AudioDriver
- {
- public:
--  explicit JackDriver(ILog& log, EventSink emit_event);
-+  explicit JackDriver(ILog& log, Driver::EventSink emit_event);
- 
-   JackDriver(const JackDriver&) = delete;
-   JackDriver& operator=(const JackDriver&) = delete;
-@@ -75,7 +76,7 @@ public:
-   void attach(bool launch_daemon) override;
-   void detach() override;
-   bool is_attached() const override;
--  void refresh(const EventSink& sink) override;
-+  void refresh(const Driver::EventSink& sink) override;
-   bool connect(const PortID& tail_id, const PortID& head_id) override;
-   bool disconnect(const PortID& tail_id, const PortID& head_id) override;
- 
-@@ -129,7 +130,7 @@ private:
-   dbus_uint64_t _graph_version;
- };
- 
--JackDriver::JackDriver(ILog& log, EventSink emit_event)
-+JackDriver::JackDriver(ILog& log, Driver::EventSink emit_event)
-   : AudioDriver{std::move(emit_event)}
-   , _log(log)
-   , _dbus_error()
-@@ -584,7 +585,7 @@ JackDriver::is_attached() const
- }
- 
- void
--JackDriver::refresh(const EventSink& sink)
-+JackDriver::refresh(const Driver::EventSink& sink)
- {
-   DBusMessage*    reply_ptr              = nullptr;
-   DBusMessageIter iter                   = {};
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index da07c271dfdc..4bae645001ae 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!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="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
-    <flag name="session">Include experimental Jack session management
-      (save/restore) support</flag>
-  </use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">drobilla/patchage</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/patchage/patchage-1.0.10.ebuild b/media-sound/patchage/patchage-1.0.10.ebuild
new file mode 100644
index 000000000000..45bf464c1982
--- /dev/null
+++ b/media-sound/patchage/patchage-1.0.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
+HOMEPAGE="https://drobilla.net/software/patchage"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/drobilla/patchage.git"
+else
+	SRC_URI="https://download.drobilla.net/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa jack jack-dbus test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	media-libs/ganv
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	jack-dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-libs/libfmt-9:="
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature alsa)
+		$(meson_feature jack)
+		$(meson_feature jack-dbus jack_dbus)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/patchage/patchage-1.0.2.ebuild b/media-sound/patchage/patchage-1.0.2.ebuild
deleted file mode 100644
index b5955f1048d3..000000000000
--- a/media-sound/patchage/patchage-1.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='threads(+)'
-inherit waf-utils python-any-r1 xdg
-
-DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
-HOMEPAGE="http://drobilla.net/software/patchage"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack-dbus session"
-
-RDEPEND=">=dev-cpp/glibmm-2.14:2
-	>=dev-cpp/gtkmm-2.11.12:2.4
-	>=dev-cpp/libglademm-2.6.0:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	>=media-libs/ganv-1.5.2
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	jack-dbus? ( dev-libs/dbus-glib
-		sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/boost
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-string.patch"
-)
-
-src_configure() {
-	waf-utils_src_configure \
-		$(use debug && echo "--debug") \
-		$(use alsa || echo "--no-alsa") \
-		$(use jack-dbus && echo "--jack-dbus") \
-		$(use session && echo "--jack-session-manage")
-}
diff --git a/media-sound/patchage/patchage-1.0.4.ebuild b/media-sound/patchage/patchage-1.0.4.ebuild
deleted file mode 100644
index 07b1e83730b7..000000000000
--- a/media-sound/patchage/patchage-1.0.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit waf-utils python-any-r1 xdg
-
-DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
-HOMEPAGE="http://drobilla.net/software/patchage"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack-dbus"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost
-	virtual/pkgconfig
-"
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libglademm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	media-libs/ganv
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	jack-dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-compilation.patch"
-)
-
-src_configure() {
-	waf-utils_src_configure \
-		$(use debug && echo "--debug") \
-		$(use alsa || echo "--no-alsa") \
-		$(use jack-dbus && echo "--jack-dbus")
-}
diff --git a/media-sound/patchage/patchage-9999.ebuild b/media-sound/patchage/patchage-9999.ebuild
new file mode 100644
index 000000000000..e449d00c7bf0
--- /dev/null
+++ b/media-sound/patchage/patchage-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
+HOMEPAGE="https://drobilla.net/software/patchage"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/drobilla/patchage.git"
+else
+	SRC_URI="https://download.drobilla.net/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa jack jack-dbus test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	media-libs/ganv
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	jack-dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-libs/libfmt-9:="
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature alsa)
+		$(meson_feature jack)
+		$(meson_feature jack-dbus jack_dbus)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 505611030c55..5218e736397d 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,2 +1,2 @@
-DIST pavucontrol-qt-0.15.0.tar.xz 97480 BLAKE2B 183c3cbbe87b6867bb116041d41dd29f5ba72156e9078a4f09e5ffcbd3e123f6511cb06c99ce3cc8ce243a0551b132438bad7b14ae759cc775974c2ad3388bf3 SHA512 c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600
-DIST pavucontrol-qt-0.16.0.tar.xz 99952 BLAKE2B 926e248f61b1652af04f772c09bc000d0f368ba6449cade308275473e970068a58ca25cccea5e4bea289424b507e3d24f30d54d76c13096e0e8047c5ea996950 SHA512 781122b57321cf1e3eff2210e7cb949c819d0148050897d3a9673e846c28fae7a926b4d840c603dac9dace8126bfc49179a737101f4d5b6ad4fe5946d82bd0d5
+DIST pavucontrol-qt-1.3.0.tar.xz 107612 BLAKE2B 1b3453d3622247adfbc69cc76cc267567bd7d6d8779a7b46b116d204cd29852acf06359f5a258e3d964bc4564ce8b490a527ae61fa6357793410887ac3616403 SHA512 64f954b103b6ffbb97a81a23489799a1fff71810f15f755b92e814a03d8bbe6351ba2a1c8179d60777cbbe60e5ee40cf0e04167cf1467a5b27c9b02142f7cb8c
+DIST pavucontrol-qt-1.4.0.tar.xz 111712 BLAKE2B c3329a621dda082c63e7ba9d289476932170b6bb569e7b508d9158bbe31f20933a70047eb69e69d768ff48ea5ed27a8ddfdcae2c4bedee6b0b73484488f1d2f6 SHA512 cfa878bddd0b0299319c31a4e97aa8b6dc799f040fedf5ca0210d8eeb526f59258aab57ae050987633826c7a94fbbd0e1a1b1fc184fc8693541c799b6118a157
diff --git a/media-sound/pavucontrol-qt/metadata.xml b/media-sound/pavucontrol-qt/metadata.xml
index 7df4f7a839d1..d141d5eb545b 100644
--- a/media-sound/pavucontrol-qt/metadata.xml
+++ b/media-sound/pavucontrol-qt/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>lxqt@gentoo.org</email>
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-1.3.0-r1.ebuild
index 5b1a8c77bf4b..72e257cc7d5d 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-1.3.0-r1.ebuild
@@ -1,36 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Qt GUI Pulseaudio Mixer"
-HOMEPAGE="https://lxqt.github.io/"
+HOMEPAGE="https://lxqt-project.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
+	>=dev-qt/linguist-tools-5.15:5
+	>=dev-util/lxqt-build-tools-0.13.0
 	virtual/pkgconfig
 "
 DEPEND="
 	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	media-sound/pulseaudio[glib]
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	media-libs/libpulse[glib]
 "
+RDEPEND="${DEPEND}"
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-1.4.0.ebuild
index 70f14e9e590c..6a15ab9e24ae 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-1.4.0.ebuild
@@ -1,36 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Qt GUI Pulseaudio Mixer"
-HOMEPAGE="https://lxqt.github.io/"
+HOMEPAGE="https://lxqt-project.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.7.0
+	>=dev-qt/linguist-tools-5.15:5
+	>=dev-util/lxqt-build-tools-0.13.0
 	virtual/pkgconfig
 "
 DEPEND="
 	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	media-sound/pulseaudio[glib]
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	media-libs/libpulse[glib]
 "
+RDEPEND="${DEPEND}"
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index c1e9e38d5383..33ea38be36bb 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1 +1 @@
-DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
+DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
diff --git a/media-sound/pavucontrol/files/pavucontrol-5.0-make-libcanberra-optional.patch b/media-sound/pavucontrol/files/pavucontrol-5.0-make-libcanberra-optional.patch
new file mode 100644
index 000000000000..595cf9f8d0bd
--- /dev/null
+++ b/media-sound/pavucontrol/files/pavucontrol-5.0-make-libcanberra-optional.patch
@@ -0,0 +1,125 @@
+From 8916cb62b0facf45ccb220fd2efd5746fdaf79b8 Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu <adrian.ratiu@collabora.com>
+Date: Mon, 25 Mar 2024 02:19:42 +0200
+Subject: [PATCH] Make libcanberra optional
+
+libcanberra is an old abandoned project whose last release
+was well over a decade ago, despite getting some few fixes
+on its master branch since then, which are unreleased.
+
+My problem with libcanberra is that it can't be built on
+pure wayland systems (no X11 headers) which are becoming
+more common nowadays.
+
+It is the only thing keeping pavucontrol tied to X11, all
+other dependencies (eg gtk+) build fine on pure wayland.
+Since canberra is not a core part of the project, let's
+make it optional so pavucontrol can build & work on
+pure wayland systems.
+
+Ideally in the future libcanberra can be replaced with
+something else, however I don't have the bandwidth to
+take this on for now, so I'm just making it optional.
+
+Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
+---
+ configure.ac           | 9 ++++++++-
+ src/pavuapplication.cc | 2 --
+ src/pavucontrol.cc     | 4 ++++
+ src/sinkwidget.cc      | 5 +++++
+ 4 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 056ba5e..1b793b8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,10 +41,17 @@ AC_TYPE_SIGNAL
+ AC_HEADER_STDC
+ AX_CXX_COMPILE_STDCXX_11
+ 
+-PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.22 sigc++-2.0 libcanberra-gtk3 >= 0.16 json-glib-1.0 ])
++PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.22 sigc++-2.0 json-glib-1.0 ])
+ AC_SUBST(GUILIBS_CFLAGS)
+ AC_SUBST(GUILIBS_LIBS)
+ 
++AC_CHECK_LIB([canberra-gtk3], [canberra_gtk_play], [HAVE_LIBCANBERRA=yes], [HAVE_LIBCANBERRA=no])
++AS_IF([test "x$HAVE_LIBCANBERRA" = "xyes"], [
++    AC_DEFINE([HAVE_LIBCANBERRA], [1], [Have libcanberra support.])
++    AC_SUBST(LIBCANBERRA_CFLAGS)
++    AC_SUBST(LIBCANBERRA_LIBS)
++])
++
+ if test -d ../pulseaudio ; then
+    PULSE_CFLAGS='-I$(top_srcdir)/../pulseaudio/src'
+    PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse -lpulse-mainloop-glib'
+diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc
+index 6773b53..60c016c 100644
+--- a/src/pavuapplication.cc
++++ b/src/pavuapplication.cc
+@@ -24,8 +24,6 @@
+ 
+ #include "i18n.h"
+ 
+-#include <canberra-gtk.h>
+-
+ #include "pavuapplication.h"
+ #include "pavucontrol.h"
+ #include "mainwindow.h"
+diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
+index 18d5400..ff652be 100644
+--- a/src/pavucontrol.cc
++++ b/src/pavucontrol.cc
+@@ -29,7 +29,9 @@
+ #include <json-glib/json-glib.h>
+ #endif
+ 
++#ifdef HAVE_LIBCANBERRA
+ #include <canberra-gtk.h>
++#endif
+ 
+ #include "pavucontrol.h"
+ #include "i18n.h"
+@@ -916,7 +918,9 @@ MainWindow* pavucontrol_get_window(pa_glib_mainloop *m, bool maximize, bool _ret
+     tab_number = _tab_number;
+     retry = _retry;
+ 
++#ifdef HAVE_LIBCANBERRA
+     ca_context_set_driver(ca_gtk_context_get(), "pulse");
++#endif
+ 
+     mainWindow = MainWindow::create(maximize);
+ 
+diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc
+index f30bd37..41d7bb8 100644
+--- a/src/sinkwidget.cc
++++ b/src/sinkwidget.cc
+@@ -24,7 +24,10 @@
+ 
+ #include "sinkwidget.h"
+ 
++#ifdef HAVE_LIBCANBERRA
+ #include <canberra-gtk.h>
++#endif
++
+ #if HAVE_EXT_DEVICE_RESTORE_API
+ #  include <pulse/format.h>
+ #  include <pulse/ext-device-restore.h>
+@@ -120,6 +123,7 @@ void SinkWidget::executeVolumeUpdate() {
+ 
+     pa_operation_unref(o);
+ 
++#ifdef HAVE_LIBCANBERRA
+     ca_context_playing(ca_gtk_context_get(), 2, &playing);
+     if (playing)
+         return;
+@@ -136,6 +140,7 @@ void SinkWidget::executeVolumeUpdate() {
+                            NULL);
+ 
+     ca_context_change_device(ca_gtk_context_get(), NULL);
++#endif
+ }
+ 
+ void SinkWidget::onMuteToggleButton() {
+-- 
+2.43.2
+
diff --git a/media-sound/pavucontrol/metadata.xml b/media-sound/pavucontrol/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/pavucontrol/metadata.xml
+++ b/media-sound/pavucontrol/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
index 3a675042aecb..c6228d9e9b8d 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
 
 DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
 HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
@@ -10,14 +9,15 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
-	>=dev-cpp/gtkmm-3.0:3.0[X]
+	dev-libs/json-glib
+	>=dev-cpp/gtkmm-3.22:3.0[X]
 	>=dev-libs/libsigc++-2.2:2
 	>=media-libs/libcanberra-0.16[gtk3]
-	>=media-sound/pulseaudio-5[glib]
+	>=media-libs/libpulse-15.0[glib]
 	virtual/freedesktop-icon-theme
 "
 DEPEND="${RDEPEND}"
@@ -30,7 +30,6 @@ BDEPEND="
 "
 
 src_configure() {
-	append-cxxflags -std=c++11 #567216
 	local myeconfargs=(
 		--disable-lynx
 		$(use_enable nls)
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r3.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r3.ebuild
new file mode 100644
index 000000000000..d55e6e0bea80
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE="nls X"
+
+inherit autotools
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0-make-libcanberra-optional.patch"
+)
+
+RDEPEND="
+	dev-libs/json-glib
+	X? (
+		>=dev-cpp/gtkmm-3.22:3.0[X]
+		>=media-libs/libcanberra-0.16[gtk3]
+	)
+	!X? ( >=dev-cpp/gtkmm-3.22:3.0 )
+	>=dev-libs/libsigc++-2.2:2
+	>=media-libs/libpulse-15.0[glib]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-lynx
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-sound/pavumeter/metadata.xml b/media-sound/pavumeter/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/pavumeter/metadata.xml
+++ b/media-sound/pavumeter/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild b/media-sound/pavumeter/pavumeter-0.9.3-r2.ebuild
index 891fe6fc3489..fb32d14b9464 100644
--- a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
+++ b/media-sound/pavumeter/pavumeter-0.9.3-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="PulseAudio Volume Meter, simple GTK volume meter for PulseAudio"
-HOMEPAGE="http://0pointer.de/lennart/projects/pavumeter/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+HOMEPAGE="https://0pointer.de/lennart/projects/pavumeter/"
+SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~sparc x86"
 RDEPEND="
 	dev-cpp/gtkmm:2.4
 	dev-libs/libsigc++:2
-	>=media-sound/pulseaudio-0.9.7[glib]
+	media-libs/libpulse[glib]
 	x11-themes/tango-icon-theme"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/peercast/metadata.xml b/media-sound/peercast/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/peercast/metadata.xml
+++ b/media-sound/peercast/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index fcbb4c5410f4..b84bd0dfd84a 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1 +1 @@
-DIST pianobar-2020.04.05.tar.bz2 48823 BLAKE2B 91e9b96f0a635995ab08bd189b7b6b353f553b6c6cd405be2e95f9c0401b075158df4aa28633854747eced4ac60777724dd265dae62744c773d5f4b4c12aa90e SHA512 40d717693f128da3718c0e1be9c90c269712becf9ac2ffe0669a91ea9417d0fdb0476949df29c1da908e2d78678f26955149dbb8c5a0167161f95835ce76084e
+DIST pianobar-2022.04.01.tar.bz2 52262 BLAKE2B d6f28a893ad94aed2cb7cda55a2b00480bb1319e01561974d75a10559c5ccda45fa6fe216d0b1d130c33d6eb2d7b395a95942a8a62eec0c21912f208799cc8f3 SHA512 9ad60c0048b375d74ad2bab289d75deec6dba46c31bfc1799dabf18661ec0cdef494df72273e6c16989ead21dc034445595a3e2ace43f6b6ca61446449895aef
diff --git a/media-sound/pianobar/metadata.xml b/media-sound/pianobar/metadata.xml
index ee7258ac28eb..fcf0dd5274ae 100644
--- a/media-sound/pianobar/metadata.xml
+++ b/media-sound/pianobar/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">PromyLOPh/pianobar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/pianobar/pianobar-2020.04.05.ebuild b/media-sound/pianobar/pianobar-2022.04.01.ebuild
index 7385bc04331c..0e9b523e9e08 100644
--- a/media-sound/pianobar/pianobar-2020.04.05.ebuild
+++ b/media-sound/pianobar/pianobar-2022.04.01.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs flag-o-matic
 
@@ -18,17 +18,16 @@ HOMEPAGE="https://6xq.net/pianobar/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
-BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/json-c:=
-	dev-libs/libgcrypt:0=
+	dev-libs/libgcrypt:=
 	media-libs/libao
-	>=media-video/ffmpeg-3.3:0=
+	>=media-video/ffmpeg-3.3:=
 	net-misc/curl
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
 	append-cflags -std=c99
@@ -38,7 +37,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
-	dodoc ChangeLog README.md
+	dodoc ChangeLog README.rst
 
 	rm "${D}"/usr/lib*/*.a || die
 
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index a13e7069ac50..2ad410129b22 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs flag-o-matic
 
@@ -18,17 +18,16 @@ HOMEPAGE="https://6xq.net/pianobar/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
-BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/json-c:=
-	dev-libs/libgcrypt:0=
+	dev-libs/libgcrypt:=
 	media-libs/libao
-	>=media-video/ffmpeg-3.3:0=
+	>=media-video/ffmpeg-3.3:=
 	net-misc/curl
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
 	append-cflags -std=c99
@@ -38,7 +37,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
-	dodoc ChangeLog README.md
+	dodoc ChangeLog README.rst
 
 	rm "${D}"/usr/lib*/*.a || die
 
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 38be1fcb13df..454d6b15b3a8 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1 +1 @@
-DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
+DIST picard-2.11.tar.gz 5829423 BLAKE2B 1f5b675a3668b7545bbb5966e3d81bec09912acbe5ae7270b92eb25accf4bbd1cc67a2a183c6d1fa0300bb0adea5dbdcdc0998d2c44f60d2dbac941ca5af9fc8 SHA512 713a2782b26c4cd0dafa95b9c0b41bf3566d933ce9af712822cce0492ca8efa45ee57f1fb51aeacef824f699156a4156ee84ba91d5cfea28751e7d0f1e9a964a
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index 75560516f38c..7f4ecbe5ec56 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.11.ebuild
index 18c76e92214a..3dcfb2ce712e 100644
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ b/media-sound/picard/picard-2.11.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
+DISTUTILS_EXT=1
+
 inherit distutils-r1 xdg
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/metabrainz/picard"
 	inherit git-r3
 else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
+	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Cross-platform music tagger"
@@ -29,16 +30,18 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/discid[${PYTHON_USEDEP}] )
 	')
-	dev-qt/qtgui:5
-	media-libs/mutagen
-	discid? ( dev-python/python-discid )
 	fingerprints? ( media-libs/chromaprint[tools] )
 "
 
-RESTRICT="test" # doesn't work with ebuilds
+distutils_enable_tests pytest
 
 python_compile() {
 	local build_args=(
@@ -60,11 +63,3 @@ python_install() {
 	fi
 	distutils-r1_python_install ${install_args[@]}
 }
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	elog "If you are upgrading Picard and it does not start, try removing"
-	elog "Picard's settings:"
-	elog "        rm ~/.config/MusicBrainz/Picard.conf"
-}
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index 511feea537f9..d3dfe8779818 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
+DISTUTILS_EXT=1
+
 inherit distutils-r1 xdg
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/metabrainz/picard"
 	inherit git-r3
 else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
+	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Cross-platform music tagger"
@@ -29,16 +30,18 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/discid[${PYTHON_USEDEP}] )
 	')
-	dev-qt/qtgui:5
-	media-libs/mutagen
-	discid? ( dev-python/python-discid )
 	fingerprints? ( media-libs/chromaprint[tools] )
 "
 
-RESTRICT="test" # doesn't work with ebuilds
+distutils_enable_tests pytest
 
 python_compile() {
 	local build_args=(
@@ -60,11 +63,3 @@ python_install() {
 	fi
 	distutils-r1_python_install ${install_args[@]}
 }
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	elog "If you are upgrading Picard and it does not start, try removing"
-	elog "Picard's settings:"
-	elog "        rm ~/.config/MusicBrainz/Picard.conf"
-}
diff --git a/media-sound/picoxine/metadata.xml b/media-sound/picoxine/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/picoxine/metadata.xml
+++ b/media-sound/picoxine/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/pitchtune/metadata.xml b/media-sound/pitchtune/metadata.xml
index a972b97d893f..85e61bb9465f 100644
--- a/media-sound/pitchtune/metadata.xml
+++ b/media-sound/pitchtune/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/pitchtune/pitchtune-0.0.4.ebuild b/media-sound/pitchtune/pitchtune-0.0.4.ebuild
index 8cded71773da..cf8407805b86 100644
--- a/media-sound/pitchtune/pitchtune-0.0.4.ebuild
+++ b/media-sound/pitchtune/pitchtune-0.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools desktop
 
 DESCRIPTION="Precise Instrument Tweaking for Crispy Harmony - tuner"
 HOMEPAGE="https://sourceforge.net/projects/pitchtune/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index 1c11e496cf13..11a139c6d707 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1 +1,2 @@
-DIST pithos-1.5.0.tar.gz 123047 BLAKE2B 6f93a41bdda6c3e9baf4d71248748d4e798f9426377fcdf5dded0bdbfec92278f98c215fe818b4d1fc5378d47275539d3a559f7b9d9d8c920f5218431b77c3b3 SHA512 eec2d2fa2fec7f87decc5934d4e1c2f8e11754cb1e042e749be102b27353811a6868636b51b8b9f88ad6f649a12347b82da98d81a476ad3b610ef1049155b657
+DIST pithos-1.6.1.tar.xz 99552 BLAKE2B 048071e4c1df0cf517de64fa19cbe589972c8a34eea2f068c7d183726523c633ce36cc87344e13a8bb31d6aa4a08365b1e9691e822e5d9a7224c318dbfd7df1e SHA512 e1a13d2c789e40bf135ed551d06dfe44bf948bfe84a8bbb3f4afcab70bbcdc4f1d3f82d25f5e8d930888dd6fa04795fa2d9d47515d4199647be854c9c4a84591
+DIST pithos-1.6.2.gh.tar.gz 122622 BLAKE2B ad496c50af32082bdaa79f9a487f048964ff527b0bb175e6002d9cc86c5fcaea8b54c528cbc0a471c02962a10d23ff4058aedd131ee9b9f576b90d42c24813f6 SHA512 3377290c7ab27718b59debed4c32fb3bd7768bcc4303948a5794294b83c333a2211ad9e7d0a2307f6c0da44460daa01d6165aee20ff45edcfff74f2998d50daf
diff --git a/media-sound/pithos/files/pithos-1.5.0-py38.patch b/media-sound/pithos/files/pithos-1.5.0-py38.patch
deleted file mode 100644
index dd4327a0d3fd..000000000000
--- a/media-sound/pithos/files/pithos-1.5.0-py38.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 3a23742614058b4bc97d71e1bb826e19891f0d24
-Author: JasonLG1979 <jasonlevigray3@gmail.com>
-Date:   Sun Mar 22 20:50:53 2020 -0500
-
-    Quiet SyntaxWarning: "is" with a literal in Python 3.8
-
-diff --git a/pithos/SearchDialog.py b/pithos/SearchDialog.py
-index d8eec14..fcc9004 100644
---- a/pithos/SearchDialog.py
-+++ b/pithos/SearchDialog.py
-@@ -61,11 +61,11 @@ class SearchDialog(Gtk.Dialog):
-                 return
- 
-             for i in results:
--                if i.resultType is 'song':
-+                if i.resultType == 'song':
-                     mk = '<b>{}</b> by {}'.format(html.escape(i.title), html.escape(i.artist))
--                elif i.resultType is 'artist':
-+                elif i.resultType == 'artist':
-                     mk = '<b>{}</b> (artist)'.format(html.escape(i.name))
--                elif i.resultType is 'genre':
-+                elif i.resultType == 'genre':
-                     mk = '<b>{}</b> (genre)'.format(html.escape(i.stationName))
-                 self.model.append((i, mk))
-             self.treeview.show()
-diff --git a/pithos/StationsDialog.py b/pithos/StationsDialog.py
-index a2b51b2..43cdcb6 100644
---- a/pithos/StationsDialog.py
-+++ b/pithos/StationsDialog.py
-@@ -201,9 +201,9 @@ class StationsDialog(Gtk.Dialog):
-     def add_station_cb(self, dialog, response):
-         result = dialog.result
-         if result is not None:
--            if result.resultType is 'song':
-+            if result.resultType == 'song':
-                 description = '{} by {}'.format(html.escape(result.title), html.escape(result.artist))
--            elif result.resultType is 'artist':
-+            elif result.resultType == 'artist':
-                 description = html.escape(result.name)
-             else:
-                 description = html.escape(result.stationName)
diff --git a/media-sound/pithos/files/pithos-1.5.0-tests.patch b/media-sound/pithos/files/pithos-1.5.0-tests.patch
deleted file mode 100644
index cab7639772ef..000000000000
--- a/media-sound/pithos/files/pithos-1.5.0-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/data/meson.build b/data/meson.build
-index efac217..d08796a 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -41,12 +41,12 @@ pithos_appstream = i18n.merge_file(
- 
- pithos_settings = gnome.compile_schemas()
- 
--appstream_util = find_program('appstream-util', required: false)
--if appstream_util.found()
--  test('Validate appstream file', appstream_util,
--    args: ['validate', pithos_appstream]
--  )
--endif
-+#appstream_util = find_program('appstream-util', required: false)
-+#if appstream_util.found()
-+#  test('Validate appstream file', appstream_util,
-+#    args: ['validate', pithos_appstream]
-+#  )
-+#endif
- 
- desktop_utils = find_program('desktop-file-validate', required: false)
- if desktop_utils.found()
diff --git a/media-sound/pithos/metadata.xml b/media-sound/pithos/metadata.xml
index cb3285681700..b50404180703 100644
--- a/media-sound/pithos/metadata.xml
+++ b/media-sound/pithos/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chutzpah@gentoo.org</email>
diff --git a/media-sound/pithos/pithos-1.5.0.ebuild b/media-sound/pithos/pithos-1.6.1-r1.ebuild
index 11ebd44dac4c..d6115fadc61b 100644
--- a/media-sound/pithos/pithos-1.5.0.ebuild
+++ b/media-sound/pithos/pithos-1.6.1-r1.ebuild
@@ -1,19 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit meson gnome2-utils virtualx python-r1
+EAPI=8
 
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
+PYTHON_COMPAT=( python3_{10..11} )
+inherit xdg meson gnome2-utils virtualx python-r1
 
 DESCRIPTION="Pandora.com client for the GNOME desktop"
 HOMEPAGE="https://pithos.github.io/"
+SRC_URI="https://github.com/pithos/pithos/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -21,7 +16,8 @@ KEYWORDS="~amd64"
 IUSE="appindicator +keybinder libnotify test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	dev-python/pygobject[${PYTHON_USEDEP}]
 	app-crypt/libsecret[introspection]
 	dev-libs/appstream-glib[introspection]
@@ -31,8 +27,8 @@ RDEPEND="${PYTHON_DEPS}
 	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
-	x11-themes/gnome-icon-theme-symbolic
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	x11-themes/hicolor-icon-theme
+	appindicator? ( dev-libs/libdbusmenu[gtk3,introspection] )
 	keybinder? ( dev-libs/keybinder:3[introspection] )
 	libnotify? ( x11-libs/libnotify[introspection] )
 "
@@ -45,13 +41,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/pithos-1.5.0-py38.patch"
-
-	# comment out tests that need internet
-	"${FILESDIR}/pithos-1.5.0-tests.patch"
-)
-
 src_configure() {
 	python_foreach_impl meson_src_configure
 }
@@ -71,8 +60,10 @@ src_install() {
 
 pkg_postinst() {
 	gnome2_schemas_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
 	gnome2_schemas_update
+	xdg_pkg_postrm
 }
diff --git a/media-sound/pithos/pithos-1.6.2.ebuild b/media-sound/pithos/pithos-1.6.2.ebuild
new file mode 100644
index 000000000000..170c8663b4a8
--- /dev/null
+++ b/media-sound/pithos/pithos-1.6.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit xdg meson gnome2-utils virtualx python-r1
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="https://pithos.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="appindicator +keybinder libnotify test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	app-crypt/libsecret[introspection]
+	dev-libs/appstream-glib[introspection]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pylast[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/hicolor-icon-theme
+	appindicator? ( dev-libs/libdbusmenu[gtk3,introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-libs/glib:2
+		dev-util/desktop-file-utils
+	)
+"
+
+src_configure() {
+	python_foreach_impl meson_src_configure
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	virtx python_foreach_impl meson_src_test
+}
+
+src_install() {
+	python_foreach_impl meson_src_install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index e86f3bf9d4a6..3089e6924b4e 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,3 +1,2 @@
-DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
-DIST playerctl-2.2.1.tar.gz 66255 BLAKE2B 76732d8074b17ca958b7efe08d7be8d4bce3ba1ec65346a219478b4807c600218e1b8fe971892e7df16ad49273721a5b423bced2bd3441e9f89497375d4e0d84 SHA512 9c08a3f1d5517d7f4270ed92f226453618fc9f0688688d1af9ff55f0c77efeb1b67daa4adc481546215491550f8528095d376ab099c8ddca05235bfb34b36eb7
 DIST playerctl-2.3.1.tar.gz 73595 BLAKE2B d6d60d82fb0a8951fba4a3de91ff1e3f4bdba7177563b65b2da53525af4ca40f42755c577f652aaa24d2de308f56a495c8f87840ad67d6cda840cba1411abdb0 SHA512 06a10d193c83f60a9a9c50dddfb0a74e00be8cde34ddaa9d75582b7ce487ac564d1ff0675f6cb0c27d968e7d435b6a427818ac14e0cdd94b86af8f5d89661a93
+DIST playerctl-2.4.1.tar.gz 77371 BLAKE2B ae9f691d714d6235bd7dc3e3d9a2ed21190482bd2aa8642c108ade0c09902ccb20196d0180ed3b1ffe680ca4e6a4ee293de1a6f10d54878589e3d8c81ca81c53 SHA512 2d84f657b07c948cd6990d9e79c4eb6e83f97c387ac53c2322fc0adbeb853950fa935332233329e7555db7d157f3ced6498cc102edaffd78849ca1f7d4c49bdc
diff --git a/media-sound/playerctl/metadata.xml b/media-sound/playerctl/metadata.xml
index 35ff4c2d260c..0a8532094796 100644
--- a/media-sound/playerctl/metadata.xml
+++ b/media-sound/playerctl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>gokturk@gentoo.org</email>
diff --git a/media-sound/playerctl/playerctl-2.0.2.ebuild b/media-sound/playerctl/playerctl-2.0.2.ebuild
deleted file mode 100644
index 4a6d3b7aa9fa..000000000000
--- a/media-sound/playerctl/playerctl-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson xdg-utils
-
-DESCRIPTION="A CLI utility to control media players over MPRIS"
-HOMEPAGE="https://github.com/acrisci/playerctl"
-SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc introspection"
-
-RDEPEND="
-	dev-libs/glib:2
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc gtk-doc)
-		$(meson_use introspection)
-	)
-
-	xdg_environment_reset # 596166
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	docinto examples
-	dodoc -r "${S}"/examples/.
-	docompress -x "/usr/share/doc/${PF}/examples"
-}
diff --git a/media-sound/playerctl/playerctl-2.3.1.ebuild b/media-sound/playerctl/playerctl-2.3.1.ebuild
index 8641a7349d5c..46180922a565 100644
--- a/media-sound/playerctl/playerctl-2.3.1.ebuild
+++ b/media-sound/playerctl/playerctl-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/acrisci/playerctl"
 SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="doc introspection"
 RESTRICT="test" # Requires dbus-next python package that's not in the tree
 
diff --git a/media-sound/playerctl/playerctl-2.4.1-r1.ebuild b/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..e5c8cd2d4649
--- /dev/null
+++ b/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 meson python-any-r1 virtualx xdg-utils
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		$(python_gen_any_dep '
+			dev-python/dbus-next[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Requires a lenient dbus config systemwide
+	# See test/data/dbus-system.conf and how its used in Dockerfile
+	"test/test_basics.py::test_system_list_players"
+	# Daemon tests are inconsistent, occasional failure occurs in upstream CI as well.
+	"test/test_daemon.py"
+)
+
+python_check_deps() {
+	python_has_version \
+		"dev-python/dbus-next[${PYTHON_USEDEP}]" \
+		"dev-python/pytest[${PYTHON_USEDEP}]" \
+		"dev-python/pytest-asyncio[${PYTHON_USEDEP}]" \
+		"dev-python/pytest-timeout[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddatadir=share
+		-Dbindir=bin
+		-Dbash-completions=false
+		-Dzsh-completions=false
+		$(meson_use doc gtk-doc)
+		$(meson_use introspection)
+	)
+
+	xdg_environment_reset # bug #596166
+	meson_src_configure
+}
+
+src_test() {
+	local dbus_params=(
+		$(dbus-daemon --session --print-address --fork --print-pid)
+	)
+	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
+
+	export PATH="${BUILD_DIR}/playerctl/:${PATH}"
+
+	virtx epytest --asyncio-mode=auto
+
+	kill "${dbus_params[1]}" || die
+}
+
+src_install() {
+	meson_src_install
+
+	docinto examples
+	dodoc -r "${S}"/examples/.
+	docompress -x "/usr/share/doc/${PF}/examples"
+
+	newbashcomp data/playerctl.bash "${PN}"
+	insinto /usr/share/zsh/site-functions
+	newins data/playerctl.zsh _playerctl
+}
diff --git a/media-sound/playerctl/playerctl-2.2.1.ebuild b/media-sound/playerctl/playerctl-2.4.1.ebuild
index 1c7dfe34655f..710b5c8ab50a 100644
--- a/media-sound/playerctl/playerctl-2.2.1.ebuild
+++ b/media-sound/playerctl/playerctl-2.4.1.ebuild
@@ -1,50 +1,54 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit bash-completion-r1 xdg-utils meson
+inherit bash-completion-r1 meson xdg
 
 DESCRIPTION="A CLI utility to control media players over MPRIS"
 HOMEPAGE="https://github.com/acrisci/playerctl"
 SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
+
+LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc introspection"
-RESTRICT="test" # Requires dbus-next python package that's not in the tree
+RESTRICT="test" # Seems to want a system bus, rather than a session one?
 
 RDEPEND="
-	dev-libs/glib:2
+	>=dev-libs/glib-2.38:2
 	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	doc? ( dev-util/gtk-doc )
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
 "
 
 src_configure() {
 	local emesonargs=(
 		-Ddatadir=share
 		-Dbindir=bin
+		-Dbash-completions=false
+		-Dzsh-completions=false
 		$(meson_use doc gtk-doc)
 		$(meson_use introspection)
 	)
 
-	xdg_environment_reset # 596166
+	xdg_environment_reset # bug #596166
 	meson_src_configure
 }
 
 src_install() {
 	meson_src_install
-	rm "${ED}"/usr/$(get_libdir)/libplayerctl.a || die
 
 	docinto examples
 	dodoc -r "${S}"/examples/.
 	docompress -x "/usr/share/doc/${PF}/examples"
 
 	newbashcomp data/playerctl.bash "${PN}"
+	insinto /usr/share/zsh/site-functions
+	newins data/playerctl.zsh _playerctl
 }
diff --git a/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch b/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch
new file mode 100644
index 000000000000..b0d586eff2c3
--- /dev/null
+++ b/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851621
+--- a/src/message.cpp
++++ b/src/message.cpp
+@@ -23,6 +23,7 @@
+ 
+ 
+ #include <cstdarg>
++#include <ctime>
+ #include <stdio.h>
+ #include "message.h"
+ 
diff --git a/media-sound/pms/metadata.xml b/media-sound/pms/metadata.xml
index dd8968f48863..27c77626f32a 100644
--- a/media-sound/pms/metadata.xml
+++ b/media-sound/pms/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
diff --git a/media-sound/pms/pms-0.42_p20170508.ebuild b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
index 5fff6b4dc85c..ca0250888b93 100644
--- a/media-sound/pms/pms-0.42_p20170508.ebuild
+++ b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake vcs-snapshot
 
 REF="8c8918488a4a22924ee04442dc5e5216783d51ff"
-DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
+DESCRIPTION="Practical Music Search: open source ncurses client for mpd, written in C++"
 HOMEPAGE="https://ambientsound.github.io/pms"
 SRC_URI="https://github.com/ambientsound/${PN}/archive/${REF}.tar.gz -> ${P}.tar.gz"
 
@@ -15,15 +15,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+regex doc"
 
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/pandoc )
-"
 RDEPEND="
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	media-libs/libmpdclient
 "
 DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/pandoc )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.42_p20170508-gcc12-time.patch )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/pms/pms-9999.ebuild b/media-sound/pms/pms-9999.ebuild
deleted file mode 100644
index 4260a7d72b3a..000000000000
--- a/media-sound/pms/pms-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
-HOMEPAGE="https://ambientsound.github.io/pms"
-
-EGIT_REPO_URI="https://github.com/ambientsound/pms.git"
-EGIT_BRANCH="0.42.x" # todo: package the golang version
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-IUSE="+regex doc"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/pandoc )
-"
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-	media-libs/libmpdclient
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_REGEX=$(usex regex)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/pnmixer/files/pnmixer-0.7.2-fix-assert-if-volume-gt-100.patch b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-assert-if-volume-gt-100.patch
new file mode 100644
index 000000000000..6fd28572f90e
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-assert-if-volume-gt-100.patch
@@ -0,0 +1,37 @@
+From 7eed10b2bd4650dadbc2c98f435d2bb10de7f75e Mon Sep 17 00:00:00 2001
+From: Arnaud Rebillout <elboulangero@gmail.com>
+Date: Mon, 19 Jun 2017 20:02:01 +0700
+Subject: [PATCH] Clip volume between 0 and 100 (thx to yunake) #162
+
+---
+ src/audio.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/audio.c b/src/audio.c
+index 750f20f..06b245c 100644
+--- a/src/audio.c
++++ b/src/audio.c
+@@ -437,11 +437,22 @@ gdouble
+ audio_get_volume(Audio *audio)
+ {
+ 	AlsaCard *soundcard = audio->soundcard;
++	gdouble volume;
+ 
+ 	if (!soundcard)
+ 		return 0;
+ 
+-	return alsa_card_get_volume(soundcard);
++	volume = alsa_card_get_volume(soundcard);
++
++	/* With PulseAudio, it is perfectly possible for the volume to go above 100%.
++	 * Since we don't really expect or handle that, let's clip it right now.
++	 */
++	if (volume < 0)
++		volume = 0;
++	if (volume > 100)
++		volume = 100;
++
++	return volume;
+ }
+ 
+ /**
diff --git a/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-garbage-value.patch b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-garbage-value.patch
new file mode 100644
index 000000000000..e85dcedd2337
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-garbage-value.patch
@@ -0,0 +1,38 @@
+From c8577027aa4597c8f194a84a73982aa0ce7f2dd0 Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Mon, 19 Feb 2018 20:06:26 +0100
+Subject: [PATCH] MEM: fix possible garbage value wrt #174
+
+Not sure if the clang static analyzer has trouble
+with g_memdup() or if there is something more serious
+going on. Good old g_malloc() works too though.
+---
+ src/ui-tray-icon.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/ui-tray-icon.c b/src/ui-tray-icon.c
+index 27b35f3..23ba947 100644
+--- a/src/ui-tray-icon.c
++++ b/src/ui-tray-icon.c
+@@ -166,9 +166,11 @@ pixbuf_array_free(GdkPixbuf **pixbufs)
+ static GdkPixbuf **
+ pixbuf_array_new(int size)
+ {
+-	GdkPixbuf *pixbufs[N_VOLUME_PIXBUFS];
++	GdkPixbuf **pixbufs;
+ 	gboolean system_theme;
+ 
++	pixbufs = g_new0(GdkPixbuf *, N_VOLUME_PIXBUFS);
++
+ 	DEBUG("Building pixbuf array (requesting size %d)", size);
+ 
+ 	system_theme = prefs_get_boolean("SystemTheme", FALSE);
+@@ -202,7 +204,7 @@ pixbuf_array_new(int size)
+ 		pixbufs[VOLUME_HIGH] = pixbuf_new_from_file("pnmixer-high.png");
+ 	}
+ 
+-	return g_memdup(pixbufs, sizeof pixbufs);
++	return pixbufs;
+ }
+ 
+ /* Tray icon volume meter */
diff --git a/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-memleak.patch b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-memleak.patch
new file mode 100644
index 000000000000..a88013b9d4b8
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-memleak.patch
@@ -0,0 +1,21 @@
+From 84c66c389cd7a8a47aa5f543726683a19dcca5ff Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Mon, 19 Feb 2018 20:06:45 +0100
+Subject: [PATCH] MEM: fix possible memory leak wrt #174
+
+---
+ src/alsa.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/alsa.c b/src/alsa.c
+index c46d4d8..d91c79f 100644
+--- a/src/alsa.c
++++ b/src/alsa.c
+@@ -336,6 +336,7 @@ mixer_get_poll_descriptors(const char *hctl, snd_mixer_t *mixer)
+ 	err = snd_mixer_poll_descriptors(mixer, fds, count);
+ 	if (err < 0) {
+ 		ALSA_CARD_ERR(hctl, err, "Couldn't get poll descriptors");
++		g_free(fds);
+ 		return NULL;
+ 	}
+ 
diff --git a/media-sound/pnmixer/metadata.xml b/media-sound/pnmixer/metadata.xml
index 6c7b2a84125f..7bfeefe2367d 100644
--- a/media-sound/pnmixer/metadata.xml
+++ b/media-sound/pnmixer/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		PNMixer is a simple mixer application designed to run in your system
 		tray. It integrates nicely into desktop environments that don't have
diff --git a/media-sound/pnmixer/pnmixer-0.7.2.ebuild b/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild
index ed3446af74c8..45e99d0fae78 100644
--- a/media-sound/pnmixer/pnmixer-0.7.2.ebuild
+++ b/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild
@@ -1,51 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils gnome2-utils
-
-MY_PV="v${PV}"
-MY_P="${PN}-${MY_PV}"
+MY_P="${PN}-v${PV}"
+inherit cmake xdg
 
 DESCRIPTION="Volume mixer for the system tray"
 HOMEPAGE="https://github.com/nicklan/pnmixer"
-SRC_URI="https://github.com/nicklan/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/nicklan/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="doc libnotify nls"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	media-libs/alsa-lib
 	x11-libs/gtk+:3
 	x11-libs/libX11
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
+	libnotify? ( x11-libs/libnotify )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		app-doc/doxygen
+		app-text/doxygen
 		media-gfx/graphviz
 	)
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}/${P}-fix-assert-if-volume-gt-100.patch"
+	"${FILESDIR}/${P}-fix-possible-garbage-value.patch"
+	"${FILESDIR}/${P}-fix-possible-memleak.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION="$(usex doc)"
 		-DWITH_LIBNOTIFY="$(usex libnotify)"
 		-DENABLE_NLS="$(usex nls)"
-		-DBUILD_DOCUMENTATION="$(usex doc)"
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	cmake_src_configure
 }
diff --git a/media-sound/pnmixer/pnmixer-9999.ebuild b/media-sound/pnmixer/pnmixer-9999.ebuild
deleted file mode 100644
index 69801bb9225a..000000000000
--- a/media-sound/pnmixer/pnmixer-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_LIBTOOL=none
-inherit cmake-utils gnome2-utils git-r3
-
-DESCRIPTION="Volume mixer for the system tray"
-HOMEPAGE="https://github.com/nicklan/pnmixer"
-EGIT_REPO_URI="git@github.com:nicklan/pnmixer.git
-	https://github.com/nicklan/pnmixer.git"
-EGIT_BRANCH="master"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="libnotify"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/alsa-lib
-	>=x11-libs/gtk+-3.12:3
-	x11-libs/libX11
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LIBNOTIFY="$(usex libnotify)"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/poc/metadata.xml b/media-sound/poc/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/poc/metadata.xml
+++ b/media-sound/poc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/poc/poc-0.4.1.ebuild b/media-sound/poc/poc-0.4.1.ebuild
index a187a005a8fe..8602af06749a 100644
--- a/media-sound/poc/poc-0.4.1.ebuild
+++ b/media-sound/poc/poc-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 BDEPEND="
-	sys-devel/bison
-	sys-devel/flex"
+	app-alternatives/yacc
+	app-alternatives/lex"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fec-pkt-prototype.patch
diff --git a/media-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
index 39626a990be5..cd1cfc033621 100644
--- a/media-sound/podcatcher/metadata.xml
+++ b/media-sound/podcatcher/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/podget/Manifest b/media-sound/podget/Manifest
index 27e34c20f98f..90161a948dc8 100644
--- a/media-sound/podget/Manifest
+++ b/media-sound/podget/Manifest
@@ -1,3 +1 @@
-DIST podget-0.7.14.tar.gz 63356 BLAKE2B ac0f591691930f67b82bb08ac8c4b0ce10a6d793ecfaf5d0d07e6f618d47fdb3ca5371d94165f49e6d7261cb8d49f8146748e89846c811badbbff1a7cbc9885d SHA512 a54d4cdac88f220f470304d9b50ef00c01540ca2e986e4ffc80d9d5aea4ddd6b80484e243f742967dcf800780a8fdfdd55437f9fe710e536ca6a5d6140374022
-DIST podget-0.8.1.tar.gz 66284 BLAKE2B e30d7c24ee12ba17c8ceaa5773c0bc1474d39b7be4f998b42e5fefcde8d2e019273e597dc298770f710fc72aea803abd9320b6b6cce6c9f2ff60efed02f25e65 SHA512 d2cadeccbba71b04e74863656dfd600e99b95ec58b09a4ba4713c401dd37aa24c339031d251cf5b4d2ee1cd4efbc91b41d8eca1a488def2dc3b5a6968b0a1d20
 DIST podget-0.8.2.tar.gz 66786 BLAKE2B 855d872df0dc07c43f9766b9e736da217a5303a963088b3414385fb055a45fa3f00e86d6f9b39fc4ea1c77b4882962666c34cb704acec5c115b6c4f9382d8210 SHA512 4e61b4d0197976b755f07445a371368cdc090e148c378b86b925ec1d23e447a4d66d9cc68c2fc8431246bc016d44161340bdb30195481d01d8fb00cf142fa696
diff --git a/media-sound/podget/metadata.xml b/media-sound/podget/metadata.xml
index 4f4416b228ce..7ebbc17c0879 100644
--- a/media-sound/podget/metadata.xml
+++ b/media-sound/podget/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kitcat490@gmail.com</email>
 		<name>Michael Niehoff</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/podget/podget-0.7.14.ebuild b/media-sound/podget/podget-0.7.14.ebuild
deleted file mode 100644
index a2eb5f346793..000000000000
--- a/media-sound/podget/podget-0.7.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
-HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
-SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	net-misc/wget
-	virtual/libiconv
-"
-
-DOCS=( README Changelog )
-
-src_compile() {
-	# There is a Makefile that we don't want to use.
-	:;
-}
-
-src_install() {
-	dobin ${PN}
-	doman DOC/${PN}.7
-	einstalldocs
-}
diff --git a/media-sound/podget/podget-0.8.1.ebuild b/media-sound/podget/podget-0.8.2-r1.ebuild
index a2eb5f346793..1c3aa569c2f0 100644
--- a/media-sound/podget/podget-0.8.1.ebuild
+++ b/media-sound/podget/podget-0.8.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
 HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
@@ -10,14 +10,11 @@ SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 RDEPEND="
+	app-shells/bash
 	net-misc/wget
-	virtual/libiconv
-"
-
-DOCS=( README Changelog )
+	virtual/libiconv"
 
 src_compile() {
 	# There is a Makefile that we don't want to use.
@@ -25,7 +22,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${PN}
-	doman DOC/${PN}.7
-	einstalldocs
+	dobin podget
+	doman DOC/podget.7
+	dodoc README Changelog
 }
diff --git a/media-sound/podget/podget-0.8.2.ebuild b/media-sound/podget/podget-0.8.2.ebuild
deleted file mode 100644
index a2eb5f346793..000000000000
--- a/media-sound/podget/podget-0.8.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
-HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
-SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	net-misc/wget
-	virtual/libiconv
-"
-
-DOCS=( README Changelog )
-
-src_compile() {
-	# There is a Makefile that we don't want to use.
-	:;
-}
-
-src_install() {
-	dobin ${PN}
-	doman DOC/${PN}.7
-	einstalldocs
-}
diff --git a/media-sound/podracer/metadata.xml b/media-sound/podracer/metadata.xml
index 560d81a96b68..c276d60f8daa 100644
--- a/media-sound/podracer/metadata.xml
+++ b/media-sound/podracer/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/media-sound/podracer/podracer-1.4-r2.ebuild b/media-sound/podracer/podracer-1.4-r2.ebuild
deleted file mode 100644
index 35df96ec5d56..000000000000
--- a/media-sound/podracer/podracer-1.4-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A simple podcast aggregator, designed for cron"
-HOMEPAGE="http://podracer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash
-	net-misc/curl"
-
-src_unpack() {
-	default
-
-	# Bug 619956. Change directories first to ensure that "unpack" outputs
-	# to ${S} and not to ${WORKDIR}.
-	cd "${S}" || die
-	unpack "${S}/podracer.1.gz"
-}
-
-src_install() {
-	dobin podracer
-	sed -i -e "s:sample=/usr/share/doc/\$progname/sample.subscriptions:sample=/usr/share/doc/${PF}/sample.subscriptions:" "${D}"/usr/bin/podracer || die
-	dodoc CREDITS README ChangeLog TODO
-	doman podracer.1
-	docompress -x "/usr/share/doc/${PF}/sample.subscriptions"
-	dodoc sample.subscriptions
-	insinto /etc/
-	doins podracer.conf
-}
diff --git a/media-sound/podracer/podracer-1.4-r3.ebuild b/media-sound/podracer/podracer-1.4-r3.ebuild
new file mode 100644
index 000000000000..53cd94ff59b3
--- /dev/null
+++ b/media-sound/podracer/podracer-1.4-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A simple podcast aggregator, designed for cron"
+HOMEPAGE="http://podracer.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	app-shells/bash
+	net-misc/curl"
+
+src_unpack() {
+	default
+
+	# Bug 619956. Change directories first to ensure that
+	# "unpack" outputs to ${S} and not to ${WORKDIR}.
+	cd "${S}" || die
+	unpack "${S}"/podracer.1.gz
+}
+
+src_prepare() {
+	default
+	sed -e "s:sample=/usr/share/doc/\$progname/sample.subscriptions:sample=/usr/share/doc/${PF}/sample.subscriptions:" \
+		-i podracer || die
+}
+
+src_install() {
+	dobin podracer
+
+	dodoc CREDITS README ChangeLog TODO sample.subscriptions
+	docompress -x /usr/share/doc/${PF}/sample.subscriptions
+	doman podracer.1
+
+	insinto /etc
+	doins podracer.conf
+}
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
deleted file mode 100644
index e1f532da073a..000000000000
--- a/media-sound/potamus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST potamus-17.tar.gz 146822 BLAKE2B 9fa7beabcd4e0ce8a3a6adda4fa425d0a6789c85cc1852bcf528c709574097f5fc34127cb8404d2d8b01c0f961026439786f58a0afd3bd022ed9efe22790bcf9 SHA512 655ac7c99e252c200bb012b1076850ae8c4307ac57dd8d6cb86fc0da0a0ea3b3193c617a365889485a4cab87cb113e40f1d828585e5bdf20c5f2b1b0a2c51099
diff --git a/media-sound/potamus/metadata.xml b/media-sound/potamus/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/potamus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/potamus/potamus-17.ebuild b/media-sound/potamus/potamus-17.ebuild
deleted file mode 100644
index 1579d146b648..000000000000
--- a/media-sound/potamus/potamus-17.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg
-
-DESCRIPTION="A lightweight audio player with a simple interface and an emphasis on high audio quality"
-HOMEPAGE="http://offog.org/code/potamus/"
-SRC_URI="http://offog.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+ao audiofile flac jack mad modplug opus vorbis"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	x11-libs/gtk+:2
-	gnome-base/libglade
-	media-libs/libsamplerate
-	media-video/ffmpeg:0=
-	ao? ( media-libs/libao )
-	audiofile? ( media-libs/audiofile )
-	flac? ( media-libs/flac )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	modplug? ( media-libs/libmodplug )
-	opus? ( media-libs/opusfile )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable audiofile input-audiofile) \
-		$(use_enable flac input-flac) \
-		$(use_enable mad input-mad) \
-		$(use_enable modplug input-modplug) \
-		$(use_enable opus input-opus) \
-		$(use_enable vorbis input-vorbis) \
-		$(use_enable ao output-ao) \
-		$(use_enable jack output-jack)
-
-}
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
deleted file mode 100644
index e9c3dc47c922..000000000000
--- a/media-sound/pragha/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pragha-1.3.99.1.tar.bz2 804701 BLAKE2B ae68c01706d593defc4ee357e1bdd1e832fb6d6720f723149c752c98f16502e1254553b404f53b40a4e126b647e6de478e7929b7715c0f9815d23b2e62e5475b SHA512 1c92bf7b2d1d1d6b3f8616b1980b60c6c688844d0bf9f80bc86185035a05971f3b8f5aa73d230b01fa5d14e54db38b356df41781e4a5da73b0adae82829c8c31
diff --git a/media-sound/pragha/metadata.xml b/media-sound/pragha/metadata.xml
deleted file mode 100644
index 230b2002c97c..000000000000
--- a/media-sound/pragha/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name="glyr">Enable music metadata searchengine support using <pkg>media-libs/glyr</pkg></flag>
-    <flag name="grilo">Play songs on DLNA servers using <pkg>media-libs/grilo</pkg></flag>
-    <flag name="keybinder">Enable shortcut support using <pkg>dev-libs/keybinder</pkg></flag>
-    <flag name="koel">Append music on Koel server</flag>
-    <flag name="lastfm">Enable last.fm support using <pkg>media-libs/libclastfm</pkg></flag>
-    <flag name="peas">Enable various plugins that will pull in <pkg>dev-libs/libpeas</pkg> as a dependency</flag>
-    <flag name="playlist">Enable enhanced playlist support using <pkg>dev-libs/totem-pl-parser</pkg></flag>
-    <flag name="rygel">Share music on DLNA using <pkg>net-misc/rygel</pkg></flag>
-    <flag name="soup">Search metadata on AcoustID and radios on TuneIn using <pkg>net-libs/libsoup</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">pragha-music-player/pragha</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-sound/pragha/pragha-1.3.99.1.ebuild b/media-sound/pragha/pragha-1.3.99.1.ebuild
deleted file mode 100644
index b9bca3f47fd0..000000000000
--- a/media-sound/pragha/pragha-1.3.99.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A lightweight music player (for Xfce)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.42
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/taglib-1.8:=
-	>=x11-libs/gtk+-3.14:3
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	cdda? ( >=dev-libs/libcdio-0.90:=
-		>=dev-libs/libcdio-paranoia-0.90:=
-		>=media-libs/libcddb-1.3.0:= )
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( media-libs/grilo:0.3[network] )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3 )
-	koel? ( dev-libs/json-glib )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7.5 )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.26 )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( dev-libs/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig
-	xfce-base/exo"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	koel? ( soup )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable cdda libcdio)
-		$(use_enable cdda libcdio_paranoia)
-		$(use_enable cdda libcddb)
-		$(use_enable playlist totem-plparser)
-
-		$(use_enable libnotify)
-		$(use_enable keybinder)
-		$(use_enable udev gudev-1.0)
-		$(use_enable mtp libmtp)
-		$(use_enable koel json-glib-1.0)
-		$(use_enable soup libsoup-2.4)
-		$(use_enable rygel rygel-server-2.6)
-		$(use_enable grilo grilo-0.3)
-		$(use_enable grilo grilo-net-0.3)
-		# avoid trying to use 0.2 & 0.3 simultaneously
-		# https://github.com/pragha-music-player/pragha/issues/124
-		--disable-grilo-0.2
-		--disable-grilo-net-0.2
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/protux/Manifest b/media-sound/protux/Manifest
deleted file mode 100644
index 3beec8175209..000000000000
--- a/media-sound/protux/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST protux-0.50.100.tar.gz 392027 BLAKE2B 3aad4eae28fe866bdff456b79ffcccba0658b97b06c29757757a1f7b8318a27c8e13166c0f6dfa0815276af4358dda031b9c2d869ffc007e9b21fb29d0733970 SHA512 8a7f241c1673193141f456367d40260bd9c1d9ec93130d51abebd14e1dfb03784a2cd21c6c72bce645bd362f138e52e5d41182358ea4b4dad50f892025b6dad7
diff --git a/media-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
deleted file mode 100644
index d1b3ad750f41..000000000000
--- a/media-sound/protux/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">protux</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-sound/protux/protux-0.50.100.ebuild b/media-sound/protux/protux-0.50.100.ebuild
deleted file mode 100644
index f4f130c2bd87..000000000000
--- a/media-sound/protux/protux-0.50.100.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="Professional Audio Tools for GNU/Linux"
-HOMEPAGE="http://protux.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="source"
-
-DEPEND=">=virtual/jdk-1.5
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	# bug #318589
-	sed -i '/com.sun.jmx.snmp.Enumerated/d' \
-		src/org/protux/core/GlobalProperties.java || die
-}
-
-src_compile() {
-	cd src || die
-	ejavac -encoding latin1 $(find . -name "*.java")
-	jar cf ${PN}.jar $(find . -name "*.class") || die
-}
-
-src_install() {
-	java-pkg_dojar src/${PN}.jar
-	dodoc AUTHORS BUGLIST ChangeLog COPYRIGHT INSTALL README TODO
-	use source && java-pkg_dosrc src/org
-	# pwd like this because it does not find resources otherwise
-	java-pkg_dolauncher ${PN} \
-		--main org.protux.Main \
-		--pwd /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r resources
-}
diff --git a/media-sound/ptabtools/metadata.xml b/media-sound/ptabtools/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/ptabtools/metadata.xml
+++ b/media-sound/ptabtools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/ptabtools/ptabtools-0.5.0.ebuild b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
index 55e4bca6c2ea..15641a2b9e4c 100644
--- a/media-sound/ptabtools/ptabtools-0.5.0.ebuild
+++ b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
new file mode 100644
index 000000000000..3f72ec3664a2
--- /dev/null
+++ b/media-sound/puddletag/Manifest
@@ -0,0 +1 @@
+DIST puddletag-2.3.0.tar.gz 13916694 BLAKE2B a525957ad82af752539d3cbf6eae996f32d6d92155cea932246f14193b78e230627443b86611bca52dded1688e63efbf5636daa2071ce5a2ad2066c7a5475f07 SHA512 7058526dfe0132bf8edc260538a18c3c169128162ad83646557e166af0bcb23166053de15e02d13eb84c2d68bdbc8bacd6a6730ade409ab34f8503ec9d69af46
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
new file mode 100644
index 000000000000..fcb7a8cba800
--- /dev/null
+++ b/media-sound/puddletag/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<use>
+		<flag name="quodlibet">Enables support for editing <pkg>media-sound/quodlibet</pkg> databases</flag>
+		<flag name="acoustid">Use <pkg>media-libs/chromaprint</pkg> for acoustic fingerprinting</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">puddletag</remote-id>
+		<remote-id type="github">puddletag/puddletag</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/puddletag/puddletag-2.3.0.ebuild b/media-sound/puddletag/puddletag-2.3.0.ebuild
new file mode 100644
index 000000000000..c18430c3b2ce
--- /dev/null
+++ b/media-sound/puddletag/puddletag-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10,11} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="Audio tag editor"
+HOMEPAGE="https://docs.puddletag.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid quodlibet"
+
+RDEPEND="
+	>=dev-python/configobj-5.0.8[${PYTHON_USEDEP}]
+	>=dev-python/Levenshtein-0.25[${PYTHON_USEDEP}]
+	>=dev-python/lxml-5.1.0[${PYTHON_USEDEP}]
+	acoustid? ( >=dev-python/pyacoustid-1.3.0[${PYTHON_USEDEP}] )
+	>=dev-python/pyparsing-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.15.10[${PYTHON_USEDEP},svg]
+	>=dev-python/PyQt5-sip-12.11.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-1.3.8[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.47.0[${PYTHON_USEDEP}]
+	quodlibet? ( >=media-sound/quodlibet-4.4.0[${PYTHON_USEDEP}] )
+"
+DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
index 0c5684ebb63d..6b48e403cc60 100644
--- a/media-sound/pulseaudio-ctl/Manifest
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -1,2 +1 @@
-DIST pulseaudio-ctl-1.67.tar.gz 6615 BLAKE2B fd760fc5475cdd9c6bbced9f4bbe0f62e793364d375f0bc24686986d42c9ddcfeddde501950c3572a4bf004cdfba36d3dc5aa1df3eed7a9730a437e74eb97b26 SHA512 5ea1cbfd87cf073de46b6fd9953a3c7b9c6969da46103dd5dfc56aa3f179b2ba36ade5db7ca47d204f0f60ac02020f1a4f2dd58bbaf010f9a99780702295418c
-DIST pulseaudio-ctl-1.68.tar.gz 6575 BLAKE2B a126730f53687b8456ed06f205e13d9380f7cadd4581430b4263dff65ebd33b22ad698cad4271402f873d9fa6c3499fd805ba02e9108723dcd60690016fcc196 SHA512 8ed4383d123d235bcde2e89a0a81fea96daa81dabb37cc9428eb3dd8e0c80fde3b9adf2b3ff911abaf6c4e5cb7cdbd74ce6817e080b3dba65d9206677ce10de5
+DIST pulseaudio-ctl-1.70.tar.gz 6513 BLAKE2B bd752c42a6ec7c205112637a11e2abae1474b2bcb43f09fa46439b1509c816e8baadd547868821f495f79acf9606bc913ee8664286f181357e264ffa3cdf60f9 SHA512 59ec5f3da3021fd79ba33d9934c6dde9eebdfcc5e7651355b69c54e13cf6525d741a68780c6dc5c871ad108a261334657f7f25306e59fc6142912e2ff2278cb7
diff --git a/media-sound/pulseaudio-ctl/metadata.xml b/media-sound/pulseaudio-ctl/metadata.xml
index 0319eec4c8be..076793e3f54b 100644
--- a/media-sound/pulseaudio-ctl/metadata.xml
+++ b/media-sound/pulseaudio-ctl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild
deleted file mode 100644
index ad9ef3abe659..000000000000
--- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="CLI utility to control PulseAudio volume"
-HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
-SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
-# in both cases they should be already present if DE supports them
-RDEPEND="media-sound/pulseaudio"
-
-src_install() {
-	# install-man target compresses manpage
-	emake install-bin PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
-	doman doc/pulseaudio-ctl.1
-}
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild
index 71ae8973b850..f6150651fbb2 100644
--- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
+++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,12 +9,12 @@ SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 # Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
 # in both cases they should be already present if DE supports them
-RDEPEND="media-sound/pulseaudio"
+RDEPEND="|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )"
 
 src_install() {
 	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
new file mode 100644
index 000000000000..776caac18a80
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -0,0 +1,3 @@
+DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
+DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2
+DIST pulseaudio-17.0.tar.xz 1566556 BLAKE2B 781ece3d507916aa681d3b0132689730a621b4d92e45f86570e4d2fdebc4c0025ebe7f7a05046545f9b26caca513e8975f12498fa314524bc67eacaea72842fa SHA512 be0aec46204d9c9188a796fbe41b4cf6f0f5e6b16fa08ce359b8f0f51253f0ade364b89448bbf5faa2af7e59deb6c72194734c3233944250dcfd4f31968a5e97
diff --git a/media-sound/pulseaudio-daemon/files/enable-autospawn.conf b/media-sound/pulseaudio-daemon/files/enable-autospawn.conf
new file mode 100644
index 000000000000..5681459a32cd
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/enable-autospawn.conf
@@ -0,0 +1,2 @@
+# Enable automatic spawning of pulseaudio daemon
+autospawn = yes
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch
new file mode 100644
index 000000000000..4ffdb82f4901
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch
@@ -0,0 +1,76 @@
+commit 823e46fba0742605f557b68cd591f61624b93966
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Sun Jun 12 21:49:32 2022 +0300
+
+    build-sys: meson: Make module-console-kit optional
+    
+    Default build configuration would fail to run on a system without systemd-logind
+    (or elogind) and without ConsoleKit daemon responding on dbus interface. Here,
+    module-console-kit would fail to initialize, preventing daemon from starting.
+    
+    Make module-console-kit an optional build feature to allow opt-out.
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/719>
+
+diff --git a/meson.build b/meson.build
+index d4cdbd6a5..c6db7e670 100644
+--- a/meson.build
++++ b/meson.build
+@@ -732,6 +732,10 @@ if get_option('daemon')
+     cdata.set('HAVE_SYSTEMD_LOGIN', 1)
+   endif
+ 
++  if get_option('consolekit').enabled()
++    assert(dbus_dep.found(), 'ConsoleKit requires D-Bus support')
++  endif
++
+   tcpwrap_dep = cc.find_library('wrap', required: get_option('tcpwrap'))
+   if cc.has_header('tcpd.h') and cc.has_function('hosts_access', dependencies : tcpwrap_dep)
+     cdata.set('HAVE_LIBWRAP', 1)
+@@ -1001,6 +1005,7 @@ summary += [
+   '  Enable HAL->udev compat:     @0@'.format(get_option('hal-compat')),
+   'Enable systemd units:          @0@'.format(systemd_dep.found()),
+   'Enable elogind:                @0@'.format(libelogind_dep.found()),
++  'Enable ConsoleKit:             @0@'.format(not get_option('consolekit').disabled() and dbus_dep.found()),
+   'Enable TCP Wrappers:           @0@'.format(tcpwrap_dep.found()),
+   'Enable OpenSSL (for Airtunes): @0@'.format(openssl_dep.found()),
+   'Database:                      @0@'.format(get_option('database')),
+diff --git a/meson_options.txt b/meson_options.txt
+index b23210072..e7160a3a7 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -99,6 +99,9 @@ option('bluez5-native-headset',
+ option('bluez5-ofono-headset',
+        type : 'boolean',
+        description : 'Optional oFono headset backend support (BlueZ 5)')
++option('consolekit',
++       type : 'feature', value : 'auto',
++       description : 'Optional ConsoleKit support')
+ option('dbus',
+        type : 'feature', value : 'auto',
+        description : 'Optional D-Bus support')
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index cdf372c8e..1d8004300 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -130,7 +130,6 @@ endif
+ 
+ if dbus_dep.found()
+   all_modules += [
+-    [ 'module-console-kit', 'module-console-kit.c', [], [], [dbus_dep] ],
+     [ 'module-dbus-protocol',
+       [ 'dbus/iface-card.c', 'dbus/iface-card.h',
+ 	'dbus/iface-card-profile.c', 'dbus/iface-card-profile.h',
+@@ -147,6 +146,12 @@ if dbus_dep.found()
+       [], [], [dbus_dep] ],
+     [ 'module-rygel-media-server', 'module-rygel-media-server.c', [], [], [dbus_dep], libprotocol_http ],
+   ]
++
++  if not get_option('consolekit').disabled()
++    all_modules += [
++      [ 'module-console-kit', 'module-console-kit.c', [], [], [dbus_dep] ],
++    ]
++  endif
+ endif
+ 
+ if fftw_dep.found()
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-load-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-load-crash.patch
new file mode 100644
index 000000000000..d02c1029f8b0
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-load-crash.patch
@@ -0,0 +1,26 @@
+commit 37c72c20720d6f7fefeeb151f5e10c2cd0dda30e
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Sun Nov 27 22:30:45 2022 +0300
+
+    module-combine-sink: Do not set up rate adjustment timer at load time
+    
+    Rate adjustment timer is set up when combine sink is resumed and relased when
+    combine sink is suspended. Do not create this timer again while module is loaded
+    to prevent duplicate effort causing assertion in time_callback.
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/756>
+
+diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
+index f98f4820b..4b7690183 100644
+--- a/src/modules/module-combine-sink.c
++++ b/src/modules/module-combine-sink.c
+@@ -1711,9 +1711,6 @@ int pa__init(pa_module*m) {
+     PA_IDXSET_FOREACH(o, u->outputs, idx)
+         output_verify(o);
+ 
+-    if (u->adjust_time > 0)
+-        u->time_event = pa_core_rttime_new(m->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
+-
+     pa_modargs_free(ma);
+ 
+     return 0;
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-unload-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-unload-crash.patch
new file mode 100644
index 000000000000..f0cd82dde16e
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-unload-crash.patch
@@ -0,0 +1,22 @@
+commit 0cbbc408aee2b5f2c42280d24dc615405387b5b1
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Sun Nov 27 19:39:23 2022 +0300
+
+    module-combine-sink: Suspend while unloading to fix crash moving sinks
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/756>
+
+diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
+index 4b7690183..2ccd9eb13 100644
+--- a/src/modules/module-combine-sink.c
++++ b/src/modules/module-combine-sink.c
+@@ -1733,6 +1733,9 @@ void pa__done(pa_module*m) {
+     if (!(u = m->userdata))
+         return;
+ 
++    if (u->sink && PA_SINK_IS_LINKED(u->sink->state))
++        pa_sink_suspend(u->sink, true, PA_SUSPEND_UNAVAILABLE);
++
+     pa_strlist_free(u->unlinked_slaves);
+ 
+     if (u->sink_put_slot)
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch
new file mode 100644
index 000000000000..d3943bf10a49
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch
@@ -0,0 +1,36 @@
+commit 07a9fcefbab049d66cb174ca2c9b91fecc444c5b
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Sat Jul 9 09:12:38 2022 +0300
+
+    build-sys: meson: Move qpaeq to daemon build
+    
+    Equalizer control requires server modules only available when daemon is built.
+    Move qpaeq script to be installed together with daemon.
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/734>
+
+diff --git a/src/utils/meson.build b/src/utils/meson.build
+index 28e1fc10a..8496d0bc5 100644
+--- a/src/utils/meson.build
++++ b/src/utils/meson.build
+@@ -72,6 +72,10 @@ if get_option('daemon')
+       c_args : pa_c_args,
+     )
+   endif
++
++  if dbus_dep.found() and fftw_dep.found()
++    install_data('qpaeq', install_dir : bindir)
++  endif
+ endif
+ 
+ if get_option('client')
+@@ -117,9 +121,5 @@ if get_option('client')
+     )
+   endif
+ 
+-  if dbus_dep.found() and fftw_dep.found()
+-    install_data('qpaeq', install_dir : bindir)
+-  endif
+-
+   install_data('pa-info', install_dir : bindir)
+ endif
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch
new file mode 100644
index 000000000000..c7aa9d8aadbe
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch
@@ -0,0 +1,23 @@
+commit e2b63d157fcc5ceb67a2f0eaed202d18baa05a11
+Author: Arun Raghavan <arun@asymptotic.io>
+Date:   Sun Aug 13 07:24:41 2023 -0400
+
+    build-sys: Bump cpp_std to c++17
+    
+    Match it with webrtc-audio-processing, which is what we care about.
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795>
+
+diff --git a/meson.build b/meson.build
+index daa80b573..ba3d01dac 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project('pulseaudio', 'c',
+         version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version'), check : false).stdout().strip(),
+         meson_version : '>= 0.50.0',
+-        default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ]
++        default_options : [ 'c_std=gnu11', 'cpp_std=c++17' ]
+         )
+ 
+ if not meson.is_subproject()
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-17.0-pr801.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-17.0-pr801.patch
new file mode 100644
index 000000000000..6e1bd338992c
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-17.0-pr801.patch
@@ -0,0 +1,95 @@
+From f5cacd94abcc47003bd88ad7ca1450de649ffb15 Mon Sep 17 00:00:00 2001
+From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
+Date: Thu, 30 Nov 2023 20:17:22 +0300
+Subject: [PATCH] alsa-ucm: Check UCM verb before working with device status
+
+Some versions of the ALSA libraries run into a segmentation fault when
+we query a UCM device/modifier status without first setting a UCM verb.
+It's not a reasonable thing to do anyway, so check for this case and
+return an error. Also do the check in other helpers.
+
+Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/801>
+---
+ src/modules/alsa/alsa-ucm.c | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
+index bb9438f79..7f5136249 100644
+--- a/src/modules/alsa/alsa-ucm.c
++++ b/src/modules/alsa/alsa-ucm.c
+@@ -624,6 +624,11 @@ static long ucm_device_status(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *dev)
+     char *devstatus;
+     long status = 0;
+ 
++    if (!ucm->active_verb) {
++        pa_log_error("Failed to get status for UCM device %s: no UCM verb set", dev_name);
++        return -1;
++    }
++
+     devstatus = pa_sprintf_malloc("_devstatus/%s", dev_name);
+     if (snd_use_case_geti(ucm->ucm_mgr, devstatus, &status) < 0) {
+         pa_log_debug("Failed to get status for UCM device %s", dev_name);
+@@ -637,6 +642,11 @@ static long ucm_device_status(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *dev)
+ static int ucm_device_disable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *dev) {
+     const char *dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
+ 
++    if (!ucm->active_verb) {
++        pa_log_error("Failed to disable UCM device %s: no UCM verb set", dev_name);
++        return -1;
++    }
++
+     /* If any of dev's conflicting devices is enabled, trying to disable
+      * dev gives an error despite the fact that it's already disabled.
+      * Check that dev is enabled to avoid this error. */
+@@ -657,6 +667,11 @@ static int ucm_device_disable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *dev)
+ static int ucm_device_enable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *dev) {
+     const char *dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
+ 
++    if (!ucm->active_verb) {
++        pa_log_error("Failed to enable UCM device %s: no UCM verb set", dev_name);
++        return -1;
++    }
++
+     /* We don't need to enable devices that are already enabled */
+     if (ucm_device_status(ucm, dev) > 0) {
+         pa_log_debug("UCM device %s is already enabled", dev_name);
+@@ -707,6 +722,11 @@ static long ucm_modifier_status(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *m
+     char *modstatus;
+     long status = 0;
+ 
++    if (!ucm->active_verb) {
++        pa_log_error("Failed to get status for UCM modifier %s: no UCM verb set", mod_name);
++        return -1;
++    }
++
+     modstatus = pa_sprintf_malloc("_modstatus/%s", mod_name);
+     if (snd_use_case_geti(ucm->ucm_mgr, modstatus, &status) < 0) {
+         pa_log_debug("Failed to get status for UCM modifier %s", mod_name);
+@@ -720,6 +740,11 @@ static long ucm_modifier_status(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *m
+ static int ucm_modifier_disable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *mod) {
+     const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
+ 
++    if (!ucm->active_verb) {
++        pa_log_error("Failed to disable UCM modifier %s: no UCM verb set", mod_name);
++        return -1;
++    }
++
+     /* We don't need to disable modifiers that are already disabled */
+     if (ucm_modifier_status(ucm, mod) == 0) {
+         pa_log_debug("UCM modifier %s is already disabled", mod_name);
+@@ -738,6 +763,11 @@ static int ucm_modifier_disable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *m
+ static int ucm_modifier_enable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *mod) {
+     const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
+ 
++    if (!ucm->active_verb) {
++        pa_log_error("Failed to disable UCM modifier %s: no UCM verb set", mod_name);
++        return -1;
++    }
++
+     /* We don't need to enable modifiers that are already enabled */
+     if (ucm_modifier_status(ucm, mod) > 0) {
+         pa_log_debug("UCM modifier %s is already enabled", mod_name);
+-- 
+GitLab
+
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-17.0-pr802.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-17.0-pr802.patch
new file mode 100644
index 000000000000..3fd2adc0cff4
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-17.0-pr802.patch
@@ -0,0 +1,64 @@
+From ed3d4f0837f670e5e5afb1afa5bcfc8ff05d3407 Mon Sep 17 00:00:00 2001
+From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
+Date: Fri, 1 Dec 2023 13:28:05 +0300
+Subject: [PATCH] alsa-ucm: Replace port device UCM context assertion with an
+ error
+
+The pa_alsa_ucm_set_port() function is passed both a mapping context and
+a device port, and both of these refer to their respective UCM device.
+While switching over to having one port per mapping per UCM device, I
+expected both of these to be the same device struct, so added an assert
+checking so.
+
+This assertion gets triggered when we have multiple UCM verbs declaring
+the same UCM device name. The root cause here is that the ports' UCM
+device references are set once while creating the ports for the card, so
+they happen to be those of a specific verb and may not match those from
+a different UCM verb's profiles' mappings.
+
+Solving the root cause necessitates a larger refactor. What we actually
+assume here is that name of the UCM device is same for both the port and
+the UCM context, which ends up always true in practice. For now, replace
+the assert with a check and error.
+
+Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/802>
+---
+ src/modules/alsa/alsa-ucm.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
+index 7f5136249..018c01739 100644
+--- a/src/modules/alsa/alsa-ucm.c
++++ b/src/modules/alsa/alsa-ucm.c
+@@ -1581,6 +1581,7 @@ int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *p
+     pa_alsa_ucm_config *ucm;
+     pa_alsa_ucm_device *dev;
+     pa_alsa_ucm_port_data *data;
++    const char *dev_name, *ucm_dev_name;
+ 
+     pa_assert(context && context->ucm);
+ 
+@@ -1588,8 +1589,17 @@ int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *p
+     pa_assert(ucm->ucm_mgr);
+ 
+     data = PA_DEVICE_PORT_DATA(port);
+-    dev = context->ucm_device;
+-    pa_assert(dev == data->device);
++    dev = data->device;
++    pa_assert(dev);
++
++    if (context->ucm_device) {
++        dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
++        ucm_dev_name = pa_proplist_gets(context->ucm_device->proplist, PA_ALSA_PROP_UCM_NAME);
++        if (!pa_streq(dev_name, ucm_dev_name)) {
++            pa_log_error("Failed to set port %s with wrong UCM context: %s", dev_name, ucm_dev_name);
++            return -1;
++        }
++    }
+ 
+     return ucm_device_enable(ucm, dev);
+ }
+-- 
+GitLab
+
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio-daemon/files/pulseaudio.conf.d
index 9e7245344a57..9e7245344a57 100644
--- a/media-sound/pulseaudio/files/pulseaudio.conf.d
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio.conf.d
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-5 b/media-sound/pulseaudio-daemon/files/pulseaudio.init.d-5
index d5415d6987d8..a14f5e74aa53 100644
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-5
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio.init.d-5
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/media-sound/pulseaudio/files/pulseaudio.service b/media-sound/pulseaudio-daemon/files/pulseaudio.service
index c5f0d5799929..c5f0d5799929 100644
--- a/media-sound/pulseaudio/files/pulseaudio.service
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio.service
diff --git a/media-sound/pulseaudio/files/pulseaudio.tmpfiles b/media-sound/pulseaudio-daemon/files/pulseaudio.tmpfiles
index 88374e35574b..88374e35574b 100644
--- a/media-sound/pulseaudio/files/pulseaudio.tmpfiles
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio.tmpfiles
diff --git a/media-sound/pulseaudio-daemon/metadata.xml b/media-sound/pulseaudio-daemon/metadata.xml
new file mode 100644
index 000000000000..b623122bdb00
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/metadata.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>igor.v.kovalenko@gmail.com</email>
+    <name>Igor V. Kovalenko</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>leio@gentoo.org</email>
+    <name>Mart Raudsepp</name>
+  </maintainer>
+  <use>
+    <flag name="X">
+      Build the X11 publish module to export PulseAudio information
+      through X11 protocol for clients to make use. Don't enable this
+      flag if you want to use a system wide instance. If unsure, enable
+      this flag.
+    </flag>
+    <flag name="alsa-plugin">
+      Request installing <pkg>media-plugins/alsa-plugins</pkg> with
+      PulseAudio plugin enabled. This ensures that clients supporting
+      ALSA only will use PulseAudio.
+    </flag>
+    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for giving each session a PA client</flag>
+    <flag name="oss">
+      Enable OSS sink/source (output/input). Deprecated, upstream does
+      not support this on systems where other sink/source systems are
+      available (i.e.: Linux). The padsp wrapper is now always build
+      if the system supports OSS at all.
+    </flag>
+    <flag name="glib">
+      Build the GSettings PA module.
+    </flag>
+    <flag name="system-wide">
+      Allow preparation and installation of the system-wide init
+      script for PulseAudio. Since this support is only supported for
+      embedded situations, do not enable without reading the upstream
+      instructions at
+      https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
+    </flag>
+    <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
+    <flag name="equalizer">
+      Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg> and <pkg>sys-apps/dbus</pkg>).
+    </flag>
+    <flag name="fftw">
+      Enable the virtual surround sink module (requires <pkg>sci-libs/fftw</pkg>).
+    </flag>
+    <flag name="ssl">
+      Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
+      (AirPort) streaming.
+    </flag>
+    <flag name="gdbm">
+      Use <pkg>sys-libs/gdbm</pkg> to store PulseAudio
+      databases. Recommended for desktop usage. This flag causes the
+      whole package to be licensed under GPL-2 or later.
+    </flag>
+    <flag name="webrtc-aec">
+      Uses the webrtc.org AudioProcessing library for enhancing VoIP calls
+      greatly in applications that support it by performing acoustic echo
+      cancellation, analog gain control, noise suppression and other processing.
+    </flag>
+    <flag name="systemd">
+      Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
+      ConsoleKit.
+    </flag>
+    <flag name="ofono-headset">
+      Build with optional oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
+    </flag>
+    <flag name="gstreamer">
+      Build GStreamer-based RTP protocol module which supports more advanced RTP features like OPUS payload encoding.
+    </flag>
+    <flag name="aptx">
+      aptX (HD) over Bluetooth (many Android compatible headphones), requires <pkg>media-plugins/gst-plugins-openaptx</pkg>.
+    </flag>
+    <flag name="ldac">
+      LDAC over Bluetooth (primarily Sony headphones), requires <pkg>media-plugins/gst-plugins-ldac</pkg>.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">pulseaudio/pulseaudio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r7.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r7.ebuild
new file mode 100644
index 000000000000..855f51ae4c9e
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r7.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+
+DESCRIPTION="Daemon component of PulseAudio (networked sound server)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+
+# +alsa-plugin as discussed in bug #519530
+# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
+# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
+IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
+ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
+
+RESTRICT="!test? ( test )"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
+# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
+REQUIRED_USE="
+	?? ( elogind systemd )
+	alsa-plugin? ( alsa )
+	aptx? ( bluetooth )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ldac? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+gstreamer_deps="
+	media-libs/gst-plugins-base
+	>=media-libs/gstreamer-1.14
+"
+COMMON_DEPEND="
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20
+	>=media-libs/speexdsp-1.2
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	aptx? ( ${gstreamer_deps} )
+	asyncns? ( >=net-libs/libasyncns-0.1 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	dev-libs/libltdl
+	sys-kernel/linux-headers
+	>=sys-libs/libcap-2.22-r2
+	dbus? ( >=sys-apps/dbus-1.4.12 )
+	elibc_mingw? ( dev-libs/libpcre:3 )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0=
+	)
+	fftw? (
+		sci-libs/fftw:3.0=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2 )
+	gstreamer? (
+		${gstreamer_deps}
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack? ( virtual/jack )
+	ldac? ( ${gstreamer_deps} )
+	lirc? ( app-misc/lirc )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	valgrind? ( dev-debug/valgrind )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
+	X? (
+		>=x11-libs/libxcb-1.6
+		x11-libs/libICE
+		x11-libs/libSM
+		>=x11-libs/libX11-1.4.0
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
+# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
+RDEPEND="
+	${COMMON_DEPEND}
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		acct-user/pulse
+		acct-group/audio
+		acct-group/pulse-access
+	)
+	bluetooth? (
+		ldac? ( media-plugins/gst-plugins-ldac )
+		aptx? ( media-plugins/gst-plugins-openaptx )
+	)
+	!media-video/pipewire[sound-server(+)]
+"
+unset gstreamer_deps
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+DOCS=( NEWS README )
+
+# patches merged upstream, to be removed with 16.2 or later bump
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch
+	"${FILESDIR}"/pulseaudio-16.1-module-combine-sink-load-crash.patch
+	"${FILESDIR}"/pulseaudio-16.1-module-combine-sink-unload-crash.patch
+	"${FILESDIR}"/pulseaudio-16.1-move-qpaeq-to-daemon.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local enable_bluez5_gstreamer="disabled"
+	if use aptx || use ldac ; then
+		enable_bluez5_gstreamer="enabled"
+	fi
+
+	local enable_fftw="disabled"
+	if use equalizer || use fftw ; then
+		enable_fftw="enabled"
+	fi
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=true
+		-Dclient=false
+		-Ddoxygen=false
+		-Dgcov=false
+		-Dman=true
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_use test tests)
+		-Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
+		$(meson_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_feature zeroconf avahi)
+		$(meson_feature bluetooth bluez5)
+		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
+		$(meson_use bluetooth bluez5-native-headset)
+		$(meson_use ofono-headset bluez5-ofono-headset)
+		-Dconsolekit=disabled
+		$(meson_feature dbus)
+		$(meson_feature elogind)
+		-Dfftw=${enable_fftw}
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature glib gsettings) # Supposedly correct?
+		$(meson_feature gstreamer)
+		-Dgtk=disabled
+		-Dhal-compat=false
+		-Dipv6=true
+		$(meson_feature jack)
+		$(meson_feature lirc)
+		$(meson_feature ssl openssl)
+		$(meson_feature orc)
+		$(meson_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_feature systemd)
+		$(meson_feature tcpd tcpwrap)
+		$(meson_feature udev)
+		$(meson_feature valgrind)
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_feature webrtc-aec)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# qpaeq moved to media-sound/qpaeq
+	if [[ -f "${ED}"/usr/bin/qpaeq ]]; then
+		rm "${ED}"/usr/bin/qpaeq || die
+	fi
+
+	# Upstream installs 'pactl' if client is built, with all symlinks except for
+	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
+	# This trips QA warning, workaround:
+	# - install missing aliases in media-libs/libpulse (client build)
+	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
+	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
+	rm "${D}/$(get_bashcompdir)"/pacmd || die
+	rm "${D}/$(get_bashcompdir)"/pasuspender || die
+
+	# Daemon configuration scripts will try to load snippets from corresponding '.d' dirs.
+	# Install these dirs to silence a warning if they are missing.
+	keepdir /etc/pulse/default.pa.d
+	keepdir /etc/pulse/system.pa.d
+
+	if use system-wide; then
+		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
+
+			use "${1}" && echo "-D${define}" || echo "-U${define}"
+		}
+
+		unifdef -x 1 \
+			$(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}"/pulseaudio.init.d-5 \
+			> "${T}"/pulseaudio \
+			|| die
+
+		doinitd "${T}"/pulseaudio
+
+		systemd_dounit "${FILESDIR}"/pulseaudio.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus; then
+			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf; then
+		sed -i \
+			-e '/module-zeroconf-publish/s:^#::' \
+			"${ED}/etc/pulse/default.pa" \
+			|| die
+	fi
+
+	# Only enable autospawning pulseaudio daemon on systems without systemd
+	if ! use systemd; then
+		insinto /etc/pulse/client.conf.d
+		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	use udev && udev_reload
+
+	if use system-wide; then
+		tmpfiles_process "pulseaudio.conf"
+
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog ""
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		elog ""
+	fi
+
+	if use bluetooth; then
+		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
+		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
+		elog "native headset backend by default. This can be selectively disabled"
+		elog "via runtime configuration arguments to module-bluetooth-discover"
+		elog "in /etc/pulse/default.pa"
+		elog "To disable HFP HF append enable_native_hfp_hf=false"
+		elog "To disable HSP HS append enable_native_hsp_hs=false"
+		elog "To disable HSP AG append headset=auto or headset=ofono"
+		elog "(note this does NOT require enabling USE ofono)"
+		elog ""
+	fi
+
+	if use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+		elog ""
+	fi
+
+	if use gstreamer; then
+		elog "GStreamer-based RTP implementation modile enabled."
+		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
+		elog "and add enable_opus=1 argument to module-rtp-send"
+		elog ""
+	fi
+
+	if use systemd; then
+		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "Root user can change system default configuration for all users:"
+		elog ""
+		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
+		elog ""
+		elog "  autospawn = yes"
+		elog ""
+		elog "The change from autospawn to user units will take effect after restarting."
+		elog ""
+	fi
+
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use equalizer && optfeature "qpaeq script for equalizer GUI" media-sound/qpaeq
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	use udev && udev_reload
+}
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild
new file mode 100644
index 000000000000..59de0db5e161
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild
@@ -0,0 +1,385 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+
+DESCRIPTION="Daemon component of PulseAudio (networked sound server)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+
+# +alsa-plugin as discussed in bug #519530
+# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
+# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
+IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
+ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
+
+RESTRICT="!test? ( test )"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
+# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
+REQUIRED_USE="
+	?? ( elogind systemd )
+	alsa-plugin? ( alsa )
+	aptx? ( bluetooth )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ldac? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+gstreamer_deps="
+	media-libs/gst-plugins-base
+	>=media-libs/gstreamer-1.14
+"
+COMMON_DEPEND="
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	>=media-libs/libpulse-16.99.1
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20
+	>=media-libs/speexdsp-1.2
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	aptx? ( ${gstreamer_deps} )
+	asyncns? ( >=net-libs/libasyncns-0.1 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	dev-libs/libltdl
+	sys-kernel/linux-headers
+	>=sys-libs/libcap-2.22-r2
+	dbus? ( >=sys-apps/dbus-1.4.12 )
+	elibc_mingw? ( dev-libs/libpcre:3 )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0=
+	)
+	fftw? (
+		sci-libs/fftw:3.0=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2 )
+	gstreamer? (
+		${gstreamer_deps}
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack? ( virtual/jack )
+	ldac? ( ${gstreamer_deps} )
+	lirc? ( app-misc/lirc )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	valgrind? ( dev-debug/valgrind )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-1.3:1 )
+	X? (
+		>=x11-libs/libxcb-1.6
+		x11-libs/libICE
+		x11-libs/libSM
+		>=x11-libs/libX11-1.4.0
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
+# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
+RDEPEND="
+	${COMMON_DEPEND}
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		acct-user/pulse
+		acct-group/audio
+		acct-group/pulse-access
+	)
+	bluetooth? (
+		ldac? ( media-plugins/gst-plugins-ldac )
+		aptx? ( media-plugins/gst-plugins-openaptx )
+	)
+	!media-video/pipewire[sound-server(+)]
+"
+unset gstreamer_deps
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+DOCS=( NEWS README )
+
+# patches merged upstream, to be removed with 16.99.2 or later bump
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-16.99.1-bump-c++17.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local enable_bluez5_gstreamer="disabled"
+	if use aptx || use ldac ; then
+		enable_bluez5_gstreamer="enabled"
+	fi
+
+	local enable_fftw="disabled"
+	if use equalizer || use fftw ; then
+		enable_fftw="enabled"
+	fi
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=true
+		-Dclient=false
+		-Ddoxygen=false
+		-Dgcov=false
+		-Dman=true
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_use test tests)
+		-Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
+		$(meson_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_feature zeroconf avahi)
+		$(meson_feature bluetooth bluez5)
+		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
+		$(meson_use bluetooth bluez5-native-headset)
+		$(meson_use ofono-headset bluez5-ofono-headset)
+		-Dconsolekit=disabled
+		$(meson_feature dbus)
+		$(meson_feature elogind)
+		-Dfftw=${enable_fftw}
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature glib gsettings) # Supposedly correct?
+		$(meson_feature gstreamer)
+		-Dgtk=disabled
+		-Dhal-compat=false
+		-Dipv6=true
+		$(meson_feature jack)
+		$(meson_feature lirc)
+		$(meson_feature ssl openssl)
+		$(meson_feature orc)
+		$(meson_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_feature systemd)
+		$(meson_feature tcpd tcpwrap)
+		$(meson_feature udev)
+		$(meson_feature valgrind)
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_feature webrtc-aec)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# qpaeq moved to media-sound/qpaeq
+	if [[ -f "${ED}"/usr/bin/qpaeq ]]; then
+		rm "${ED}"/usr/bin/qpaeq || die
+	fi
+
+	# Upstream installs 'pactl' if client is built, with all symlinks except for
+	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
+	# This trips QA warning, workaround:
+	# - install missing aliases in media-libs/libpulse (client build)
+	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
+	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
+	rm "${D}/$(get_bashcompdir)"/pacmd || die
+	rm "${D}/$(get_bashcompdir)"/pasuspender || die
+
+	# Daemon configuration scripts will try to load snippets from corresponding '.d' dirs.
+	# Install these dirs to silence a warning if they are missing.
+	keepdir /etc/pulse/default.pa.d
+	keepdir /etc/pulse/system.pa.d
+
+	if use system-wide; then
+		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
+
+			use "${1}" && echo "-D${define}" || echo "-U${define}"
+		}
+
+		unifdef -x 1 \
+			$(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}"/pulseaudio.init.d-5 \
+			> "${T}"/pulseaudio \
+			|| die
+
+		doinitd "${T}"/pulseaudio
+
+		systemd_dounit "${FILESDIR}"/pulseaudio.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus; then
+			rm "${ED}"/usr/share/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf; then
+		sed -i \
+			-e '/module-zeroconf-publish/s:^#::' \
+			"${ED}/etc/pulse/default.pa" \
+			|| die
+	fi
+
+	# Only enable autospawning pulseaudio daemon on systems without systemd
+	if ! use systemd; then
+		insinto /etc/pulse/client.conf.d
+		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	use udev && udev_reload
+
+	if use system-wide; then
+		tmpfiles_process "pulseaudio.conf"
+
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog ""
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		elog ""
+	fi
+
+	if use bluetooth; then
+		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
+		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
+		elog "native headset backend by default. This can be selectively disabled"
+		elog "via runtime configuration arguments to module-bluetooth-discover"
+		elog "in /etc/pulse/default.pa"
+		elog "To disable HFP HF append enable_native_hfp_hf=false"
+		elog "To disable HSP HS append enable_native_hsp_hs=false"
+		elog "To disable HSP AG append headset=auto or headset=ofono"
+		elog "(note this does NOT require enabling USE ofono)"
+		elog ""
+	fi
+
+	if use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+		elog ""
+	fi
+
+	if use gstreamer; then
+		elog "GStreamer-based RTP implementation modile enabled."
+		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
+		elog "and add enable_opus=1 argument to module-rtp-send"
+		elog ""
+	fi
+
+	if use systemd; then
+		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "Root user can change system default configuration for all users:"
+		elog ""
+		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
+		elog ""
+		elog "  autospawn = yes"
+		elog ""
+		elog "The change from autospawn to user units will take effect after restarting."
+		elog ""
+	fi
+
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use equalizer && optfeature "qpaeq script for equalizer GUI" media-sound/qpaeq
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	use udev && udev_reload
+}
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-17.0-r1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-17.0-r1.ebuild
new file mode 100644
index 000000000000..bcfa95dc4123
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-17.0-r1.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+
+DESCRIPTION="Daemon component of PulseAudio (networked sound server)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+
+# +alsa-plugin as discussed in bug #519530
+# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
+# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
+IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
+ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
+
+RESTRICT="!test? ( test )"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
+# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
+REQUIRED_USE="
+	?? ( elogind systemd )
+	alsa-plugin? ( alsa )
+	aptx? ( bluetooth )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ldac? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+gstreamer_deps="
+	media-libs/gst-plugins-base
+	>=media-libs/gstreamer-1.14
+"
+COMMON_DEPEND="
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	>=media-libs/libpulse-16.99.1
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20
+	>=media-libs/speexdsp-1.2
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	aptx? ( ${gstreamer_deps} )
+	asyncns? ( >=net-libs/libasyncns-0.1 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	dev-libs/libltdl
+	sys-kernel/linux-headers
+	>=sys-libs/libcap-2.22-r2
+	dbus? ( >=sys-apps/dbus-1.4.12 )
+	elibc_mingw? ( dev-libs/libpcre:3 )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0=
+	)
+	fftw? (
+		sci-libs/fftw:3.0=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2 )
+	gstreamer? (
+		${gstreamer_deps}
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack? ( virtual/jack )
+	ldac? ( ${gstreamer_deps} )
+	lirc? ( app-misc/lirc )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	valgrind? ( dev-debug/valgrind )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-1.3:1 )
+	X? (
+		>=x11-libs/libxcb-1.6
+		x11-libs/libICE
+		x11-libs/libSM
+		>=x11-libs/libX11-1.4.0
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
+# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
+RDEPEND="
+	${COMMON_DEPEND}
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		acct-user/pulse
+		acct-group/audio
+		acct-group/pulse-access
+	)
+	bluetooth? (
+		ldac? ( media-plugins/gst-plugins-ldac )
+		aptx? ( media-plugins/gst-plugins-openaptx )
+	)
+	!media-video/pipewire[sound-server(+)]
+"
+unset gstreamer_deps
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+DOCS=( NEWS README )
+
+# patches merged upstream, to be removed with 17.1 or later bump
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-17.0-pr801.patch
+	"${FILESDIR}"/pulseaudio-17.0-pr802.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local enable_bluez5_gstreamer="disabled"
+	if use aptx || use ldac ; then
+		enable_bluez5_gstreamer="enabled"
+	fi
+
+	local enable_fftw="disabled"
+	if use equalizer || use fftw ; then
+		enable_fftw="enabled"
+	fi
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=true
+		-Dclient=false
+		-Ddoxygen=false
+		-Dgcov=false
+		-Dman=true
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_use test tests)
+		-Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
+		$(meson_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_feature zeroconf avahi)
+		$(meson_feature bluetooth bluez5)
+		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
+		$(meson_use bluetooth bluez5-native-headset)
+		$(meson_use ofono-headset bluez5-ofono-headset)
+		-Dconsolekit=disabled
+		$(meson_feature dbus)
+		$(meson_feature elogind)
+		-Dfftw=${enable_fftw}
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature glib gsettings) # Supposedly correct?
+		$(meson_feature gstreamer)
+		-Dgtk=disabled
+		-Dhal-compat=false
+		-Dipv6=true
+		$(meson_feature jack)
+		$(meson_feature lirc)
+		$(meson_feature ssl openssl)
+		$(meson_feature orc)
+		$(meson_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_feature systemd)
+		$(meson_feature tcpd tcpwrap)
+		$(meson_feature udev)
+		$(meson_feature valgrind)
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_feature webrtc-aec)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# qpaeq moved to media-sound/qpaeq
+	if [[ -f "${ED}"/usr/bin/qpaeq ]]; then
+		rm "${ED}"/usr/bin/qpaeq || die
+	fi
+
+	# Upstream installs 'pactl' if client is built, with all symlinks except for
+	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
+	# This trips QA warning, workaround:
+	# - install missing aliases in media-libs/libpulse (client build)
+	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
+	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
+	rm "${D}/$(get_bashcompdir)"/pacmd || die
+	rm "${D}/$(get_bashcompdir)"/pasuspender || die
+
+	# Daemon configuration scripts will try to load snippets from corresponding '.d' dirs.
+	# Install these dirs to silence a warning if they are missing.
+	keepdir /etc/pulse/default.pa.d
+	keepdir /etc/pulse/system.pa.d
+
+	if use system-wide; then
+		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
+
+			use "${1}" && echo "-D${define}" || echo "-U${define}"
+		}
+
+		unifdef -x 1 \
+			$(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}"/pulseaudio.init.d-5 \
+			> "${T}"/pulseaudio \
+			|| die
+
+		doinitd "${T}"/pulseaudio
+
+		systemd_dounit "${FILESDIR}"/pulseaudio.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus; then
+			rm "${ED}"/usr/share/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf; then
+		sed -i \
+			-e '/module-zeroconf-publish/s:^#::' \
+			"${ED}/etc/pulse/default.pa" \
+			|| die
+	fi
+
+	# Only enable autospawning pulseaudio daemon on systems without systemd
+	if ! use systemd; then
+		insinto /etc/pulse/client.conf.d
+		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	use udev && udev_reload
+
+	if use system-wide; then
+		tmpfiles_process "pulseaudio.conf"
+
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog ""
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		elog ""
+	fi
+
+	if use bluetooth; then
+		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
+		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
+		elog "native headset backend by default. This can be selectively disabled"
+		elog "via runtime configuration arguments to module-bluetooth-discover"
+		elog "in /etc/pulse/default.pa"
+		elog "To disable HFP HF append enable_native_hfp_hf=false"
+		elog "To disable HSP HS append enable_native_hsp_hs=false"
+		elog "To disable HSP AG append headset=auto or headset=ofono"
+		elog "(note this does NOT require enabling USE ofono)"
+		elog ""
+	fi
+
+	if use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+		elog ""
+	fi
+
+	if use gstreamer; then
+		elog "GStreamer-based RTP implementation modile enabled."
+		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
+		elog "and add enable_opus=1 argument to module-rtp-send"
+		elog ""
+	fi
+
+	if use systemd; then
+		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "Root user can change system default configuration for all users:"
+		elog ""
+		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
+		elog ""
+		elog "  autospawn = yes"
+		elog ""
+		elog "The change from autospawn to user units will take effect after restarting."
+		elog ""
+	fi
+
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use equalizer && optfeature "qpaeq script for equalizer GUI" media-sound/qpaeq
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	use udev && udev_reload
+}
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
deleted file mode 100644
index 189ea5903d3c..000000000000
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-DIST pulseaudio-modules-bt-1.3.tar.gz 85802 BLAKE2B ea7e5141d07c1d3b19372cbae2aa9a5b6049509a12bb2470f47f231f85cc66ef4a74e70bdc91d3554d57e9c26b64129f87b2a3a55e16fbf0c6fe1b5ce7721074 SHA512 094c4205c1c71326efd42053a1bc9f131633c9e28fde177f1c08a290395864b76b8f60f79ffec2fbb8445186aa5c85aafabc47908fd302beb5b278ebcac98558
-DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
diff --git a/media-sound/pulseaudio-modules-bt/metadata.xml b/media-sound/pulseaudio-modules-bt/metadata.xml
deleted file mode 100644
index ecdf5fddd6d7..000000000000
--- a/media-sound/pulseaudio-modules-bt/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>pacho@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="fdk">
-		AAC encoding support using media-libs/fdk-aac
-		</flag>
-		<flag name="ffmpeg">
-		APTX, APTX-HD encoding support
-		</flag>
-		<flag name="ldac">
-		LDAC encoding support, using media-libs/libldac
-		</flag>
-		<flag name="native-headset">
-		Build with native HSP (Headset Profile) headset for bluez 5
-		</flag>
-		<flag name="ofono-headset">
-		Build with oFono HFP (Hands Free Profile) headset for bluez 5, requires net-misc/ofono.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r2.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r2.ebuild
deleted file mode 100644
index f46c7072e9c9..000000000000
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils readme.gentoo-r1
-
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
-HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
-
-PULSE_VER="13.0"
-SRC_URI="
-	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
-
-DEPEND="
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/sbc
-	ldac? ( media-libs/libldac )
-	>=net-wireless/bluez-5
-	>=sys-apps/dbus-1.0.0
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
-"
-# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-DISABLE_AUTOFORMATTING="no"
-DOC_CONTENTS="
-After getting media-sound/pulseaudio merged without its bluetooth
-support (to not collide with this) you may have removed the loading
-of bluetooth modules in default.pa config file, leading to failure
-to use your bluetooth device (see
-https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
-Please ensure you have this lines present in your /etc/pulse/default.pa
-file:
-
-.ifexists module-bluetooth-policy.so
-load-module module-bluetooth-policy
-.endif
-
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
-		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
-		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
-		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
-	)
-	cmake-utils_src_configure
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# pulseaudio headers needed to build
-	rmdir pa/ || die
-	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
deleted file mode 100644
index 56a66ff8e9e3..000000000000
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils readme.gentoo-r1
-
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
-HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
-
-PULSE_VER="13.0"
-SRC_URI="
-	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
-
-DEPEND="
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/sbc
-	ldac? ( media-libs/libldac )
-	>=net-wireless/bluez-5
-	>=sys-apps/dbus-1.0.0
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
-"
-# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-DISABLE_AUTOFORMATTING="no"
-DOC_CONTENTS="
-After getting media-sound/pulseaudio merged without its bluetooth
-support (to not collide with this) you may have removed the loading
-of bluetooth modules in default.pa config file, leading to failure
-to use your bluetooth device (see
-https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
-Please ensure you have this lines present in your /etc/pulse/default.pa
-file:
-
-.ifexists module-bluetooth-policy.so
-load-module module-bluetooth-policy
-.endif
-
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
-		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
-		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
-		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
-	)
-	cmake-utils_src_configure
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# pulseaudio headers needed to build
-	rmdir pa/ || die
-	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
deleted file mode 100644
index 5363d6d475a6..000000000000
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 cmake-utils readme.gentoo-r1
-
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
-HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/EHfive/${PN}"
-
-# Ensure it is synced with major pulseaudio version
-# https://github.com/EHfive/pulseaudio-modules-bt/issues/83
-EGIT_OVERRIDE_COMMIT_PULSEAUDIO_PULSEAUDIO="v13.0"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
-
-DEPEND="
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/sbc
-	ldac? ( media-libs/libldac )
-	>=net-wireless/bluez-5
-	>=sys-apps/dbus-1.0.0
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	>=media-sound/pulseaudio-13[-bluetooth]
-"
-# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-DISABLE_AUTOFORMATTING="no"
-DOC_CONTENTS="
-After getting media-sound/pulseaudio merged without its bluetooth
-support (to not collide with this) you may have removed the loading
-of bluetooth modules in default.pa config file, leading to failure
-to use your bluetooth device (see
-https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
-Please ensure you have this lines present in your /etc/pulse/default.pa
-file:
-
-.ifexists module-bluetooth-policy.so
-load-module module-bluetooth-policy
-.endif
-
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
-		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
-		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
-		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
deleted file mode 100644
index 8c2628da203d..000000000000
--- a/media-sound/pulseaudio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
deleted file mode 100644
index 40b23ec05f2e..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
---- a/man/pulse-daemon.conf.5.xml.in	2016-05-26 23:21:17.000000000 -0500
-+++ b/man/pulse-daemon.conf.5.xml.in	2016-05-31 10:01:55.679976730 -0500
-@@ -220,7 +220,7 @@ License along with PulseAudio; if not, s
-       <p><opt>flat-volumes=</opt> Enable 'flat' volumes, i.e. where
-       possible let the sink volume equal the maximum of the volumes of
-       the inputs connected to it. Takes a boolean argument, defaults
--      to <opt>yes</opt>.</p>
-+      to <opt>no</opt>.</p>
-     </option>
- 
-   </section>
-diff -up a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
---- a/src/daemon/daemon-conf.c	2016-05-26 23:21:17.000000000 -0500
-+++ b/src/daemon/daemon-conf.c	2016-05-31 10:01:55.680976735 -0500
-@@ -68,7 +68,7 @@ static const pa_daemon_conf default_conf
-     .realtime_priority = 5,  /* Half of JACK's default rtprio */
-     .disallow_module_loading = false,
-     .disallow_exit = false,
--    .flat_volumes = true,
-+    .flat_volumes = false,
-     .exit_idle_time = 20,
-     .scache_idle_time = 20,
-     .script_commands = NULL,
-diff -up a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
---- a/src/daemon/daemon.conf.in	2016-05-31 10:01:55.680976735 -0500
-+++ b/src/daemon/daemon.conf.in	2016-05-31 10:02:28.048133267 -0500
-@@ -57,7 +57,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
- ; enable-lfe-remixing = no
- ; lfe-crossover-freq = 0
- 
--; flat-volumes = yes
-+; flat-volumes = no
- 
- ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
- ; rlimit-fsize = -1
-diff -up a/src/pulsecore/core.c b/src/pulsecore/core.c
---- a/src/pulsecore/core.c	2016-05-26 23:21:17.000000000 -0500
-+++ b/src/pulsecore/core.c	2016-05-31 10:01:55.681976740 -0500
-@@ -135,7 +135,7 @@ pa_core* pa_core_new(pa_mainloop_api *m,
-     c->exit_idle_time = -1;
-     c->scache_idle_time = 20;
- 
--    c->flat_volumes = true;
-+    c->flat_volumes = false;
-     c->disallow_module_loading = false;
-     c->disallow_exit = false;
-     c->running_as_daemon = false;
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 38993dac40af..9810b94f531c 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -1,75 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
+  <maintainer type="person" proxied="yes">
+    <email>igor.v.kovalenko@gmail.com</email>
+    <name>Igor V. Kovalenko</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>leio@gentoo.org</email>
+    <name>Mart Raudsepp</name>
   </maintainer>
   <use>
-    <flag name="X">
-      Build the X11 publish module to export PulseAudio information
-      through X11 protocol for clients to make use. Don't enable this
-      flag if you want to use a system wide instance. If unsure, enable
-      this flag.
-    </flag>
-    <flag name="alsa-plugin">
-      Request installing <pkg>media-plugins/alsa-plugins</pkg> with
-      PulseAudio plugin enabled. This ensures that clients supporting
-      ALSA only will use PulseAudio.
-    </flag>
-    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for giving each session a PA client</flag>
-    <flag name="gconf">
-      Ensure <pkg>gnome-base/gconf</pkg> is present for pulseaudio GConf
-      to GSettings module automatic migration (keeping the user configuration)
-    </flag>
-    <flag name="oss">
-      Enable OSS sink/source (output/input). Deprecated, upstream does
-      not support this on systems where other sink/source systems are
-      available (i.e.: Linux). The padsp wrapper is now always build
-      if the system supports OSS at all.
-    </flag>
+    <flag name="daemon">Build the pulseaudio binary (not-needed for pipewire-pulse)</flag>
     <flag name="glib">
       Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
       libpulse client library, to allow using libpulse on glib-based
       programs. Build the GSettings PA module.
     </flag>
-    <flag name="system-wide">
-      Allow preparation and installation of the system-wide init
-      script for PulseAudio. Since this support is only supported for
-      embedded situations, do not enable without reading the upstream
-      instructions at
-      https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
-    </flag>
-    <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
-    <flag name="doc">Build the doxygen-described API documentation.</flag>
-    <flag name="realtime">
-      Makes PulseAudio use RealtimeKit (<pkg>sys-auth/rtkit</pkg>) to get
-      real-time priority while running.
-    </flag>
-    <flag name="equalizer">
-      Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
-    </flag>
-    <flag name="ssl">
-      Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
-      (AirPort) streaming.
-    </flag>
-    <flag name="gdbm">
-      Use <pkg>sys-libs/gdbm</pkg> to store PulseAudio
-      databases. Recommended for desktop usage. This flag causes the
-      whole package to be licensed under GPL-2 or later.
-    </flag>
-    <flag name="webrtc-aec">
-      Uses the webrtc.org AudioProcessing library for enhancing VoIP calls
-      greatly in applications that support it by performing acoustic echo
-      cancellation, analog gain control, noise suppression and other processing.
-    </flag>
-    <flag name="systemd">
-      Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
-      ConsoleKit.
-    </flag>
-    <flag name="native-headset">
-      Build with native HSP backend for bluez 5.
-    </flag>
     <flag name="ofono-headset">
       Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
     </flag>
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
deleted file mode 100644
index 5d88aeb97634..000000000000
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
-+gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset cpu_flags_arm_neon
-ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
-+udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	?? ( elogind systemd )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	realtime? ( dbus )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-	realtime? ( sys-auth/rtkit )
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-		acct-user/pulse
-		acct-group/pulse-access
-	)
-	acct-group/audio
-"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	system-wide? ( dev-util/unifdef )
-	test? ( >=dev-libs/check-0.9.10 )
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
-	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable cpu_flags_arm_neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use elogind && multilib_is_native_abi; then
-		local PKGCONFIG="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind")"
-			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind")"
-		)
-	fi
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	else
-		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
-		if use elibc_glibc ; then
-			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
deleted file mode 100644
index 2e67499f79dd..000000000000
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs user udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
-+gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset cpu_flags_arm_neon
-ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
-+udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	?? ( elogind systemd )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	realtime? ( dbus )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-CDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-RDEPEND="${CDEPEND}
-	realtime? ( sys-auth/rtkit )
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( dev-util/unifdef )
-	>=sys-devel/gettext-0.19.3
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
-	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable cpu_flags_arm_neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use elogind && multilib_is_native_abi; then
-		local PKGCONFIG="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind")"
-			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind")"
-		)
-	fi
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	else
-		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
-		if use elibc_glibc ; then
-			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED%/}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-16.1.ebuild b/media-sound/pulseaudio/pulseaudio-16.1.ebuild
new file mode 100644
index 000000000000..4dcb6be5ba33
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-16.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+DESCRIPTION="A meta package for PulseAudio (networked sound server)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI=""
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+
+LICENSE="metapackage"
+
+SLOT="0"
+
+# NOTE: bluetooth and ofono-headset are passed through to
+# pulseaudio-daemon dependency to make sure users who have bluetooth enabled
+# just for pulseaudio package will also get these enabled via metapackage.
+IUSE="bluetooth daemon +glib jack ofono-headset"
+
+RDEPEND="
+	>=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
+	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[bluetooth?,glib?,jack?,ofono-headset?] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 68f235de03ff..d83abb7279f8 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,2 +1 @@
-DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
-DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac706fc9eb535c78c06f32526d910dffb82bec36af4130490645c95b200562c51f59f19de8905c3c54bda5d8a4b68b5297a SHA512 4d68f5bd678c75f5b13519cddb2f46bd0a827516f1cc7431a8952204f51bd2691f701df869258092a93843bcdb4c61bac916291bade8c4428ed9a4d68b70c757
+DIST pulseeffects-4.8.7.tar.gz 2028489 BLAKE2B 705783104c7ce3f4ff1246cf05c1a31c09ef0507a720365b9a8914e6e076a209dcc56e240ae2de1981f3ab377f10947d08260fe8ae8b3cae5724db1235a0c01c SHA512 0fa679723ba76ab0a0cf3136dfa66fec09b16643f3f4f7bd1bb2826794d907c5c29a2fc7633e30d3542ddf755c842fdaa167528942fe459e3e697ac3524c0cb9
diff --git a/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch b/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch
deleted file mode 100644
index fb8080dd823a..000000000000
--- a/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dbaea05da683f7bfcd7960c88b1b7d13379435c0 Mon Sep 17 00:00:00 2001
-From: Vasiliy Glazov <vascom2@gmail.com>
-Date: Tue, 24 Mar 2020 10:54:09 +0300
-Subject: [PATCH] Fix build with GCC 10
-
-This fix build error:
-```
-../include/plugin_base.hpp:10:25: error: expected ')' before 'tag'
-   10 |   PluginBase(std::string tag, std::string plugin_name, const std::string& schema);
-      |             ~           ^~~~
-      |                         )
-../include/plugin_base.hpp:17:8: error: 'string' in namespace 'std' does not name a type
-   17 |   std::string log_tag, name;
-      |        ^~~~~~
-../include/plugin_base.hpp:7:1: note: 'std::string' is defined in header '<string>'; did you forget to '#include <string>'?
-```
----
- include/plugin_base.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/plugin_base.hpp b/include/plugin_base.hpp
-index a2356fbf..79fd5452 100644
---- a/include/plugin_base.hpp
-+++ b/include/plugin_base.hpp
-@@ -4,6 +4,7 @@
- #include <gio/gio.h>
- #include <gst/gst.h>
- #include <sigc++/sigc++.h>
-+#include <string>
- 
- class PluginBase {
-  public:
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
new file mode 100644
index 000000000000..7d29270ce54e
--- /dev/null
+++ b/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
@@ -0,0 +1,55 @@
+--- a/meson.build
++++ b/meson.build
+@@ -4,7 +4,7 @@
+ 	'cpp',
+ 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
+ 	version: '4.8.7',
+-	meson_version: '>= 0.40.0'
++	meson_version: '>= 0.47.0'
+ )
+ 
+ add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -0,0 +1,12 @@
++option(
++        'bs2b',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
++)
++option(
++        'rnnoise',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable rnnoise-based Noise Reduction plug-in'
++)
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -108,7 +108,7 @@
+ 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
+ 	dependency('gstreamer-fft-1.0'),
+ 	dependency('lilv-0', version: '>=0.22', required: false),
+-	dependency('libbs2b', required: false),
++	dependency('libbs2b', required: get_option('bs2b')),
+ 	dependency('boost', version: '>=1.72', modules:['system','filesystem']),
+ 	dependency('sndfile'),
+ 	dependency('threads')
+--- a/src/rnnoise/meson.build
++++ b/src/rnnoise/meson.build
+@@ -1,4 +1,5 @@
+-dep_rnnoise = dependency('rnnoise', required: false)
++opt_rnnoise = get_option('rnnoise')
++dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
+ 
+ if dep_rnnoise.found()
+ 
+@@ -28,7 +29,7 @@
+   	cpp_args: plugins_cxx_args
+ )
+ 
+-else
++elif opt_rnnoise.auto()
+ 
+ message('could not find the RNNoise library')
+ 
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index c0da3601cd32..9e2ce750f76e 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
-		<flag name="bs2b">Enable use of media-libs/libbs2b</flag>
-		<flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
-		<flag name="mda-lv2">Enable use of media-plugins/mda-lv2 for the loudness FX</flag>
-		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
+		<flag name="bs2b">Enable use of <pkg>media-libs/libbs2b</pkg> for the crossfeed FX</flag>
+		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
+		<flag name="doc">Install packages needed to display built-in user documentation</flag>
+		<flag name="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
+			noise-reduction FX</flag>
+		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
+		<flag name="webrtc">Enable use of <pkg>media-plugins/gst-plugins-webrtc</pkg> for various
+			voice-enhancement FX</flag>
+		<flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag>
 	</use>
 	<longdescription lang="en">
 		GUI to manage audio effects for Pulseaudio applications, giving full control over the effects order to the user.
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.2-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.2-r1.ebuild
deleted file mode 100644
index b12d12b7438a..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/patch-4.7.2-gcc10.patch"
-)
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.4.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.4.ebuild
deleted file mode 100644
index 2da1d6c26e68..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.8.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
new file mode 100644
index 000000000000..bd7592de8370
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+	EGIT_BRANCH="pulseaudio-legacy"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf +doc rnnoise rubberband webrtc zamaudio"
+
+COMMON="dev-libs/boost:=
+	>=dev-cpp/glibmm-2.56.0:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=media-libs/gstreamer-1.12.5:1.0
+	media-libs/gst-plugins-base
+	>=media-libs/gst-plugins-bad-1.12.5:1.0
+	media-libs/libebur128
+	media-libs/libsndfile
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/zita-convolver-3.0.0
+	media-sound/pulseaudio
+	>=x11-libs/gtk+-3.20:3
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
+	rnnoise? ( media-libs/rnnoise )"
+# Only header files are used from libsamplerate
+DEPEND="${COMMON}
+	media-libs/libsamplerate"
+RDEPEND="!media-sound/easyeffects
+	${COMMON}
+	>=media-libs/gst-plugins-good-1.12.5:1.0
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	rubberband? ( media-libs/rubberband[ladspa] )
+	webrtc? ( media-plugins/gst-plugins-webrtc )
+	zamaudio? ( media-plugins/zam-plugins )"
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.7-meson_no_automagic.patch
+)
+
+S="${WORKDIR}"/easyeffects-${PV}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bs2b)
+		$(meson_feature rnnoise)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
deleted file mode 100644
index cbfd497f5e76..000000000000
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/pulsemixer/metadata.xml b/media-sound/pulsemixer/metadata.xml
index 5cffdd8cf98c..8f6422c1ecbe 100644
--- a/media-sound/pulsemixer/metadata.xml
+++ b/media-sound/pulsemixer/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">GeorgeFilipkin/pulsemixer</remote-id>
 		<changelog>https://github.com/GeorgeFilipkin/pulsemixer/releases</changelog>
diff --git a/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild b/media-sound/pulsemixer/pulsemixer-1.5.1-r2.ebuild
index e35eab3f236e..92808ef8f579 100644
--- a/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild
+++ b/media-sound/pulsemixer/pulsemixer-1.5.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
@@ -22,4 +23,4 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="media-sound/pulseaudio"
+RDEPEND="media-libs/libpulse"
diff --git a/media-sound/pulsemixer/pulsemixer-9999.ebuild b/media-sound/pulsemixer/pulsemixer-9999.ebuild
index 45f1ee6b0c9b..c8ced02506c6 100644
--- a/media-sound/pulsemixer/pulsemixer-9999.ebuild
+++ b/media-sound/pulsemixer/pulsemixer-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
@@ -16,10 +17,10 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/GeorgeFilipkin/${PN}"
 else
 	SRC_URI="https://github.com/GeorgeFilipkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="media-sound/pulseaudio"
+RDEPEND="media-libs/libpulse"
diff --git a/media-sound/pwavecat/metadata.xml b/media-sound/pwavecat/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/pwavecat/metadata.xml
+++ b/media-sound/pwavecat/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/pwavecat/pwavecat-0.4.5.ebuild b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
index f49e51ba3f36..284b2e17ce75 100644
--- a/media-sound/pwavecat/pwavecat-0.4.5.ebuild
+++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="concatenates any number of audio files to stdout"
-HOMEPAGE="http://panteltje.com/panteltje/dvd/"
-SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+DESCRIPTION="Concatenates any number of audio files to stdout"
+HOMEPAGE="https://www.panteltje.nl/panteltje/dvd/"
+SRC_URI="https://www.panteltje.nl/panteltje/dvd/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
index aecf7481de9d..582cda61bd85 100644
--- a/media-sound/qastools/Manifest
+++ b/media-sound/qastools/Manifest
@@ -1 +1,2 @@
 DIST qastools-v0.23.0.tar.gz 292875 BLAKE2B c0ba54462e702411bee7a15a913617870488b1c9c2676e3c6f69d0648cff79cc1989e0f367953ba6f27b94c014c9b2fa7ef74ae4800d03b99bb8336ce4535d4a SHA512 79042a41a0ad37097d297175b899af73052953b7ae14058a1878e3145769db839b8bd4350bd36646d8436a3e8b37b64da7b3004bee3c7c7780d46a942af1d3b9
+DIST qastools-v1.4.0.tar.gz 304640 BLAKE2B 4a48ea32b41d03739497764f9677a79a0ca0f917fa758acab4ae61d776fe79d4d8b7cc6d3bfed657aafc241c2bf57d7d469184b2b95084c999133480faa8b5b6 SHA512 eced94ce0c796148d3dae79f8b687d481b2adb34466de41ad0c6ecf3b820562297720d8052332c3f1ba422a856dbc7742f1bdb2a32b6bb1c43eaad9cba256946
diff --git a/media-sound/qastools/metadata.xml b/media-sound/qastools/metadata.xml
index a35e89ccdeee..22b18c1ee79b 100644
--- a/media-sound/qastools/metadata.xml
+++ b/media-sound/qastools/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">qastools</remote-id>
 	</upstream>
diff --git a/media-sound/qastools/qastools-1.4.0.ebuild b/media-sound/qastools/qastools-1.4.0.ebuild
new file mode 100644
index 000000000000..fd5462cfef8f
--- /dev/null
+++ b/media-sound/qastools/qastools-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt GUI ALSA tools: mixer, configuration browser"
+HOMEPAGE="https://gitlab.com/sebholt/qastools"
+SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}"/${PN}-v${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtbase:6[dbus,gui,network,widgets]
+	dev-qt/qtsvg:6
+	media-libs/alsa-lib
+	virtual/libudev:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-nomancompress.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKIP_LICENSE_INSTALL=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index ddc5158024aa..1facac40020b 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,2 +1,3 @@
-DIST qjackctl-0.6.3.tar.gz 1033664 BLAKE2B 98d80d0fea3db359b732fad14711352ba688e605b7225daad64d7df1dabf1d19e24b4d643581f1936afa0df0c84350cf5727686246bd8a850e09da969a228e44 SHA512 72a9218b3b8a6b72470656e774f5cfbfe6670059e9f1a85a394345f4689c5d5c05af23b5e37d5f8dfc6159e591f64249006936069dde1632ef9d74b6f8355e0b
-DIST qjackctl-0.9.0.tar.gz 1088061 BLAKE2B 3be89091b6efb34d2dffee92fdfda5dabadc8b6e9f9a248cc5cd60df423482dc65342e9758a98f34c5c01bfba74eac64039e3ec2de157df0e03f8bf09a7a14fc SHA512 5aa6f3e86b6a5c528daa5fdb71b5400d5882fea6569d585a86bb6b9fa66b62699472fd82999a6f4eb1a375c70e684a20214240c1fc3b44239c22d182e3ae1b1c
+DIST qjackctl-0.9.13.tar.gz 1305333 BLAKE2B 940241df829a573ab33a950319debf5123538151853723141369b9ac47048bae84c58f3a70fe53ec7f98109914e78c49203410e241db22842c4f41f79ab6aba9 SHA512 89b9d5212654267030f30020085ad3dfe674a041e200796144d1441ba12630e963a06e405de5ab7c27d9ebc42fd8fa0a970bf59b91837dbc7580147db6adc9bc
+DIST qjackctl-0.9.90.tar.gz 1306770 BLAKE2B 213d66848640271a2dfc8e00b490c722311ee47653a23fc0f6c82267cebbe869a6546de523a3d6d0b81111559879f87f91f146828620264eacbddab23992aff9 SHA512 8e4840278576476b1ad8c36147773cb8ef38e1cf4959dd883d965a97897b53dea9166086969355b6b1b1776f5331e30aff6c109d2aa0cfc2d60ad622df9b8436
+DIST qjackctl-0.9.91.tar.gz 1312312 BLAKE2B db7dbffd55bb94b5bbd43fb68e9ffc00d47cab90773b8e4e9d386d84a365be71dee8d6ff480fb888fd70024a1467317554745bbc2ff433931a87cf4e7923e9fe SHA512 b4b7ef5619fde94b9b6e840477339972aa97906b0e1eceb2918de3d19dbf96bbea6b119bce7881143a533666967c646328ff887bdae7a5c21f0300951abd2afe
diff --git a/media-sound/qjackctl/files/qjackctl-0.9.13-disable-git.patch b/media-sound/qjackctl/files/qjackctl-0.9.13-disable-git.patch
new file mode 100644
index 000000000000..ff4e69fa1762
--- /dev/null
+++ b/media-sound/qjackctl/files/qjackctl-0.9.13-disable-git.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,6 +14,7 @@ set (PROJECT_DOMAIN    "rncbc.org")
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+ 
++#[[
+ execute_process (
+   COMMAND git describe --tags --dirty --abbrev=6
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+@@ -38,7 +39,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
+   endif ()
+   set (PROJECT_VERSION "${GIT_VERSION}")
+ endif ()
+-
++]]
++set (VERSION "${PROJECT_VERSION}")
+ 
+ if (CMAKE_BUILD_TYPE MATCHES "Debug")
+   set (CONFIG_DEBUG 1)
diff --git a/media-sound/qjackctl/metadata.xml b/media-sound/qjackctl/metadata.xml
index b61555de1db3..6e4c619dcf41 100644
--- a/media-sound/qjackctl/metadata.xml
+++ b/media-sound/qjackctl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/qjackctl/qjackctl-0.6.3.ebuild b/media-sound/qjackctl/qjackctl-0.6.3.ebuild
deleted file mode 100644
index ce7cdbc92ede..000000000000
--- a/media-sound/qjackctl/qjackctl-0.6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-RDEPEND="
-	app-arch/gzip
-	dev-qt/qtcore:5
-	dev-qt/qtgui: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 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	local myeconfargs=(
-		$(use_enable alsa alsa-seq)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable portaudio)
-		--enable-jack-version
-	)
-	econf "${myeconfargs[@]}"
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz" || die
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
-}
diff --git a/media-sound/qjackctl/qjackctl-0.9.0.ebuild b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
deleted file mode 100644
index f91e1e16e544..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-RDEPEND="
-	app-arch/gzip
-	dev-qt/qtcore:5
-	dev-qt/qtgui: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 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	local myeconfargs=(
-		$(use_enable alsa alsa-seq)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable portaudio)
-		--enable-jack-version
-	)
-	econf "${myeconfargs[@]}"
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
-	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
-}
diff --git a/media-sound/qjackctl/qjackctl-0.9.13.ebuild b/media-sound/qjackctl/qjackctl-0.9.13.ebuild
new file mode 100644
index 000000000000..8b1ca524e452
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.13.ebuild
@@ -0,0 +1,47 @@
+# 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/qjackctl/qjackctl-0.9.90.ebuild b/media-sound/qjackctl/qjackctl-0.9.90.ebuild
new file mode 100644
index 000000000000..29b887562b75
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.90.ebuild
@@ -0,0 +1,47 @@
+# 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/qjackctl/qjackctl-0.9.91.ebuild b/media-sound/qjackctl/qjackctl-0.9.91.ebuild
new file mode 100644
index 000000000000..29b887562b75
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.91.ebuild
@@ -0,0 +1,47 @@
+# 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/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 55ceab1b20dc..195544d225f7 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic qmake-utils autotools git-r3 xdg
+inherit xdg cmake git-r3
 
 DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
 HOMEPAGE="https://qjackctl.sourceforge.io/"
@@ -11,48 +11,32 @@ EGIT_REPO_URI="https://git.code.sf.net/p/qjackctl/code"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
-RDEPEND="
-	app-arch/gzip
+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 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
 
 src_configure() {
-	append-cxxflags -std=c++11
-	local myeconfargs=(
-		$(use_enable alsa alsa-seq)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable portaudio)
-		--enable-jack-version
+	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
 	)
-	econf "${myeconfargs[@]}"
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
-	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
+	cmake_src_configure
 }
diff --git a/media-sound/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest
index ad6b7db320da..3b48a0281a9e 100644
--- a/media-sound/qmidiarp/Manifest
+++ b/media-sound/qmidiarp/Manifest
@@ -1 +1 @@
-DIST qmidiarp-0.6.5.tar.bz2 541288 BLAKE2B eb2acb80c6fd442b197510eef2be000dc6a8e4cf7142cebbbbd156dad464f80062cc0a41881476aedc41c1b7cff27b1c56ae64354134b255b6cbd7672ef182f0 SHA512 171d74230a77b15453367fd38f9bcc94bbbd025a9665853180172bdfd812c2ee5ae0954124706d46c7e5cec0aafaebd5de68435f717789f052e7f86c48917379
+DIST qmidiarp-0.7.0.tar.bz2 718430 BLAKE2B 43b558d8185f2e798dc17dc58c966daf244f35b11abf5c96220f81210b39dc619daa260ff384a16da35c74584c90e86330597ec6e170bb071cebf977374c5efa SHA512 f1dcb9c817bfc9c39a9b120f5716518c3ef825652258d5852f9e228cbc3018202427a19d4b47858c16d43e5d8bbf3712cced68d95f300cc6b98ad76c608b68fd
diff --git a/media-sound/qmidiarp/metadata.xml b/media-sound/qmidiarp/metadata.xml
index 0fa01de6dce3..e804378b1016 100644
--- a/media-sound/qmidiarp/metadata.xml
+++ b/media-sound/qmidiarp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/qmidiarp/qmidiarp-0.6.5.ebuild b/media-sound/qmidiarp/qmidiarp-0.7.0.ebuild
index 3f32bdbdb919..d1676a8a296b 100644
--- a/media-sound/qmidiarp/qmidiarp-0.6.5.ebuild
+++ b/media-sound/qmidiarp/qmidiarp-0.7.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils xdg
 
 DESCRIPTION="Arpeggiator, sequencer and MIDI LFO for ALSA"
-HOMEPAGE="http://qmidiarp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://qmidiarp.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="lv2 nls osc"
 
 BDEPEND="
diff --git a/media-sound/qmidiroute/metadata.xml b/media-sound/qmidiroute/metadata.xml
index 7b3a323df70b..4c15adff2d33 100644
--- a/media-sound/qmidiroute/metadata.xml
+++ b/media-sound/qmidiroute/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.4.0-r1.ebuild
index bda001fdd4ca..15d0434947db 100644
--- a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
+++ b/media-sound/qmidiroute/qmidiroute-0.4.0-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic qmake-utils
+inherit autotools qmake-utils
 
 DESCRIPTION="QMidiRoute is a filter/router for MIDI events"
-HOMEPAGE="http://alsamodular.sourceforge.net"
-SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+HOMEPAGE="https://alsamodular.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/alsamodular/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -21,7 +20,9 @@ BDEPEND="
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	media-libs/alsa-lib"
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -34,7 +35,6 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cxxflags '-std=c++11'
 	export PATH="$(qt5_get_bindir):${PATH}"
 	econf --enable-qt5
 }
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 3e141b45058e..f119fae0ae05 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1 +1 @@
-DIST qmmp-1.4.2.tar.bz2 1295867 BLAKE2B ce282f543dc6b14ccd027aa9a4ad85f190a8aee149049798ad5e51bf944cd34ce7773dcfb7b6ea4bdf0a8a69baea430802f04de631e9b12b68d2d23a8c599461 SHA512 00ed0c4bd74dc50294c9d8e717f249a577fb26f5d4eb93dbc42c6c79964188fd885ab577904dea5aec31db0d2b828d7038febca1ffdfd2f4bfe81f931bbed7ff
+DIST qmmp-1.6.4.tar.bz2 1379335 BLAKE2B e17ec8f84f94cfbc6a0a1d30d6d954f3e6b3448909c0e3344614340b41974d69aa5bd3dbb149fcc88c6ede289ec7900050eb0de81307dfeb8ebfc360255d1ea6 SHA512 da8eae4ca4e10cca8a177064a422fdc196e76bb5e3e06c3029040e1120da0d2e5666824a8effd51f82c94b999e1243ae3bc6c71c8c05e334276bf40a5767c17f
diff --git a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
new file mode 100644
index 000000000000..45512099ffeb
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
@@ -0,0 +1,11 @@
+--- qmmp-1.6.0/src/plugins/General/CMakeLists.txt
++++ qmmp-1.6.0/src/plugins/General/CMakeLists.txt
+@@ -51,7 +51,7 @@
+ ENDIF(USE_HAL AND Qt5DBus_FOUND)
+ 
+ IF(USE_UDISKS2 AND Qt5DBus_FOUND)
+-add_subdirectory(udisks2)
++add_subdirectory(udisks)
+ ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND)
+ 
+ IF(USE_HOTKEY AND Qt5X11Extras_FOUND)
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index eb5b4f1891fd..f3b32f35bd28 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -19,15 +19,16 @@
 		<flag name="lyrics">Fetch track lyrics from the web</flag>
 		<flag name="midi">Enable midi support using wildmidi library</flag>
 		<flag name="notifier">Enable qmmps' notifier system</flag>
+		<flag name="pipewire">Enable PipeWire output plugin</flag>
 		<flag name="projectm">Enable projectm music visualization plugin</flag>
 		<flag name="qsui">Enable QMMP simple UI</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
 		<flag name="shout">Enable shoutcast plug-in via <pkg>media-libs/libshout</pkg>.</flag>
-		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Use the SoX resampling library</flag>
 		<flag name="sndfile">Enable wav playback support via <pkg>media-libs/libsndfile</pkg></flag>
 		<flag name="stereo">Enable stereo effect</flag>
 		<flag name="tray">Build tray icon</flag>
+		<flag name="xmp">Enable module files renderer (modplug replacement)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-1.4.2.ebuild b/media-sound/qmmp/qmmp-1.6.4.ebuild
index 2e5fa0978838..d51786af6c2d 100644
--- a/media-sound/qmmp/qmmp-1.4.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.6.4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
-[[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+HOMEPAGE="https://qmmp.ylsoftware.com"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2"
 	KEYWORDS="amd64 x86"
 else
+	inherit subversion
 	QMMP_DEV_BRANCH="1.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
@@ -20,9 +20,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -51,7 +52,7 @@ RDEPEND="
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
 	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	game? ( media-libs/game-music-emu )
 	jack? (
 		media-libs/libsamplerate
@@ -64,16 +65,16 @@ RDEPEND="
 	)
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
 	mplayer? ( media-video/mplayer )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
 	projectm? (
 		dev-qt/qtgui:5[-gles2-only]
 		dev-qt/qtopengl:5
 		media-libs/libprojectm:=
 	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	pulseaudio? ( media-libs/libpulse )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	shout? ( media-libs/libshout )
@@ -86,15 +87,15 @@ RDEPEND="
 		media-libs/libvorbis
 	)
 	wavpack? ( media-sound/wavpack )
+	xmp? ( media-libs/libxmp )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
+	if has_version dev-libs/libcdio-paranoia ; then
 		sed -i \
 			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
@@ -123,19 +124,18 @@ src_configure() {
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
 		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
 		-DUSE_JACK="$(usex jack)"
 		-DUSE_LADSPA="$(usex ladspa)"
 		-DUSE_LYRICS="$(usex lyrics)"
 		-DUSE_MAD="$(usex mad)"
 		-DUSE_MIDI="$(usex midi)"
 		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
 		-DUSE_MPLAYER="$(usex mplayer)"
 		-DUSE_MPC="$(usex musepack)"
 		-DUSE_NOTIFIER="$(usex notifier)"
 		-DUSE_OPUS="$(usex opus)"
 		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
 		-DUSE_PROJECTM="$(usex projectm)"
 		-DUSE_PULSE="$(usex pulseaudio)"
 		-DUSE_QSUI="$(usex qsui)"
@@ -147,9 +147,10 @@ src_configure() {
 		-DUSE_SOXR="$(usex soxr)"
 		-DUSE_STEREO="$(usex stereo)"
 		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_UDISKS="$(usex udisks)"
 		-DUSE_VORBIS="$(usex vorbis)"
 		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex xmp)"
 	)
 
 	cmake_src_configure
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 45e48d80e0dc..e69b0aa74275 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
-[[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+HOMEPAGE="https://qmmp.ylsoftware.com"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
+	inherit subversion
 	QMMP_DEV_BRANCH="1.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
@@ -20,9 +20,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -51,29 +52,29 @@ RDEPEND="
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
 	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	game? ( media-libs/game-music-emu )
 	jack? (
 		media-libs/libsamplerate
 		virtual/jack
 	)
 	ladspa? ( media-plugins/cmt-plugins )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
 	mplayer? ( media-video/mplayer )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
 	projectm? (
 		dev-qt/qtgui:5[-gles2-only]
 		dev-qt/qtopengl:5
 		media-libs/libprojectm:=
 	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	pulseaudio? ( media-libs/libpulse )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	shout? ( media-libs/libshout )
@@ -86,15 +87,19 @@ RDEPEND="
 		media-libs/libvorbis
 	)
 	wavpack? ( media-sound/wavpack )
+	xmp? ( media-libs/libxmp )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch"
+)
+
 src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
+	if has_version dev-libs/libcdio-paranoia ; then
 		sed -i \
 			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
@@ -123,19 +128,18 @@ src_configure() {
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
 		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
 		-DUSE_JACK="$(usex jack)"
 		-DUSE_LADSPA="$(usex ladspa)"
 		-DUSE_LYRICS="$(usex lyrics)"
 		-DUSE_MAD="$(usex mad)"
 		-DUSE_MIDI="$(usex midi)"
 		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
 		-DUSE_MPLAYER="$(usex mplayer)"
 		-DUSE_MPC="$(usex musepack)"
 		-DUSE_NOTIFIER="$(usex notifier)"
 		-DUSE_OPUS="$(usex opus)"
 		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
 		-DUSE_PROJECTM="$(usex projectm)"
 		-DUSE_PULSE="$(usex pulseaudio)"
 		-DUSE_QSUI="$(usex qsui)"
@@ -147,9 +151,10 @@ src_configure() {
 		-DUSE_SOXR="$(usex soxr)"
 		-DUSE_STEREO="$(usex stereo)"
 		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_UDISKS="$(usex udisks)"
 		-DUSE_VORBIS="$(usex vorbis)"
 		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex xmp)"
 	)
 
 	cmake_src_configure
diff --git a/media-sound/qpaeq/Manifest b/media-sound/qpaeq/Manifest
new file mode 100644
index 000000000000..955eec847d0e
--- /dev/null
+++ b/media-sound/qpaeq/Manifest
@@ -0,0 +1 @@
+DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
diff --git a/media-sound/qpaeq/metadata.xml b/media-sound/qpaeq/metadata.xml
new file mode 100644
index 000000000000..200e0214650c
--- /dev/null
+++ b/media-sound/qpaeq/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>igor.v.kovalenko@gmail.com</email>
+    <name>Igor V. Kovalenko</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>leio@gentoo.org</email>
+    <name>Mart Raudsepp</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/qpaeq/qpaeq-16.1.ebuild b/media-sound/qpaeq/qpaeq-16.1.ebuild
new file mode 100644
index 000000000000..789a0a286fdc
--- /dev/null
+++ b/media-sound/qpaeq/qpaeq-16.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit python-single-r1
+
+DESCRIPTION="Equalizer interface for equalizer sinks of PulseAudio (networked sound server)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	')
+	>=media-sound/pulseaudio-daemon-16.1-r7[dbus,fftw]
+	!<media-sound/pulseaudio-daemon-16.1-r7
+"
+
+src_configure() {
+	:; # do nothing
+}
+
+src_install() {
+	python_doscript src/utils/qpaeq
+}
+
+pkg_postinst() {
+	elog "You will need to load some extra modules to make qpaeq work."
+	elog "You can do that by adding the following two lines in"
+	elog "/etc/pulse/default.pa and restarting pulseaudio:"
+	elog "load-module module-equalizer-sink"
+	elog "load-module module-dbus-protocol"
+}
diff --git a/media-sound/qpwgraph/Manifest b/media-sound/qpwgraph/Manifest
new file mode 100644
index 000000000000..d5e22c9a82b1
--- /dev/null
+++ b/media-sound/qpwgraph/Manifest
@@ -0,0 +1 @@
+DIST qpwgraph-v0.6.2.tar.bz2 213346 BLAKE2B eb2984c0b72d6478a865cad22f9cfb2fcf4098a2d86bd42d69946ccc14780a1c27e8843518b7fc25769bf157090170efe33ff3b95f7df9823ac57c53b465a9ca SHA512 229bc94691206b5bd236c5b998009b799e00c2ca6dd5eb5a1aa7c3ff0c88713d13705700961d536bac82aca6c4ecd8776cd18307f61f9ddc7f5abbdc4e429693
diff --git a/media-sound/qpwgraph/metadata.xml b/media-sound/qpwgraph/metadata.xml
new file mode 100644
index 000000000000..d07baf2f954e
--- /dev/null
+++ b/media-sound/qpwgraph/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Adel Kara Slimane</name>
+		<email>adel.ks@zegrapher.com</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">rncbc/qpwgraph</remote-id>
+		<bugs-to>https://gitlab.freedesktop.org/rncbc/qpwgraph/-/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="trayicon">Build support for tray icon</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/qpwgraph/qpwgraph-0.6.2.ebuild b/media-sound/qpwgraph/qpwgraph-0.6.2.ebuild
new file mode 100644
index 000000000000..37b4e0ba45ae
--- /dev/null
+++ b/media-sound/qpwgraph/qpwgraph-0.6.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="PipeWire Graph Qt GUI Interface"
+HOMEPAGE="https://gitlab.freedesktop.org/rncbc/qpwgraph"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/rncbc/qpwgraph"
+else
+	SRC_URI="https://gitlab.freedesktop.org/rncbc/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="alsa trayicon qt6 wayland"
+
+BDEPEND="
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+DEPEND="
+	media-video/pipewire:=
+	alsa? ( media-libs/alsa-lib )
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets,xml,network]
+		dev-qt/qtsvg:6
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_MIDI=$(usex alsa)
+		-DCONFIG_SYSTEM_TRAY=$(usex trayicon)
+		-DCONFIG_WAYLAND=$(usex wayland)
+		-DCONFIG_QT6=$(usex qt6)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qpwgraph/qpwgraph-9999.ebuild b/media-sound/qpwgraph/qpwgraph-9999.ebuild
new file mode 100644
index 000000000000..744009584113
--- /dev/null
+++ b/media-sound/qpwgraph/qpwgraph-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="PipeWire Graph Qt GUI Interface"
+HOMEPAGE="https://gitlab.freedesktop.org/rncbc/qpwgraph"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/rncbc/qpwgraph"
+else
+	SRC_URI="https://gitlab.freedesktop.org/rncbc/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="alsa trayicon qt6 wayland"
+
+BDEPEND="
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+DEPEND="
+	media-video/pipewire:=
+	alsa? ( media-libs/alsa-lib )
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets,xml,network]
+		dev-qt/qtsvg:6
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_MIDI=$(usex alsa)
+		-DCONFIG_SYSTEM_TRAY=$(usex trayicon)
+		-DCONFIG_WAYLAND=$(usex wayland)
+		-DCONFIG_QT6=$(usex qt6)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 66b24d017d63..bc54f1a0046e 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1 +1,3 @@
-DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
+DIST qsampler-0.9.12.tar.gz 219168 BLAKE2B c68fad51b37f4b471e1ffdcb4168487ef0069877ed2c13fd06f320c1a353c146ab493d94522d7ed86a8541646429550a4d02a89d5b37ae44847687acb5400fd1 SHA512 089a177e2d6350880c96e17f7833ef80b94add3535b9cf0418453080c294c51a98b909a4072054c5f0b8ecdf014914966ac7d2e90add984225ec3c9a35a0ca0c
+DIST qsampler-0.9.90.tar.gz 219790 BLAKE2B ccbb9b94eedd200f0f79d22adf8541c49f334249f7b5eeca59a200a70ba9fd633c288a78f486394df3c33983c2be0d313ba0c8ad5e4151b83b9d630c0e7a9d94 SHA512 4ff7663e5ea7cbea34127e242debdf0ac8da1a06e3d8de071fbf9543841819b94c9addb1e368d2bda692269f31503bc52cd47ac7590d96e31866611349ff3aae
+DIST qsampler-0.9.91.tar.gz 219798 BLAKE2B c947e865a62f4e14f701635d434ec6624a81fbcd471929b7ea1d9d841460afa931914937b6f9d863d4bd0759bcfd32da40765bc1d51e8950103f03f8e63a0078 SHA512 8ef9eefa7624d5e4b45a462fdb1fceded51e350ea75aafd5d9939be1d10f0d582d05244f3f73f1aeb9743a630d7a6f06a05ebf602a1e2a54bf542626c386db06
diff --git a/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch b/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch
deleted file mode 100644
index 5da44d8a8175..000000000000
--- a/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 9756274..f88b2fd 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -111,7 +111,6 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/files/qsampler-9999-Makefile.patch b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
deleted file mode 100644
index 29788b0fd35b..000000000000
--- a/media-sound/qsampler/files/qsampler-9999-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index e683df9..5c2d4f0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -111,10 +111,8 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1/$(name).1
--	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/fr/man1
- 	@install -v -m 0644 $(name).fr.1 $(DESTDIR)$(mandir)/fr/man1/$(name).1
--	@gzip -nvf $(DESTDIR)$(mandir)/fr/man1/$(name).1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/metadata.xml b/media-sound/qsampler/metadata.xml
index 70aeb4a9f721..daf211ca3f08 100644
--- a/media-sound/qsampler/metadata.xml
+++ b/media-sound/qsampler/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/qsampler/qsampler-0.6.3.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild
deleted file mode 100644
index 049457c6e582..000000000000
--- a/media-sound/qsampler/qsampler-0.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
-	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
-}
diff --git a/media-sound/qsampler/qsampler-0.9.12.ebuild b/media-sound/qsampler/qsampler-0.9.12.ebuild
new file mode 100644
index 000000000000..eeea4826b161
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +libgig qt6"
+
+DEPEND="
+	media-libs/alsa-lib
+	media-libs/liblscp:=
+	x11-libs/libX11
+	libgig? ( media-libs/libgig:= )
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
+	)
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}
+	media-sound/linuxsampler
+"
+BDEPEND="
+	qt6? ( dev-qt/qttools:6[linguist] )
+	!qt6? ( dev-qt/linguist-tools:5 )
+"
+
+DOCS=( ChangeLog README TRANSLATORS )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+		-DCONFIG_QT6=$(usex qt6 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsampler/qsampler-0.9.90.ebuild b/media-sound/qsampler/qsampler-0.9.90.ebuild
new file mode 100644
index 000000000000..f0a0b110d46b
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.90.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +libgig qt6"
+
+DEPEND="
+	media-libs/alsa-lib
+	media-libs/liblscp:=
+	x11-libs/libX11
+	libgig? ( media-libs/libgig:= )
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
+	)
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}
+	media-sound/linuxsampler
+"
+BDEPEND="
+	qt6? ( dev-qt/qttools:6[linguist] )
+	!qt6? ( dev-qt/linguist-tools:5 )
+"
+
+DOCS=( ChangeLog README TRANSLATORS )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+		-DCONFIG_QT6=$(usex qt6 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsampler/qsampler-0.9.91.ebuild b/media-sound/qsampler/qsampler-0.9.91.ebuild
new file mode 100644
index 000000000000..f0a0b110d46b
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.91.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +libgig qt6"
+
+DEPEND="
+	media-libs/alsa-lib
+	media-libs/liblscp:=
+	x11-libs/libX11
+	libgig? ( media-libs/libgig:= )
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
+	)
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}
+	media-sound/linuxsampler
+"
+BDEPEND="
+	qt6? ( dev-qt/qttools:6[linguist] )
+	!qt6? ( dev-qt/linguist-tools:5 )
+"
+
+DOCS=( ChangeLog README TRANSLATORS )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+		-DCONFIG_QT6=$(usex qt6 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 23f189c07e1c..f0a0b110d46b 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -1,54 +1,57 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
-inherit qmake-utils xdg autotools git-r3
+inherit cmake xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
 HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug +libgig"
+IUSE="debug +libgig qt6"
 
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
+	media-libs/liblscp:=
 	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
+	libgig? ( media-libs/libgig:= )
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
+	)
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
 "
 RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5
+	media-sound/linuxsampler
+"
+BDEPEND="
+	qt6? ( dev-qt/qttools:6[linguist] )
+	!qt6? ( dev-qt/linguist-tools:5 )
 "
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
-
-src_prepare() {
-	default
 
-	emake -f Makefile.git
-	eautoreconf
-}
+DOCS=( ChangeLog README TRANSLATORS )
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+		-DCONFIG_QT6=$(usex qt6 1 0)
 	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
+	cmake_src_configure
 }
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index b6fb37b4356f..604805a1d54e 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,2 +1,3 @@
-DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
-DIST qsynth-0.9.0.tar.gz 383118 BLAKE2B d9464a2f122d7281ff69171c431fff72d05886ec130d20aae8d8f122e1cefd1180b8bcdc157f324c5cdbc7e2c524c82a9cc7f481efc8b69912ce61912e73ed58 SHA512 5cc0e099cd05f3639ded81642bde80205c8921b65d22dcb32d40ac874107043edeb672e69d7e4734e0fd37a498be2e5b787f0b8c1707be45e39cfab616fd522c
+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
diff --git a/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch b/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
deleted file mode 100644
index 6b164924aca9..000000000000
--- a/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru qsynth-0.4.0/configure qsynth-0.4.0-modified/configure
---- qsynth-0.4.0/configure	2015-09-07 16:59:25.083842955 +0200
-+++ qsynth-0.4.0-modified/configure	2016-01-12 15:57:36.673008368 +0100
-@@ -4159,6 +4159,7 @@
- 
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#define QT_NO_VERSION_TAGGING
- #include "QtCore/qglobal.h"
- int
- main ()
diff --git a/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch b/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch
deleted file mode 100644
index 11091ba11660..000000000000
--- a/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7ddf562dfc92174f47e3da95a1e18e5b1af83bfc Mon Sep 17 00:00:00 2001
-From: Christoph Karl <pampelmuse@gmx.at>
-Date: Dec 31 2020 15:42:42 +0000
-Subject: Fix version number in about dialog
-
-
----
-
-diff -rupN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt     2020-12-31 16:31:19.395906813 +0100
-+++ b/CMakeLists.txt 2020-12-31 16:37:42.293523588 +0100
-@@ -5,25 +5,6 @@ cmake_minimum_required(VERSION 3.1)
- set (VERSION "0.9.0")
- 
- set (CONFIG_VERSION ${VERSION})
--execute_process (
--  COMMAND git describe --tags --dirty --abbrev=6
--  OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
--  RESULT_VARIABLE GIT_DESCRIBE_RESULT
--  OUTPUT_STRIP_TRAILING_WHITESPACE)
--if (GIT_DESCRIBE_RESULT EQUAL 0)
--  set (VERSION "${GIT_DESCRIBE_OUTPUT}")
--  string (REGEX REPLACE "^[^0-9]+" "" VERSION "${VERSION}")
--  string (REGEX REPLACE "-g"   "git." VERSION "${VERSION}")
--  string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")
--  execute_process (
--    COMMAND git rev-parse --abbrev-ref HEAD
--    OUTPUT_VARIABLE GIT_REVPARSE_OUTPUT
--    RESULT_VARIABLE GIT_REVPARSE_RESULT
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--  if (GIT_REVPARSE_RESULT EQUAL 0 AND NOT GIT_REVPARSE_OUTPUT STREQUAL "master")
--    set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]")
--  endif ()
--endif ()
- 
- set (PACKAGE_NAME "Qsynth")
- set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qsynth/metadata.xml b/media-sound/qsynth/metadata.xml
index 22d9da6dd56b..f156269be7c4 100644
--- a/media-sound/qsynth/metadata.xml
+++ b/media-sound/qsynth/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<longdescription>
-QSynth is a fluidsynth GUI front-end application written in C++ around the
-Qt toolkit using Qt Designer. Eventually it may evolve into a softsynth
-management application allowing the user to control and manage a variety of
-command line softsynth but for the moment it wraps the excellent FluidSynth.
-FluidSynth is a command line software synthesiser based on the Soundfont
-specification.
-</longdescription>
+	QSynth is a fluidsynth GUI front-end application written in C++ around the
+	Qt toolkit using Qt Designer. Eventually it may evolve into a softsynth
+	management application allowing the user to control and manage a variety of
+	command line softsynth but for the moment it wraps the excellent FluidSynth.
+	FluidSynth is a command line software synthesiser based on the Soundfont
+	specification.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">qsynth</remote-id>
 	</upstream>
diff --git a/media-sound/qsynth/qsynth-0.6.3.ebuild b/media-sound/qsynth/qsynth-0.6.3.ebuild
deleted file mode 100644
index 2e469dea3b30..000000000000
--- a/media-sound/qsynth/qsynth-0.6.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/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 qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qsynth/qsynth-0.9.13.ebuild b/media-sound/qsynth/qsynth-0.9.13.ebuild
new file mode 100644
index 000000000000..e030f127d687
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.13.ebuild
@@ -0,0 +1,72 @@
+# 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.0.ebuild b/media-sound/qsynth/qsynth-0.9.90.ebuild
index 70d95bac46aa..496e8129a1ca 100644
--- a/media-sound/qsynth/qsynth-0.9.0.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.90.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake desktop qmake-utils xdg-utils
+inherit cmake desktop xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
@@ -12,39 +12,40 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
 	inherit git-r3
 else
-	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+	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"
+IUSE="+alsa debug jack pulseaudio qt6"
 
 REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
+	qt6? ( dev-qt/qttools:6[linguist] )
+	!qt6? ( dev-qt/linguist-tools:5 )
 "
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
+	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}"
 
-PATCHES=( "${FILESDIR}/${P}-cmake-no-git-version.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_QT6=$(usex qt6 1 0)
 	)
 	cmake_src_configure
 }
@@ -54,7 +55,7 @@ src_install() {
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
+	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
 
 	local cmd
 	if use jack; then
@@ -67,13 +68,5 @@ src_install() {
 		cmd="qsynth -a oss"
 	fi
 
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
+	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
new file mode 100644
index 000000000000..496e8129a1ca
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.91.ebuild
@@ -0,0 +1,72 @@
+# 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-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index 70d95bac46aa..496e8129a1ca 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake desktop qmake-utils xdg-utils
+inherit cmake desktop xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
@@ -12,39 +12,40 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
 	inherit git-r3
 else
-	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+	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"
+IUSE="+alsa debug jack pulseaudio qt6"
 
 REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
+	qt6? ( dev-qt/qttools:6[linguist] )
+	!qt6? ( dev-qt/linguist-tools:5 )
 "
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
+	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}"
 
-PATCHES=( "${FILESDIR}/${P}-cmake-no-git-version.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_QT6=$(usex qt6 1 0)
 	)
 	cmake_src_configure
 }
@@ -54,7 +55,7 @@ src_install() {
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
+	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
 
 	local cmd
 	if use jack; then
@@ -67,13 +68,5 @@ src_install() {
 		cmd="qsynth -a oss"
 	fi
 
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
+	make_desktop_entry "${cmd}" Qsynth org.rncbc.qsynth
 }
diff --git a/media-sound/qtagger/metadata.xml b/media-sound/qtagger/metadata.xml
index 8a2a74a1ca47..57d1ae17da96 100644
--- a/media-sound/qtagger/metadata.xml
+++ b/media-sound/qtagger/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">DOOMer/qtagger</remote-id>
 	</upstream>
diff --git a/media-sound/qtgain/metadata.xml b/media-sound/qtgain/metadata.xml
index 27ed34b21c11..cd1cfc033621 100644
--- a/media-sound/qtgain/metadata.xml
+++ b/media-sound/qtgain/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
-<maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/qtgain/qtgain-1.0.0.ebuild b/media-sound/qtgain/qtgain-1.0.0.ebuild
index 30cfbd9acb38..05c73f72ba02 100644
--- a/media-sound/qtgain/qtgain-1.0.0.ebuild
+++ b/media-sound/qtgain/qtgain-1.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="QtGain"
-inherit desktop qmake-utils
+inherit desktop optfeature qmake-utils
 
 DESCRIPTION="Simple frontend to mp3gain, vorbisgain and metaflac"
 HOMEPAGE="https://www.linux-apps.com/content/show.php/QtGain?content=56842"
@@ -20,9 +20,8 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
 
@@ -37,11 +36,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Additional features can be enabled by installing optional packages:"
-	elog ""
-	elog "media-libs/flac - flac support"
-	elog "media-sound/aacgain - aac support"
-	elog "media-sound/mp3gain - mp3 support"
-	elog "media-sound/vorbisgain - vorbis support"
-	elog "media-sound/id3v2 - mass renamer and cover downloader"
+	optfeature "FLAC support" media-libs/flac
+	optfeature "AAC support" media-sound/aacgain
+	optfeature "MP3 support" media-sound/mp3gain
+	optfeature "Vorbis support" media-sound/vorbisgain
+	optfeature "Mass renamer and cover downloader" media-sound/id3v2
 }
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 8b16c1b97473..8de6b6756fa5 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,2 +1,3 @@
-DIST qtractor-0.9.18.tar.gz 1937478 BLAKE2B 269d2fd9cdb3171155ba32d7af5d6c0ad0037287311d2e77efb706820071fde353c84ba6958c0c0fb75f3ecc22eea5e5f7204018d1503bbfb424f48aefc60150 SHA512 e488f95becde10117fc675a5b20b66378e8ae1f8c388fb12042cafa1f4434292d4156f5fe613b93e0c7409c414df9bf0e614afce843e0a42e4a1bce7c9ee9125
-DIST qtractor-0.9.19.tar.gz 1943040 BLAKE2B 33ccb2e4002a8a666dc9f325dd7f14e66a2f624e0dda9eb916f8b958d01e2a8f72b5e8390946482e6170de9e2fcc28a4efcf8447b6610b21003288e7c7b9f9b7 SHA512 cab7ef6dc259ba570645a7f20efd6816377ae9707e004370f24745e00e20df90be9316543c5cb5ddbdc6bb1c749053bfb964e53ac97dc8ae2dd468e371274bfc
+DIST qtractor-0.9.39.tar.gz 2619142 BLAKE2B 062b363c2db748da731a2b5ee375e1a820bae9ea2d312a2f9f313fc2df11049e86452308c725fff58d7ffd05e916c3d3bbe42e8fd07f10012a34005edf874967 SHA512 3b2a4dde182147d73c773cff0ee6e3d086dd8b598b884a7ca564f10a1fdb56c3e86b3d135739f2629476a587e13b11d4a42abe7c498b76a0321151d9c0ff2852
+DIST qtractor-0.9.90.tar.gz 2647835 BLAKE2B a9bf283f062f946e630e4e878c194326d1cc7028c27dc91dbcb8f8567612d88c4005b73ca9a8270e837b27ea20f419bad4d54d85441338863bf6b7558c07ba50 SHA512 caed9a454e84fd2701c7d37f33bfcff32383127e891af5c2823045f710f953bf2e2040b7261ce5b24b1fc330a06ffb47132fe4b9a378c9cfe3e40f6b4e6f01cb
+DIST qtractor-0.9.91.tar.gz 2633018 BLAKE2B 7ae2ba467ce87e0df6a95e694dbfebbc4cad5551bccdf723ded4f26aa02ade31e666a294eb5c82762fc2918938d96ecd55d9cf062cf4ebc0ec138010e98ce03b SHA512 6628b61b46c18f69a30cd183e7d166581e64b00a117201a60064ce98926908576c8f7c677c39f8f1601ea42b72a04056a85cd915579f96575c080414dc75e011
diff --git a/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch b/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch
deleted file mode 100644
index cb4d5a4bbae7..000000000000
--- a/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 42849a9..3f05f9d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -346,10 +346,8 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1/$(name).1
--	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/fr/man1
- 	@install -v -m 0644 $(name).fr.1 $(DESTDIR)$(mandir)/fr/man1/$(name).1
--	@gzip -nvf $(DESTDIR)$(mandir)/fr/man1/$(name).1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qtractor/metadata.xml b/media-sound/qtractor/metadata.xml
index 5169d9fae0a0..1574ee971f67 100644
--- a/media-sound/qtractor/metadata.xml
+++ b/media-sound/qtractor/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!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>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>simon.vanderveldt+gentoo@gmail.com</email>
 		<name>Simon van der Veldt</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -20,5 +20,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">qtractor</remote-id>
+		<remote-id type="github">rncbc/qtractor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/qtractor/qtractor-0.9.18.ebuild b/media-sound/qtractor/qtractor-0.9.18.ebuild
deleted file mode 100644
index bbeb12feb8c7..000000000000
--- a/media-sound/qtractor/qtractor-0.9.18.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	>=media-libs/lilv-0.16.0
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.17-dont-compress-manpages.patch"
-)
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--enable-ladspa \
-		--enable-liblilv \
-		$(use_enable debug) \
-		$(use_enable aubio libaubio) \
-		$(use_enable dssi) \
-		$(use_enable libsamplerate) \
-		$(use_enable mad libmad) \
-		$(use_enable osc liblo) \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable zlib libz)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
diff --git a/media-sound/qtractor/qtractor-0.9.19.ebuild b/media-sound/qtractor/qtractor-0.9.19.ebuild
deleted file mode 100644
index 41b62db5a499..000000000000
--- a/media-sound/qtractor/qtractor-0.9.19.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.17-dont-compress-manpages.patch"
-)
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--enable-ladspa \
-		--enable-liblilv \
-		$(use_enable debug) \
-		$(use_enable aubio libaubio) \
-		$(use_enable dssi) \
-		$(use_enable libsamplerate) \
-		$(use_enable mad libmad) \
-		$(use_enable osc liblo) \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable zlib libz)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
diff --git a/media-sound/qtractor/qtractor-0.9.39.ebuild b/media-sound/qtractor/qtractor-0.9.39.ebuild
new file mode 100644
index 000000000000..f5b5ca1aa5d5
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.39.ebuild
@@ -0,0 +1,116 @@
+# 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="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io https://github.com/rncbc/qtractor"
+SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	x11-libs/libxcb:=
+	aubio? ( media-libs/aubio:= )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/927061
+	# https://github.com/rncbc/qtractor/commit/83ed590eed798f24b6aa1a792b38c2fc61051356
+	#
+	# Remove on next version bump.
+	filter-lto
+
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_QT6=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=1
+		-DCONFIG_VST2=1
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/qtractor/qtractor-0.9.90.ebuild b/media-sound/qtractor/qtractor-0.9.90.ebuild
new file mode 100644
index 000000000000..d5be14c65a71
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.90.ebuild
@@ -0,0 +1,116 @@
+# 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="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io https://github.com/rncbc/qtractor"
+SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	x11-libs/libxcb:=
+	aubio? ( media-libs/aubio:= )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/927061
+	# https://github.com/rncbc/qtractor/commit/83ed590eed798f24b6aa1a792b38c2fc61051356
+	#
+	# Remove on next version bump.
+	filter-lto
+
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_QT6=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=1
+		-DCONFIG_VST2=1
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/qtractor/qtractor-0.9.91.ebuild b/media-sound/qtractor/qtractor-0.9.91.ebuild
new file mode 100644
index 000000000000..d5be14c65a71
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.91.ebuild
@@ -0,0 +1,116 @@
+# 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="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io https://github.com/rncbc/qtractor"
+SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	x11-libs/libxcb:=
+	aubio? ( media-libs/aubio:= )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/927061
+	# https://github.com/rncbc/qtractor/commit/83ed590eed798f24b6aa1a792b38c2fc61051356
+	#
+	# Remove on next version bump.
+	filter-lto
+
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_QT6=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=1
+		-DCONFIG_VST2=1
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/qtscrobbler/metadata.xml b/media-sound/qtscrobbler/metadata.xml
index ad4d7db42b1a..3f08f4b22c06 100644
--- a/media-sound/qtscrobbler/metadata.xml
+++ b/media-sound/qtscrobbler/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/quimup/metadata.xml b/media-sound/quimup/metadata.xml
index b82bb04a8443..7692dbbf08fb 100644
--- a/media-sound/quimup/metadata.xml
+++ b/media-sound/quimup/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/quimup/quimup-1.4.4.ebuild b/media-sound/quimup/quimup-1.4.4.ebuild
index 074276e6cf8e..c6078900aae7 100644
--- a/media-sound/quimup/quimup-1.4.4.ebuild
+++ b/media-sound/quimup/quimup-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit desktop qmake-utils
 
 DESCRIPTION="Qt5 client for the music player daemon (MPD)"
 HOMEPAGE="https://sourceforge.net/projects/quimup/"
-SRC_URI="mirror://sourceforge/${PN}/${PN^}_${PV}_source.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${PN^}_${PV}_source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index be02153e499a..b8deab4e7cfe 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1 +1 @@
-DIST quodlibet-4.3.0.tar.gz 5061542 BLAKE2B 31ec24f43a1750d065e14fe69d90a1646382ead13362633c08c9c44b17cb1dca02da37612bd30e1737212098fd26947cf637501ed79b34f03167b85cc11cbdc8 SHA512 6e3cd8bebb8abeb6acde6effb08a439479e293fed18633240a1508a015c083c814fb98722c36d3970917970259095499efeb27e323ab788252940714cae2fddc
+DIST quodlibet-4.6.0.tar.gz 5719390 BLAKE2B 3b5d43c2fc1e5c3dabdf17c1d35f42762f9db4849a2e99e69a261bc72d5af6f0edac56a1f0e888989a839a4fa905209384b1e37a624676e1c52ca7a5d33ce53c SHA512 eb3bae6eaa2b976bce11ded1a521dc3f2a0a83358ae53215d3f5bce82447f721e7fef2e05b5d1ba87ac984c176e52d7915c4d40b529394d8616d846b78a2af8c
diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
index 6c2b729f2933..56f548197440 100644
--- a/media-sound/quodlibet/metadata.xml
+++ b/media-sound/quodlibet/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>klausman@gentoo.org</email>
-		<name>Tobias Klausmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
@@ -21,8 +17,6 @@
 	this for all the file formats it supports -- Ogg Vorbis, FLAC, MP3, 
 	Musepack, and MOD.</longdescription>
 	<upstream>
-		<remote-id type="google-code">quodlibet</remote-id>
 		<remote-id type="github">quodlibet/quodlibet</remote-id>
-		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/quodlibet/quodlibet-4.3.0.ebuild b/media-sound/quodlibet/quodlibet-4.6.0-r1.ebuild
index c36d97d4c6ea..688bd48bc898 100644
--- a/media-sound/quodlibet/quodlibet-4.3.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.6.0-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-inherit distutils-r1 xdg-utils
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 xdg
 
 DESCRIPTION="audio library tagger, manager, and player for GTK+"
 HOMEPAGE="https://quodlibet.readthedocs.io/"
@@ -17,8 +18,8 @@ IUSE="+dbus gstreamer +udev"
 RDEPEND="dev-libs/keybinder:3[introspection]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
-	net-libs/libsoup[introspection]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	net-libs/libsoup:3.0[introspection]
 	x11-libs/gtk+[introspection]
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -34,10 +35,10 @@ RDEPEND="dev-libs/keybinder:3[introspection]
 	udev? ( virtual/udev )"
 DEPEND="dev-util/intltool"
 
-S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+S="${WORKDIR}/${PN}-release-${PV}"
 
 src_prepare() {
-	local qlconfig=${PN}/config.py
+	local qlconfig=quodlibet/config.py
 
 	if ! use gstreamer; then
 		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
@@ -50,15 +51,8 @@ src_prepare() {
 
 src_install() {
 	distutils-r1_src_install
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
+	dodoc README.rst
 
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+	# fix location of desktop file
+	mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die "Failed to fix desktop file location"
 }
diff --git a/media-sound/rawrec/metadata.xml b/media-sound/rawrec/metadata.xml
index b963d482205a..1a4d24b8d6d8 100644
--- a/media-sound/rawrec/metadata.xml
+++ b/media-sound/rawrec/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/rawrec/rawrec-0.9.991.ebuild b/media-sound/rawrec/rawrec-0.9.991.ebuild
index 940ba0cdbc25..3404c35fad0b 100644
--- a/media-sound/rawrec/rawrec-0.9.991.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="CLI program to play and record audiofiles"
 HOMEPAGE="http://rawrec.sourceforge.net"
-SRC_URI="mirror://sourceforge/rawrec/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/rawrec/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/rcenter/metadata.xml b/media-sound/rcenter/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/rcenter/metadata.xml
+++ b/media-sound/rcenter/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/reaper-bin/Manifest b/media-sound/reaper-bin/Manifest
new file mode 100644
index 000000000000..59acc60891a1
--- /dev/null
+++ b/media-sound/reaper-bin/Manifest
@@ -0,0 +1,5 @@
+DIST WDL-ce8eaac26787a8e059cbeb808d566e8bf1438075.tar.gz 2471262 BLAKE2B 20901c986cb9719cfe654137bfa5a4e571b9255373ba18d0c53f61e16ab077277913e6b379d62d328cd5ec617bdc8dea5300f176b55115f4553045dfe559c84b SHA512 e03493ad6809d4b436aed603e0e87fcb8dc17c9f810b6ca59ad0684639f4a54cc4b520711ae65b7ed9d4af2f00b9554ef488346678ae79f254bc30aeb9c500f0
+DIST reaper714_linux_aarch64.tar.xz 10923196 BLAKE2B 2f3286c2a43a4be1957912de771c6a77fedc7d0083c6f043183880b4bcfe9a105f10bf07029815b5eae1e1e6141c976d0e9e68095c632a5ae6b4669cea6a5a21 SHA512 e1fab156d3c4c9471810c3dbd5b00444bb76426293340cb4075974258ebadbc7ecee272950e80631e3e0495870a4d7e19eccf3f86b5a673a0df7e9022e47fbdd
+DIST reaper714_linux_armv7l.tar.xz 10575364 BLAKE2B 8fcd394042870cb29eb39baac0c7c490ddd0e0ff20a36e70d2d2cf4bf04c07d135d237c5d8334cb8931c7d9e7cd82115f980a72c10e36e346c26ac8a692bf098 SHA512 8858f5e128c0bd922e8c52cb4f19adbb3947a33b0c2535246eaf00c6ec7c5820a1ea35863ab7329c9050ee63945d7b8a8cecbb8ad74bbfc38dbcaec18306e1ae
+DIST reaper714_linux_i686.tar.xz 12210344 BLAKE2B e6c26d4c797d447d7cbaa6ed211f5270901cb83ad928a88c476d660115a33e1527580cff9ac4a0af8f34b837d933a702f5f0895b86d022f6cf22791ae22635cb SHA512 4daa930bd24d853d72539745de6073d121d2953b6de02d9587cd619d9d79019918cf0d1fdf5b8757b99ac2219860160b3aaf8729bcc223210e9fefda649adcb8
+DIST reaper714_linux_x86_64.tar.xz 12206572 BLAKE2B edd320c6718eaa00e52e26f250a449b3611c7f9f0bb3d488d83744c07eb20ab4a5691a84b53c9147e1687145e4324e6609430020ad9bbc88e7a448afd6dbff23 SHA512 4b41783b0c16689fdf74c48bd222edd0344362179b34afee84dbf0be5412db24389b84268036215ae2d3a8c8e2d3f844704b70bf1c9a615a1a877d1761c2bd2b
diff --git a/media-sound/reaper-bin/files/libSwell-makefile-cflags.patch b/media-sound/reaper-bin/files/libSwell-makefile-cflags.patch
new file mode 100644
index 000000000000..dd87a76756c8
--- /dev/null
+++ b/media-sound/reaper-bin/files/libSwell-makefile-cflags.patch
@@ -0,0 +1,31 @@
+diff -ru justinfrankel-WDL-d974e49/WDL/swell/Makefile justinfrankel-WDL-d974e49.new/WDL/swell/Makefile
+--- justinfrankel-WDL-d974e49/WDL/swell/Makefile	2023-12-10 17:12:41.000000000 +0100
++++ justinfrankel-WDL-d974e49.new/WDL/swell/Makefile	2023-12-12 19:42:19.161433462 +0100
+@@ -17,7 +17,7 @@
+ 
+ COMPILER=GCC
+ 
+-CFLAGS = -pipe -fvisibility=hidden -fno-math-errno -fPIC -DPIC -Wall -Wshadow -Wno-unused-function -Wno-multichar -Wtype-limits
++CFLAGS += -fvisibility=hidden -fno-math-errno -fPIC -DPIC -Wall -Wshadow -Wno-unused-function -Wno-multichar -Wtype-limits
+ 
+ CFLAGS += -DSWELL_MAKING_DYLIB
+ 
+@@ -63,16 +63,9 @@
+ 
+ 
+ ifdef DEBUG
+-CFLAGS += -O0 -g -D_DEBUG
++CFLAGS += -D_DEBUG
+ else
+-CFLAGS += -O2 -DNDEBUG
+-  ifdef DEBUG_INFO
+-    CFLAGS += -g
+-  else
+-    ifneq ($(COMPILER),CLANG)
+-      CFLAGS += -s
+-    endif
+-  endif
++CFLAGS += -DNDEBUG
+ endif
+ 
+ LINKEXTRA =  -lpthread -ldl 
diff --git a/media-sound/reaper-bin/metadata.xml b/media-sound/reaper-bin/metadata.xml
new file mode 100644
index 000000000000..d171bdf22658
--- /dev/null
+++ b/media-sound/reaper-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+<name>Jason A. Donenfeld</name>
+</maintainer>
+<maintainer type="project">
+<email>proaudio@gentoo.org</email>
+<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/reaper-bin/reaper-bin-7.14.ebuild b/media-sound/reaper-bin/reaper-bin-7.14.ebuild
new file mode 100644
index 000000000000..b06b170162e9
--- /dev/null
+++ b/media-sound/reaper-bin/reaper-bin-7.14.ebuild
@@ -0,0 +1,160 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Digital audio workstation"
+HOMEPAGE="https://www.reaper.fm"
+
+WDL_COMMIT="ce8eaac26787a8e059cbeb808d566e8bf1438075"
+
+SRC_URI="
+	amd64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_x86_64.tar.xz )
+	x86? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_i686.tar.xz )
+	arm64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_aarch64.tar.xz )
+	arm? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_armv7l.tar.xz )
+	https://github.com/justinfrankel/WDL/archive/${WDL_COMMIT}.tar.gz -> WDL-${WDL_COMMIT}.tar.gz
+"
+
+LICENSE="Cockos"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+RESTRICT="mirror"
+
+IUSE="+jack pulseaudio mp3 ffmpeg"
+
+RDEPEND="
+	${DEPEND}
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	mp3? ( media-sound/lame )
+	ffmpeg? ( media-video/ffmpeg )
+"
+
+DEPEND="
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXi
+	media-libs/fontconfig
+	media-libs/freetype
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	cd "WDL-${WDL_COMMIT}" || die
+	eapply "${FILESDIR}"/libSwell-makefile-cflags.patch
+}
+
+src_compile() {
+	emake -C "WDL-${WDL_COMMIT}/WDL/swell" \
+		PRELOAD_GDK=1 \
+		ALLOW_WARNINGS=1
+}
+
+QA_PREBUILT="*/*.so */reaper */reaper_host_*"
+
+src_install() {
+	cd "reaper_linux_"* || die
+	mv -fv "../WDL-${WDL_COMMIT}/WDL/swell/libSwell.so" REAPER/ || die
+
+	./install-reaper.sh --install "${D}"/opt || die
+	rm -f "${D}"/opt/REAPER/uninstall-reaper.sh
+
+	dosym ../../opt/REAPER/reaper /usr/bin/reaper
+
+	# The following is pulled out of install-reaper.sh to match desktop.eclass.
+	cd REAPER || die
+
+	newicon -s 256 Resources/main.png cockos-reaper.png
+	doicon -s 256 Resources/cockos-reaper-backup.png
+	doicon -s 256 Resources/cockos-reaper-document.png
+	doicon -s 256 Resources/cockos-reaper-theme.png
+	doicon -s 256 Resources/cockos-reaper-peak.png
+	doicon -s 256 Resources/cockos-reaper-template.png
+	doicon -s 256 Resources/cockos-reaper-template2.png
+
+	cat > cockos-reaper.desktop <<-EOF
+	[Desktop Entry]
+	Encoding=UTF-8
+	Type=Application
+	Name=REAPER
+	Comment=REAPER
+	Categories=Audio;Video;AudioVideo;AudioVideoEditing;Recorder;
+	Exec="/usr/bin/reaper" %F
+	Icon=cockos-reaper
+	MimeType=application/x-reaper-project;application/x-reaper-project-backup;application/x-reaper-theme
+	StartupWMClass=REAPER
+	EOF
+	domenu cockos-reaper.desktop
+
+	cat > application-x-reaper.xml <<-EOF
+	<?xml version="1.0" encoding="UTF-8"?>
+	<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+	  <mime-type type="application/x-reaper-project">
+		<sub-class-of type="text/plain"/>
+		<comment xml:lang="en">REAPER project</comment>
+		<icon name="cockos-reaper-document"/>
+		<glob pattern="*.rpp"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-project-backup">
+		<sub-class-of type="text/plain"/>
+		<comment xml:lang="en">REAPER project backup</comment>
+		<icon name="cockos-reaper-backup"/>
+		<glob pattern="*.rpp-bak"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-config">
+		<sub-class-of type="text/plain"/>
+		<icon name="cockos-reaper"/>
+		<comment xml:lang="en">REAPER configuration</comment>
+		<glob pattern="reaper*.ini"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-fxchain">
+		<sub-class-of type="text/plain"/>
+		<comment xml:lang="en">REAPER fx chain</comment>
+		<icon name="cockos-reaper-template"/>
+		<glob pattern="*.rfxchain"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-tracktemplate">
+		<sub-class-of type="text/plain"/>
+		<comment xml:lang="en">REAPER track template</comment>
+		<icon name="cockos-reaper-template2"/>
+		<glob pattern="*.RTrackTemplate"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-theme">
+		<comment xml:lang="en">REAPER theme</comment>
+		<icon name="cockos-reaper-theme"/>
+		<glob pattern="*.ReaperTheme"/>
+		<glob pattern="*.ReaperThemeZip"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-undo">
+		<icon name="cockos-reaper-backup"/>
+		<comment xml:lang="en">REAPER undo</comment>
+		<glob pattern="*.rpp-undo"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-bak-undo">
+		<icon name="cockos-reaper-backup"/>
+		<comment xml:lang="en">REAPER undo backup</comment>
+		<glob pattern="*.rpp-bak-undo"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-peak">
+		<comment xml:lang="en">REAPER peak file</comment>
+		<icon name="cockos-reaper-peak"/>
+		<glob pattern="*.reapeaks"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-proxy">
+		<icon name="cockos-reaper-peak"/>
+		<comment xml:lang="en">REAPER proxy</comment>
+		<glob pattern="*.rpp-prox"/>
+	  </mime-type>
+	</mime-info>
+	EOF
+	insopts -m 0644
+	insinto /usr/share/mime
+	doins application-x-reaper.xml
+}
diff --git a/media-sound/redoflacs/metadata.xml b/media-sound/redoflacs/metadata.xml
index 6e23e090c268..1a3b153aa981 100644
--- a/media-sound/redoflacs/metadata.xml
+++ b/media-sound/redoflacs/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/rescrobbled/Manifest b/media-sound/rescrobbled/Manifest
new file mode 100644
index 000000000000..3223ab966849
--- /dev/null
+++ b/media-sound/rescrobbled/Manifest
@@ -0,0 +1,116 @@
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST anyhow-1.0.71.crate 43808 BLAKE2B 1ec6b440758e26b2328738bab7c6b1fe8670959793cc24f61cecd0d8b0ebe60b9855ee1cdac9b5f5a5b238daf796eae5b7c82b903e7c822a5625d95130f8b61f SHA512 401b1c5d04fa0581f303395fcb3af5e7684ead367e2a173b4d90db9c04ac20010c5330a686f3ba91a541e1526a7185091b7dbfddce5134b5a74cc749b0338da5
+DIST attohttpc-0.24.1.crate 60895 BLAKE2B 96d3ecfc4cc536dc5f699a52425619443326a064b4bea219b38157bd4322073a5c23060f3c46e0f3e99f452c5ed2a5327a6eb3b09812d45dda7a411b70fc8898 SHA512 ee47a48d2222f7259b81f52d9f129b4c927932b96cb6cb46136ffa064b9f06f025ec0c40b3eca6825e6f76d409b00e721297ed448cb170df303cdc35b778dbeb
+DIST attohttpc-0.25.0.crate 61675 BLAKE2B f988eb7b289575ec6ddb87fbcdcffa4a6950966ab39eda9d0f7cd434a5c8b0c5454dd0f5f9dd5e06fa9dbcd8786f7fb8e5bcf3eb86f92f382b30eb1ecde5f267 SHA512 c115cfc8faa97763cd5275fcba06d41c53680d208db6105fbd1a331b4127400eb2165e7ac89c1e0c1902c8842f96700879e0edcd57179f729f21291f6348d91d
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000
+DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
+DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
+DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST darling-0.14.4.crate 25168 BLAKE2B bc48b27823a1a85a01a5daea47d87c2ac4b3ea48079249606aec912a4f417b72516004f17765e38f06048543708b758bf68afa63dc5e7415906de7940f02726d SHA512 1f236976cd291502229a49c2317fbcad94df54e2d7fbedebd9ac3173f9e51620ce8f2e37c78e86a63db8d9cd089e3eaedb990e58cc97847baa2cbaae58526aa6
+DIST darling_core-0.14.4.crate 57485 BLAKE2B 3d284d6a5100f45228aef5e42f9de63b6cfe2b5d42f1224bb19ff5d262b0c293931ee99f3aaf1f0eb24e55bb7e04ae790389d73c624c5f00f17a280a4a496ebc SHA512 6df7e911a543e9cadd0810cd8bf6563e2f000b52bab875f7a34d229bb6c4fb7beb6ebbc4fb0e12b97f23616280a20f306210abdfd1dd094c53da35f97be27b96
+DIST darling_macro-0.14.4.crate 1896 BLAKE2B e537b384c4c05103a962ff03be3da6c6c31d1c0cc25dedf5df1522c524e744446274a1696093d6f4479c0b6ddf02d27941fe959f517ede4b203bff3e20eeb294 SHA512 819fb85d8e324f4848669d32b2eecb2c2945a9891fa098eb9ca61d84588d26f0e0d1c7c482956935c7188e9c6feea0db5ae4c81bfe3d014f74fcebde80a204cf
+DIST dbus-0.9.7.crate 104206 BLAKE2B f08f72170fbf9af3e525c20f4f11de64368e4a5d010571bc2ed9985c13353d99466f7e98a39ac949787ee9f4d10845d6940d9dbeaf1fae2122d49eeefa5306b1 SHA512 c1557d8be0c5c5623ec6a3928de310c80eef2cdf976d9fcbcc00f08a532af5b8d530f8ee1eba4de12f2df0ff7cf4d21323dfad76be82eeee2f386173991681e5
+DIST derive_is_enum_variant-0.1.1.crate 9807 BLAKE2B 5df4a24af5199311fdc92194f42da77f3ed10ac0c248c0da561922cd879d835e40809a27cc186ca9f0ad3eb637aa2be79fcc8315cf3883e6c360c1333bbef6ea SHA512 b3a867b589e12ab8559c3507c057a08b11fbed2cacaaf002d25f829c1f3ddfa38ead70781dd093de2c54f5abc8f545d3f6d49e95fb5d68ae9a452051ccaa57a3
+DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1
+DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a
+DIST enum-kinds-0.5.1.crate 4253 BLAKE2B f96e8fbc208d449085ed583ae81cf665eae29b5d2226309927d43f7d9decb489e64f121c932cf8afd03c639efd83ee3f03f8f7ca06bc7135cd9415de1d63af9e SHA512 51977d15c988fe25548916662802906771b5a1db62352284488a5c3c737967df8e9a9aee5eef5eea7b6ef281bd2a51b8a59191b1e9c5034609689aaf2cfc2713
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.1.crate 10348 BLAKE2B 72831d0b69f95884a69918249cc0e814eb5eade3205331bec6d2021f8b01a42c4c9b494f2717033d65a4c5230c8490b6ce250d349c1e8e177b20e7e84a860020 SHA512 00d64157d066f1e7601c522c0f4e777eb662ca5cce64682f616de0734857765c343396f7161ac2908c3db0c474995ae157bfe9d8a9880743724d9bd428dfdf54
+DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
+DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
+DIST flate2-1.0.26.crate 70832 BLAKE2B acbfad138abf2175822153867413dc89bafa9254494b4f13d958dcc6008a26fca6f934e8010b8c090367b8e25272a4ba3b26a31e59cec69c1359f83ca859d186 SHA512 a9f7b9e4adfd0a22fbf66e1cbcfe377cc03ec248c7fb7113097b839922b569cc96bf080089b8c800b35ec6f81b3f602a5860de55963b85f27ee6d75a9df88f3d
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104
+DIST from_variants-1.0.2.crate 4357 BLAKE2B af8ea5741ddd00a05887e2ac918b3712d7ba72ca9f892effd8e38f8e172ee8551d46d8be9546a82e6c372c3e3ee260b025add322528e0eb19b0e8c05b9c2254c SHA512 ba80ac5c665030f1549e75e0f789fd6000f5c6ddb6ea2619f87eda4bf9cde2611262ea3cbedae8416fc383ede38b0684b4a94a39eefda48eb49e546ac76c4326
+DIST from_variants_impl-1.0.2.crate 3745 BLAKE2B ed54a0799609a189300d2adb9ee267a01773ba77afca7448c2abf77b542f27414f31e08a0f64da02b9ca56eb1b01d469bd08e58a03c02458e3d2afb0c08c3ba7 SHA512 c802c8070b58ab4ec4976fd769be5aa8edb96ea6489b225372d21fa92d83522a6452dee40297a52681228688203de97066d5ef87143ae7745394697086a6311c
+DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
+DIST hashbrown-0.14.0.crate 116103 BLAKE2B 24bab03e8a8cb7623b92282c83bf8acaf0752c696ee1c010249e3ebb3646e7549d8d6d798b02c9d5b621afbebba7320f8a859d9a1af1523dbd46377b857dbb5f SHA512 f0fbdf81517f59a0b67f792a4097f1131d346b2b4cbda93590749cef7f9f1c9029e0e182f58c23b74d3028f7502c30b9593c1eb4da37f95388d74b14582b8959
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
+DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6
+DIST http-0.2.9.crate 100146 BLAKE2B a720a5ea6e59d1bd4e7b422fdaa30b3b9d72a7533c5e91d1c8ee2b1dcd899309b490479ec578aa3b51f1dddeb5c6510f28136e9fd1f04d2af12d2418261f6c03 SHA512 17bbc886d34f5aa4b56d82a605a54e920a244988085d06e70bc416f8e0edfa3356544f29082b3fbf3dcea18e741ade374375dd82ebe2276fd9a9508735a1e03a
+DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
+DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb
+DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
+DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
+DIST itoa-1.0.8.crate 10465 BLAKE2B e518264938d044e24a4d72cab788de717c36cc7396fdbf2805fe3a3e0cdfc361c4f6fedee7bcebea6fbacff254e073da26b2400a073fa75f75523b8ed9de9938 SHA512 6171bfcd70634a2587740c145a15790e12807d2c756a25e74950daf9dd36acc662f12836c5b87e20483b4d020bc0d98a352b8e9787b0b8544bf1ee1b6a0c2c8e
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
+DIST libdbus-sys-0.2.5.crate 1557017 BLAKE2B 4528c792d727e71141ee2fb2bc7080b101df650121487c420c7c6f3602d2ac987deed7ad49bab850619128f258c1f3a94364f7658b83fed16167944c4ed12c88 SHA512 94ce1de7e1f1727e923b2042aed6652f9d0e68f27388c186c37f7aa2195fd71cb3c92a2bee7e8628c95f36ba2d2a38d25d9804900bf55eb13af31f790bca2847
+DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
+DIST listenbrainz-0.7.0.crate 16752 BLAKE2B 2dfa60a32ab9a7dcdd3332cf201c5821457165ac110ecfc2104d2f929a0e1962f3329e082197dad221a7df9277e73ab61f7f6f8acc3e232af1ef3d16c4ea5c90 SHA512 6df5f35d7c3bd10a29d2526c6bcfb6d5ead27e802cb9b774fb8415a0d5083e57ce68e646a1bd03eb1aba0a05320980b5f3daa3fc757fba9c544aeee400708e9a
+DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038
+DIST md5-0.7.0.crate 6671 BLAKE2B a1c8132cb4d7497ab3f4550e6fffdea6b118ad99a31128c068ea3243b5f76c4b059042da376a0be32fb74e866571348a581c2ca727d6acf855d823ce15f593b5 SHA512 569c992eafe25986a1328666a428b2335ecc5cb7a5ba142c34d7abb1247f6768c0bb3dce790121686d4ebf1b4a1832d65315136552163dfba5f799f99551544a
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
+DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
+DIST mpris-2.0.1.crate 175119 BLAKE2B ddf14017e0047f6204d20f738e11ea11f40981ec11e610e640b4f6cdad736598b741f6d1e0461309cd339883ecfb4c74f82cd4078c7ad49c4b1bcde3060d4103 SHA512 c96258e5405809ff2309e3864689bfffe1613f67742099200203f0438535eb6175bd8b054d2727fb30df4c8935de85707bd2f9e2b0d6e98f1639a0ce000621aa
+DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
+DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
+DIST openssl-0.10.55.crate 258750 BLAKE2B 288d8d0edd23415be5aacbdda538d43bf4b0f3dd12f2217f23e1b8a8a69ea4f731e93fabba70e07c29716faa8798437bcaaa893374df8523b8af3f36debbb76a SHA512 397a970f254eca152fd4d8166ad7554c1bae2593e27150132c4b8757fc439a2ec61e45b92440408a92334bd17c57e0adda64680ebd8084ea346ac713257454fb
+DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c
+DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
+DIST openssl-sys-0.9.90.crate 66197 BLAKE2B 4cb5f74619b595ad224e33679023b3ba73cb99f8cb81516124dfb9b03ef8af9ed2d20b705acfee4e2cd08387fe20133f20a55114ffdb4b14b94e7b2142529909 SHA512 6b0eccecca799093f15fbcd17f3f37b7b4c83bb11fea1c77b1eb3e4cd1c9ad46e9c5f0c01ded7b22c4d2bb5e8d0d864f15163d481fcc973d6d06b41707fe7dc1
+DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
+DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd
+DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a
+DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04
+DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
+DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b
+DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
+DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
+DIST rescrobbled-0.7.1.tar.gz 32770 BLAKE2B 380da30589856a3d29f2305592993b26efd1f23ce5402cd8c85175fc50f3636983b7759a59f86ff5fad1510110c280551ad5680ab3a90f77346973957b9eb788 SHA512 de1829203924f2eaef9a0f389056f9a4fd0b9fdc7b8b0d5abab905eda142b1b8b10da6d870decafe8b3206c30c0cfd73f3f27a85c1c2a0844b7af17db3a1cb78
+DIST rpassword-7.2.0.crate 8857 BLAKE2B 224a0920b93252a835f81e60fc90e28c8baf6224175e3d9098e48385e62c958b96c93808fcd6ea7612fcc975ab048546ea77c1a9ab9240d2cb236850f324aa4c SHA512 b220b45143d43d8ae8d975b8e89022281cef6cac7db07df6577d9fbff6881c1d7e3c20b3a23bf746e77be5e9d8ae54baf9aa7f14aef6370f0165783e72bc8113
+DIST rtoolbox-0.0.1.crate 9430 BLAKE2B 3ccd51b85e63cf495bd46350c4197544e898304b2a9ee88f824fb63be4783c1cf56e783af8381cb78bb26f72ed07e21f52fba22b8e3ad0c5aaf5dbb344a47f79 SHA512 d33fd7b3dd169554d34b877eac11b524861a40e5a75c2bcb7b24945ddba40e6d15f3b609561d612720650769efe74d00edc9d0a39b3aecdb71196be9b5397b71
+DIST rustfm-scrobble-proxy-2.0.0.crate 22903 BLAKE2B 50f65a3bbf9d0b2aa16aa13437922c33bd4b34e71d2bb8fed006a54f51c15d8becfcaa79c629f9e2a149ff10f9fbb37673ed3d10ca993c64c420420e0165f765 SHA512 ea012fda9360faf3f6a4f2ea42d9c44689369f9191f6be8261760907f45cb1502dcb2e54a35e9d7954edc8fe1e542cfe3fc40e6020dae024be9c941801b81409
+DIST rustix-0.37.23.crate 328010 BLAKE2B 299ad4b521b1008b6e864e9e52e523e97319d4b976343dccfe9705273f92930bbf7ca21c3e243c90ff7424fe881b55f38a2840701ab75bdb381f31ca91b1d9ff SHA512 9dcc915b753b0ae9ea4d92d33f3a7c73e889ca0dc22abb95ec3d375e4188449d1bd6835c122598beb947fc8aaf884c59cc2cf55ab77f32480f5c17e789664988
+DIST ryu-1.0.14.crate 46861 BLAKE2B 208fa87e54e3c6831193ddefcdfa7e9731a3b72de6ea23a4af708a15487cf4d6cbc49fd3681da078390741595ff5d44b02e607cab6ea9e37e7f5f05c7275b4a9 SHA512 9832c760d1ac674ba362639968962928971231d696e450738045ca36ae2780116ad865b2bdd96e36f14d8f92e12107dc8b75be90c74d76e3bb834a94bd6e5599
+DIST schannel-0.1.22.crate 41642 BLAKE2B ccb512f6c6765e5245dcee607b7886411710aa89d317cbaed2f511f74a927a0083042653e070c9d4b976ec83a74f3f37218f3ecb621781ee367b774596227f68 SHA512 6ec962cbd25f25dcee5e31b5012e61d38b97a7e8651a5439ab4cbc8ab33a0e2ce04fa22e06a82ef8750001c6659937ffd8dccb0cbd6971f68b0c354d0075aaa0
+DIST security-framework-2.9.1.crate 78844 BLAKE2B e75c6322b1077fea47e2a83ada6b84ef9f00ef6ce31729b821998694cbefa088d501a264784edf69e45212062b016c214c37f965e933bcba11d23d1ecb2e313a SHA512 fa309080138ef4aa7c5a2278456647743ed40ffa7827a0f081e3f11ba61d0184501be20e1bde25c0c3d5568de3d7ad9bc8ac7a939bc8dac95bcd4714ade6c966
+DIST security-framework-sys-2.9.0.crate 18197 BLAKE2B 9eb2881c86bbef77120177a2548a50e6bc5410910ce808183491d9c6f606c1c8c0ddce9e8b910eb2043293d9993456568a27b7d46b2a08926eca2193ffdce07e SHA512 152133eb3bf66a37046de74df94bba856696c76c6c50b9cad2bb09ac3d6b73d1e23aef8c18fcf050ffb43e7246313cc6ed563a0af8b55e58ba62ae549a6ad9ee
+DIST serde-1.0.171.crate 77630 BLAKE2B 84b4377c78018a9d32a1a3841d26111f2db8b761f45376abaf0412ce456e0bbb39b287e460a8d99e217dcf0ce24a461488af85539ec127672767fee0b44aab7a SHA512 c8db09da8845e102e209276d5747a28d2e7b12ab5297d24156062c61c6ac8aaac8789d6e91a4f939d1f674375d8c3d3d1e372dd248baf63fece3740ea6f68bce
+DIST serde_derive-1.0.171.crate 55183 BLAKE2B d60c2aefc4f7ef43bc5ba9b39c9d62d5a784aef205aae4c90c9fe402e872699ce7fb0d74f2c657cb6862459d1dcba39562a7f4a0915cbe3e2c45a9f649858983 SHA512 2561e5105c6fd6ab802ddc04dbb4392450c7eff6709f39ec8ae43ba73138944879330f9bb8de7a6cbef3507153a22007a69d6e27d0acc717889ac91ea195ef45
+DIST serde_json-1.0.102.crate 146070 BLAKE2B 3b1cd8a40b8569ed933d105eb1e37861339b7fc98d0e3583e91a976d8414244daa17049640a4f44d7c1ed604e13c9fd6d735a915c14be0ae0bd5bfa0e52a5979 SHA512 103d2fae45bf5b723ebf8cae4ee1734a06f9f4c93dfa3a9ae58c633942c92c380020cbd7913e870baf9db27a51feee505c4a2fae455a7b8c6fa76c82f14b65b1
+DIST serde_spanned-0.6.3.crate 7737 BLAKE2B 957352cb24d5cb1173613a48de7e411d768c61a73dd57572530490be0569e133e7c8eb62ec34e542a17010871562a53e37b296386c54dee8ea61d175dd0b05e3 SHA512 5c4f4a861dba2af7f0ad0c585859f845a7ea6c0a8ff8b63985503c9da27f313ba15b904b0aa56a59043c44a87c75fd317b23006a3804d332b84855189e436610
+DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
+DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
+DIST syn-2.0.25.crate 241421 BLAKE2B f8b06686d0891a1d50d5f214836e43f518aeea443cbb7dabd2563c2399559014b9d42b7e0d1dbed2f4aa5e644efaf2f5f8b37358f9e0140efa231a62348fa1b6 SHA512 2c07b24d5bec7463da97eabbbccea3bf82aff5a74d7ffca6ef21f66420dce369cf77529fe722ce77b019b9085a52feb900f707b6aee5ee088d07035ae191930b
+DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
+DIST tempfile-3.6.0.crate 31812 BLAKE2B a40a18a810e957b576d2fa8c78c192fa68f0c70d7305a476512fe0602e449e1668b434f0a8a0c0e98b4930054a92c009437581c1984d1ec6496026cd03847e06 SHA512 69b0d8a5619201620245899849b807841e90c24aff08bf9ffac76469ee5f4d6fd3b4258d5903bd0261fa771df88cc83e869faff27a413188571258aba1a249cb
+DIST thiserror-1.0.43.crate 18735 BLAKE2B 5fe2238a5e8daba702a3f8d33843b91a37fae7d49b9a570694f6bd22ea567a658e15c682ffa2aa92f5a77d5456fb5143e3eb31faedcc1d4538196894938e3f74 SHA512 3e5ab0a0450bd1be0bc5c928d0d9332fdb5a98e4c7b989b814f764994138988aa0c3776eb0b1e9f7568f3110ab421d3eacfcc0cbd4d5c9dd0f3f3fe252b57785
+DIST thiserror-impl-1.0.43.crate 15062 BLAKE2B 9f8ee18d7d0db4f93eeb673edd0ff7f01bc293cfa6531ee047a0976b56bd1358750854809444c40932ac80f1403df933ccacd8a3b0adbf410ff4fdfc6d62a549 SHA512 8b3b873a543e3a0cef5efe2feac161878b5efb60a0aacc83f80376573557e540a503429359d60d286d27ef84b2b823f8a112e515380a10b84426c779f4993885
+DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
+DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
+DIST toml-0.7.6.crate 49220 BLAKE2B 805bd9928fc3d05a1658188d4b858df62347cc93bf870a3846b9509c1dbdfc4123bc29a26019efa04e98699239ca7bb95ce63c802badffd86246266cebc65d7a SHA512 e51c49af63e37d1682892b84e74d48e171591c36dccb26e26bbf136385181ea9cbb94809b8900eae82b15e1cb79f844ae1cf0b00f0a6ac3afd5ebd02d554f9bc
+DIST toml_datetime-0.6.3.crate 10770 BLAKE2B fc1754eb7c3a7073cfe41e5ccba152ff09891a8de8afe38991cf2dd7b93aacf07f1075fd24d7aa643238cf31e3df1fc3162335b2c475438178b4a4d8a2055471 SHA512 cabf5dce24ed3bf4674008743180a21e86286d999cdce79f934de48b1e1fe0f16a7f3d2498bf059acdb823b51bc01986faf47139f8100ae272e6bd19095cfa9b
+DIST toml_edit-0.19.12.crate 96151 BLAKE2B 13e6a13543b660d4b4f6e035c63d223016567cb36486e8b9dcca29ef26b3559bbb001e670b8ff444f50fd5b037a745e0890de9bc9c8a8a5c24878d85807ce475 SHA512 79726b5bbe4d350868409f6a9b828a5c9cb0fe48c18461d17943e97accce67d5c5123d49cae8ce8ecf7c2b98fa41a119e6299a2469fc76bfdeb0443f83ba2a30
+DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9
+DIST unicode-ident-1.0.10.crate 42039 BLAKE2B 3365850e1991b9e572c6917a35f3c85523d921d5ebd9fa7025fbc1ce2a0518b06aaa9f3e3bfafb47d357226b5b9964145c7f1b5ddc16cb7280542f6c96f650ec SHA512 5dcc24e138a86f84cb05290332d02953b0ca18839ead1e74b0319bc361ea449700e04d62a51e435cba266121e463643e017718d3023a84f844a59e4ca4475686
+DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
+DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b
+DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
+DIST url-2.4.0.crate 75670 BLAKE2B 8cfff1d8ae0b7353ab4f539e2df1f15dde3c75f347c36bc5c4c8ea45a0cfcb31950b073b50acb34a14cd3d7a11b665c3a73a3d070cc590ce740c561f0e6e92d2 SHA512 acef524d2c00d2fd68ec6385ca2a44b740f60724256750d8b0ea609dec7f9d59303069f315f04a5205925a27274ec7709f3818a2237ea0023845e9a12905694c
+DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
+DIST windows-targets-0.48.1.crate 6902 BLAKE2B 8e6cd47dea52131c66983cbf4982e88f7bd30416dfae4e380f7afb39f67ee0ac88d40769668dd5aba40d4415f9f00cbc2ac98d598506fed26029f5ec4df3a2c5 SHA512 e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2
+DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
+DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df
+DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68
+DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b
+DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
+DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
+DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
+DIST winnow-0.4.9.crate 143537 BLAKE2B c5c52420dc6e6e8fc49f7fc778f8276d5fc3a024c2a39da5fc60142d6c0d2fb2da34e53e1e7ba8648733abb3eca69b3fb251adfd53f8f27735a16d23960718be SHA512 1e30230541b995fd4902392c8000870d289df0d3040e3b6b5fa098d1194f315263a3ab64ee0858977cda543146ff402a758cad78a43ba02286dbf14bdc3abc37
+DIST wrapped-vec-0.3.0.crate 9255 BLAKE2B a082b32d9ed12b5a9abc1eedfbce974262632c8703b9b7a71658599622362dace45de1acf5e785d95cc976014db30599738a5ae7771d4ce354afb4c47260960f SHA512 e3c2d925a83dcfa58a16e548b70882135b82e168fabe74add01d7db75dd59a8ef01ca13781637639afbed3fd60524140d9b57f9c517d9371e2f896d4e6a5b67e
diff --git a/media-sound/rescrobbled/files/config.toml b/media-sound/rescrobbled/files/config.toml
new file mode 100644
index 000000000000..f541ca294cf1
--- /dev/null
+++ b/media-sound/rescrobbled/files/config.toml
@@ -0,0 +1,10 @@
+lastfm-key = "Last.fm API key"
+lastfm-secret = "Last.fm API secret"
+enable-notifications = false
+min-play-time = 0
+player-whitelist = [ "Player MPRIS identity or bus name" ]
+filter-script = "path/to/script"
+
+[[listenbrainz]]
+url = "Custom API URL"
+token = "User token"
diff --git a/media-sound/rescrobbled/metadata.xml b/media-sound/rescrobbled/metadata.xml
new file mode 100644
index 000000000000..bbc3a3c12e32
--- /dev/null
+++ b/media-sound/rescrobbled/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">InputUsername/rescrobbled</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/rescrobbled/rescrobbled-0.7.1.ebuild b/media-sound/rescrobbled/rescrobbled-0.7.1.ebuild
new file mode 100644
index 000000000000..690a968b2706
--- /dev/null
+++ b/media-sound/rescrobbled/rescrobbled-0.7.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6
+
+EAPI=8
+
+CRATES="
+	adler@1.0.2
+	anyhow@1.0.71
+	attohttpc@0.24.1
+	attohttpc@0.25.0
+	autocfg@1.1.0
+	bitflags@1.3.2
+	bytes@1.4.0
+	cc@1.0.79
+	cfg-if@1.0.0
+	core-foundation-sys@0.8.4
+	core-foundation@0.9.3
+	crc32fast@1.3.2
+	darling@0.14.4
+	darling_core@0.14.4
+	darling_macro@0.14.4
+	dbus@0.9.7
+	derive_is_enum_variant@0.1.1
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	enum-kinds@0.5.1
+	equivalent@1.0.1
+	errno-dragonfly@0.1.2
+	errno@0.3.1
+	fastrand@1.9.0
+	flate2@1.0.26
+	fnv@1.0.7
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form_urlencoded@1.2.0
+	from_variants@1.0.2
+	from_variants_impl@1.0.2
+	getrandom@0.2.10
+	hashbrown@0.14.0
+	heck@0.3.3
+	hermit-abi@0.3.2
+	http@0.2.9
+	ident_case@1.0.1
+	idna@0.4.0
+	indexmap@2.0.0
+	instant@0.1.12
+	io-lifetimes@1.0.11
+	itoa@1.0.8
+	lazy_static@1.4.0
+	libc@0.2.147
+	libdbus-sys@0.2.5
+	linux-raw-sys@0.3.8
+	listenbrainz@0.7.0
+	log@0.4.19
+	md5@0.7.0
+	memchr@2.5.0
+	miniz_oxide@0.7.1
+	mpris@2.0.1
+	native-tls@0.2.11
+	once_cell@1.18.0
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.90
+	openssl@0.10.55
+	option-ext@0.2.0
+	percent-encoding@2.3.0
+	pkg-config@0.3.27
+	proc-macro2@1.0.64
+	quote@0.3.15
+	quote@1.0.29
+	redox_syscall@0.2.16
+	redox_syscall@0.3.5
+	redox_users@0.4.3
+	rpassword@7.2.0
+	rtoolbox@0.0.1
+	rustfm-scrobble-proxy@2.0.0
+	rustix@0.37.23
+	ryu@1.0.14
+	schannel@0.1.22
+	security-framework-sys@2.9.0
+	security-framework@2.9.1
+	serde@1.0.171
+	serde_derive@1.0.171
+	serde_json@1.0.102
+	serde_spanned@0.6.3
+	serde_urlencoded@0.7.1
+	strsim@0.10.0
+	syn@0.11.11
+	syn@1.0.109
+	syn@2.0.25
+	synom@0.11.3
+	tempfile@3.6.0
+	thiserror-impl@1.0.43
+	thiserror@1.0.43
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	toml@0.7.6
+	toml_datetime@0.6.3
+	toml_edit@0.19.12
+	unicode-bidi@0.3.13
+	unicode-ident@1.0.10
+	unicode-normalization@0.1.22
+	unicode-segmentation@1.10.1
+	unicode-xid@0.0.4
+	url@2.4.0
+	vcpkg@0.2.15
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-targets@0.48.1
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.48.0
+	winnow@0.4.9
+	wrapped-vec@0.3.0
+"
+
+inherit cargo systemd
+
+DESCRIPTION="MPRIS music scrobbler daemon"
+HOMEPAGE="https://github.com/InputUsername/rescrobbled"
+SRC_URI="https://github.com/InputUsername/rescrobbled/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="GPL-3"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND="dev-libs/openssl:=
+	sys-apps/dbus"
+
+# https://github.com/InputUsername/rescrobbled/issues/109
+RESTRICT="test"
+
+QA_FLAGS_IGNORED="/usr/bin/rescrobbled"
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+
+	systemd_dounit "${S}"/rescrobbled.service
+
+	dodoc "${FILESDIR}"/config.toml
+	docompress -x "/usr/share/doc/${PF}/config.toml"
+
+	dodoc -r "${S}"/filter-script-examples
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Sample configuration file has been installed to "
+		elog "  /usr/share/doc/rescrobbled-${PVR}/config.toml"
+		elog ""
+		elog "Use the sample, or launch rescrobbled to create a new empty one."
+		elog ""
+	fi
+}
diff --git a/media-sound/retrovol/Manifest b/media-sound/retrovol/Manifest
deleted file mode 100644
index b8c0a5ffa0e8..000000000000
--- a/media-sound/retrovol/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST retrovol-0.13.tar.gz 210929 BLAKE2B 72b59cbae3b290ef32ed07bd80bacbd512d6594fa859df576505d8257529af93bb5135a8a843998d47e7a935411dd9541ac1747cf6b072f33f612c823a07e00c SHA512 a2e21ae70b1be7c824061a7118b331558dd27f5d93861d509ac03fd85856661555880ad592eb1fb4750eebeac7f1930aebc3c1f64b31ce6983b993098b509ce4
diff --git a/media-sound/retrovol/metadata.xml b/media-sound/retrovol/metadata.xml
deleted file mode 100644
index 39626a990be5..000000000000
--- a/media-sound/retrovol/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-sound/retrovol/retrovol-0.13.ebuild b/media-sound/retrovol/retrovol-0.13.ebuild
deleted file mode 100644
index e1956bda5b8a..000000000000
--- a/media-sound/retrovol/retrovol-0.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Systemtray volume mixer applet from PuppyLinux"
-HOMEPAGE="http://puppylinux.org/wikka/Retrovol"
-SRC_URI="http://www.browserloadofcoolness.com/software/puppy/PETget/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-pkg_postinst() {
-	echo
-	elog "You can find a sample configuration file at"
-	elog "   ${EROOT}/usr/share/retrovol/dot.retrovolrc"
-	elog "To customize, copy it to ~/.retrovolrc and edit it as you like"
-	echo
-}
diff --git a/media-sound/rexima/files/rexima-1.4-makefile.patch b/media-sound/rexima/files/rexima-1.4-makefile.patch
new file mode 100644
index 000000000000..9c70493b4cd5
--- /dev/null
+++ b/media-sound/rexima/files/rexima-1.4-makefile.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,9 @@
+ # Makefile - makefile for rexima
+ 
+-CC=gcc
+-CFLAGS=-O -Wall
++PKG_CONFIG ?= pkg-config
++CFLAGS += -Wall
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags ncurses)
++LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses)
+ 
+ # Set BINDIR to directory for binary,
+ # MANDIR to directory for man page.
+@@ -16,9 +18,6 @@
+ 
+ all: rexima
+ 
+-rexima: rexima.o
+-	$(CC) $(CFLAGS) -o rexima rexima.o -lncurses
+-
+ installdirs:
+ 	/bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR)
+ 
diff --git a/media-sound/rexima/metadata.xml b/media-sound/rexima/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/rexima/metadata.xml
+++ b/media-sound/rexima/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/rexima/rexima-1.4-r1.ebuild b/media-sound/rexima/rexima-1.4-r2.ebuild
index 60fcf194acd7..72dfeb4e8a71 100644
--- a/media-sound/rexima/rexima-1.4-r1.ebuild
+++ b/media-sound/rexima/rexima-1.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,19 +12,15 @@ SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-	tc-export CC
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-	cat > Makefile <<- _EOF_ || die
-		LDLIBS=$($(tc-getPKG_CONFIG) --libs ncurses)
-		all: rexima
-	_EOF_
+src_configure() {
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index c48e5a4161bf..4c8d15a0bf9a 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1 +1 @@
-DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
+DIST rhythmbox-3.4.7.tar.xz 3673444 BLAKE2B a9186d7c23f281ff0a0d4a2188061473e9bab39078f816051e385319afeb1a8825e124e608fc50422f1bd27adae569d75fb6c53af23c7d51086dcf01b962d652 SHA512 58de6e51d046920857ba0905043f4863ef443d5eca28cdf93c1a25e3053322664eb1f894c102d5629f8261c507626e215c097ee166f13a3e7cd82fb35c891cb4
diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-implicit-declaration.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-implicit-declaration.patch
new file mode 100644
index 000000000000..2595561ad779
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-implicit-declaration.patch
@@ -0,0 +1,72 @@
+From 10369b9a6b896dc79d7ae715fe67bf3b4c581c22 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 9 May 2023 15:48:56 -0400
+Subject: [PATCH] build: Define _GNU_SOURCE for pthread_getname_np
+
+With clang-16, implicit function definitions are treated as errors. As a
+result, the check for pthread_getname_np fails because
+pthread_getname_np is only provided under _GNU_SOURCE (see
+pthread_getname_np(3))
+
+> Checking if "pthread_getname_np" : links: NO
+
+The compilation failure is
+
+> error: implicit declaration of function 'pthread_getname_np' [-Werror,-Wimplicit-function-declaration]
+
+The inclusion of pthread.h lib/rb-debug.c must be moved above the system
+headers because they may include pthread.h themselves (and in practice
+unistd.h does). If that change is not done, lib/rb-debug.c will fail to
+compile for the same reason as the configure test.
+
+Note that to test this, one must disable prctl() detection.
+
+Bug: https://bugs.gentoo.org/898926
+---
+ lib/rb-debug.c | 11 ++++++-----
+ meson.build    |  1 +
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/lib/rb-debug.c b/lib/rb-debug.c
+index a5b4ccac6..b9e0ec81d 100644
+--- a/lib/rb-debug.c
++++ b/lib/rb-debug.c
+@@ -30,17 +30,18 @@
+ 
+ #include "config.h"
+ 
++#if defined(HAVE_PRCTL)
++#include <sys/prctl.h>
++#elif defined(HAVE_PTHREAD_GETNAME_NP)
++#define _GNU_SOURCE
++#include <pthread.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
+ #include <signal.h>
+ #include <time.h>
+-#if defined(HAVE_PRCTL)
+-#include <sys/prctl.h>
+-#elif defined(HAVE_PTHREAD_GETNAME_NP)
+-#include <pthread.h>
+-#endif
+ 
+ #include <glib.h>
+ 
+diff --git a/meson.build b/meson.build
+index 681e084e8..bbe014246 100644
+--- a/meson.build
++++ b/meson.build
+@@ -110,6 +110,7 @@ have_prctl = cc.has_function('prctl', prefix: '#include <sys/prctl.h>')
+ cdata.set('HAVE_PRCTL', have_prctl)
+ 
+ have_pthread_getname_np = cc.links('''
++  #define _GNU_SOURCE
+   #include <pthread.h>
+   int main() {
+     char nm[17];
+-- 
+GitLab
+
diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml-entities.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml-entities.patch
new file mode 100644
index 000000000000..b542224d2fbe
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml-entities.patch
@@ -0,0 +1,36 @@
+From: =?utf-8?q?J=C3=BCrg_Billeter?= <j@bitron.ch>
+Date: Tue, 28 Nov 2023 20:12:07 +0100
+Subject: Add missing <libxml/entities.h> include
+
+(cherry picked from commit 4a906b33535c794f45d3bbc816f3b56a729529b4)
+
+Origin: upstream, after 3.4.7
+---
+ rhythmdb/rhythmdb-query.c           | 1 +
+ sources/rb-static-playlist-source.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/rhythmdb/rhythmdb-query.c b/rhythmdb/rhythmdb-query.c
+index 0d1c24c..0009dde 100644
+--- a/rhythmdb/rhythmdb-query.c
++++ b/rhythmdb/rhythmdb-query.c
+@@ -30,6 +30,7 @@
+ 
+ #include <string.h>
+ 
++#include <libxml/entities.h>
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <gobject/gvaluecollector.h>
+diff --git a/sources/rb-static-playlist-source.c b/sources/rb-static-playlist-source.c
+index 4c60f70..9d8606a 100644
+--- a/sources/rb-static-playlist-source.c
++++ b/sources/rb-static-playlist-source.c
+@@ -46,6 +46,7 @@
+ 
+ #include <string.h>
+ 
++#include <libxml/entities.h>
+ #include <libxml/tree.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml2-2.12.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml2-2.12.patch
new file mode 100644
index 000000000000..7d95cb439d57
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml2-2.12.patch
@@ -0,0 +1,38 @@
+From: =?utf-8?q?J=C3=BCrg_Billeter?= <j@bitron.ch>
+Date: Tue, 28 Nov 2023 20:04:17 +0100
+Subject: playlist-manager: Fix crash with libxml2 2.12
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+The missing include resulted in an implicit function declaration, which
+may result in a segmentation fault on startup.
+
+    ../shell/rb-playlist-manager.c: In function ‘rb_playlist_manager_load_playlists’:
+    ../shell/rb-playlist-manager.c:374:23: warning: implicit declaration of function ‘xmlParseMemory’ [-Wimplicit-function-declaration]
+      374 |                 doc = xmlParseMemory (g_bytes_get_data (data, NULL), g_bytes_get_size (data));
+          |                       ^~~~~~~~~~~~~~
+    ../shell/rb-playlist-manager.c:374:23: warning: nested extern declaration of ‘xmlParseMemory’ [-Wnested-externs]
+    ../shell/rb-playlist-manager.c:374:21: warning: assignment to ‘xmlDocPtr’ {aka ‘struct _xmlDoc *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
+      374 |                 doc = xmlParseMemory (g_bytes_get_data (data, NULL), g_bytes_get_size (data));
+          |                     ^
+
+(cherry picked from commit 66da2f843e84bfa85870a4ace4054aa91ea07951)
+
+Origin: upstream, after 3.4.7
+---
+ shell/rb-playlist-manager.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/shell/rb-playlist-manager.c b/shell/rb-playlist-manager.c
+index 4974c9f..e0a54c6 100644
+--- a/shell/rb-playlist-manager.c
++++ b/shell/rb-playlist-manager.c
+@@ -41,6 +41,7 @@
+ #include <stdio.h>      /* rename() */
+ #include <unistd.h>     /* unlink() */
+ 
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-python3.12.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-python3.12.patch
new file mode 100644
index 000000000000..fb38b66c89d4
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-python3.12.patch
@@ -0,0 +1,30 @@
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Mon, 4 Dec 2023 08:15:19 +1000
+Subject: artsearch: fix regex strings so python 3.12 stops complaining
+
+(cherry picked from commit ceeed5736c3e25d33fec5a100afde20ef485e07e)
+
+Origin: upstream, after 3.4.7
+---
+ plugins/artsearch/lastfm.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/artsearch/lastfm.py b/plugins/artsearch/lastfm.py
+index 0409105..82d5eeb 100644
+--- a/plugins/artsearch/lastfm.py
++++ b/plugins/artsearch/lastfm.py
+@@ -49,10 +49,10 @@ API_URL = 'https://ws.audioscrobbler.com/2.0/'
+ # LASTFM_TOOLTIP = (LASTFM_LOGO, _("Image provided by Last.fm"))
+ 
+ DISC_NUMBER_REGEXS = (
+-	"\(disc *[0-9]+\)",
+-	"\(cd *[0-9]+\)",
+-	"\[disc *[0-9]+\]",
+-	"\[cd *[0-9]+\]",
++	"\\(disc *[0-9]+\\)",
++	"\\(cd *[0-9]+\\)",
++	"\\[disc *[0-9]+\\]",
++	"\\[cd *[0-9]+\\]",
+ 	" - disc *[0-9]+$",
+ 	" - cd *[0-9]+$",
+ 	" disc *[0-9]+$",
diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-skip-broken-test.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-skip-broken-test.patch
new file mode 100644
index 000000000000..6cfccb262f7c
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-skip-broken-test.patch
@@ -0,0 +1,24 @@
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Thu, 23 Jun 2022 10:12:20 -0400
+Subject: tests: Skip load_query_multiple
+
+This test fails on arm64 only
+
+https://gitlab.gnome.org/GNOME/rhythmbox/-/issues/1993
+---
+ tests/test-widgets.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test-widgets.c b/tests/test-widgets.c
+index 0f725ed..60b194d 100644
+--- a/tests/test-widgets.c
++++ b/tests/test-widgets.c
+@@ -291,7 +291,7 @@ rb_query_creator_suite (void)
+ 	tcase_add_checked_fixture (tc_qls, test_rhythmdb_setup, test_rhythmdb_shutdown);
+ 	tcase_add_test (tc_qls, test_query_creator_load_query_empty);
+ 	tcase_add_test (tc_qls, test_query_creator_load_query_simple);
+-	tcase_add_test (tc_qls, test_query_creator_load_query_multiple);
++	/* tcase_add_test (tc_qls, test_query_creator_load_query_multiple); */
+ 	tcase_add_test (tc_qls, test_query_creator_load_query_disjunction);
+ 	tcase_add_test (tc_qls, test_query_creator_load_limit_count);
+ 	tcase_add_test (tc_qls, test_query_creator_load_limit_minutes);
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index c87a0ebc6bf6..2935412caa6e 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-  <email>gnome@gentoo.org</email>
-  <name>Gentoo GNOME Desktop</name>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <maintainer type="project">
-  <email>gstreamer@gentoo.org</email>
-  <name>GStreamer package maintainers</name>
+    <email>gstreamer@gentoo.org</email>
+    <name>GStreamer package maintainers</name>
   </maintainer>
   <use>
     <flag name="daap">Build the local network music sharing plugin which uses the DAAP protocol using <pkg>net-libs/libdmapsharing</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/rhythmbox</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
deleted file mode 100644
index a2483b05d611..000000000000
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1 multilib virtualx
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp +python test +udev upnp-av"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	ipod? ( udev )
-	mtp? ( udev )
-	dbus? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.7.8:2
-	>=x11-libs/gtk+-3.20.0:3[X,introspection]
-	>=x11-libs/gdk-pixbuf-2.18:2
-	>=dev-libs/gobject-introspection-0.10:=
-	>=dev-libs/libpeas-0.7.3[gtk]
-	>=dev-libs/totem-pl-parser-3.2
-	>=net-libs/libsoup-2.42:2.4
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
-	>=media-libs/gstreamer-1.4:1.0[introspection]
-	>=sys-libs/tdb-1.2.6
-	dev-libs/json-glib
-
-	cdr? ( >=app-cdr/brasero-2.91.90 )
-	daap? (
-		>=net-libs/libdmapsharing-2.9.19:3.0
-		>=media-plugins/gst-plugins-soup-1.4:1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
-	lirc? ( app-misc/lirc )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	udev? (
-		dev-libs/libgudev:=
-		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
-		mtp? ( >=media-libs/libmtp-0.3 ) )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-libmms:1.0
-	|| (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		>=dev-libs/libpeas-0.7.3[python,${PYTHON_SINGLE_USEDEP}]
-		net-libs/libsoup:2.4[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-
-		dbus? ( sys-apps/dbus )
-		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
-	upnp-av? (
-		>=media-libs/grilo-0.3:0.3
-		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-# eautoreconf needs yelp-tools
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# --enable-vala just installs the sample vala plugin, and the configure
-	# checks are broken, so don't enable it
-	gnome2_src_configure \
-		VALAC=$(type -P true) \
-		--enable-mmkeys \
-		--disable-more-warnings \
-		--disable-static \
-		--disable-vala \
-		$(use_enable daap) \
-		$(use_enable libnotify) \
-		$(use_enable lirc) \
-		$(use_enable python) \
-		$(use_enable upnp-av grilo) \
-		$(use_with cdr brasero) \
-		$(use_with gnome-keyring libsecret) \
-		$(use_with ipod) \
-		$(use_with mtp) \
-		$(use_with udev gudev)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check CK_DEFAULT_TIMEOUT=60
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
-	gnome2_src_install
-}
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.7-r3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.7-r3.ebuild
new file mode 100644
index 000000000000..41b0233119b4
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.7-r3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils python-single-r1 meson virtualx xdg
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="cdr daap dbus keyring gtk-doc ipod libnotify lirc mtp +python test +udev upnp-av"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/glib-2.66.0:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=media-libs/gstreamer-1.4.0:1.0[introspection]
+	>=media-libs/gst-plugins-base-1.4.0:1.0[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+	dev-libs/json-glib
+	>=dev-libs/libpeas-0.7.3:0[gtk]
+	>=net-libs/libsoup-3.0.7:3.0
+	>=dev-libs/libxml2-2.7.8:2
+	x11-libs/pango
+	>=sys-libs/tdb-1.2.6
+	>=dev-libs/totem-pl-parser-3.2:=
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-3.9.11:4.0=
+		>=media-plugins/gst-plugins-soup-1.4:1.0
+	)
+	keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+		')
+	)
+	udev? (
+		dev-libs/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 )
+	)
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0
+	)
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3:0[python,${PYTHON_SINGLE_USEDEP}]
+		net-libs/libsoup:3.0[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		keyring? ( >=app-crypt/libsecret-0.18[introspection] )
+	)
+	upnp-av? (
+		>=media-libs/grilo-0.3.15-r1:0.3
+		>=media-plugins/grilo-plugins-0.3.16:0.3[upnp-av]
+	)
+"
+BDEPEND="
+	gtk-doc? ( dev-util/gtk-doc )
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature cdr brasero)
+		$(meson_feature daap)
+		-Dfm_radio=enabled
+		$(meson_feature upnp-av grilo)
+		$(meson_feature udev gudev)
+		$(meson_feature ipod)
+		$(meson_feature libnotify)
+		$(meson_feature keyring libsecret)
+		$(meson_feature lirc)
+		$(meson_feature mtp)
+		$(meson_feature python plugins_python)
+		-Dplugins_vala=disabled
+		-Dsample-plugins=false
+
+		-Dhelp=true
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.7-r4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.7-r4.ebuild
new file mode 100644
index 000000000000..429b5babe57c
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.7-r4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils python-single-r1 meson virtualx xdg
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="cdr daap dbus keyring gtk-doc ipod libnotify lirc mtp +python test +udev upnp-av"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/glib-2.66.0:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=media-libs/gstreamer-1.4.0:1.0[introspection]
+	>=media-libs/gst-plugins-base-1.4.0:1.0[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+	dev-libs/json-glib
+	>=dev-libs/libpeas-0.7.3:0[gtk]
+	>=net-libs/libsoup-3.0.7:3.0
+	>=dev-libs/libxml2-2.7.8:2
+	x11-libs/pango
+	>=sys-libs/tdb-1.2.6
+	>=dev-libs/totem-pl-parser-3.2:=
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-3.9.11:4.0=
+		>=media-plugins/gst-plugins-soup-1.4:1.0
+	)
+	keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+		')
+	)
+	udev? (
+		dev-libs/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 )
+	)
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0
+	)
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3:0[python,${PYTHON_SINGLE_USEDEP}]
+		net-libs/libsoup:3.0[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		keyring? ( >=app-crypt/libsecret-0.18[introspection] )
+	)
+	upnp-av? (
+		>=media-libs/grilo-0.3.15-r1:0.3
+		>=media-plugins/grilo-plugins-0.3.16:0.3[upnp-av]
+	)
+"
+BDEPEND="
+	gtk-doc? ( dev-util/gtk-doc )
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit-declaration.patch
+	"${FILESDIR}"/${P}-libxml2-2.12.patch
+	"${FILESDIR}"/${P}-libxml-entities.patch
+	"${FILESDIR}"/${P}-python3.12.patch
+	"${FILESDIR}"/${P}-skip-broken-test.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature cdr brasero)
+		$(meson_feature daap)
+		-Dfm_radio=enabled
+		$(meson_feature upnp-av grilo)
+		$(meson_feature udev gudev)
+		$(meson_feature ipod)
+		$(meson_feature libnotify)
+		$(meson_feature keyring libsecret)
+		$(meson_feature lirc)
+		$(meson_feature mtp)
+		$(meson_feature python plugins_python)
+		-Dplugins_vala=disabled
+		-Dsample-plugins=false
+
+		-Dhelp=true
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/rip/metadata.xml b/media-sound/rip/metadata.xml
index 437cb26a73b1..981e52ae05f0 100644
--- a/media-sound/rip/metadata.xml
+++ b/media-sound/rip/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/rip/rip-1.07-r1.ebuild b/media-sound/rip/rip-1.07-r1.ebuild
deleted file mode 100644
index c84749041b37..000000000000
--- a/media-sound/rip/rip-1.07-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line based audio CD ripper and mp3 encoder"
-SRC_URI="http://rip.sourceforge.net/download/${P}.tar.gz"
-HOMEPAGE="http://rip.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-RDEPEND="media-sound/cdparanoia
-	virtual/eject
-	dev-lang/perl
-	>=dev-perl/CDDB_get-2.10
-	>=dev-perl/MP3-Info-0.91
-	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-change-to-gnudb-org.patch"
-)
-
-src_install() {
-	dobin rip
-	einstalldocs
-}
diff --git a/media-sound/rip/rip-1.07-r3.ebuild b/media-sound/rip/rip-1.07-r3.ebuild
new file mode 100644
index 000000000000..eacab3b0e02d
--- /dev/null
+++ b/media-sound/rip/rip-1.07-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command-line based audio CD ripper and mp3 encoder"
+HOMEPAGE="https://rip.sourceforge.net"
+SRC_URI="https://rip.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+RDEPEND=">=dev-perl/CDDB_get-2.10
+	>=dev-perl/MP3-Info-0.91
+	dev-lang/perl
+	media-sound/cdparanoia
+	sys-apps/util-linux
+	|| (
+		media-libs/flac
+		media-sound/lame
+		media-sound/vorbis-tools
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-change-to-gnudb-org.patch"
+)
+
+src_install() {
+	dobin rip
+	einstalldocs
+}
diff --git a/media-sound/ripperx/metadata.xml b/media-sound/ripperx/metadata.xml
index 6bb1c7ca3d69..5cc31015d753 100644
--- a/media-sound/ripperx/metadata.xml
+++ b/media-sound/ripperx/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/ripperx/ripperx-2.7.3.ebuild b/media-sound/ripperx/ripperx-2.7.3.ebuild
index 2656cb3b070a..1b2d20834a94 100644
--- a/media-sound/ripperx/ripperx-2.7.3.ebuild
+++ b/media-sound/ripperx/ripperx-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit desktop
 
 DESCRIPTION="GTK program to rip CD audio tracks to Ogg, MP3 or FLAC"
 HOMEPAGE="https://sourceforge.net/projects/ripperx"
-SRC_URI="mirror://sourceforge/${PN}/${P/x/X}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P/x/X}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 7e6a8d2d32b2..f0068df0696d 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,2 +1 @@
-DIST rosegarden-20.06.tar.bz2 6821122 BLAKE2B 2c37729133f60524466c9eb6cb761e36698acc2addee802fa01b498c4450e0f87a8d02dc66f893e87c23484f7fc4f32e4e4e13f01a457a86363b4fa98bca4a1d SHA512 7f3892697b99344d47e2bf398f6fe82de9867a093f3396d571730a30f3442a923f16a5472a74bda865205696ff3834c0a188ceefae17e56b137d8df1a56e03f7
-DIST rosegarden-20.12.tar.bz2 6438971 BLAKE2B f03862a8523dd43cc7e2b146446bb943229cfa1c598bc36601695465566d1037d360b15ac78802dbcc51c601e605abc9199f3006b3072e5e0ad2b49da9e15c28 SHA512 a2901d35ef7dac9358350fa47e47b9314698790bb2e2a95c6cc444135f49a92e3fb6d6cbf8710194bca6e57e1c82218991ae3db4aa7b6acea311cb3b627d3dc2
+DIST rosegarden-23.12.tar.xz 5577476 BLAKE2B 7010657bdc3f159982b1f6eff83a5cbf1ca2c8300ccde786995645712471f31ed8b6ca1faa54e63748745de7731a29144a4144b59801d9c41bedfe4574ee4bdc SHA512 a51a5ddb1fe9c2ef0c2f7b16f8fbc4fd4fd727e7a3873bd744177a00188fa13d696fd800d38f0a67e16c33c3a98a8a924e72a4a6fa347ea68f1dd1cdf6492d24
diff --git a/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch b/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch
deleted file mode 100644
index bb4244baeba9..000000000000
--- a/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/gui/general/ThornStyle.cpp b/src/gui/general/ThornStyle.cpp
-index 4374607..de426f1 100644
---- a/src/gui/general/ThornStyle.cpp
-+++ b/src/gui/general/ThornStyle.cpp
-@@ -34,6 +34,7 @@
- #include <QLabel>
- #include <QLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadioButton>
- #include <QStyleFactory>
- #include <QStyleOption>
-diff --git a/src/gui/widgets/Panner.cpp b/src/gui/widgets/Panner.cpp
-index ceba4ea..ead23fa 100644
---- a/src/gui/widgets/Panner.cpp
-+++ b/src/gui/widgets/Panner.cpp
-@@ -24,6 +24,7 @@
- #include "misc/Debug.h"
- #include "base/Profiler.h"
- 
-+#include <QPainterPath>
- #include <QPolygon>
- #include <QMouseEvent>
- 
diff --git a/media-sound/rosegarden/metadata.xml b/media-sound/rosegarden/metadata.xml
index c399767911ba..4eb60ee9462d 100644
--- a/media-sound/rosegarden/metadata.xml
+++ b/media-sound/rosegarden/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>proaudio@gentoo.org</email>
diff --git a/media-sound/rosegarden/rosegarden-20.06.ebuild b/media-sound/rosegarden/rosegarden-20.06.ebuild
deleted file mode 100644
index 2042a29fe018..000000000000
--- a/media-sound/rosegarden/rosegarden-20.06.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg virtualx
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/rosegarden-fix-qt5.15.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_LIRC=$(usex !lirc)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# bug 701682, tries to open network socket and fails.
-	local myctestargs=(
-		-E "(test_notationview_selection)"
-	)
-	virtx cmake_src_test
-}
diff --git a/media-sound/rosegarden/rosegarden-20.12.ebuild b/media-sound/rosegarden/rosegarden-23.12.ebuild
index 8acbaa0785b7..8aeb311cb16a 100644
--- a/media-sound/rosegarden/rosegarden-20.12.ebuild
+++ b/media-sound/rosegarden/rosegarden-23.12.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg virtualx
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
deleted file mode 100644
index 5e2adbe75eec..000000000000
--- a/media-sound/rplay/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
-DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
diff --git a/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch b/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch
deleted file mode 100644
index 79d9a128806e..000000000000
--- a/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/adpcm/decode.c
-+++ b/adpcm/decode.c
-@@ -6,6 +6,7 @@
-  * Usage : decode [-3|4|5] [-a|u|l] < infile > outfile
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include "g72x.h"
- 
- 
---- a/adpcm/encode.c
-+++ b/adpcm/encode.c
-@@ -6,6 +6,7 @@
-  * Usage : encode [-3|4|5] [-a|u|l] < infile > outfile
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include "g72x.h"
- 
- 
diff --git a/media-sound/rplay/metadata.xml b/media-sound/rplay/metadata.xml
deleted file mode 100644
index a8457ac72f28..000000000000
--- a/media-sound/rplay/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<longdescription lang="en">
-		rplay is a flexible network audio system that allows sounds to be played
-		to and from local and remote Unix systems. Sounds can be played with or
-		without sending audio data over the network using either UDP or TCP.
-		rplay audio servers can be configured to share sound files with each
-		other.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
deleted file mode 100644
index 0daa2f8a38d4..000000000000
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools user
-
-DESCRIPTION="Play sounds on remote Unix systems without data transfer"
-HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz
-	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="media-sound/gsm"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}/debian/patches"
-	"${FILESDIR}/${P}-built-in_function_exit-r1.patch"
-)
-
-pkg_setup() {
-	enewgroup rplayd ""
-	enewuser rplayd "" "" "" rplayd
-}
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	mv rx/configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-rplayd-user=rplayd \
-		--enable-rplayd-group=rplayd
-}
-
-src_install() {
-	# This is borrowed from the old einstall helper, and is necessary
-	# (at least some of variables).
-	emake prefix="${ED}/usr" \
-		libdir="${ED}/usr/$(get_libdir)" \
-		datadir="${ED}/usr/share" \
-		infodir="${ED}/usr/share/info" \
-		localstatedir="${ED}/var/lib" \
-		mandir="${ED}/usr/share/man" \
-		sysconfdir="${ED}/etc" \
-		install
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/saydate/metadata.xml b/media-sound/saydate/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/saydate/metadata.xml
+++ b/media-sound/saydate/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
deleted file mode 100644
index 285545a43d17..000000000000
--- a/media-sound/sc2mpd/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST ohdevtools.d35861.tar.gz 1187475 BLAKE2B 82138d9b64f3172d540402e99b716e9b56bde2133b2565b442bfe6ae6b0e2235226027c4b43b17e3eb005b6f52a4d6a278e0895d267222a63f910ea556e4d76c SHA512 25188c3ae837db12e5c7f349ab01a315f8c68909e3eaa530dc9ba09fb2bcb3cd0a671676b3dd4902ef019b7e331d2acac0978649bce29df585e54d13158ff162
-DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B 82724b7f2cd5cd0dcaa54786394a2560b965f5f16df7bb84037795f1334b8052a4cfeff8f5f39bdc5d7a0ccb2093190c38de987957463d10cac407d9694a6a92 SHA512 67ccdbee6d909df30acb7c89aeba75d3accdbb533dda5abc02c66f867e2fad9a360696d5e28dd1decdc575a1396d026824329450e85e3a3b3e4f7af2e144140a
-DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906 SHA512 9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811
-DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661
-DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
-DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
-DIST sc2mpd-1.1.5.tar.gz 219031 BLAKE2B ac8a3b4da6caff58db4948c32d643bf9244efa4ad77e29c18aa7e10036715a9a84c9f69478f5a2eabf6769112fb61ea15e1d7e8e613fbae05794cef609f21247 SHA512 8ea47b8bda62b8e97b95b0ddf0ab7979a54ae8bc599c67ef7bdd16ea876254446c8be440fade7355be93742c94c6f20b56e40a5756cc3c0dbe0409612dc3788e
-DIST sc2mpd-1.1.7.tar.gz 238674 BLAKE2B 35fd57797612e3883ad5cc04be3f5328dbf4ec9aedb0461a801fe79566ef20de4026ad653eec6e7d932ffcd0385bb618331a519ec54838fd856d09c20f1971b8 SHA512 0b39e200f013602c851bec1ba41210c40d1a984638c86bd8dd5d61286aff19b315f282182753426e4470c8e6ccb60265b16dc6ba2e5117f59a3d40194464b4b3
diff --git a/media-sound/sc2mpd/files/ohnet.makefile.patch b/media-sound/sc2mpd/files/ohnet.makefile.patch
deleted file mode 100644
index 29a29bcc9bb5..000000000000
--- a/media-sound/sc2mpd/files/ohnet.makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 29f2d6a..038b05e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -82,12 +82,19 @@ else
-     ifneq (,$(findstring arm,$(gcc_machine)))
-         ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
-             detected_openhome_architecture = armhf
-+        else ifneq (,$(findstring armv7hl,$(gcc_machine)))
-+            # cubox: armv7hl-redhat-linux-gnueabi
-+            detected_openhome_architecture = armhf
-         else ifeq (${detected_openhome_system},Qnap)
-             detected_openhome_architecture = x19
-         else
-             detected_openhome_architecture = armel
-         endif
-     endif
-+    ifneq (,$(findstring aarch64,$(gcc_machine)))
-+      # odroid64: aarch64-linux-gnu
-+      detected_openhome_architecture = arm64
-+    endif
-     ifneq (,$(findstring i686,$(gcc_machine)))
-       detected_openhome_architecture = x86
-     endif
-@@ -375,6 +382,10 @@ mkdir = mkdir -p
- rmdir = rm -rf
- uset4 = no
- 
-+# This avoids errors in Generated/Devices.mak (they apparently have no
-+# consequences anyway because we use make native_only=yes)
-+t4 = echo
-+
- ifeq ($(managed_only), yes)
- build_targets_base = make_obj_dir ohNet.net.dll CpProxyDotNetAssemblies DvDeviceDotNetAssemblies
- else
diff --git a/media-sound/sc2mpd/files/ohnet.optionparser.patch b/media-sound/sc2mpd/files/ohnet.optionparser.patch
deleted file mode 100644
index a31657684271..000000000000
--- a/media-sound/sc2mpd/files/ohnet.optionparser.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/OpenHome/TestFramework/OptionParser.cpp b/OpenHome/TestFramework/OptionParser.cpp
-index fe90233..644fc0b 100644
---- a/OpenHome/TestFramework/OptionParser.cpp
-+++ b/OpenHome/TestFramework/OptionParser.cpp
-@@ -282,6 +282,6 @@ void OptionParser::SetUsage(const TChar* aUsage)
- {
-     delete iUsage;
-     iUsage = NULL;
--    iUsage = new TChar[strlen(iUsage)];
-+    iUsage = new TChar[strlen(aUsage)];
-     (void)strcpy(iUsage, aUsage);
- }
diff --git a/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch b/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
deleted file mode 100644
index a4f28f9a7009..000000000000
--- a/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u ./Common.mak ../../openhome/ohNetGenerated/Common.mak
---- ./Common.mak	2017-09-19 10:51:13.000000000 +0200
-+++ ./Common.mak	2017-09-19 13:21:25.984071432 +0200
-@@ -17,20 +17,6 @@
- $(objdir)ohnet-generated.jar : CpProxyJavaClasses DvDeviceJavaClasses

- 	$(jar) $(jarflags) $(objdir)ohnet-generated.jar -C $(objdir) org

- 

--Generated$(dirsep)GenerateSourceFiles.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/UpnpMakeT4.tt

--	$(mkdir) Generated

--	$(t4) -o Generated$(dirsep)GenerateSourceFiles.mak OpenHome/Net/T4/Templates/UpnpMakeT4.tt -a xml:OpenHome/Net/Service/Services.xml

--	@echo Attention: a makefile has been re-generated.

--

--Generated$(dirsep)Proxies.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt

--	$(mkdir) Generated

--	$(t4) -o Generated$(dirsep)Proxies.mak OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt -a xml:OpenHome/Net/Service/Services.xml

--	@echo Attention: a makefile has been re-generated.

--

--Generated$(dirsep)Devices.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt

--	$(mkdir) Generated

--	$(t4) -o Generated$(dirsep)Devices.mak OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt -a xml:OpenHome/Net/Service/Services.xml

--	@echo Attention: a makefile has been re-generated.

- 

- native_targets = make_obj_dir copy_build_includes proxies devices

- 

diff --git a/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch b/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
deleted file mode 100644
index d320cefbd473..000000000000
--- a/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bf7a1ba..49bffaf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -70,14 +70,17 @@ else
-     else ifneq (,$(findstring linux,$(gcc_machine)))
-       detected_openhome_system = Linux
-     endif
--    ifeq ($(gcc_machine),arm-none-linux-gnueabi)
--      detected_openhome_architecture = armel
--    endif
--    ifeq ($(gcc_machine),arm-linux-gnueabi)
--      detected_openhome_architecture = armel
--    endif
--    ifeq ($(gcc_machine),arm-linux-gnueabihf)
--      detected_openhome_architecture = armhf
-+    ifneq (,$(findstring arm,$(gcc_machine)))
-+        ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
-+            detected_openhome_architecture = armhf
-+        else ifneq (,$(findstring armv7hl,$(gcc_machine)))
-+            # cubox: armv7hl-redhat-linux-gnueabi
-+            detected_openhome_architecture = armhf
-+        else ifeq (${detected_openhome_system},Qnap)
-+            detected_openhome_architecture = x19
-+        else
-+            detected_openhome_architecture = armel
-+        endif
-     endif
-     ifneq (,$(findstring i686,$(gcc_machine)))
-       detected_openhome_architecture = x86
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
deleted file mode 100644
index ecc415f91b54..000000000000
--- a/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur sc2mpd-1.1.5/work/openhome/ohNet/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNet/Makefile
---- a/openhome/ohNet/Makefile   2020-11-16 20:49:27.220636318 -0600
-+++ b/openhome/ohNet/Makefile   2020-11-16 20:46:19.822974263 -0600
-@@ -310,13 +310,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -Werror
-+    cppflags = $(cflags_base) -std=c++0x
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- inc_build = Build/Include
- includes = -IBuild/Include/ $(version_specific_includes)
- bundle_build = Build/Bundles
-@@ -371,7 +371,7 @@
-        jar = $(JAVA_HOME)/bin/jar
- endif
-
--java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur sc2mpd-1.1.5/work/openhome/ohNetGenerated/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNetGenerated/Makefile
---- a/openhome/ohNetGenerated/Makefile  2020-11-16 20:49:27.262636458 -0600
-+++ b/openhome/ohNetGenerated/Makefile  2020-11-16 20:45:36.594809974 -0600
-@@ -273,13 +273,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
-+    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- depsPlatform = ${openhome_system}-${openhome_architecture}
- header_install = Build/Include
- inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
-@@ -334,7 +334,7 @@
-        jar = $(JAVA_HOME)/bin/jar
- endif
-
--java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur sc2mpd-1.1.5/work/openhome/ohSongcast/Makefile sc2mpd-1.1.5.altered/work/openhome/ohSongcast/Makefile
---- a/openhome/ohSongcast/Makefile      2016-10-18 02:34:33.000000000 -0500
-+++ b/openhome/ohSongcast/Makefile      2020-11-16 20:46:57.123112193 -0600
-@@ -38,7 +38,7 @@
- # Macros used by Common.mak
-
- ar = ${CROSS_COMPILE}ar rc $(objdir)
--cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
-+cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
- ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
- ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
- ohtopologydir = ../ohTopology/build/
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch
deleted file mode 100644
index d4103a522451..000000000000
--- a/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur work.orig/ohNet/bundle_binaries.py work/ohNet/bundle_binaries.py
---- a/openhome/ohNet/bundle_binaries.py	2020-11-10 00:24:29.640122646 -0600
-+++ b/openhome/ohNet/bundle_binaries.py	2020-11-10 00:26:38.441470487 -0600
-@@ -121,22 +121,22 @@
-     parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")

-     options, args = parser.parse_args()

-     if len(args)>0:

--        print "Too many arguments."

-+        print("Too many arguments.")

-         sys.exit(1)

-     if options.system not in ALL_SYSTEMS:

--        print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))

-+        print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))

-         sys.exit(1)

-     if options.architecture not in ALL_ARCHITECTURES:

--        print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))

-+        print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))

-         sys.exit(1)

-     if options.configuration not in ALL_CONFIGURATIONS:

--        print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))

-+        print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))

-         sys.exit(1)

-     target = BuildTarget(options.system, options.architecture, options.configuration)

-     if target not in ALL_TARGETS:

--        print "Unrecognized target combination. Valid combinations are:"

-+        print("Unrecognized target combination. Valid combinations are:")

-         for valid_target in sorted(ALL_TARGETS.keys()):

--            print "    " + get_target_as_option_string(valid_target)

-+            print("    " + get_target_as_option_string(valid_target))

-         sys.exit(1)

- 

-     buildinfo = ALL_TARGETS[target]

-diff -ur work.orig/ohNetGenerated/bundle_binaries.py work/ohNetGenerated/bundle_binaries.py
---- a/openhome/ohNetGenerated/bundle_binaries.py	2020-11-10 00:24:29.847123204 -0600
-+++ b/openhome/ohNetGenerated/bundle_binaries.py	2020-11-10 00:26:11.793398395 -0600
-@@ -96,22 +96,22 @@
-     parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")

-     options, args = parser.parse_args()

-     if len(args)>0:

--        print "Too many arguments."

-+        print("Too many arguments.")

-         sys.exit(1)

-     if options.system not in ALL_SYSTEMS:

--        print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))

-+        print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))

-         sys.exit(1)

-     if options.architecture not in ALL_ARCHITECTURES:

--        print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))

-+        print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))

-         sys.exit(1)

-     if options.configuration not in ALL_CONFIGURATIONS:

--        print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))

-+        print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))

-         sys.exit(1)

-     target = BuildTarget(options.system, options.architecture, options.configuration)

-     if target not in ALL_TARGETS:

--        print "Unrecognized target combination. Valid combinations are:"

-+        print("Unrecognized target combination. Valid combinations are:")

-         for valid_target in sorted(ALL_TARGETS.keys()):

--            print "    " + get_target_as_option_string(valid_target)

-+            print("    " + get_target_as_option_string(valid_target))

-         sys.exit(1)

- 

-     buildinfo = ALL_TARGETS[target]

diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch
deleted file mode 100644
index fd079e26fb8a..000000000000
--- a/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur ohNet/Makefile ohNet/Makefile
---- a/openhome/ohNet/Makefile	2020-11-09 23:46:21.295605850 -0600
-+++ b/openhome/ohNet/Makefile	2020-11-09 23:48:05.977868337 -0600
-@@ -344,13 +344,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -Werror
-+    cppflags = $(cflags_base) -std=c++0x
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- inc_build = Build/Include
- includes = -IBuild/Include/ $(version_specific_includes)
- bundle_build = Build/Bundles
-@@ -407,7 +407,7 @@
- 	jar = $(JAVA_HOME)/bin/jar
- endif
- 
--java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur ohNetGenerated/Makefile ohNetGenerated/Makefile
---- a/openhome/ohNetGenerated/Makefile	2020-11-09 23:46:21.344605971 -0600
-+++ b/openhome/ohNetGenerated/Makefile	2020-11-09 23:47:44.656814158 -0600
-@@ -276,13 +276,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
-+    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- depsPlatform = ${openhome_system}-${openhome_architecture}
- header_install = Build/Include
- inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
-@@ -337,7 +337,7 @@
- 	jar = $(JAVA_HOME)/bin/jar
- endif
- 
--java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur ohSongcast/Makefile ohSongcast/Makefile
---- a/openhome/ohSongcast/Makefile	2020-11-09 23:46:21.256605754 -0600
-+++ b/openhome/ohSongcast/Makefile	2020-11-09 23:47:23.130759816 -0600
-@@ -38,7 +38,7 @@
- # Macros used by Common.mak
- 
- ar = ${CROSS_COMPILE}ar rc $(objdir)
--cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
-+cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
- ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
- ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
- ohtopologydir = ../ohTopology/build/
diff --git a/media-sound/sc2mpd/metadata.xml b/media-sound/sc2mpd/metadata.xml
deleted file mode 100644
index 411334230662..000000000000
--- a/media-sound/sc2mpd/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>stasibear@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
deleted file mode 100644
index dd5733ae60e6..000000000000
--- a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-
-sha_net="1dd6411ffbe59fe09517162fb88e2405adb4990f"
-sha_netgenerated="e3edb912410d4c5a4d5323bb1e9c27660a42d78f"
-sha_topology="cc09c09da4be8d3d04adae5b8f0daaf8450906a3"
-sha_songcast="3299eaedfea34993b79e6d30444792d4fb12a110"
-sha_devtools="d3586187dfa5f0a8b0f3e35e3d1dc50d1c34943d"
-
-SRC_URI="
-	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
-	https://codeload.github.com/openhome/ohNet/tar.gz/${sha_net}
-		-> ohnet.${sha_net:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohNetGenerated/tar.gz/${sha_netgenerated}
-		-> ohnetgenerated.${sha_netgenerated:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohTopology/tar.gz/${sha_topology}
-		-> ohtopology.${sha_topology:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohSongcast/tar.gz/${sha_songcast}
-		-> ohsongcast.${sha_songcast:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohdevtools/tar.gz/${sha_devtools}
-		-> ohdevtools.${sha_devtools:0:6}.tar.gz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	media-libs/alsa-lib
-	media-libs/libsamplerate
-	net-libs/libmicrohttpd
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
-	mkdir openhome || die "Couldn't mkdir openhome"
-	mv ohNet-${sha_net} openhome/ohNet || die "Couldn't mv ohNet"
-	mv ohNetGenerated-${sha_netgenerated} openhome/ohNetGenerated || die "Couldn't mv ohNetGenerated"
-	mv ohdevtools-${sha_devtools} openhome/ohdevtools || die "Couldn't mv ohdevtools"
-	mv ohTopology-${sha_topology} openhome/ohTopology || die "Couldn't mv ohTopology"
-	mv ohSongcast-${sha_songcast} openhome/ohSongcast || die "Couldn't mv ohSongcast"
-
-	eapply "${FILESDIR}/${P}-werror.patch"
-
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	epatch "${FILESDIR}/ohnet.makefile.patch"
-	epatch "${FILESDIR}/ohnet.optionparser.patch"
-	sed -i -e 's/ bundle-after-build//' UserTargets.mak || die "Couldn't patch UserTargets.mak"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	epatch "${FILESDIR}/ohnetgenerated.makefile.patch"
-	epatch "${FILESDIR}/ohnetgenerated.commonmk.patch"
-	sed -i -e 's/ bundle-after-build//' UserTargets.mak \
-		|| die "Couldn't patch generated UserTargets.mak"
-
-	eapply_user
-}
-
-src_configure() {
-	econf "--with-openhome=${WORKDIR}/openhome"
-}
-
-src_compile() {
-	# Begin ohbuild.sh reverse engineer
-
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	make native_only=yes || die "ohnet make failed"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	# TODO: get from environment/make target
-	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
-	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
-	cd $deps || die "Couldn't cd to deps dir"
-
-	ohnet="${WORKDIR}/openhome/ohNet"
-	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
-		 -exec cp '{}' lib ';' \
-		|| die "Couldn't cp binary libs"
-
-	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
-	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
-	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
-	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
-	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
-	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
-	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
-	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
-	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
-	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
-	make native_only=yes || die "ohnetgenerated make failed"
-
-	cd "Build/Include" || die "Couldn't cd later to include"
-	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
-
-	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
-	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
-	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
-
-	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
-	make release=1 Receiver WavSender || die "Failed to build ohSongcast"
-
-	# End ohbuild.sh reverse engineer
-
-	cd "${S}" || die "Failed to cd to source directory"
-	make || die "Failed to make sc2mpd"
-}
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
deleted file mode 100644
index 5e598bc0f586..000000000000
--- a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-
-openhome_packageversion="20200704"
-
-SRC_URI="
-	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
-	https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-${openhome_packageversion}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/alsa-lib
-	media-libs/libsamplerate
-	media-libs/libmpdclient
-	<=net-libs/libmicrohttpd-0.9.70
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	mkdir openhome || die "Can't create openhome directory"
-	cd openhome || die "Can't enter openhome directory"
-	unpack openhome-sc2-${openhome_packageversion}.tar.gz
-}
-
-src_prepare() {
-	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
-	eapply "${FILESDIR}/${P}-python.patch"
-	eapply "${FILESDIR}/${P}-werror.patch"
-	eapply_user
-}
-
-src_configure() {
-	econf "--with-openhome=${WORKDIR}/openhome"
-}
-
-src_compile() {
-
-	#### Begin ohbuild.sh reverse engineer
-
-	# build_ohNet
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	make native_only=yes || die "ohnet make failed"
-
-	# build_ohNetGenerated
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	# TODO: get from environment/make target
-	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
-	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
-	cd $deps || die "Couldn't cd to deps dir"
-
-	ohnet="${WORKDIR}/openhome/ohNet"
-	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
-		 -exec cp '{}' lib ';' \
-		|| die "Couldn't cp binary libs"
-
-	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
-	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
-	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
-	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
-	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
-	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
-	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
-	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
-	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
-	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
-	make native_only=yes || die "ohnetgenerated make failed"
-
-	cd "Build/Include" || die "Couldn't cd later to include"
-	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
-
-	# build_ohTopology
-	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
-	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
-	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
-
-	# build_ohSongcast
-	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
-	make release=1 library_static || die "Failed to build ohSongcast"
-
-	#### End ohbuild.sh reverse engineer
-
-	cd "${S}" || die "Failed to cd to source directory"
-	make || die "Failed to make sc2mpd"
-}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index f4d298f10db2..142cd631ed95 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1 +1,3 @@
-DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
+DIST schismtracker-20240409.source.tar.gz 1162489 BLAKE2B 733ffd624e15b143c995bc124971ff49c18fb37fb65df1d8b3d1bf8b7283ddbfe9ab9906ee03230f68f85a224dcc149dce61e1d0ed1498a77e9dfcf2be2a8c7a SHA512 4ce52e4837148ff04487e1d060a4cde20f3ae924074949e225298ac6ed22a2a05186000536bdd48e38a19b09be34fa10054d68e2bda58634e92af86f0f4a2142
+DIST schismtracker-20240503.source.tar.gz 1172609 BLAKE2B 3229262a47a5b87174fc1113704100b0d5ed65468df441d7d84be9e7bd4b246613e83f6d6eaf3977d01f0c09f3a02d8d6f45c72749f5d9a6b6882f31c92b544d SHA512 f9f344962419b263a57306dd49635185a7d265da771439b6186222e768061b4b65258b87705b021d33c22c92413f07e4356c2b9db6491da86aed2ef3099aab6c
+DIST schismtracker-20240515.source.tar.gz 1178544 BLAKE2B fa6275344cf15308234cd2499862ebaf980b65834c7987ee8812413afb70980ffdc1b8f1dee551763c0d68c3364b6035032b5926b3117981203845fd854c8ccb SHA512 4b2f03b017a7105eb895db1b23faa3bf1ef8bebfffa22a7452ef019a08ef7338f4a757ebefbccca5e060cdaacd801206922ac30792451e490fd299d150be3582
diff --git a/media-sound/schismtracker/metadata.xml b/media-sound/schismtracker/metadata.xml
index 39626a990be5..4eff900f8f78 100644
--- a/media-sound/schismtracker/metadata.xml
+++ b/media-sound/schismtracker/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">schismtracker/schismtracker</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/schismtracker/schismtracker-20180810-r1.ebuild b/media-sound/schismtracker/schismtracker-20240409.ebuild
index 5c18d760c9f3..401281380980 100644
--- a/media-sound/schismtracker/schismtracker-20180810-r1.ebuild
+++ b/media-sound/schismtracker/schismtracker-20240409.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools desktop xdg-utils
+inherit desktop xdg
 
 DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
 HOMEPAGE="http://schismtracker.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/${P}.source.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
-	media-libs/alsa-lib
-	>=media-libs/libsdl-1.2[X]
+	>=media-libs/libsdl2-2.0.5[X]
 	x11-libs/libX11
-	x11-libs/libXext
 	x11-libs/libXv
 "
 DEPEND="${RDEPEND}
@@ -28,14 +25,12 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	eautoreconf
-
-	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
 
 	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt \
+	#	font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
 	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
+	mkdir auto || die
 
 	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
 	#   wine provides /usr/bin/windres
@@ -50,11 +45,3 @@ src_install() {
 	domenu sys/fd.org/*.desktop
 	doicon icons/schism{,-itf}-icon-128.png
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/schismtracker/schismtracker-20240503.ebuild b/media-sound/schismtracker/schismtracker-20240503.ebuild
new file mode 100644
index 000000000000..9f693420ffe6
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20240503.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/${P}.source.tar.gz"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.5[X]
+	x11-libs/libX11
+	x11-libs/libXv
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+
+	# workaround for temporary files (missing directory). Fixes:
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt \
+	#	font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto || die
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}
diff --git a/media-sound/schismtracker/schismtracker-20240515.ebuild b/media-sound/schismtracker/schismtracker-20240515.ebuild
new file mode 100644
index 000000000000..9f693420ffe6
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20240515.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/${P}.source.tar.gz"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.5[X]
+	x11-libs/libX11
+	x11-libs/libXv
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+
+	# workaround for temporary files (missing directory). Fixes:
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt \
+	#	font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto || die
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}
diff --git a/media-sound/scmpc/metadata.xml b/media-sound/scmpc/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/media-sound/scmpc/metadata.xml
+++ b/media-sound/scmpc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-sound/scmpc/scmpc-0.4.1.ebuild b/media-sound/scmpc/scmpc-0.4.1.ebuild
index 2b76d4155534..a0695f86c9ee 100644
--- a/media-sound/scmpc/scmpc-0.4.1.ebuild
+++ b/media-sound/scmpc/scmpc-0.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="a client for MPD which submits your tracks to last.fm"
-HOMEPAGE="https://cmende.github.com/scmpc/"
+HOMEPAGE="https://cmende.github.io/scmpc/"
 SRC_URI="https://dev.gentoo.org/~angelos/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/scream/Manifest b/media-sound/scream/Manifest
index d7e02efe74da..ba566f83ea9c 100644
--- a/media-sound/scream/Manifest
+++ b/media-sound/scream/Manifest
@@ -1 +1 @@
-DIST scream-3.6.tar.gz 999237 BLAKE2B d199d9658958ac53d973c25421ee3a7f2c1ec9666c34596639942bcbfa5efb60e4aad033adc2fdbd810f676f412357283dc5fda6224752587498f7636ade1662 SHA512 4fd07a808d8f0ead3551061e96fe2f9b54ef6f34d1d615fb6454185fc6ffc67f71afb08a876550363cb3f8c15bbff461936808031e5aba5885626c92880e92ec
+DIST scream-4.0.tar.gz 1114738 BLAKE2B 8e67033faea465d6d64427c9c7ff40d38ad88892cbcb9d3fa3d09998161fef2fce998a6d11e5c416f8b5652701f6c9dcf86283e44e084e7fa005aaf8275b49c6 SHA512 70b41f946e5f3dc3ccdceef752a719ba59841a850a9b347e8d33dc08dd5c3a4ba3d2fe5ae5004b9b621372f5d3faf52b34dc02fdaaa5be6f89991084425f682a
diff --git a/media-sound/scream/metadata.xml b/media-sound/scream/metadata.xml
index ed60e1c354ac..ec07ba2bea31 100644
--- a/media-sound/scream/metadata.xml
+++ b/media-sound/scream/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="pcap">Support sniffing packets from network using <pkg>net-libs/libpcap</pkg></flag>
+	</use>
 	<upstream>
 		<remote-id type="github">duncanthrax/scream</remote-id>
 	</upstream>
diff --git a/media-sound/scream/scream-3.6.ebuild b/media-sound/scream/scream-4.0.ebuild
index 1c3ead36e4d3..8c7ed7611cf1 100644
--- a/media-sound/scream/scream-3.6.ebuild
+++ b/media-sound/scream/scream-4.0.ebuild
@@ -1,14 +1,15 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Plays sound received from network or from a QEMU Windows VM"
 HOMEPAGE="https://github.com/duncanthrax/scream"
+S="${WORKDIR}/${P}/Receivers/unix"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/duncanthrax/scream.git"
 else
@@ -16,24 +17,27 @@ else
 	KEYWORDS="~amd64"
 fi
 
-S="${WORKDIR}/${P}/Receivers/unix"
-
 LICENSE="Ms-PL"
 SLOT="0"
-IUSE="alsa pulseaudio"
+IUSE="alsa jack pcap pulseaudio"
 
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
+	jack? (
+		media-libs/soxr
+		virtual/jack
+	)
+	pcap? ( net-libs/libpcap )
+	pulseaudio? ( media-sound/pulseaudio )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
 		-DALSA_ENABLE=$(usex alsa)
+		-DJACK_ENABLE=$(usex jack)
+		-DPCAP_ENABLE=$(usex pcap)
 		-DPULSEAUDIO_ENABLE=$(usex pulseaudio)
 	)
-
 	cmake_src_configure
 }
diff --git a/media-sound/scream/scream-9999.ebuild b/media-sound/scream/scream-9999.ebuild
index 1c3ead36e4d3..75ab1107c4f1 100644
--- a/media-sound/scream/scream-9999.ebuild
+++ b/media-sound/scream/scream-9999.ebuild
@@ -1,14 +1,15 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Plays sound received from network or from a QEMU Windows VM"
 HOMEPAGE="https://github.com/duncanthrax/scream"
+S="${WORKDIR}/${P}/Receivers/unix"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/duncanthrax/scream.git"
 else
@@ -16,24 +17,27 @@ else
 	KEYWORDS="~amd64"
 fi
 
-S="${WORKDIR}/${P}/Receivers/unix"
-
 LICENSE="Ms-PL"
 SLOT="0"
-IUSE="alsa pulseaudio"
+IUSE="alsa jack pcap pulseaudio"
 
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
+	jack? (
+		media-libs/soxr
+		virtual/jack
+	)
+	pcap? ( net-libs/libpcap )
+	pulseaudio? ( media-libs/libpulse )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
 		-DALSA_ENABLE=$(usex alsa)
+		-DJACK_ENABLE=$(usex jack)
+		-DPCAP_ENABLE=$(usex pcap)
 		-DPULSEAUDIO_ENABLE=$(usex pulseaudio)
 	)
-
 	cmake_src_configure
 }
diff --git a/media-sound/seq24/metadata.xml b/media-sound/seq24/metadata.xml
index f79bb67acbd9..3fed8a8997c3 100644
--- a/media-sound/seq24/metadata.xml
+++ b/media-sound/seq24/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>proaudio@gentoo.org</email>
diff --git a/media-sound/seq24/seq24-0.9.3-r1.ebuild b/media-sound/seq24/seq24-0.9.3-r1.ebuild
index 1917270dffd8..a585e79b26f3 100644
--- a/media-sound/seq24/seq24-0.9.3-r1.ebuild
+++ b/media-sound/seq24/seq24-0.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools desktop
 
 DESCRIPTION="Loop based MIDI sequencer with focus on live performances"
-HOMEPAGE="https://edge.launchpad.net/seq24/"
-SRC_URI="https://edge.launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2"
+HOMEPAGE="https://launchpad.net/seq24/"
+SRC_URI="https://launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/setmixer/metadata.xml b/media-sound/setmixer/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/setmixer/metadata.xml
+++ b/media-sound/setmixer/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/sexypsf/metadata.xml b/media-sound/sexypsf/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/sexypsf/metadata.xml
+++ b/media-sound/sexypsf/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/shnflacverify/metadata.xml b/media-sound/shnflacverify/metadata.xml
index 3c4b72cedd85..8c6e5ad9b6f7 100644
--- a/media-sound/shnflacverify/metadata.xml
+++ b/media-sound/shnflacverify/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
diff --git a/media-sound/shnflacverify/shnflacverify-0.3.ebuild b/media-sound/shnflacverify/shnflacverify-0.3-r1.ebuild
index c87293cfecf4..a0e70430e399 100644
--- a/media-sound/shnflacverify/shnflacverify-0.3.ebuild
+++ b/media-sound/shnflacverify/shnflacverify-0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit edos2unix
 
diff --git a/media-sound/shntool/metadata.xml b/media-sound/shntool/metadata.xml
index 372b7fd68e56..17c4baad5f7a 100644
--- a/media-sound/shntool/metadata.xml
+++ b/media-sound/shntool/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/shntool/shntool-3.0.10-r1.ebuild b/media-sound/shntool/shntool-3.0.10-r3.ebuild
index 85c00e64e36c..36d805f84bc6 100644
--- a/media-sound/shntool/shntool-3.0.10-r1.ebuild
+++ b/media-sound/shntool/shntool-3.0.10-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A multi-purpose WAVE data processing and reporting utility"
 HOMEPAGE="http://www.etree.org/shnutils/shntool/"
@@ -15,7 +15,7 @@ IUSE="alac flac mac shorten sox wavpack"
 RDEPEND="
 	alac? ( media-sound/alac_decoder )
 	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
+	mac? ( <=media-sound/mac-4.12 )
 	shorten? ( media-sound/shorten )
 	sox? ( media-sound/sox )
 	wavpack? ( media-sound/wavpack )"
diff --git a/media-sound/shorten/files/shorten-3.6.1-modern-c.patch b/media-sound/shorten/files/shorten-3.6.1-modern-c.patch
new file mode 100644
index 000000000000..a390c3c30d22
--- /dev/null
+++ b/media-sound/shorten/files/shorten-3.6.1-modern-c.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/880807
+--- a/src/fixio.c
++++ b/src/fixio.c
+@@ -10,9 +10,11 @@
+  * $Id: fixio.c,v 1.4 2002/01/28 01:16:52 jason Exp $
+  */
+ 
++#define _XOPEN_SOURCE 600
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include "shorten.h"
+ #include "bitshift.h"
+ 
diff --git a/media-sound/shorten/metadata.xml b/media-sound/shorten/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/shorten/metadata.xml
+++ b/media-sound/shorten/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/shorten/shorten-3.6.1.ebuild b/media-sound/shorten/shorten-3.6.1-r1.ebuild
index e05e1cf4f4de..4ad5e7a0b738 100644
--- a/media-sound/shorten/shorten-3.6.1.ebuild
+++ b/media-sound/shorten/shorten-3.6.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="fast, low complexity waveform coder (i.e. audio compressor)"
 HOMEPAGE="http://shnutils.freeshell.org/shorten/"
@@ -11,4 +11,7 @@ LICENSE="shorten"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc sparc x86"
 
-PATCHES=( "${FILESDIR}"/${PN}-tests.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-tests.patch
+	"${FILESDIR}"/${PN}-3.6.1-modern-c.patch
+)
diff --git a/media-sound/sidplay/files/sidplay-2.0.9-drop-register-keyword.patch b/media-sound/sidplay/files/sidplay-2.0.9-drop-register-keyword.patch
new file mode 100644
index 000000000000..91c01de93b37
--- /dev/null
+++ b/media-sound/sidplay/files/sidplay-2.0.9-drop-register-keyword.patch
@@ -0,0 +1,16 @@
+Bug; https://bugs.gentoo.org/897796
+--- a/src/keyboard.cpp
++++ b/src/keyboard.cpp
+@@ -129,9 +129,9 @@ static char keytable[] =
+  */
+ static int keyboard_search (char *cmd)
+ {
+-    register char *p;
+-    register char *q;
+-    register int   a;
++    char *p;
++    char *q;
++    int   a;
+ 
+     for (p = keytable, q = cmd;;  p++, q++)
+     {
diff --git a/media-sound/sidplay/metadata.xml b/media-sound/sidplay/metadata.xml
index 973cb291162c..c40e3d8ce770 100644
--- a/media-sound/sidplay/metadata.xml
+++ b/media-sound/sidplay/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/sidplay/sidplay-2.0.9-r1.ebuild b/media-sound/sidplay/sidplay-2.0.9-r2.ebuild
index 231c5b2d8bd8..8ec69de1d0f1 100644
--- a/media-sound/sidplay/sidplay-2.0.9-r1.ebuild
+++ b/media-sound/sidplay/sidplay-2.0.9-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="C64 SID player"
-HOMEPAGE="http://sidplay2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sidplay2/${P}.tar.gz"
+HOMEPAGE="https://sidplay2.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/sidplay2/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86"
 IUSE=""
@@ -19,4 +19,5 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-gcc43.patch"
 	"${FILESDIR}/${P}-gcc44.patch"
+	"${FILESDIR}/${P}-drop-register-keyword.patch"
 )
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index c32fb96f0fd3..065bd3d2fc31 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1 +1 @@
-DIST sidplayfp-1.4.4.tar.gz 183711 BLAKE2B 31ff002d4cd54e827117e2b2f86d253ee1e0bc07fb6ac777653109585c059311205e141e339a8d8cde08209e1c35776d6f0a0ccf0ad754f78eb5e5f4bafd3cfb SHA512 8375a249da80a10d9c0ef55b35c5b047bf0249393026ad8ff25fb8a2660151f1d482fe581a85c6982b3c70ea257807ce17e1c6011874f10c64bec54a1982ec04
+DIST sidplayfp-2.7.0.tar.gz 247006 BLAKE2B abf6a00b818df7c228114470eeb92902bca2179b6f16751b1c023b5d18df661c7551ae469264e2e54f117b2fdd914cdeefac33f034fcf9c2182b61d4c3d06b8a SHA512 22fd5d70bad33071c080f87144f17ae41a82046a7f7f9b8fb510968810d74024f512ddabf70fc7b01e92b4345f0e8e8c3477b523ab2ef4975ff00d3007ce33bc
diff --git a/media-sound/sidplayfp/files/sidplayfp-1.4.4-musl-limits.patch b/media-sound/sidplayfp/files/sidplayfp-1.4.4-musl-limits.patch
new file mode 100644
index 000000000000..ad810d66f5b5
--- /dev/null
+++ b/media-sound/sidplayfp/files/sidplayfp-1.4.4-musl-limits.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/764113
+--- a/src/IniConfig.cpp
++++ b/src/IniConfig.cpp
+@@ -36,6 +36,7 @@
+ #  include <sys/types.h>
+ #  include <sys/stat.h>  /* mkdir */
+ #  include <dirent.h>    /* opendir */
++#  include <limits.h>
+ #else
+ #  include <windows.h>
+ #endif
diff --git a/media-sound/sidplayfp/metadata.xml b/media-sound/sidplayfp/metadata.xml
index cb5d4fa14508..920e9989240a 100644
--- a/media-sound/sidplayfp/metadata.xml
+++ b/media-sound/sidplayfp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/sidplayfp/sidplayfp-1.4.4.ebuild b/media-sound/sidplayfp/sidplayfp-2.7.0.ebuild
index 40dc1277bbd0..2fd85b9b65bd 100644
--- a/media-sound/sidplayfp/sidplayfp-1.4.4.ebuild
+++ b/media-sound/sidplayfp/sidplayfp-2.7.0.ebuild
@@ -1,32 +1,38 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Sidplay2 fork with resid-fp"
 HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+alsa oss pulseaudio"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	>=media-libs/libsidplayfp-1.8.0
+	media-libs/libsidplayfp
 	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
+	pulseaudio? ( media-libs/libpulse )"
 DEPEND="${RDEPEND}
 	oss? ( virtual/os-headers )"
 
 DOCS=( AUTHORS README TODO )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-musl-limits.patch
+)
+
 src_prepare() {
 	default
+
 	if ! use alsa; then
 		sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die
 	fi
+
 	if ! use pulseaudio; then
 		sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die
 	fi
@@ -34,5 +40,6 @@ src_prepare() {
 
 src_configure() {
 	export ac_cv_header_linux_soundcard_h=$(usex oss)
+
 	econf
 }
diff --git a/media-sound/smixer/metadata.xml b/media-sound/smixer/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/smixer/metadata.xml
+++ b/media-sound/smixer/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 0e56320be76c..d45a494a4445 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -1 +1 @@
-DIST snapcast-0.20.0.tar.gz 729346 BLAKE2B 01a937b74d12f40717cec049e9af0c03f01cc957a97aa0c7316cac2c90f29d8a79dae99a0ae390b72e1a6ff8dce8e6134d40c83ac051641a97bbcd8df90ef64e SHA512 55542a5d915e359b4d8dcb69292dc8ee61067c5b35318151542d875b47a357b8713780ec03fb247ee424645457e68371499e84bae38fbb197737b1369dc7b622
+DIST snapcast-0.27.0.tar.gz 1566337 BLAKE2B 77183cd2496beaf6808f8c1ff030cdb1e483c86ebafd57d0c75daa2dfe31030f0dd9704db40e2c0780b85c2b346e121ccd16c1cb75dea1f80e9834d3ae100fb8 SHA512 fd86f5b0d38bf308eb9cc1f3024676471176355a8cc91ee8c8d2dfe1aa0cde99fc7636133071b50304fe66ea42dee996e0088e013be7fa703f21c5bc2a35cfdd
diff --git a/media-sound/snapcast/files/snapcast-0.27.0-gcc13.patch b/media-sound/snapcast/files/snapcast-0.27.0-gcc13.patch
new file mode 100644
index 000000000000..5378874e6dd3
--- /dev/null
+++ b/media-sound/snapcast/files/snapcast-0.27.0-gcc13.patch
@@ -0,0 +1,26 @@
+https://github.com/badaix/snapcast/pull/1124
+
+From 73c75ccb8eb20aa1514e8c86deb859e70bc63290 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 15 Apr 2023 10:20:47 +0100
+Subject: [PATCH] Fix build with GCC 13
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
+are no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Bug: https://bugs.gentoo.org/894742
+--- a/common/sample_format.hpp
++++ b/common/sample_format.hpp
+@@ -19,6 +19,7 @@
+ #ifndef SAMPLE_FORMAT_H
+ #define SAMPLE_FORMAT_H
+ 
++#include <cstdint>
+ #include <string>
+ 
+ 
+-- 
+2.40.0
+
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml
index a11864f7a852..d3a59a2bfebf 100644
--- a/media-sound/snapcast/metadata.xml
+++ b/media-sound/snapcast/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<use>
 		<flag name="client">Build and install Snapcast client component</flag>
diff --git a/media-sound/snapcast/snapcast-0.20.0.ebuild b/media-sound/snapcast/snapcast-0.27.0.ebuild
index 6228cd7ec667..80e1997b38e9 100644
--- a/media-sound/snapcast/snapcast-0.20.0.ebuild
+++ b/media-sound/snapcast/snapcast-0.27.0.ebuild
@@ -1,45 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Synchronous multi-room audio player"
 HOMEPAGE="https://github.com/badaix/snapcast"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+client +expat +flac +opus +server static-libs tremor +vorbis +zeroconf"
-
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
+IUSE="+client +expat +flac +opus +server tremor +vorbis +zeroconf"
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="client? (
-		acct-user/snapclient
-		media-libs/alsa-lib )
+RDEPEND="
+	dev-libs/boost:=
+	media-libs/alsa-lib
+	client? ( acct-user/snapclient )
 	expat? ( dev-libs/expat )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	opus? ( media-libs/opus )
 	server? (
 		acct-group/snapserver
-		acct-user/snapserver )
+		acct-user/snapserver
+	)
 	tremor? ( media-libs/tremor )
 	vorbis? ( media-libs/libvorbis )
-	zeroconf? ( net-dns/avahi[dbus] )"
-DEPEND="${RDEPEND}
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="
+	${RDEPEND}
 	>=dev-cpp/aixlog-1.2.1
 	>=dev-cpp/asio-1.12.1
-	>=dev-cpp/popl-1.2.0"
+	>=dev-cpp/popl-1.2.0
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.27.0-gcc13.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
@@ -48,11 +48,12 @@ src_configure() {
 		-DBUILD_WITH_FLAC=$(usex flac)
 		-DBUILD_WITH_OPUS=$(usex opus)
 		-DBUILD_SERVER=$(usex server)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_STATIC_LIBS=no
 		-DBUILD_TESTS=no
 		-DBUILD_WITH_TREMOR=$(usex tremor)
 		-DBUILD_WITH_VORBIS=$(usex vorbis)
 		-DBUILD_WITH_AVAHI=$(usex zeroconf)
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
 	)
 
 	cmake_src_configure
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
deleted file mode 100644
index 6228cd7ec667..000000000000
--- a/media-sound/snapcast/snapcast-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Synchronous multi-room audio player"
-HOMEPAGE="https://github.com/badaix/snapcast"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+client +expat +flac +opus +server static-libs tremor +vorbis +zeroconf"
-
-REQUIRED_USE="|| ( server client )"
-
-RDEPEND="client? (
-		acct-user/snapclient
-		media-libs/alsa-lib )
-	expat? ( dev-libs/expat )
-	flac? ( media-libs/flac )
-	opus? ( media-libs/opus )
-	server? (
-		acct-group/snapserver
-		acct-user/snapserver )
-	tremor? ( media-libs/tremor )
-	vorbis? ( media-libs/libvorbis )
-	zeroconf? ( net-dns/avahi[dbus] )"
-DEPEND="${RDEPEND}
-	>=dev-cpp/aixlog-1.2.1
-	>=dev-cpp/asio-1.12.1
-	>=dev-cpp/popl-1.2.0"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_WITH_EXPAT=$(usex expat)
-		-DBUILD_WITH_FLAC=$(usex flac)
-		-DBUILD_WITH_OPUS=$(usex opus)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTS=no
-		-DBUILD_WITH_TREMOR=$(usex tremor)
-		-DBUILD_WITH_VORBIS=$(usex vorbis)
-		-DBUILD_WITH_AVAHI=$(usex zeroconf)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	for bin in server client ; do
-		if use ${bin} ; then
-			doman "${bin}/snap${bin}.1"
-
-			newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}"
-			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
-		fi
-	done
-}
diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest
index 2d1639713161..5f1766d25c89 100644
--- a/media-sound/snd/Manifest
+++ b/media-sound/snd/Manifest
@@ -1 +1 @@
-DIST snd-17.4.tar.gz 15096338 BLAKE2B ca054977caacd2ea4c1b14f50c31d3b4cc6b206a58529ee5537ec80e51acb72c1b8baad6db9729270fe07067c097f16e630e1f7a81521ac0532f5b5689fb963c SHA512 cbbc546fe4a3ef758c5372edbdae4db29457c559eafa08854819917e153ce850f5ab302da68dee826f99c26f10769aae8c6df6ea8434614f084f21d0dbbc5c88
+DIST snd-22.9.tar.gz 14704873 BLAKE2B 788a0d77571b13cac0bb191bd88e0d18d5a6808fbee170c8cb3237a2bdc8b20a72cd3a4360cf0632c1746bec317b367ebf6344ac05d9a5485d54a77268ab96cf SHA512 641f49438dd71285249d2da6f36f30ca52ec8f8fc8189af7815abff054db7651d8da54798509c77d93d542d09bb11e3ad6662aec51e9ba1c7a6a1672bb0eba48
diff --git a/media-sound/snd/files/snd-17.4-portaudio.patch b/media-sound/snd/files/snd-17.4-portaudio.patch
deleted file mode 100644
index 8bdb1af01e8a..000000000000
--- a/media-sound/snd/files/snd-17.4-portaudio.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -521,8 +521,9 @@
-   
-   if test "$with_portaudio" = yes ; then
-     AC_DEFINE(MUS_PORTAUDIO)
-+    PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0])
-     AUDIO_SYSTEM=portaudio
--    AUDIO_LIB="-lportaudio"
-+    AUDIO_LIB="${PORTAUDIO_LIBS}"
-   fi
- 
-   if test "$with_jack" = yes ; then
---- a/makefile.in
-+++ b/makefile.in
-@@ -11,6 +11,7 @@
- GL_FLAGS = @GL_FLAGS@
- GSL_FLAGS = @GSL_CFLAGS@
- JACK_FLAGS = @JACK_FLAGS@
-+PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
- 
- ORIGINAL_LDFLAGS = @ORIGINAL_LDFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -28,6 +29,7 @@
- WEBSERVER_FILES = @WEBSERVER_FILES@
- JACK_LIBS = @JACK_LIBS@
- GMP_LIBS = @GMP_LIBS@
-+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
- 
- LDSO_FLAGS = @LDSO_FLAGS@
- SO_FLAGS = @SO_FLAGS@
-@@ -53,7 +55,7 @@
- .SUFFIXES: .c .o
- 
- .c.o:
--	$(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $<
-+	$(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $(PORTAUDIO_CFLAGS) $<
- 
- SND_SCRIPTS = *.scm *.fs *.rb *.fsm
- SNDLIB_HEADERS = mus-config.h sndlib.h _sndlib.h sndlib-strings.h clm.h vct.h sndlib2xen.h clm2xen.h xen.h clm-strings.h
-@@ -84,7 +86,7 @@
- main_target: @MAKE_TARGET@
- 
- snd: $(SNDLIB_HEADERS) $(SND_HEADERS) $(GX_HEADERS) $(S7_HEADERS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) $(WEBSERVER_FILES)
--	$(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES)  $(WEBSERVER_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(WEBSERVER_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(LIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES)  $(WEBSERVER_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(WEBSERVER_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(PORTAUDIO_LIBS) $(LIBS)
- 
- xm: 	xen.h mus-config.h $(S7_HEADERS)
- 	$(CC) -c xm.c -DUSE_SND=0 $(DEFS) $(SO_FLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(JACK_FLAGS) $(GL_FLAGS)
diff --git a/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch
deleted file mode 100644
index 6199a7b183fd..000000000000
--- a/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Always compile the `oss_sample_types` function
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621758
-
---- a/audio.c
-+++ b/audio.c
-@@ -743,7 +743,6 @@
- }
- 
- 
--#if (!HAVE_ALSA)
- static int oss_sample_types(int ur_dev, mus_sample_t *val)
- {
-   int fd, samp_types = 0, sys, ind;
-@@ -774,7 +773,6 @@
-   val[0] = (mus_sample_t)(ind - 1);
-   return(MUS_NO_ERROR);
- }
--#endif
- 
- 
- 
diff --git a/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch
new file mode 100644
index 000000000000..f94e5b64ea53
--- /dev/null
+++ b/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch
@@ -0,0 +1,42 @@
+Always compile the `oss_sample_types` function
+Bug: https://bugs.gentoo.org/621758
+
+Also, conditionally use pulseaudio_sample_types:
+```
+audio.c: In function ‘mus_audio_device_sample_type’:
+audio.c:5687:5: error: implicit declaration of function ‘pulseaudio_sample_types’; did you mean ‘alsa_sample_types’? [-Werror=implicit-function-declaration]
+ 5687 |     pulseaudio_sample_types(dev, mixer_vals);
+      |     ^~~~~~~~~~~~~~~~~~~~~~~
+      |     alsa_sample_types
+```
+--- a/audio.c
++++ b/audio.c
+@@ -744,7 +744,6 @@ static int oss_mus_audio_open_input(int ur_dev, int srate, int chans, mus_sample
+ }
+ 
+ 
+-#if (!HAVE_ALSA) && (!HAVE_JACK_IN_LINUX)
+ static int oss_sample_types(int ur_dev, mus_sample_t *val)
+ {
+   int fd, samp_types = 0, sys, ind;
+@@ -775,7 +774,6 @@ static int oss_sample_types(int ur_dev, mus_sample_t *val)
+   val[0] = (mus_sample_t)(ind - 1);
+   return(MUS_NO_ERROR);
+ }
+-#endif
+
+
+
+--- a/audio.c
++++ b/audio.c
+@@ -5682,7 +5682,7 @@ mus_sample_t mus_audio_device_sample_type(int dev) /* snd-dac */
+ #endif
+ #endif
+
+-#if defined(MUS_PULSEAUDIO)
++#if defined(MUS_PULSEAUDIO) && (!(defined(AUDIO_OK)))
+   if (mixer_vals[0] == MUS_UNKNOWN_SAMPLE)
+     pulseaudio_sample_types(dev, mixer_vals);
+ #endif
+--
+2.38.0
diff --git a/media-sound/snd/metadata.xml b/media-sound/snd/metadata.xml
index 45299bb81517..1007169df4b2 100644
--- a/media-sound/snd/metadata.xml
+++ b/media-sound/snd/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound project</name>
-</maintainer>
-<use>
-  <flag name="s7">Enable the s7 extension language (a version of Scheme)</flag>
-</use>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="notcurses">Terminal interface via <pkg>dev-cpp/notcurses</pkg></flag>
+		<flag name="s7">Enable the s7 extension language (a version of Scheme)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/snd/snd-17.4-r1.ebuild b/media-sound/snd/snd-22.9.ebuild
index 90c2fce54b92..cf4a5df234b2 100644
--- a/media-sound/snd/snd-17.4-r1.ebuild
+++ b/media-sound/snd/snd-22.9.ebuild
@@ -1,63 +1,52 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools flag-o-matic
 
 DESCRIPTION="Snd is a sound editor"
 HOMEPAGE="https://ccrma.stanford.edu/software/snd/"
-SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"
+SRC_URI="https://ccrma.stanford.edu/software/${PN}/${P}.tar.gz"
 
-LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )"
+LICENSE="Snd 0BSD BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alsa doc fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7"
+IUSE="alsa doc fftw gmp gsl gui jack ladspa notcurses opengl oss portaudio pulseaudio readline ruby +s7"
 
 RDEPEND="
-	media-libs/audiofile
 	alsa? ( media-libs/alsa-lib )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? (
-		dev-libs/gmp:0=
+		dev-libs/gmp:=
 		dev-libs/mpc
-		dev-libs/mpfr:0=
+		dev-libs/mpfr:=
 	)
 	gsl? ( sci-libs/gsl:= )
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
+	gui? ( x11-libs/motif:0 )
 	jack? ( virtual/jack )
 	ladspa? ( media-libs/ladspa-sdk )
-	motif? ( >=x11-libs/motif-2.3:0 )
+	notcurses? ( dev-cpp/notcurses )
 	opengl? ( virtual/opengl )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
-	readline? ( sys-libs/readline:* )
-	ruby? ( dev-lang/ruby:* )"
+	readline? ( sys-libs/readline:= )
+	ruby? ( dev-lang/ruby:* )
+"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
 	?? ( portaudio pulseaudio )
 	?? ( ruby s7 )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-17.4-portaudio.patch
-	"${FILESDIR}"/${PN}-17.4-undefined-oss_sample_types.patch
+	"${FILESDIR}"/${PN}-22.8-undefined-oss_sample_types.patch
 )
 
-pkg_setup() {
-	if ! use gtk && ! use motif ; then
-		ewarn "Warning: no graphic toolkit selected (gtk or motif)."
-		ewarn "Upstream suggests to enable one of the toolkits (or both)"
-		ewarn "or only the command line utilities will be helpful."
-	fi
-}
-
 src_prepare() {
 	default
+
 	sed -i -e "s:-O2 ::" configure.ac || die
 	eautoreconf
 }
@@ -66,26 +55,27 @@ src_configure() {
 	# Workaround executable sections QA warning (bug #348754)
 	append-ldflags -Wl,-z,noexecstack
 
-	local myconf
+	local myeconfargs=(
+		$(use_with alsa)
+		$(use_with fftw)
+		$(use_with gmp)
+		$(use_with gsl)
+		$(use_with gui)
+		$(use_with jack)
+		$(use_with ladspa)
+		$(use_with notcurses)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio)
+		$(use_with ruby)
+		$(use_with s7)
+	)
+
 	if ! use ruby && ! use s7 ; then
-		myconf+=" --without-extension-language"
+		myeconfargs+=( --without-extension-language )
 	fi
 
-	econf \
-		$(use_with alsa) \
-		$(use_with fftw) \
-		$(use_with gmp) \
-		$(use_with gsl) \
-		$(use_with gtk) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with motif) \
-		$(use_with oss) \
-		$(use_with portaudio) \
-		$(use_with pulseaudio) \
-		$(use_with ruby) \
-		$(use_with s7) \
-		${myconf}
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -94,10 +84,7 @@ src_compile() {
 	# Do not compile ruby extensions for command line programs since they fail
 	sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h || die
 
-	local i
-	for i in sndplay sndinfo; do
-	   emake ${i}
-	done
+	emake sndplay sndinfo
 }
 
 src_install() {
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
index d2c11f912f4b..8c293a61adb1 100644
--- a/media-sound/sndfile-tools/Manifest
+++ b/media-sound/sndfile-tools/Manifest
@@ -1 +1 @@
-DIST sndfile-tools-1.04a.tar.bz2 715692 BLAKE2B e65a222bfdd96803293f006c2c5704fd1037d81524559d86c8e3812b91bd90fa0b47d1f589adb303f68e1ffdbebfd8b4ec616c9f1d897ad993768981c83022e3 SHA512 b93fd74386960c986031fd1652335bc34243bd785ccf31480b82f4d76ef86760ca53173aace273a635db70db46c0c1c4066328aef9c21c01c6e76346dbe56390
+DIST sndfile-tools-1.5.tar.bz2 555122 BLAKE2B c273bb655163816dcad81f15b089fa36a227a73b3b331d51bc16f91025afdca4a994b5d3838c5cf61335b5f900e8da3a299f9dd9cf8e34d2c9b2c21987625809 SHA512 04926a6c489634762efaa787e468ab653990762d5b96ba3cdfca595102c1d5eeb86411c9010d5640b1b3ec2b38d8d9d434fb549c52446e4b88d5b2a1d06a2bc6
diff --git a/media-sound/sndfile-tools/metadata.xml b/media-sound/sndfile-tools/metadata.xml
index 398910b981cb..f9cfd2e46510 100644
--- a/media-sound/sndfile-tools/metadata.xml
+++ b/media-sound/sndfile-tools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -15,4 +15,7 @@
 		* sndfile-spectrogram
 		* sndfile-mix-to-mono
 	</longdescription>
+	<upstream>
+		<remote-id type="github">libsndfile/sndfile-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.5.ebuild
index 946196cd2f67..cea855aff343 100644
--- a/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild
+++ b/media-sound/sndfile-tools/sndfile-tools-1.5.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Small collection of programs that use libsndfile"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
+HOMEPAGE="https://libsndfile.github.io/sndfile-tools/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git"
+	EGIT_REPO_URI="https://github.com/libsndfile/sndfile-tools.git"
 else
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2 -> ${P}a.tar.bz2"
+	SRC_URI="https://github.com/libsndfile/sndfile-tools/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64"
 fi
 
@@ -23,11 +23,9 @@ DEPEND="
 	media-libs/libsndfile
 	x11-libs/cairo
 	sci-libs/fftw:3.0=
-	jack? ( virtual/jack )
-"
+	jack? ( virtual/jack )"
 RDEPEND="${DEPEND}
-	!<media-libs/libsamplerate-0.1.9-r1
-"
+	!<media-libs/libsamplerate-0.1.9-r1"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
diff --git a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
index 6ed4dd5751d3..cea855aff343 100644
--- a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
+++ b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Small collection of programs that use libsndfile"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
+HOMEPAGE="https://libsndfile.github.io/sndfile-tools/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git"
+	EGIT_REPO_URI="https://github.com/libsndfile/sndfile-tools.git"
 else
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2"
+	SRC_URI="https://github.com/libsndfile/sndfile-tools/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64"
 fi
 
@@ -23,11 +23,9 @@ DEPEND="
 	media-libs/libsndfile
 	x11-libs/cairo
 	sci-libs/fftw:3.0=
-	jack? ( virtual/jack )
-"
+	jack? ( virtual/jack )"
 RDEPEND="${DEPEND}
-	!<media-libs/libsamplerate-0.1.9-r1
-"
+	!<media-libs/libsamplerate-0.1.9-r1"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
new file mode 100644
index 000000000000..09c5535dae7e
--- /dev/null
+++ b/media-sound/sndio/Manifest
@@ -0,0 +1,2 @@
+DIST sndio-1.8.0.tar.gz 156249 BLAKE2B 46d279c0a9ab40253d9f4abf5892d6c2cbbbeeeeb5ff72f45287b16adce122550025ee2d50b45de5e6952dfac1f25041e520692b0afc31ce9cfa5e122d8799fa SHA512 c3225e59e50c3dee41df7df1d87d32ed616117ea6883d9c643a57091b2239b03988c00230882c32f68331952852781dccb8bdc5a6c92780d97a294a1bd9d8ef8
+DIST sndio-1.9.0.tar.gz 157354 BLAKE2B d7e5f8137f87096a0260679afba84e4952bb060e28df6cb9a184fb4436b627a0fc8260cc29e459f3cca4d10372f96424f18e19ddf5805d281cbb8c538fbfffa2 SHA512 f322886e428a4b5bf6867f9faaeaea26d377babbf4176960a0287ebcb0b678bf3cbac134c6c08838c9bd2094a68286be2f2df71ca0f55b7b0e816fdea9cd41cf
diff --git a/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch b/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch
new file mode 100644
index 000000000000..70c66157fab8
--- /dev/null
+++ b/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch
@@ -0,0 +1,12 @@
+diff -Naur a/configure b/configure
+--- a/configure	2021-05-07 10:49:58.000000000 +0300
++++ b/configure	2022-06-07 14:49:07.623069325 +0300
+@@ -205,7 +205,7 @@
+ datadir="${datadir:-$prefix/share}"
+ includedir="${includedir:-$prefix/include}"
+ libdir="${libdir:-$exec_prefix/lib}"
+-pkgconfdir="${pkgconfdir:-$prefix/lib/pkgconfig}"
++pkgconfdir="${pkgconfdir:-$libdir/pkgconfig}"
+ mandir="${mandir:-$prefix/share/man}"
+ 
+ #
diff --git a/media-sound/sndio/files/sndiod b/media-sound/sndio/files/sndiod
new file mode 100644
index 000000000000..ce4ebe523c16
--- /dev/null
+++ b/media-sound/sndio/files/sndiod
@@ -0,0 +1,2 @@
+#!/sbin/openrc-run
+command="sndiod"
diff --git a/media-sound/sndio/metadata.xml b/media-sound/sndio/metadata.xml
new file mode 100644
index 000000000000..bf5592871976
--- /dev/null
+++ b/media-sound/sndio/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/sndio/sndio-1.8.0-r1.ebuild b/media-sound/sndio/sndio-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..57f3788ceb24
--- /dev/null
+++ b/media-sound/sndio/sndio-1.8.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="small audio and MIDI framework part of the OpenBSD project"
+HOMEPAGE="http://www.sndio.org/"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://caoua.org/git/sndio"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="http://www.sndio.org/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86"
+fi
+
+LICENSE="ISC"
+SLOT="0/7.1"
+IUSE="alsa"
+
+DEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/sndiod
+"
+
+PATCHES=( "${FILESDIR}"/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export CC
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--privsep-user=sndiod \
+		--with-libbsd \
+		$(use_enable alsa) \
+	|| die "Configure failed"
+}
+
+src_install() {
+	multilib-minimal_src_install
+
+	doinitd "${FILESDIR}/sndiod"
+}
diff --git a/media-sound/sndio/sndio-1.8.0.ebuild b/media-sound/sndio/sndio-1.8.0.ebuild
new file mode 100644
index 000000000000..2ddabfba5be4
--- /dev/null
+++ b/media-sound/sndio/sndio-1.8.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="small audio and MIDI framework part of the OpenBSD project"
+HOMEPAGE="http://www.sndio.org/"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://caoua.org/git/sndio"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="http://www.sndio.org/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+fi
+
+LICENSE="ISC"
+SLOT="0/7.1"
+IUSE="alsa"
+
+DEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/sndiod
+"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export CC
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--privsep-user=sndiod \
+		--with-libbsd \
+		$(use_enable alsa) \
+	|| die "Configure failed"
+}
+
+src_install() {
+	multilib-minimal_src_install
+
+	doinitd "${FILESDIR}/sndiod"
+}
diff --git a/media-sound/sndio/sndio-1.9.0.ebuild b/media-sound/sndio/sndio-1.9.0.ebuild
new file mode 100644
index 000000000000..b8820cd6e025
--- /dev/null
+++ b/media-sound/sndio/sndio-1.9.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="small audio and MIDI framework part of the OpenBSD project"
+HOMEPAGE="http://www.sndio.org/"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://caoua.org/git/sndio"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="http://www.sndio.org/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0/7.1"
+IUSE="alsa"
+
+DEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/sndiod
+"
+
+PATCHES=( "${FILESDIR}"/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export CC
+
+	# Not autotools-based but a custom script.
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--privsep-user=sndiod \
+		--with-libbsd \
+		$(use_enable alsa) \
+	|| die "Configure failed"
+}
+
+src_install() {
+	multilib-minimal_src_install
+
+	doinitd "${FILESDIR}/sndiod"
+}
diff --git a/media-sound/sndio/sndio-9999.ebuild b/media-sound/sndio/sndio-9999.ebuild
new file mode 100644
index 000000000000..e0f1505c6ab9
--- /dev/null
+++ b/media-sound/sndio/sndio-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="small audio and MIDI framework part of the OpenBSD project"
+HOMEPAGE="http://www.sndio.org/"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://caoua.org/git/sndio"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="http://www.sndio.org/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0/7.1"
+IUSE="alsa"
+
+DEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/sndiod
+"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export CC
+
+	# Not autotools-based but a custom one.
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--privsep-user=sndiod \
+		--with-libbsd \
+		$(use_enable alsa) \
+	|| die "Configure failed"
+}
+
+src_install() {
+	multilib-minimal_src_install
+
+	doinitd "${FILESDIR}/sndiod"
+}
diff --git a/media-sound/sndpeek/metadata.xml b/media-sound/sndpeek/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/sndpeek/metadata.xml
+++ b/media-sound/sndpeek/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/sndpeek/sndpeek-1.41-r1.ebuild b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
index ce8567bae371..bbe0f7e6f139 100644
--- a/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
+++ b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="real-time audio visualization"
 HOMEPAGE="http://soundlab.cs.princeton.edu/software/sndpeek/"
@@ -39,8 +39,8 @@ compile_backend() {
 	backend=$1
 	cd "${S}/src/sndpeek"
 	einfo "Compiling against ${backend}"
-	emake -f "makefile.${backend}" CC=$(tc-getCC) \
-		CXX=$(tc-getCXX)
+	emake -f "makefile.${backend}" CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
 	mv sndpeek{,-${backend}}
 	emake -f "makefile.${backend}" clean
 	cd -
diff --git a/media-sound/solfege/metadata.xml b/media-sound/solfege/metadata.xml
index db2c9b8969ad..d13c18823d3d 100644
--- a/media-sound/solfege/metadata.xml
+++ b/media-sound/solfege/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/solfege/solfege-3.23.4.ebuild b/media-sound/solfege/solfege-3.23.4.ebuild
index 84956a2abe8c..c29daa506cec 100644
--- a/media-sound/solfege/solfege-3.23.4.ebuild
+++ b/media-sound/solfege/solfege-3.23.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="sqlite"
 inherit autotools python-single-r1
 
 DESCRIPTION="GNU program to help practicing ear training"
 HOMEPAGE="https://www.gnu.org/software/solfege/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -30,8 +30,8 @@ BDEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3
 	alsa? ( dev-python/pyalsa )
@@ -57,7 +57,7 @@ src_prepare() {
 	sed -i 's/charset=iso-8859-2/charset=utf-8/' po/hu.po.new || die
 	mv po/hu.po.new po/hu.po || die
 
-	sed -E 's|(PYTHON_INCLUDES=).+|\1"$(pkg-config --cflags-only-I python3)"|g' \
+	sed -E 's|(PYTHON_INCLUDES=).+|\1"$($(tc-getPKG_CONFIG) --cflags-only-I python3)"|g' \
 		-i acinclude.m4 || die
 
 	eautoreconf
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 56b4c18b3889..4a125c990e67 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1 +1 @@
-DIST sonata-1.7_beta1_p20200212.tar.gz 2259353 BLAKE2B 78befe6896d75033649e4f7333bc1487cc7462a66564860d93b4770cb7e86a6cc4656377b6e13defb07591b0a81cbd22653f01c5e9f20d75fcbf28a84551f7fb SHA512 bdff3ee3ec4d94a18604409efbca398f94633a510780f33d449921b69787521ad5d68285aa0fe7252191c1227435c42cf60bca0fe7764e1a8b3d887ff4be4ae6
+DIST sonata-1.7.0.tar.gz 2258617 BLAKE2B 704f673737095351f88f64bc858db465b26d8e0fdb34cbb4d3917abe65ec276ec3e6419edd41d9e8b193a886c8dfd178b5fc94daa4a178aae817c2d3024c266b SHA512 c60c16b6cca439c2063069ceea62afdb9f09c9735d36ba42e2b5b1caf07506f15d722d75c68e355db4615b937a728679aeae1619527ac8267feec111635c27f5
diff --git a/media-sound/sonata/metadata.xml b/media-sound/sonata/metadata.xml
index 7bd3321222f2..51b521bd6472 100644
--- a/media-sound/sonata/metadata.xml
+++ b/media-sound/sonata/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
@@ -10,4 +10,7 @@
     (MPD). It aims to be efficient (no toolbar, main menu, or statusbar),
     user-friendly, and clean.
   </longdescription>
+  <upstream>
+    <remote-id type="github">multani/sonata</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/sonata/sonata-1.7.0-r1.ebuild b/media-sound/sonata/sonata-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..c45e9db16e8c
--- /dev/null
+++ b/media-sound/sonata/sonata-1.7.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+inherit desktop distutils-r1 xdg
+
+DESCRIPTION="Elegant GTK+ music client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.nongnu.org/sonata/"
+SRC_URI="https://github.com/multani/sonata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="dbus taglib"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-mpd2[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		taglib? ( dev-python/tagpy[${PYTHON_USEDEP}] )
+	')
+"
+BDEPEND="virtual/pkgconfig"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doicon -s 128 sonata/pixmaps/sonata.png
+	rm -r "${ED}"/usr/share/sonata || die
+}
diff --git a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
deleted file mode 100644
index de649a75f57b..000000000000
--- a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT=0c807e593f7571a654ad055cb126652d7f3a698d
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL="true"
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-inherit desktop distutils-r1
-
-DESCRIPTION="Elegant GTK+ music client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.nongnu.org/sonata/"
-SRC_URI="https://github.com/multani/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus taglib"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
-		taglib? ( dev-python/tagpy[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_install() {
-	distutils-r1_src_install
-	doicon -s 128 sonata/pixmaps/sonata.png
-	rm -r "${D}"/usr/share/sonata || die
-}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 989343543f5e..29fb60832d07 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1 +1 @@
-DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
+DIST sonic-visualiser-4.5.tar.gz 6652200 BLAKE2B a5e39a755e991663390370c06ce5d54b2ff9422081f8b9046097645f1f747972d270233a0d4fe05d4e6adde5239ca6d2d0210a8a67d9ef6ede60089471ce6452 SHA512 eca7f7b2a56a4c70f38c8fafdd20d5c0e773dc1a99a75189998dd1f50ae777df4999e1a4b3431f9202edfb8ce2686d05cf6448493c263c52ab5f068169a7385d
diff --git a/media-sound/sonic-visualiser/files/serd.patch b/media-sound/sonic-visualiser/files/serd.patch
new file mode 100644
index 000000000000..c7b6f179a686
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/serd.patch
@@ -0,0 +1,21 @@
+From 865fbe253cde8e966709bb11dc8c441ceb3891ed Mon Sep 17 00:00:00 2001
+From: Chris Cannam <cannam@all-day-breakfast.com>
+Date: Fri, 29 Jul 2022 13:31:37 +0100
+Subject: [PATCH] Fix build failure
+
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 59a635f..35fc470 100644
+--- a/meson.build
++++ b/meson.build
+@@ -138,6 +138,7 @@ if system == 'linux'
+   server_dependencies = [
+     capnp_dep,
+     sord_dep,
++    serd_dep,
+     dl_dep,
+   ]
+   
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
deleted file mode 100644
index ec70849915ec..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/test-svcore-base.pro b/test-svcore-base.pro
-index 275cb58..636129c 100644
---- a/test-svcore-base.pro
-+++ b/test-svcore-base.pro
-@@ -27,8 +27,3 @@ include(svcore/base/test/files.pri)
- 
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
--
--!win32* {
--    POST_TARGETDEPS += $$PWD/libbase.a
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro
-index 7b53ca1..a2aa3ce 100644
---- a/test-svcore-data-fileio.pro
-+++ b/test-svcore-data-fileio.pro
-@@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri)
- 
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
--
--!win32* {
--    POST_TARGETDEPS += $$PWD/libbase.a
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro
-index 3b45ac0..d08b14e 100644
---- a/test-svcore-data-model.pro
-+++ b/test-svcore-data-model.pro
-@@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri)
- 
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
--
--!win32* {
--    POST_TARGETDEPS += $$PWD/libbase.a
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-system.pro b/test-svcore-system.pro
-index 6ef7db7..685c1ba 100644
---- a/test-svcore-system.pro
-+++ b/test-svcore-system.pro
-@@ -27,8 +27,3 @@ include(svcore/system/test/files.pri)
- 
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) }
--
--!win32* {
--    POST_TARGETDEPS += $$PWD/libbase.a
--    QMAKE_POST_LINK = ./$${TARGET}
--}
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch
new file mode 100644
index 000000000000..d92c07d587f7
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch
@@ -0,0 +1,182 @@
+diff --git a/meson.build b/meson.build
+index d1771e1..b18a5b6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,17 +90,7 @@ if system == 'linux'
+   serd_dep = dependency('serd-0', version: '>= 0.5')
+   capnp_dep = dependency('capnp', version: '>= 0.6')
+   lrdf_dep = dependency('lrdf', version: '>= 0.2')
+-  oggz_dep = dependency('oggz', version: '>= 1.0.0')
+-  fishsound_dep = dependency('fishsound', version: '>= 1.0.0')
+-  mad_dep = dependency('mad', version: '>= 0.15.0')
+-  id3tag_dep = dependency('id3tag', version: '>= 0.15.0')
+-  opus_dep = dependency('opusfile')
+-  lo_dep = dependency('liblo')
+-  jack_dep = dependency('jack', version: '>= 0.100')
+-  libpulse_dep = dependency('libpulse', version: '>= 0.9')
+   alsa_dep = dependency('alsa')
+-  
+-  portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false)
+ 
+   feature_dependencies = [
+     bzip2_dep,
+@@ -113,23 +103,8 @@ if system == 'linux'
+     serd_dep,
+     capnp_dep,
+     lrdf_dep,
+-    oggz_dep,
+-    fishsound_dep,
+-    mad_dep,
+-    id3tag_dep,
+-    opus_dep,
+-    lo_dep,
+-    portaudio_dep,
+-    jack_dep,
+-    libpulse_dep,
+     alsa_dep,
+   ]
+-
+-  server_dependencies = [
+-    capnp_dep,
+-    sord_dep,
+-    dl_dep,
+-  ]
+   
+   feature_defines = [
+     '-DHAVE_BZ2',
+@@ -142,26 +117,110 @@ if system == 'linux'
+     '-DHAVE_SERD',
+     '-DHAVE_CAPNP',
+     '-DHAVE_LRDF',
+-    '-DHAVE_OGGZ',
+-    '-DHAVE_FISHSOUND',
+-    '-DHAVE_MAD',
+-    '-DHAVE_ID3TAG',
+-    '-DHAVE_OPUS',
+-    '-DHAVE_LIBLO',
+-    '-DHAVE_JACK', '-DDYNAMIC_JACK',
+-    '-DHAVE_LIBPULSE',
+     '-D__LINUX_ALSASEQ__',
+     '-D__LINUX_ALSA__' # for RtMidi
+   ]
+ 
+-  if portaudio_dep.found()
++  enable_id3tag = get_option('id3tag')
++  if enable_id3tag
++    id3tag_dep = dependency('id3tag', version: '>= 0.15.0')
++    feature_dependencies += [
++      id3tag_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_ID3TAG',
++    ]
++  endif
++
++  enable_jack = get_option('jack')
++  if enable_jack
++    jack_dep = dependency('jack', version: '>= 0.100')
++    feature_dependencies += [
++      jack_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_JACK',
++      '-DDYNAMIC_JACK',
++    ]
++  endif
++
++  enable_mad = get_option('mad')
++  if enable_mad
++    mad_dep = dependency('mad', version: '>= 0.15.0')
++    feature_dependencies += [
++      mad_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_MAD',
++    ]
++
++    svcore_moc_args = [
++      '-DHAVE_MAD'
++    ]
++  endif
++
++  enable_ogg = get_option('ogg')
++  if enable_ogg
++    oggz_dep = dependency('oggz', version: '>= 1.0.0')
++    fishsound_dep = dependency('fishsound', version: '>= 1.0.0')
++    feature_dependencies += [
++      oggz_dep,
++      fishsound_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_OGGZ',
++      '-DHAVE_FISHSOUND',
++    ]
++  endif
++
++  enable_opus = get_option('opus')
++  if enable_opus
++    opus_dep = dependency('opusfile')
++    feature_dependencies += [
++      opus_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_OPUS',
++    ]
++  endif
++
++  enable_osc = get_option('osc')
++  if enable_osc
++    lo_dep = dependency('liblo')
++    feature_dependencies += [
++      lo_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_LIBLO',
++    ]
++  endif
++
++  enable_portaudio = get_option('portaudio')
++  if enable_portaudio
++    portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false)
++    feature_dependencies += [
++      portaudio_dep,
++    ]
+     feature_defines += [
+       '-DHAVE_PORTAUDIO',
+     ]
+   endif
+ 
+-  svcore_moc_args = [
+-    '-DHAVE_MAD'
++  enable_pulseaudio = get_option('pulseaudio')
++  if enable_pulseaudio
++    libpulse_dep = dependency('libpulse', version: '>= 0.9')
++    feature_dependencies += [
++      libpulse_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_LIBPULSE',
++    ]
++  endif
++
++  server_dependencies = [
++    capnp_dep,
++    sord_dep,
++    dl_dep,
+   ]
+   
+ elif system == 'darwin'
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..e0da4fb
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,8 @@
++option('id3tag', type: 'boolean', value: false)
++option('jack', type: 'boolean', value: false)
++option('mad', type: 'boolean', value: false)
++option('ogg', type: 'boolean', value: false)
++option('opus', type: 'boolean', value: false)
++option('osc', type: 'boolean', value: false)
++option('portaudio', type: 'boolean', value: false)
++option('pulseaudio', type: 'boolean', value: false)
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser.xml b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
deleted file mode 100644
index 6daac7430022..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-
-  <mime-type type="application/x-sonicvisualiser">
-    <comment>Sonic Visualiser session file</comment>
-    <generic-icon name="sv-icon"/>
-    <glob pattern="*.sv"/>
-  </mime-type>
-
-  <mime-type type="application/x-sonicvisualiser-layer">
-    <comment>Sonic Visualiser layer file</comment>
-    <generic-icon name="sv-icon"/>
-    <glob pattern="*.svl"/>
-  </mime-type>
-
-</mime-info>
diff --git a/media-sound/sonic-visualiser/metadata.xml b/media-sound/sonic-visualiser/metadata.xml
index 09c4d45f4670..f96f3ae721a6 100644
--- a/media-sound/sonic-visualiser/metadata.xml
+++ b/media-sound/sonic-visualiser/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!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>
+  <upstream>
+     <remote-id type="github">sonic-visualiser/sonic-visualiser</remote-id>
+  </upstream>
   <use>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
   </use>
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
deleted file mode 100644
index f76d06d4e8a5..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop qmake-utils xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
-
-BDEPEND="
-	dev-qt/qttest:5
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	>=dev-libs/capnproto-0.6:=
-	dev-libs/serd
-	dev-libs/sord
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib
-	media-libs/dssi
-	media-libs/ladspa-sdk
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/rubberband
-	media-libs/speex
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libfishsound
-		media-libs/liboggz
-	)
-	opus? ( media-libs/opusfile )
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-# tests fail without mp3 support
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( jack pulseaudio portaudio )
-	test? ( id3tag mad )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-notest.patch"
-)
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	default
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use opus || sv_disable_opt opus
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	# capnproto 0.7 requires c++14 now
-	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
-		-i configure.ac \
-		-i */configure.ac \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-	sed -e 's/std=gnu++11/std=gnu++14/g' \
-		-i Makefile.* \
-		-i checker/Makefile.* \
-		|| die
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
-		einfo "Running ${i}"
-		HOME="${T}" ./${i} || die
-	done
-}
-
-src_install() {
-	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
-	dodoc README*
-
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-
-	# desktop entry
-	mv icons/sv-icon.svg icons/${PN}.svg
-	doicon -s scalable icons/${PN}.svg
-	domenu sonic-visualiser.desktop
-
-	# mime types
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild
new file mode 100644
index 000000000000..a8d5a288ec4f
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2820/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
+
+BDEPEND="
+	dev-qt/qttest:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/capnproto:=
+	dev-libs/serd
+	dev-libs/sord
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib
+	media-libs/dssi
+	media-libs/ladspa-sdk
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/rubberband
+	media-libs/speex
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	mad? ( media-libs/libmad )
+	ogg? (
+		media-libs/libfishsound
+		media-libs/liboggz
+	)
+	opus? ( media-libs/opusfile )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+
+# tests fail without mp3 support
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( jack pulseaudio portaudio )
+	test? ( id3tag mad )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3-meson.build.patch"
+	"${FILESDIR}/serd.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use id3tag)
+		$(meson_use jack)
+		$(meson_use mad)
+		$(meson_use ogg)
+		$(meson_use opus)
+		$(meson_use osc)
+		$(meson_use portaudio)
+		$(meson_use pulseaudio)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index f9fbef1f2d29..5a55dac3407f 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -1,2 +1,4 @@
 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 BLAKE2B b02010f5aae113078d167b65a8ab232673eac622ae6595d23f4759fafa05aeb503ea30ace950b3e9cb4d85abe92af7eda13e4c5a3199630c83f2761c812bc9f7 SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d
-DIST sooperlooper-1.7.4.tar.gz 857069 BLAKE2B 0e7f13195a73ec9e41deaf93443c612bd2e44a3133dcc5685a3da497bfdc2acb24c5de33ea853c79e3c1a13c552d19f06370d96fe8fd17569c6e94541d035f5f SHA512 f2921346759ad3821c43cc75d77e3a5b3a5433e03204048580e36cd2cddb08bd2447e509e01e01fcce4585a1759a913fd01fd098a50d9bcdb30f8dde6cc509c2
+DIST sooperlooper-1.7.8.tar.gz 858042 BLAKE2B 762ccdacdd3a44a009d35b591095636bc251a831bfa8d092ab4a3555016c8ee4ad12988f6aefcc38cb5f3c56a28910e3a4d0161121f8fac6c4b9f5ff045bcfe1 SHA512 4746ce77dee5d2744d814060ff58e586b7c90f9e3b20cfb49354cec522e9d4ce1cd4b51b6b809346be6cf82a48bfef52caeeaa919b8f4da10fece367c287692f
+DIST sooperlooper.png 2644 BLAKE2B 84149d70c63931a2b0f9864da1aed850bbf564fb1f2d8bd97bd270a353ed7ef1d978a5bda7fd6c4641284f61d1655b15eef033353d7ed6a3751f96d2cd07fe07 SHA512 d98c807db122f8a377e18a3ea0f23518ef97a480707b0de685fe842745a1565fe2071ba6c8487ef1bcf6802f9a209ad434b7daba84ede4c24cbaad8de935490e
+DIST sooperlooper_1.7.8~dfsg0-2.debian.tar.xz 13644 BLAKE2B b91fbee90c1f2b676932db9a6cd98aa8006232b3c4e58e5a514da67abc30fa03bea6e47fa5b0edf9ab8be5912269820646adbe96d08f99d5aba671cebd9c8372 SHA512 3f61d4f8c735bf23853d3c26ba81c140b7ad3a5da6a72e53c3341f88b3fda49c7aa8157278c9950f759f2e427c373aa4aea9a89a358b83bcfa46ebba6f82a176
diff --git a/media-sound/sooperlooper/metadata.xml b/media-sound/sooperlooper/metadata.xml
index c870d0eef0ab..180951d3dba1 100644
--- a/media-sound/sooperlooper/metadata.xml
+++ b/media-sound/sooperlooper/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">essej/sooperlooper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.8_p2.ebuild
index fcb4278b1f9e..f40e4d764de0 100644
--- a/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild
+++ b/media-sound/sooperlooper/sooperlooper-1.7.8_p2.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-WX_GTK_VER=3.0-gtk3
+EAPI=8
+WX_GTK_VER=3.2-gtk3
 
-inherit autotools flag-o-matic wxwidgets toolchain-funcs desktop xdg
+inherit autotools wxwidgets toolchain-funcs desktop xdg
 
 DESCRIPTION="Live looping sampler with immediate loop recording"
-HOMEPAGE="http://essej.net/sooperlooper/index.html"
-SRC_URI="http://essej.net/sooperlooper/${P/_p/-}.tar.gz
+HOMEPAGE="https://sonosaurus.com/sooperlooper/index.html"
+SRC_URI="https://sonosaurus.com/${PN}/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}~dfsg0-${PV/*_p}.debian.tar.xz
 	mirror://gentoo/${PN}-1.6.5-m4.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/${PN}.png
 "
 
 LICENSE="GPL-2"
@@ -17,11 +19,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="wxwidgets"
 
-BDEPEND="
-	virtual/pkgconfig
-"
 RDEPEND="
-	media-libs/liblo
+	>=media-libs/liblo-0.18
 	dev-libs/libsigc++:2
 	media-libs/libsndfile
 	media-libs/libsamplerate
@@ -32,6 +31,7 @@ RDEPEND="
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${P/_p*}"
 
@@ -39,13 +39,18 @@ DOCS=( OSC README )
 
 src_prepare() {
 	default
+
+	# Debian patches
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
 	cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed"
 	AT_M4DIR="${S}"/aclocal eautoreconf
 }
 
 src_configure() {
 	use wxwidgets && setup-wxwidgets
-	append-cppflags -std=c++11 # Its ugly build system honors CPPFLAGS instead of CXXFLAGS for this
 	econf \
 		$(use_with wxwidgets gui) \
 		--disable-optimize \
@@ -59,5 +64,8 @@ src_compile() {
 src_install() {
 	default
 
-	use wxwidgets && make_desktop_entry /usr/bin/slgui SooperLooper
+	if use wxwidgets; then
+		make_desktop_entry /usr/bin/slgui SooperLooper
+		doicon "${DISTDIR}"/${PN}.png
+	fi
 }
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index e189e35ef298..ac1fd4d178f4 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1 +1 @@
-DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
+DIST sound-juicer-3.40.0.tar.xz 1806280 BLAKE2B 9af23f0aec09d27e845d68647ec7c2b3c703ab488d1240211a048c666e67040c157a283f98356d93026ccc3544e05a8616c1556dff115cb2c8f26d410f469b43 SHA512 b0d9720f0c75dfb8809764213e0589978cb265dfc2010f1accb92e7ffdfdc2ac6deb17a4683e9f7f5a6e867d45f87e8f93659ef04bc73ead3b403394a0ba409b
diff --git a/media-sound/sound-juicer/metadata.xml b/media-sound/sound-juicer/metadata.xml
index 39980802b1da..478f93d81d2d 100644
--- a/media-sound/sound-juicer/metadata.xml
+++ b/media-sound/sound-juicer/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/sound-juicer</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.40.0.ebuild
index ed690672588a..bc9840221f95 100644
--- a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.40.0.ebuild
@@ -1,61 +1,60 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2
+EAPI=8
+
+inherit gnome2 meson
 
 DESCRIPTION="CD ripper for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug flac test vorbis"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+IUSE="flac vorbis"
+RESTRICT="test" # only does appdata validation, which fails with network-sandbox
 
-COMMON_DEPEND="
-	app-text/iso-codes
+DEPEND="
 	>=dev-libs/glib-2.49.5:2[dbus]
 	>=x11-libs/gtk+-3.21.6:3
 	media-libs/libcanberra[gtk3]
-	>=app-cdr/brasero-2.90
-	sys-apps/dbus
 	gnome-base/gsettings-desktop-schemas
-
-	>=media-libs/libdiscid-0.4.0
-	>=media-libs/musicbrainz-5.0.1:5=
-
+	>=app-cdr/brasero-2.90
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0[vorbis?]
+	>=media-libs/musicbrainz-5.0.1:5=
+	app-text/iso-codes
+	>=media-libs/libdiscid-0.4.0
+
+	sys-apps/dbus
+
 	flac? ( media-plugins/gst-plugins-flac:1.0 )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gnome-base/gvfs[cdda,udev]
 	|| (
 		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )
+		media-plugins/gst-plugins-cdio:1.0
+	)
 	media-plugins/gst-plugins-meta:1.0
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+	app-text/docbook-xml-dtd:4.3
 	dev-libs/appstream-glib
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.3 )
 "
 
 src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: gst macros does not take GST_INSPECT override anymore but we need a
-	# way to disable inspection due to gst-clutter always creating a GL context
-	# which is forbidden in sandbox since it needs write access to
-	# /dev/card*/dri
-	sed -e "s|\(gstinspect=\).*|\1$(type -P true)|" \
-		-i configure || die
+	# Avoid sandbox failures
+	sed -i -e '/gst_inspect/d' meson.build || die
+	default
 }
 
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ')
+src_install() {
+	meson_src_install
+
+	# Don't put files in deprecated directory
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
 }
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 65d94a9871b3..a5fa1c2a5dc0 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1 +1 @@
-DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
+DIST soundconverter-4.0.3.gh.tar.gz 632495 BLAKE2B 9a2847b5ebb998b9122ff4020e47dc5b84635a6e1ae0de9061bab18e813ab3918278e940df80bc370b071de77a82a3637c376d9ebdd84d2f7b00865dda94935a SHA512 0674eb430bb3cf267ceabee8e7dbdeb2ee81e537ca093fcf6e1adab21112690ed9e3eb349a994805ddfc51b3a4f875b87a5819a1f2cf020752eb8e742665a998
diff --git a/media-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
index 15f4ec06414c..e16be19bd1bc 100644
--- a/media-sound/soundconverter/metadata.xml
+++ b/media-sound/soundconverter/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>gstreamer@gentoo.org</email>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">soundconverter</remote-id>
+		<remote-id type="github">kassoulet/soundconverter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
deleted file mode 100644
index 45b51787eec5..000000000000
--- a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="https://soundconverter.org/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac flac libnotify mp3 ogg opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/gobject-introspection:=
-	x11-libs/gtk+:3[introspection]
-	media-libs/gstreamer:1.0[introspection]
-"
-
-# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
-# List in soundconverter/gstreamer.py
-# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-	')
-	libnotify? ( x11-libs/libnotify[introspection] )
-
-	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
-	media-plugins/gst-plugins-meta:1.0
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-	media-libs/gst-plugins-good:1.0
-	mp3? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-lame:1.0
-	)
-	aac? ( media-plugins/gst-plugins-faac:1.0 )
-	opus? (	media-plugins/gst-plugins-opus:1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-RESTRICT="test" # broken pot files list in 3.0.0 release, making src_test fallback to "make test" which fails
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/soundconverter/soundconverter-4.0.3.ebuild b/media-sound/soundconverter/soundconverter-4.0.3.ebuild
new file mode 100644
index 000000000000..3385a3f88ae1
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-4.0.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome2-utils distutils-r1 virtualx xdg
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="https://soundconverter.org/"
+SRC_URI="https://github.com/kassoulet/${PN}/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="aac flac mp3 ogg opus vorbis"
+
+# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
+# List in soundconverter/gstreamer.py
+# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
+RDEPEND="
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+	')
+	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
+	media-plugins/gst-plugins-meta:1.0
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+	media-libs/gst-plugins-good:1.0
+	mp3? (
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+	)
+	aac? ( media-plugins/gst-plugins-faac:1.0 )
+	opus? (	media-plugins/gst-plugins-opus:1.0 )
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	')
+	dev-util/intltool
+	test? (
+		media-plugins/gst-plugins-flac:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+		media-plugins/gst-plugins-faac:1.0
+		media-plugins/gst-plugins-opus:1.0
+	)
+"
+
+# Before PEP517: tests seem to hang and also fail to find fdkaacenc from gst?
+# After: need to trick it into finding the data (inc. glade files)
+RESTRICT="test"
+
+python_prepare_all() {
+	gnome2_environment_reset
+	distutils-r1_python_prepare_all
+
+	rm -v "${S}/CHANGELOG.old" || die
+
+	# workaround incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	! [[ -v LINGUAS && -z ${LINGUAS} ]] || rm po/*.po || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	export GSETTINGS_SCHEMA_DIR="${S}/data"
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}"/data || die
+
+	"${EPYTHON}" tests/test.py || die
+}
+
+python_install_all() {
+	rm -v "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+	mv -v "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+	distutils-r1_python_install_all
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/media-sound/soundkonverter/metadata.xml b/media-sound/soundkonverter/metadata.xml
index bc8b1bfb8ae6..8b7b2706f6a4 100644
--- a/media-sound/soundkonverter/metadata.xml
+++ b/media-sound/soundkonverter/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -9,4 +9,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dfaust/soundkonverter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
deleted file mode 100644
index 98e141c9a710..000000000000
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm
-
-DESCRIPTION="Frontend to various audio converters"
-HOMEPAGE="https://www.linux-apps.com/p/1126634/ https://github.com/dfaust/soundkonverter"
-SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkcddb-19.04.3:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
-	>=media-libs/taglib-1.10
-	media-sound/cdparanoia
-"
-RDEPEND="${DEPEND}
-	!media-sound/soundkonverter:4
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-deps.patch" # pending upstream
-	"${FILESDIR}/${P}-kf-5.72-findtaglib.patch" # pending upstream
-	"${FILESDIR}/${P}-fix-add-dirs.patch"
-	"${FILESDIR}/${P}-metainfodir.patch"
-)
-
-S="${WORKDIR}"/${P}/src
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "soundKonverter optionally supports many different audio formats."
-	elog "You will need to install the appropriate encoding packages for the"
-	elog "formats you require. For a full listing, consult the README file"
-	elog "in /usr/share/doc/${PF}"
-}
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild
new file mode 100644
index 000000000000..391721a35df6
--- /dev/null
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ecm
+
+DESCRIPTION="Frontend to various audio converters"
+HOMEPAGE="https://www.linux-apps.com/p/1126634/ https://github.com/dfaust/soundkonverter"
+SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-apps/libkcddb:5
+	kde-frameworks/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kdelibs4support:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kio:5
+	kde-frameworks/knotifications:5
+	kde-frameworks/kservice:5
+	kde-frameworks/ktextwidgets:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kxmlgui:5
+	kde-frameworks/solid:5
+	>=media-libs/phonon-4.11.0[qt5(+)]
+	>=media-libs/taglib-1.10
+	media-sound/cdparanoia
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+# git master, now archived:
+PATCHES=(
+	"${FILESDIR}/${P}-deps.patch"
+	"${FILESDIR}/${P}-kf-5.72-findtaglib.patch"
+	"${FILESDIR}/${P}-fix-add-dirs.patch"
+	"${FILESDIR}/${P}-metainfodir.patch"
+)
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "soundKonverter optionally supports many different audio formats."
+	elog "You will need to install the appropriate encoding packages for the"
+	elog "formats you require. For a full listing, consult the README file"
+	elog "in /usr/share/doc/${PF}"
+}
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index f8cd840cafa0..af44637e105c 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1 +1 @@
-DIST sox-14.4.2_p20200803.zip 1089835 BLAKE2B fa53d8c9f14620675bf534090bf6c69ec256bb977aa1b3c01b2d95ba8e685eb4f9d479872f303b2954aa1b063c095bf3b90e5b746fd8d7d66e35476e5218fa6b SHA512 8c485a53b9ecce9ecf759d7bbf8d95e568a89505bec7d1258afded4c7ad0f28c624b637a188ab87b64dee720db59b8de20c347805910f0401f00550832e16392
+DIST sox-14.4.2_p20210509.zip 942551 BLAKE2B 2ddd229faacb9190fe18052b1c02da40d4c3f24fc73dd08b28ac99bef267cb05f8bcbf64e0c397c391b3be2467667783ed94f6c60798af069567e1c237ec9ccd SHA512 4868f9b77141b7e2caf2571ceb68a48bd744732e72f63ed787f8e0b9fe39b77de4e998b32d99c2500e10b017a1fd1a3379f4f9f8b67db6093b85d02cb3447934
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index c891b42123b6..59bdfdf971d4 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
@@ -8,6 +8,7 @@
   <use>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
+    <flag name="sndio">Enable support for sndio</flag>
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
   </use>
   <upstream>
diff --git a/media-sound/sox/sox-14.4.2_p20200803.ebuild b/media-sound/sox/sox-14.4.2_p20210509-r2.ebuild
index aca286171c86..22e9f050840f 100644
--- a/media-sound/sox/sox-14.4.2_p20200803.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20210509-r2.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 # We take a snapshot because of the huge number of security
 # and other fixes since the release of 14.4.2.
 # Recommend mirroring the snapshot; unclear if they are stable URIs.
-COMMIT="50857c46c03a85c72826e819f5e815aad4a4633d"
+COMMIT="42b3557e13e0fe01a83465b672d89faddbe65f49"
 MY_P="sox-code-${COMMIT}"
 
 DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
+HOMEPAGE="https://sox.sourceforge.net"
 # Source: https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/${MY_P}.zip
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.zip -> ${P}.zip"
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${MY_P}.zip -> ${P}.zip"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="alsa amr ao encode flac id3tag ladspa mad magic ogg openmp oss opus png pulseaudio sndfile sndio static-libs twolame wavpack"
 
 BDEPEND="
 	app-arch/unzip
+	dev-build/autoconf-archive
 	virtual/pkgconfig
 "
 RDEPEND="
 	dev-libs/libltdl:0=
 	>=media-sound/gsm-1.0.12-r1
+	sys-apps/file
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
-	ao? ( media-libs/libao )
+	ao? ( media-libs/libao:= )
 	encode? ( >=media-sound/lame-3.98.4 )
-	flac? ( >=media-libs/flac-1.1.3 )
-	id3tag? ( media-libs/libid3tag )
+	flac? ( >=media-libs/flac-1.1.3:= )
+	id3tag? ( media-libs/libid3tag:= )
 	ladspa? ( media-libs/ladspa-sdk )
 	mad? ( media-libs/libmad )
+	magic? ( sys-apps/file )
 	ogg? (
 		media-libs/libogg
 		media-libs/libvorbis
@@ -51,8 +54,10 @@ RDEPEND="
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	sndfile? ( >=media-libs/libsndfile-1.0.11 )
+	sndio? ( media-sound/sndio:= )
 	twolame? ( media-sound/twolame )
-	wavpack? ( media-sound/wavpack )"
+	wavpack? ( media-sound/wavpack )
+"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS )
@@ -61,7 +66,7 @@ src_prepare() {
 	default
 
 	# bug #386027
-	sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure.ac || die
+	sed -i -e 's|CFLAGS="-g"|CFLAGS="$CFLAGS -g"|' configure.ac || die
 
 	# bug #712630
 	if use elibc_musl ; then
@@ -75,32 +80,32 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_with alsa) \
-		$(use_with amr amrnb) \
-		$(use_with amr amrwb) \
-		$(use_with ao) \
-		$(use_enable debug) \
+		$(use_enable alsa) \
+		$(use_enable amr amrnb) \
+		$(use_enable amr amrwb) \
+		$(use_enable ao) \
 		$(use_with encode lame) \
-		$(use_with flac) \
+		$(use_enable flac) \
 		$(use_with id3tag) \
-		$(use_with ladspa) \
+		$(use_with ladspa ladspa dyn) \
 		$(use_with mad) \
+		$(use_with magic) \
 		$(use_enable openmp) \
-		$(use_with ogg oggvorbis) \
-		$(use_with oss) \
-		$(use_with opus) \
+		$(use_enable ogg oggvorbis) \
+		$(use_enable oss) \
+		$(use_enable opus) \
 		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with sndfile) \
+		$(use_enable pulseaudio) \
+		$(use_enable sndfile) \
+		$(use_enable sndio) \
 		$(use_enable static-libs static) \
 		$(use_with twolame) \
-		$(use_with wavpack) \
+		$(use_enable wavpack) \
+		--enable-formats=dyn \
 		--with-distro="Gentoo"
 }
 
 src_install() {
 	default
-	# libltdl is used for loading plugins, keeping libtool files with empty
-	# dependency_libs what otherwise would be -exec rm -f {} +
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/media-sound/spek/Manifest b/media-sound/spek/Manifest
index 54f02a8e7449..ca9e2b639607 100644
--- a/media-sound/spek/Manifest
+++ b/media-sound/spek/Manifest
@@ -1 +1 @@
-DIST spek-0.8.3.tar.gz 1349573 BLAKE2B ce783c319741c43f27462caf9dcd27e71f4c8fbc9d3a3d2ac0b977189cca4cf8ed14f258958bbf59532c4cae97562fa20819222ae68567e9e607f243a2777000 SHA512 a4b54746316d295574bc963e650728b23b3730ee6bcc8d78b043a5678baac70a0e859870120de2b0e6a17059e9e3757075f4691e2abde98c083afc393e93e17c
+DIST spek-0.8.5.tar.xz 430464 BLAKE2B 54c977cc38f8162ec7fe45fe9eca023a9bdd2c1b42c0ad80dcf07c15ab93b416f58b499a3e8a9b9bb2ed16143deb899ce1c4fed2eba6b0e78eeab8b23a3326e7 SHA512 25f72c9372b142183ab34c47f1d7d6e62b9316d94b31aacff5d3ca007be030f4848a385be1bbb98f285aba010804fd429a7e099e597c30861347f5b8ed50d5b1
diff --git a/media-sound/spek/files/00_dfsg.patch b/media-sound/spek/files/00_dfsg.patch
new file mode 100644
index 000000000000..4384fc1f326d
--- /dev/null
+++ b/media-sound/spek/files/00_dfsg.patch
@@ -0,0 +1,19 @@
+Author: Matteo Bini <matteobin@tiepi.it>
+Description: Remove DFSG excluded files for Autoconf
+Forwarded: not-needed
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,13 +81,10 @@ AC_CONFIG_FILES([
+ 	data/icons/32x32/Makefile
+ 	data/icons/48x48/Makefile
+ 	data/icons/scalable/Makefile
+-	dist/osx/Info.plist
+-	dist/win/spek.wxs
+ 	man/Makefile
+ 	po/Makefile.in
+ 	src/Makefile
+ 	tests/Makefile
+-	web/version
+ ])
+ AC_OUTPUT
+ 
diff --git a/media-sound/spek/files/01_arm64-mips64el.patch b/media-sound/spek/files/01_arm64-mips64el.patch
new file mode 100644
index 000000000000..8d14a48b3b29
--- /dev/null
+++ b/media-sound/spek/files/01_arm64-mips64el.patch
@@ -0,0 +1,15 @@
+Author: Mike Wang <mikewang000000@gmail.com>
+Bug: https://github.com/alexkay/spek/issues/262
+Description: Fix FFT unit tests
+Forwarded: https://github.com/alexkay/spek/commit/0998df9a7ac99d509ddd10fb76d883f24efc0179
+--- a/tests/test-fft.cc
++++ b/tests/test-fft.cc
+@@ -62,7 +62,7 @@ static void test_sine()
+                 if (i == k) {
+                     continue;
+                 }
+-                if (plan->get_output(i) > -150.0f) {
++                if (plan->get_output(i) > -149.0f) {
+                     silence = false;
+                     break;
+                 }
diff --git a/media-sound/spek/files/02_ftbfs-gcc13.patch b/media-sound/spek/files/02_ftbfs-gcc13.patch
new file mode 100644
index 000000000000..3271d2eb3947
--- /dev/null
+++ b/media-sound/spek/files/02_ftbfs-gcc13.patch
@@ -0,0 +1,10 @@
+Author: Matteo Bini <matteobin@tiepi.it>
+Description: Fix ftbfs with GCC-13
+Forwarded: https://github.com/alexkay/spek/commit/b1600d9926fa434330171cbebb407d2d0ccdcf03
+--- a/tests/perf.cc
++++ b/tests/perf.cc
+@@ -1,3 +1,4 @@
++#include <cstdint>
+ #include <cstdlib>
+ #include <iostream>
+ #include <fstream>
diff --git a/media-sound/spek/files/03_metainfo.patch b/media-sound/spek/files/03_metainfo.patch
new file mode 100644
index 000000000000..f4e57657f36a
--- /dev/null
+++ b/media-sound/spek/files/03_metainfo.patch
@@ -0,0 +1,66 @@
+Author: Nils Fürniß <contact@nalsai.de>
+Description: Add metainfo file
+Forwarded: https://github.com/alexkay/spek/commit/03d7fb6a1a01e7a0adffd0b083fa4c026efb8f84
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -6,8 +6,15 @@ desktopdir = $(datadir)/applications
+ desktop_in_files = spek.desktop.in
+ desktop_DATA = spek.desktop
+ 
+-EXTRA_DIST = spek.desktop.in
+-CLEANFILES = spek.desktop
++appdatadir = $(datadir)/metainfo
++appdata_in_files = spek.metainfo.xml.in
++appdata_DATA = spek.metainfo.xml
++
++EXTRA_DIST = spek.desktop.in spek.metainfo.xml.in
++CLEANFILES = spek.desktop spek.metainfo.xml
+ 
+ spek.desktop: spek.desktop.in $(wildcard $(top_srcdir)/po/*po)
+ 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
++
++spek.metainfo.xml: spek.metainfo.xml.in $(wildcard $(top_srcdir)/po/*po)
++	$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+--- a/data/spek.metainfo.xml.in
++++ b/data/spek.metainfo.xml.in
+@@ -0,0 +1,40 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component type="desktop-application">
++    <id>cc.spek.Spek</id>
++    <metadata_license>CC0-1.0</metadata_license>
++    <project_license>GPL-3.0</project_license>
++    <name>Spek</name>
++    <summary>View spectrograms of your audio files</summary>
++    <description>
++        <p>Spek is an acoustic spectrum analyser written in C and C++. It uses FFmpeg libraries for audio decoding and wxWidgets for the GUI.</p>
++        <ul>
++            <li>Supports all popular lossy and lossless audio file formats thanks to the FFmpeg libraries.</li>
++            <li>Ultra-fast signal processing, uses multiple threads to further speed up the analysis.</li>
++            <li>Shows the codec name and the audio signal parameters.</li>
++            <li>Allows to save the spectrogram as an image file.</li>
++            <li>Drag-and-drop support; associates with common audio file formats.</li>
++            <li>Auto-fitting time, frequency and spectral density rulers.</li>
++            <li>Adjustable spectral density range.</li>
++            <li>Translated into 19 languages.</li>
++        </ul>
++    </description>
++    <screenshots>
++      <screenshot type="default">
++        <image>https://raw.githubusercontent.com/alexkay/spek/b3759bbb7d1108b3193394b941eeee982f15b739/web/flac.png</image>
++      </screenshot>
++    </screenshots>
++	<categories>
++		<category>Audio</category>
++		<category>AudioVideo</category>
++	</categories>
++    <url type="homepage">https://www.spek.cc/</url>
++    <url type="bugtracker">https://github.com/alexkay/spek/issues</url>
++    <developer_name>alexkay</developer_name>
++    <content_rating type="oars-1.1" />
++    <launchable type="desktop-id">spek.desktop</launchable>
++    <releases>
++        <release version="0.8.5" date="2023-01-10"/>
++        <release version="0.8.4" date="2022-07-11"/>
++        <release version="0.8.2" date="2016-01-19"/>
++    </releases>
++</component>
diff --git a/media-sound/spek/files/spek-0.8.1-disable-updates.patch b/media-sound/spek/files/spek-0.8.1-disable-updates.patch
deleted file mode 100644
index e035a4c60819..000000000000
--- a/media-sound/spek/files/spek-0.8.1-disable-updates.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spek-0.8.1/src/spek-preferences.cc
-+++ spek-0.8.1/src/spek-preferences.cc
-@@ -62,7 +62,7 @@
- 
- bool SpekPreferences::get_check_update()
- {
--    bool result = true;
-+    bool result = false;
-     this->config->Read(wxT("/update/check"), &result);
-     return result;
- }
diff --git a/media-sound/spek/files/spek-0.8.3-AR.patch b/media-sound/spek/files/spek-0.8.3-AR.patch
deleted file mode 100644
index be797ba663fc..000000000000
--- a/media-sound/spek/files/spek-0.8.3-AR.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Bug: https://bugs.gentoo.org/754861
-https://github.com/alexkay/spek/pull/198
-
-diff --git a/configure.ac b/configure.ac
-index 3fc451b..b270033 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE([1.11.1 foreign no-dist-gzip dist-xz serial-tests])
- AM_SILENT_RULES([yes])
- 
- AC_LANG([C++])
-+AM_PROG_AR
- AC_PROG_CXX
- CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
- AC_PROG_CXXCPP
--- 
-2.26.2
-
diff --git a/media-sound/spek/files/spek-0.8.3-ffmpeg3-1.patch b/media-sound/spek/files/spek-0.8.3-ffmpeg3-1.patch
deleted file mode 100644
index dee0e3ca0f8f..000000000000
--- a/media-sound/spek/files/spek-0.8.3-ffmpeg3-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/alexkay/spek/commit/ee8bc49ed4a93a14a933ecb0eebfe424111f8413
-
-Index: spek-0.8.3/src/spek-audio.cc
-===================================================================
---- spek-0.8.3.orig/src/spek-audio.cc
-+++ spek-0.8.3/src/spek-audio.cc
-@@ -202,7 +202,7 @@ AudioFileImpl::AudioFileImpl(
-     this->packet.data = nullptr;
-     this->packet.size = 0;
-     this->offset = 0;
--    this->frame = avcodec_alloc_frame();
-+    this->frame = av_frame_alloc();
-     this->buffer_size = 0;
-     this->buffer = nullptr;
-     this->frames_per_interval = 0;
-@@ -218,7 +218,7 @@ AudioFileImpl::~AudioFileImpl()
-     if (this->frame) {
-         // TODO: Remove this check after Debian switches to libav 9.
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
--        avcodec_free_frame(&this->frame);
-+        av_frame_free(&this->frame);
- #else
-         av_freep(&this->frame);
- #endif
-@@ -258,7 +258,7 @@ int AudioFileImpl::read()
- 
-     for (;;) {
-         while (this->packet.size > 0) {
--            avcodec_get_frame_defaults(this->frame);
-+	    av_frame_unref(this->frame);
-             auto codec_context = this->format_context->streams[this->audio_stream]->codec;
-             int got_frame = 0;
-             int len = avcodec_decode_audio4(codec_context, this->frame, &got_frame, &this->packet);
diff --git a/media-sound/spek/files/spek-0.8.3-ffmpeg3.patch b/media-sound/spek/files/spek-0.8.3-ffmpeg3.patch
deleted file mode 100644
index ad82a38c31c5..000000000000
--- a/media-sound/spek/files/spek-0.8.3-ffmpeg3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 1ef950dcbf89dd8adf816009b54009f487828a45
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Date:   Sun Mar 27 14:19:42 2016 -0700
-
-    Replace deprecated FFmpeg API
-
-diff --git a/src/spek-audio.cc b/src/spek-audio.cc
-index b7633bc..21ea7a4 100644
---- a/src/spek-audio.cc
-+++ b/src/spek-audio.cc
-@@ -222,7 +222,7 @@ AudioFileImpl::~AudioFileImpl()
-         this->packet.data -= this->offset;
-         this->packet.size += this->offset;
-         this->offset = 0;
--        av_free_packet(&this->packet);
-+        av_packet_unref(&this->packet);
-     }
-     if (this->format_context) {
-         if (this->audio_stream >= 0) {
-@@ -326,7 +326,7 @@ int AudioFileImpl::read()
-             this->packet.data -= this->offset;
-             this->packet.size += this->offset;
-             this->offset = 0;
--            av_free_packet(&this->packet);
-+            av_packet_unref(&this->packet);
-         }
- 
-         int res = 0;
-@@ -334,7 +334,7 @@ int AudioFileImpl::read()
-             if (this->packet.stream_index == this->audio_stream) {
-                 break;
-             }
--            av_free_packet(&this->packet);
-+            av_packet_unref(&this->packet);
-         }
-         if (res < 0) {
-             // End of file or error.
diff --git a/media-sound/spek/files/spek-0.8.3-replace-gnu+11-with-c++11.patch b/media-sound/spek/files/spek-0.8.3-replace-gnu+11-with-c++11.patch
deleted file mode 100644
index 624e969dba4a..000000000000
--- a/media-sound/spek/files/spek-0.8.3-replace-gnu+11-with-c++11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spek-0.8.3/configure.ac
-+++ spek-0.8.3/configure.ac
-@@ -6,7 +6,7 @@
- 
- AC_LANG([C++])
- AC_PROG_CXX
--CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
-+CXXFLAGS="$CXXFLAGS -std=c++11 -Wall -Wextra"
- AC_PROG_CXXCPP
- AC_PROG_RANLIB
- AC_PROG_INSTALL
diff --git a/media-sound/spek/files/spek-0.8.3-stdlib.patch b/media-sound/spek/files/spek-0.8.3-stdlib.patch
deleted file mode 100644
index c0ffa16b4d52..000000000000
--- a/media-sound/spek/files/spek-0.8.3-stdlib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/519450
-
---- spek-0.8.3/src/spek-fft.cc
-+++ spek-0.8.3/src/spek-fft.cc
-@@ -17,6 +17,7 @@
-  */
- 
- #include <math.h>
-+#include <stdlib.h>
- 
- #define __STDC_CONSTANT_MACROS
- extern "C" {
---- spek-0.8.3/src/spek-events.cc
-+++ spek-0.8.3/src/spek-events.cc
-@@ -16,6 +16,7 @@
-  * along with Spek.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <stdlib.h>
- #include "spek-events.h"
- 
- //IMPLEMENT_DYNAMIC_CLASS(SpekHaveSampleEvent, wxEvent)
diff --git a/media-sound/spek/files/spek-0.8.4-disable-updates.patch b/media-sound/spek/files/spek-0.8.4-disable-updates.patch
new file mode 100644
index 000000000000..8f498e7942e2
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.4-disable-updates.patch
@@ -0,0 +1,11 @@
+--- a/src/spek-preferences.cc
++++ b/src/spek-preferences.cc
+@@ -44,7 +44,7 @@ SpekPreferences::SpekPreferences() : locale(NULL)
+ 
+ bool SpekPreferences::get_check_update()
+ {
+-    bool result = true;
++    bool result = false;
+     this->config->Read("/update/check", &result);
+     return result;
+ }
diff --git a/media-sound/spek/metadata.xml b/media-sound/spek/metadata.xml
index 2f596d797027..4a35efff0cc3 100644
--- a/media-sound/spek/metadata.xml
+++ b/media-sound/spek/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild b/media-sound/spek/spek-0.8.3-r1.ebuild
deleted file mode 100644
index be7cff895114..000000000000
--- a/media-sound/spek/spek-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-
-inherit autotools wxwidgets xdg
-
-DESCRIPTION="Analyse your audio files by showing their spectrogram"
-HOMEPAGE="http://www.spek-project.org/"
-SRC_URI="https://github.com/alexkay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	media-video/ffmpeg:0=
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch
-	"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch
-	"${FILESDIR}"/${P}-stdlib.patch
-	"${FILESDIR}"/${P}-ffmpeg3.patch
-	"${FILESDIR}"/${P}-ffmpeg3-1.patch
-	"${FILESDIR}"/${P}-AR.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets unicode
-	default
-}
diff --git a/media-sound/spek/spek-0.8.5-r1.ebuild b/media-sound/spek/spek-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..953b1a51bb29
--- /dev/null
+++ b/media-sound/spek/spek-0.8.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+WX_GTK_VER="3.2-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="Analyse your audio files by showing their spectrogram"
+HOMEPAGE="https://spek.cc/"
+SRC_URI="https://github.com/alexkay/spek/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=media-video/ffmpeg-5:=
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.4-disable-updates.patch
+	# Debian patches
+	"${FILESDIR}"/00_dfsg.patch
+	"${FILESDIR}"/01_arm64-mips64el.patch
+	"${FILESDIR}"/02_ftbfs-gcc13.patch
+	"${FILESDIR}"/03_metainfo.patch
+)
+
+src_prepare() {
+	setup-wxwidgets unicode
+	default
+	eautoreconf
+}
diff --git a/media-sound/spek/spek-0.8.5.ebuild b/media-sound/spek/spek-0.8.5.ebuild
new file mode 100644
index 000000000000..dc8f88f83699
--- /dev/null
+++ b/media-sound/spek/spek-0.8.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets xdg
+
+DESCRIPTION="Analyse your audio files by showing their spectrogram"
+HOMEPAGE="https://spek.cc/"
+SRC_URI="https://github.com/alexkay/spek/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=media-video/ffmpeg-5:=
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.4-disable-updates.patch
+)
+
+src_configure() {
+	setup-wxwidgets unicode
+	default
+}
diff --git a/media-sound/splay/metadata.xml b/media-sound/splay/metadata.xml
index 0de8cce1131e..7e5563bc7804 100644
--- a/media-sound/splay/metadata.xml
+++ b/media-sound/splay/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/splay/splay-0.9.5.2-r2.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild
index b66657bceebf..27fbf22ba608 100644
--- a/media-sound/splay/splay-0.9.5.2-r2.ebuild
+++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="An audio player, primarily for the console"
-HOMEPAGE="http://splay.sourceforge.net/"
-SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz"
+HOMEPAGE="https://splay.sourceforge.net/"
+SRC_URI="https://splay.sourceforge.net/tgz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,3 +28,9 @@ src_prepare() {
 	mv configure.{in,ac} || die
 	eautoreconf
 }
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	default
+}
diff --git a/media-sound/split2flac/metadata.xml b/media-sound/split2flac/metadata.xml
index d20b4cebdc6c..1609a07630ec 100644
--- a/media-sound/split2flac/metadata.xml
+++ b/media-sound/split2flac/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 57e6bc2a2850..1f5ac1104d29 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1 @@
-DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4
-DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
-DIST spotify-client_1.1.42.622.gbd112320-37_amd64.deb 126293582 BLAKE2B 909d2cba7a2d2686a4e278e315658d8011d83f3eca3b5381fcd1df574d8e4223c3fb8508f417ec9f66b37740ac8b221a6d8cf753fc2cee47700b45a867556302 SHA512 a3fe98d69460ffd641df3219c2a3d164a33e2b52c86a56276e473dd5c3a43d6304df3b77fefcf0ca6c09cb6e2c8dacab65573cf7543725b6c8d402832149e122
+DIST spotify-client_1.2.31.1205.g4d59ad7c_amd64.deb 135223836 BLAKE2B 50ce5c84c538a31a64725d1d4afdaa88a95e2b6d1412a10316aaa197f8c69b2442227e52f7b875bbeea2a81d59aa692d78c11964ff4d1bf7b225c873c2ac9a58 SHA512 76babfbe40ab7b7c82d83a3ae40ab3dbc85e73b4a412aeaa8aa758c01c7cf69bd78df4ee222c4c5add84668f552212bed15049a8f8cd1025dc04a87f84c79f88
diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper
new file mode 100644
index 000000000000..0d7295af5ca1
--- /dev/null
+++ b/media-sound/spotify/files/spotify-wrapper
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse"
+
+if command -v spotify-dbus.py > /dev/null; then
+        echo "Launching spotify with Gnome systray integration."
+        spotify-dbus.py "$@"
+else
+    if pgrep -f "Spotify/[0-9].[0-9].[0-9]" > /dev/null; then
+        busline="org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.OpenUri ${1}"
+        echo "Spotify is already running"
+        echo "Sending ${busline} to dbus"
+        if command -v qdbus &> /dev/null; then
+            qdbus $busline
+            exit
+        fi
+        if command -v dbus-send &> /dev/null; then
+            dbus-send $busline
+            exit
+        fi
+        echo "No bus dispatcher found."
+    else
+        echo "Neither gnome-integration-spotify nor spotify-tray are installed."
+        echo "Launching spotify without systray integration."
+        exec "$SPOTIFY_HOME/spotify" "$@"
+    fi
+fi
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 6e853bb00209..4c1e9f6e336a 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <use>
-    <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
-    <flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
-    <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
-  </use>
-<maintainer type="person">
-<email>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
-</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="local-playback">Allows playing local files with the Spotify client</flag>
+		<flag name="pax-kernel">Triggers a paxmarking of the main Spotify binary</flag>
+		<flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/spotify/spotify-1.0.72-r1.ebuild b/media-sound/spotify/spotify-1.0.72-r1.ebuild
deleted file mode 100644
index 0f511f48f5dc..000000000000
--- a/media-sound/spotify/spotify-1.0.72-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-#BUILD_ID_AMD64="117.g6bd7cc73-35"
-BUILD_ID_X86="117.g6bd7cc73-35"
-#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
-#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="libnotify systray pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-# zenity needed for filepicker
-RDEPEND="
-	${DEPEND}
-	dev-libs/nss
-	gnome-base/gconf
-	gnome-extra/zenity
-	media-libs/alsa-lib
-	media-libs/harfbuzz
-	media-libs/fontconfig
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl,curl_ssl_openssl]
-	net-print/cups[ssl]
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	dev-python/pygobject:3
-	dev-python/dbus-python
-	libnotify? ( x11-libs/libnotify )
-	pulseaudio? ( media-sound/pulseaudio )
-	systray? ( gnome-extra/gnome-integration-spotify )"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/spotify/spotify-1.1.10-r1.ebuild b/media-sound/spotify/spotify-1.1.10-r1.ebuild
deleted file mode 100644
index 8267b9da0b39..000000000000
--- a/media-sound/spotify/spotify-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="546.ge08ef575-19"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	|| ( media-sound/pulseaudio media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-1.1.26-r1.ebuild b/media-sound/spotify/spotify-1.1.26-r1.ebuild
deleted file mode 100644
index 2310f6ff5afb..000000000000
--- a/media-sound/spotify/spotify-1.1.26-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="501.gbe11e53b-15"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-1.1.26-r2.ebuild b/media-sound/spotify/spotify-1.1.26-r2.ebuild
deleted file mode 100644
index fdf168b74773..000000000000
--- a/media-sound/spotify/spotify-1.1.26-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="501.gbe11e53b-15"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libSM
-	x11-libs/libICE
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="
-	opt/spotify/spotify-client/spotify
-	opt/spotify/spotify-client/libEGL.so
-	opt/spotify/spotify-client/libGLESv2.so
-	opt/spotify/spotify-client/libcef.so
-	opt/spotify/spotify-client/swiftshader/libEGL.so
-	opt/spotify/spotify-client/swiftshader/libGLESv2.so
-"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-1.1.42.ebuild b/media-sound/spotify/spotify-1.2.31.ebuild
index 4b9dc6ccaf58..a01c85bd7944 100644
--- a/media-sound/spotify/spotify-1.1.42.ebuild
+++ b/media-sound/spotify/spotify-1.2.31.ebuild
@@ -1,66 +1,82 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit desktop pax-utils unpacker xdg
 
 DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="622.gbd112320-37"
+BUILD_ID_AMD64="1205.g4d59ad7c"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel pulseaudio"
+KEYWORDS="amd64"
+IUSE="libnotify local-playback pax-kernel pulseaudio"
 RESTRICT="mirror strip"
 
-BDEPEND=">=dev-util/patchelf-0.10"
+BDEPEND="
+	>=dev-util/patchelf-0.10
+	sys-devel/gettext
+"
 RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
 	dev-libs/nss
+	dev-libs/openssl:0=
 	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/harfbuzz
 	media-libs/mesa[X(+)]
 	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libSM
+	net-print/cups[ssl(+)]
+	sys-apps/dbus
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
 	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	!gnome-extra/gnome-integration-spotify
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/libayatana-appindicator
+	local-playback? ( media-video/ffmpeg:0/56.58.58 )
+	pulseaudio? ( media-libs/libpulse )
+	!pulseaudio? ( media-sound/apulse )
 "
+	#gnome-integration-spotify causes spotify to fail to launch
 	#sys-libs/glibc
 
-S=${WORKDIR}/
+S="${WORKDIR}/"
 
 QA_PREBUILT="
 	opt/spotify/spotify-client/spotify
 	opt/spotify/spotify-client/libEGL.so
 	opt/spotify/spotify-client/libGLESv2.so
 	opt/spotify/spotify-client/libcef.so
+	opt/spotify/spotify-client/libvk_swiftshader.so
+	opt/spotify/spotify-client/libvulkan.so.1
 	opt/spotify/spotify-client/swiftshader/libEGL.so
 	opt/spotify/spotify-client/swiftshader/libGLESv2.so
 "
 
 src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
 	default
-
 	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
 	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
 		|| die "failed to patch libcurl library dependency"
@@ -81,11 +97,9 @@ src_install() {
 	fperms +x ${SPOTIFY_HOME}/spotify
 
 	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
+	SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \
+		envsubst '$SPOTIFY_HOME $LIBDIR' \
+		< "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die
 	fperms +x /usr/bin/spotify
 
 	local size
@@ -94,12 +108,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 723357cc4b38..68eba5d693bc 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,3 +1 @@
-DIST strawberry-0.8.3.tar.xz 10280356 BLAKE2B 3c99193af3e753d48822567a3391900b1d4326ece49582718b949eb3753fd15d3cae2469ffdcc28334db95099a914c1065ed84c397b4ade53c624e7eab5cdfe5 SHA512 e64c49a6b479677486ae7868107e945a63a028cbaa6dcfb68c9c0784fe0ea8a1133264832367d092628fb1094ca90d87d6ab49199d4aab7f56f2620eb4e9b2f7
-DIST strawberry-0.8.4.tar.xz 10781080 BLAKE2B 395898e68117848613666edb545d15db22eea418c7dce553c442c52b459406c88640368da9a98c4f25e5cbff40369127ee4cec2dfadacdb79e4cef4c17e0f875 SHA512 a93308e6ba3450e8164f02c2b46bd5e785995d59963be7a896e769fa8312467fe29f1c7d48f5fbc290ccd6392293dc6af65e24001912a9f54292f25a023468b4
-DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8
+DIST strawberry-1.0.23.tar.xz 11297440 BLAKE2B 4110a19ac27a254ec778bc46592f4b1b00ea8cb077a231d5dc0bb69c8ef78aca02a15339b888812c7cb31540f61647e2c8b15d416c68c4da4690407ac851dec4 SHA512 f3249e97b2f0130dadf2a5fcfc128d7054accd6b86cf088a3a45549c584529aefbadaf09e9ed074af85c679495b03ad700e78f6952e913a40b38eaf7c77d5adb
diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index 135ead34eb68..c5351200e084 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
 		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
+		<flag name="moodbar">Enable moodbar support</flag>
+		<flag name="soup">Enable soup support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">jonaski/strawberry</remote-id>
diff --git a/media-sound/strawberry/strawberry-0.8.3.ebuild b/media-sound/strawberry/strawberry-0.8.3.ebuild
deleted file mode 100644
index caca9c641006..000000000000
--- a/media-sound/strawberry/strawberry-0.8.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic l10n virtualx xdg
-
-PLOCALES="cs de es fr hu id it ko nb pl ru"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	media-video/vlc
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
-	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-"
-
-DOCS=( Changelog README.md )
-
-src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-	rm -r 3rdparty/taglib || die
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(l10n_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_SYSTEM_TAGLIB=ON
-		-DWITH_QT6=OFF
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/strawberry/strawberry-0.8.4.ebuild b/media-sound/strawberry/strawberry-0.8.4.ebuild
deleted file mode 100644
index 2e4b045125e9..000000000000
--- a/media-sound/strawberry/strawberry-0.8.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic l10n virtualx xdg
-
-PLOCALES="cs de es fr hu id it ko nb pl ru"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	media-video/vlc
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
-	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-"
-
-DOCS=( Changelog README.md )
-
-src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
-
-	rm -r 3rdparty/taglib || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(l10n_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_SYSTEM_TAGLIB=ON
-		-DWITH_QT6=OFF
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/strawberry/strawberry-1.0.23-r1.ebuild b/media-sound/strawberry/strawberry-1.0.23-r1.ebuild
new file mode 100644
index 000000000000..e074219d1e18
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.23-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale xdg
+
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
+
+BDEPEND="
+	!qt6? ( dev-qt/linguist-tools:5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	media-libs/alsa-lib
+	media-libs/taglib
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+	qt6? (
+		dev-qt/qtbase[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets]
+		dev-qt/kdsingleapplication[qt6]
+	)
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		media-libs/chromaprint:=
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	icu? ( dev-libs/icu:= )
+	ipod? ( media-libs/libgpod )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( media-libs/libmtp )
+	pulseaudio? ( media-libs/libpulse )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		soup? ( media-plugins/gst-plugins-soup:1.0 )
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gtest
+	dev-libs/boost
+	!qt6? ( dev-qt/qttest:5 )
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	cdda? ( gstreamer )
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DUSE_ICU="$(usex icu)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		-DBUILD_WITH_QT6="$(usex qt6)"
+		-DBUILD_WITH_QT5="$(usex !qt6)"
+		-DQT_VERSION_MAJOR="$(usex qt6 6 5)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-1.0.23.ebuild
index 0d5281b6b697..fc81b1b29b2b 100644
--- a/media-sound/strawberry/strawberry-0.8.5.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.23.ebuild
@@ -1,29 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic plocale xdg
 
-PLOCALES="cs de es fr hu id it ko nb pl ru sv"
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-"
+IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio +udisks vlc"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -31,33 +27,31 @@ BDEPEND="
 	virtual/pkgconfig
 "
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
 	dev-libs/glib:2
-	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	media-libs/chromaprint:=
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	virtual/glu
+	media-libs/taglib
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
 	gstreamer? (
+		media-libs/chromaprint:=
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	pulseaudio? ( media-sound/pulseaudio )
+	icu? ( dev-libs/icu:= )
+	ipod? ( media-libs/libgpod )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( media-libs/libmtp )
+	pulseaudio? ( media-libs/libpulse )
 	vlc? ( media-video/vlc )
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
@@ -71,23 +65,21 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
+	dev-cpp/gtest
 	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
+	dev-qt/qttest:5
 "
 
 DOCS=( Changelog README.md )
 
 REQUIRED_USE="
+	cdda? ( gstreamer )
 	|| ( gstreamer vlc )
 "
 
 src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
+	plocale_find_changes "src/translations" "" ".po"
 
-	rm -r 3rdparty/taglib || die
 	cmake_src_prepare
 }
 
@@ -98,17 +90,19 @@ src_configure() {
 		# avoid automagically enabling of ccache (bug #611010)
 		-DCCACHE_EXECUTABLE=OFF
 		-DENABLE_GIO=ON
-		-DLINGUAS="$(l10n_get_locales)"
+		-DLINGUAS="$(plocale_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
 		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DUSE_ICU="$(usex icu)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_VLC="$(usex vlc)"
-		-DUSE_SYSTEM_TAGLIB=ON
-		-DWITH_QT6=OFF
+		-DQT_VERSION_MAJOR=5
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 0d5281b6b697..3db9ec7c7628 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -1,29 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic plocale xdg
 
-PLOCALES="cs de es fr hu id it ko nb pl ru sv"
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-"
+IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio +udisks vlc"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -31,33 +27,31 @@ BDEPEND="
 	virtual/pkgconfig
 "
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
 	dev-libs/glib:2
-	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	media-libs/chromaprint:=
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	virtual/glu
+	media-libs/taglib
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
 	gstreamer? (
+		media-libs/chromaprint:=
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	pulseaudio? ( media-sound/pulseaudio )
+	icu? ( dev-libs/icu:= )
+	ipod? ( media-libs/libgpod )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( media-libs/libmtp )
+	pulseaudio? ( media-libs/libpulse )
 	vlc? ( media-video/vlc )
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
@@ -71,23 +65,21 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
+	dev-cpp/gtest
 	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
+	dev-qt/qttest:5
 "
 
 DOCS=( Changelog README.md )
 
 REQUIRED_USE="
+	cdda? ( gstreamer )
 	|| ( gstreamer vlc )
 "
 
 src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
+	plocale_find_changes "src/translations" "" ".po"
 
-	rm -r 3rdparty/taglib || die
 	cmake_src_prepare
 }
 
@@ -98,17 +90,19 @@ src_configure() {
 		# avoid automagically enabling of ccache (bug #611010)
 		-DCCACHE_EXECUTABLE=OFF
 		-DENABLE_GIO=ON
-		-DLINGUAS="$(l10n_get_locales)"
+		-DLINGUAS="$(plocale_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
 		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DUSE_ICU="$(usex icu)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_VLC="$(usex vlc)"
-		-DUSE_SYSTEM_TAGLIB=ON
-		-DWITH_QT6=OFF
+		-DQT_VERSION_MAJOR=5
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/streamripper/files/streamripper-1.64.6-fix-c99.patch b/media-sound/streamripper/files/streamripper-1.64.6-fix-c99.patch
new file mode 100644
index 000000000000..60fb15da9433
--- /dev/null
+++ b/media-sound/streamripper/files/streamripper-1.64.6-fix-c99.patch
@@ -0,0 +1,44 @@
+We live in modern world and have ANSI C here. Plus, nothing defines ANSI_PROTOTYPES
+Include unconditionally
+
+Closes: https://bugs.gentoo.org/713314
+Closes: https://bugs.gentoo.org/896432
+--- a/lib/argv.c
++++ b/lib/argv.c
+@@ -52,25 +52,10 @@
+ 
+ /*  Routines imported from standard C runtime libraries. */
+ 
+-#ifdef ANSI_PROTOTYPES
+-
+ #include <stddef.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#else	/* !ANSI_PROTOTYPES */
+-
+-#if !defined _WIN32 || defined __GNUC__
+-extern char *memcpy ();		/* Copy memory region */
+-extern int strlen ();		/* Count length of string */
+-extern char *malloc ();		/* Standard memory allocater */
+-extern char *realloc ();	/* Standard memory reallocator */
+-extern void free ();		/* Free malloc'd memory */
+-extern char *strdup ();		/* Duplicate a string */
+-#endif
+-
+-#endif	/* ANSI_PROTOTYPES */
+-
+ 
+ #ifndef NULL
+ #define NULL 0
+--- a/lib/ripstream.c
++++ b/lib/ripstream.c
+@@ -714,7 +714,7 @@
+     char bigbuf[HEADER_SIZE] = "";
+     ID3V2frame id3v2frame;
+ #ifndef WIN32
+-    __uint32_t framesize = 0;
++    uint32_t framesize = 0;
+ #else
+     unsigned long int framesize = 0;
+ #endif
diff --git a/media-sound/streamripper/metadata.xml b/media-sound/streamripper/metadata.xml
index fc27a2d11134..7932863c4453 100644
--- a/media-sound/streamripper/metadata.xml
+++ b/media-sound/streamripper/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/streamripper/streamripper-1.64.6-r1.ebuild b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
new file mode 100644
index 000000000000..1efacf79082f
--- /dev/null
+++ b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
+HOMEPAGE="https://streamripper.sourceforge.net"
+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"
+IUSE="vorbis"
+
+RDEPEND="
+	media-libs/libmad
+	media-libs/faad2
+	>=dev-libs/glib-2.16
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-autotools.patch
+	"${FILESDIR}"/${P}-fix-c99.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-included-libmad \
+		--without-included-argv \
+		$(use_with vorbis ogg)
+}
+
+src_install() {
+	default
+	dodoc parse_rules.txt
+}
diff --git a/media-sound/streamripper/streamripper-1.64.6.ebuild b/media-sound/streamripper/streamripper-1.64.6.ebuild
index eeb00af1c86a..72dbeb087df7 100644
--- a/media-sound/streamripper/streamripper-1.64.6.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,12 +6,12 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
-HOMEPAGE="http://streamripper.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://streamripper.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~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="
diff --git a/media-sound/streamtranscoder/Manifest b/media-sound/streamtranscoder/Manifest
index 24a6ebb815a2..eec92a93711e 100644
--- a/media-sound/streamtranscoder/Manifest
+++ b/media-sound/streamtranscoder/Manifest
@@ -1,2 +1 @@
-DIST streamtranscoder-1.2.4.tar.gz 352873 BLAKE2B ab6fa290469a68273eeb1acf1790ccdf00aab23862130e903a0c70594fa791766c9f09422de81feec39a1ce6be4e24e44d652bedf8ab9cd8e8bc63d7cb85d4f7 SHA512 c2a4d866e65628777a15ac301bbd06bdc5cab1558747c07d4b12d2b007989ab871ee0e5109f503779bf8554897a2ff11aab0ea9c522979bdee540235d2054071
 DIST streamtranscoderv3-3.1.11.tar.gz 480731 BLAKE2B 2b1adb68d8b92f392e6807cba5a92be6fb03b84ad649f717a4ed0cd3b69a32cbc870561eb1f67aade7c123f05194ad5589056ef337848d09adf2948d6511f12c SHA512 5682d8bc8f93a85bd84ba4bba37d1613f3b53afea9499d9417daa40806b4fb7e4fd77c209df2e68ea5e102a783ad8c2424468022e71366114006d041d4e20b99
diff --git a/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch b/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch
deleted file mode 100644
index d79b074abd9d..000000000000
--- a/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -83,22 +83,29 @@
- 
- dnl -- configure options --
- 
--XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!(Perhaps you need --with-ogg-prefix=/usr/local)))
--XIPH_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!(Perhaps you need --with-vorbis-prefix=/usr/local)))
--AM_PATH_CURL(,,AC_MSG_ERROR(must have libcurl installed!))
--AM_PATH_MAD(, AC_MSG_ERROR(must have libmad installed!))
--AM_PATH_LAME(, AC_MSG_ERROR(must have libmp3lame installed!))
-+PKG_CHECK_MODULES([OGG],[ogg])
-+PKG_CHECK_MODULES([VORBIS],[vorbis])
-+PKG_CHECK_MODULES([VORBISENC],[vorbisenc])
-+PKG_CHECK_MODULES([VORBISFILE],[vorbisfile])
-+PKG_CHECK_MODULES([CURL],[libcurl])
-+PKG_CHECK_MODULES([MAD],[mad])
-+
-+AC_PATH_PROG([LAME],[lame])
- 
- dnl Make substitutions
- 
- AC_SUBST(MAD_CFLAGS)
- AC_SUBST(MAD_LIBS)
- AC_SUBST(LAME_CFLAGS)
--AC_SUBST(LAME_LIBS)
-+AC_SUBST([LAME_LIBS],[-lmp3lame])
- AC_SUBST(OGG_CFLAGS)
- AC_SUBST(VORBIS_CFLAGS)
-+AC_SUBST(VORBISENC_CFLAGS)
-+AC_SUBST(VORBISFILE_CFLAGS)
- AC_SUBST(OGG_LIBS)
- AC_SUBST(VORBIS_LIBS)
-+AC_SUBST(VORBISENC_LIBS)
-+AC_SUBST(VORBISFILE_LIBS)
- AC_SUBST(LIBTOOL_DEPS)
- AC_SUBST(OPT)
- AC_SUBST(LIBS)
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -17,5 +17,6 @@
-  
- INCLUDES = -I$(srcdir)/liboddcast -I$(srcdir)/libtranscoder
- 
--install-hook:
--	cp transcoder.cfg $(DESTDIR)$(sysconfdir)/transcoder.cfg
-+install-data-hook:
-+	$(INSTALL) -d $(DESTDIR)$(sysconfdir)
-+	$(INSTALL) -m644 transcoder.cfg $(DESTDIR)$(sysconfdir)/transcoder.cfg
---- a/src/libtranscoder/transcurl.cpp
-+++ b/src/libtranscoder/transcurl.cpp
-@@ -18,7 +18,6 @@
- #include <winsock2.h>
- #endif
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #include "transcurl.h"
- #include "cbuffer.h"
diff --git a/media-sound/streamtranscoder/metadata.xml b/media-sound/streamtranscoder/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/streamtranscoder/metadata.xml
+++ b/media-sound/streamtranscoder/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild b/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
deleted file mode 100644
index 3ad59e039eb8..000000000000
--- a/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Commandline program to transcode shoutcast/icecast streams to different bitrates"
-HOMEPAGE="http://www.oddsock.org"
-SRC_URI="http://www.oddsock.org/tools/streamTranscoder/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libogg-1.1
-	>=media-libs/libvorbis-1.0.1-r2
-	>=media-sound/lame-3.96
-	>=media-libs/libmad-0.15.1b
-	>=net-misc/curl-7.11.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
diff --git a/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild b/media-sound/streamtranscoder/streamtranscoder-3.1.11-r1.ebuild
index 8e03e14c0175..f763307a9203 100644
--- a/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild
+++ b/media-sound/streamtranscoder/streamtranscoder-3.1.11-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-MY_P=${PN}v3-${PV}
+MY_P="${PN}v3-${PV}"
 
 DESCRIPTION="Commandline program to transcode shoutcast/icecast streams to different bitrates"
 HOMEPAGE="http://www.oddsock.org/tools/streamTranscoderV3"
 SRC_URI="http://www.oddsock.org/tools/streamTranscoderV3/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
-RDEPEND=">=media-libs/libogg-1.1
-	>=media-libs/libvorbis-1.0.1-r2
-	>=media-sound/lame-3.96
-	>=media-libs/libmad-0.15.1b
-	>=net-misc/curl-7.11.0"
+RDEPEND="
+	media-libs/libogg
+	media-libs/libvorbis
+	media-sound/lame
+	media-libs/libmad
+	net-misc/curl"
 DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
diff --git a/media-sound/subsonic-bin/Manifest b/media-sound/subsonic-bin/Manifest
index 073eb1fc5539..9162465224d2 100644
--- a/media-sound/subsonic-bin/Manifest
+++ b/media-sound/subsonic-bin/Manifest
@@ -1 +1 @@
-DIST subsonic-5.2.1-standalone.tar.gz 43671795 BLAKE2B 2cf2ff67aaac7dd2ce405d832bfbd1f7dd0a87f4e5698092048891778ebbcac35e70c535a1e2af012655bc49e555ffdcbcfaffea62ad16cd987458e0d30a0135 SHA512 1251b77cfbee80224d3e332945fecec981c79b27c129cb47f5880a82344db15d1f8d17b11dd272a4ad3d9794f4e3055d4a59826623d543b676de73fe1c83b936
+DIST subsonic-6.1.6-standalone.tar.gz 51987601 BLAKE2B 35f124e1c7ef920524f7b1c37389c681c8849facc8331b3db08ada9635e781ddb7c74f5ab808fa0e83e45559f1ac347e9ba52cce75161a802d1b41f9e261a49c SHA512 d339b5ba893efb23479f1dc919ad540d3ea23d9fd0288a982ab4290aadd103db57ec4c5b922b39f64e09adec3af32b9cf20d7cb4aad62c65e48448eca2e456de
diff --git a/media-sound/subsonic-bin/metadata.xml b/media-sound/subsonic-bin/metadata.xml
index 207efe7b11ee..55620da4927c 100644
--- a/media-sound/subsonic-bin/metadata.xml
+++ b/media-sound/subsonic-bin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>perfinion@gentoo.org</email>
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild b/media-sound/subsonic-bin/subsonic-bin-6.1.6.ebuild
index 522f0e8ef95f..0017b651832f 100644
--- a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
+++ b/media-sound/subsonic-bin/subsonic-bin-6.1.6.ebuild
@@ -1,35 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit eutils user
+inherit wrapper
 
 MY_PN="${PN//-bin}"
+MY_P="subsonic-${PV}-standalone"
 
 DESCRIPTION="Subsonic is a complete, personal media streaming solution"
 HOMEPAGE="http://www.subsonic.org/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_PN}-${PV}-standalone.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/project/subsonic/subsonic/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ffmpeg lame selinux"
 
-DEPEND=""
-RDEPEND="virtual/jre
+RDEPEND="
+	acct-group/subsonic
+	acct-user/subsonic
+	virtual/jre
 	lame? ( media-sound/lame )
 	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-subsonic )"
+	selinux? ( sec-policy/selinux-subsonic )
+"
 
-S="${WORKDIR}/"
-SUBSONIC_HOME="/var/lib/${MY_PN}"
-USER_GROUP="subsonic"
-
-pkg_setup() {
-	enewgroup "${USER_GROUP}"
-	enewuser "${USER_GROUP}" -1 -1 ${SUBSONIC_HOME} "${USER_GROUP}"
-}
+S="${WORKDIR}"
 
 src_install() {
 	local dir="/usr/libexec/${MY_PN}"
@@ -42,21 +39,18 @@ src_install() {
 	exeinto ${dir}
 	doexe subsonic.sh
 
-	keepdir ${SUBSONIC_HOME}
-	fowners ${USER_GROUP}:${USER_GROUP} ${SUBSONIC_HOME}
-
 	newinitd "${FILESDIR}/subsonic.initd" subsonic
 	newconfd "${FILESDIR}/subsonic.confd" subsonic
 
 	make_wrapper ${MY_PN} "${dir}/subsonic.sh"
 
 	if use ffmpeg; then
-		dodir ${SUBSONIC_HOME}/transcode
-		dosym ../../../../usr/bin/ffmpeg ${SUBSONIC_HOME}/transcode/ffmpeg
+		keepdir /var/lib/subsonic/transcode
+		dosym ../../../../../usr/bin/ffmpeg /var/lib/subsonic/transcode/transcode/ffmpeg
 	fi
 
 	if use lame; then
-		dodir ${SUBSONIC_HOME}/transcode
-		dosym ../../../../usr/bin/lame ${SUBSONIC_HOME}/transcode/lame
+		keepdir /var/lib/subsonic/transcode/transcode
+		dosym ../../../../../usr/bin/lame /var/lib/subsonic/transcode/transcode/lame
 	fi
 }
diff --git a/media-sound/substract_wave/metadata.xml b/media-sound/substract_wave/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/substract_wave/metadata.xml
+++ b/media-sound/substract_wave/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/substract_wave/substract_wave-0.3-r1.ebuild b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
index bef6d1ddfaa8..b79eda1bff07 100644
--- a/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
+++ b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
-DESCRIPTION="substracts 2 mono wave files from each other by a factor specified on the command line"
-HOMEPAGE="http://panteltje.com/panteltje/dvd/"
-SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+DESCRIPTION="Substracts 2 mono wave files from each other by a factor specified"
+HOMEPAGE="https://www.panteltje.nl/panteltje/dvd/"
+SRC_URI="https://www.panteltje.nl/panteltje/dvd/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${P}-Makefile.patch"
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 60c9f8a5f07e..4436653080aa 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,2 +1 @@
-DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da
-DIST SuperCollider-3.11.2-Source.tar.bz2 18130954 BLAKE2B 3713561e5ebee6dd4c08baa8aaaf4a422ab983480c76b2176373ce3cd080128f9392b50482e02dc82dce235e928d058c42722e0863dad9f6d2dd086894cd85da SHA512 636062c6acf8be43260632287b587f167352079c4e86ede34d1c6056180bfdb3ae50d6a3ff4f349327a3ab6af0eb01ac503d6b22667b4799dfcddd9c6489a23c
+DIST SuperCollider-3.13.0-Source.tar.bz2 18685091 BLAKE2B a5e57a17f93e40848b2044ee0791179f857d144eabb7f4d74580b2eebd49a31d6ec671a0526236c5b906aadeb455e5a7ad18cacb79ed214076d6bceca39ea2ae SHA512 a60a128f7646f077f91adae666fa4014529aa9df78cf0dfe5d68c9bd6447f008af7da2970b8736f3f29d0adbaf67bce680a8201fcbe7e1aba29c3499a57f89cd
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch b/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch
deleted file mode 100644
index 66a765a8b9ea..000000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-disabled the use of ccache, to prevent FTBFS; as the compilation is done once
-it has no backdraws to make the debian package.
-Index: supercollider/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -150,12 +150,12 @@ add_definitions(-DBOOST_CHRONO_HEADER_ON
- #############################################
- # Detect CCache
- 
--find_program(CCacheExectuable ccache)
--if( CCacheExectuable )
--  # only used with >=cmake-3.4
--  set( CMAKE_C_COMPILER_LAUNCHER   "${CCacheExectuable}" )
--  set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" )
--endif()
-+## find_program(CCacheExecutable ccache)
-+## if( CCacheExecutable )
-+##   # only used with >=cmake-3.4
-+##   set( CMAKE_C_COMPILER_LAUNCHER   "${CCacheExecutable}" )
-+##   set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" )
-+## endif()
- 
- #############################################
- # Options
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch b/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
deleted file mode 100644
index 94329b867915..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 43b2b27c14186a9a3eff917d7598751ed298ae20 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Sun, 31 May 2020 21:25:12 +0900
-Subject: [PATCH 2/2] Fix build with Boost 1.72.0
-
----
- .../include/boost/sync/detail/throw_exception.hpp           | 4 ----
- external_libraries/oscpack_build.cpp                        | 6 +++---
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
-index b5fdfabf8..a7d7fa7b3 100755
---- a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
-+++ b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
-@@ -164,11 +164,7 @@ BOOST_NOINLINE BOOST_NORETURN void throw_exception(const char* func, const char*
- 
- #endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
- 
--#if !defined(BOOST_EXCEPTION_DISABLE)
--#define BOOST_SYNC_DETAIL_HERE BOOST_THROW_EXCEPTION_CURRENT_FUNCTION, __FILE__, __LINE__
--#else
- #define BOOST_SYNC_DETAIL_HERE BOOST_CURRENT_FUNCTION, __FILE__, __LINE__
--#endif
- 
- #define BOOST_SYNC_DETAIL_THROW_DEFAULT(ex)\
-     boost::sync::detail::throw_exception< ex >(BOOST_SYNC_DETAIL_HERE)
-diff --git a/external_libraries/oscpack_build.cpp b/external_libraries/oscpack_build.cpp
-index 3a658f3d3..1f6283d1c 100644
---- a/external_libraries/oscpack_build.cpp
-+++ b/external_libraries/oscpack_build.cpp
-@@ -1,8 +1,8 @@
--#include <boost/detail/endian.hpp>
-+#include <boost/predef.h>
- 
--#ifdef BOOST_LITTLE_ENDIAN
-+#if BOOST_ENDIAN_LITTLE_BYTE
- #define OSC_HOST_LITTLE_ENDIAN
--#elif defined(BOOST_BIG_ENDIAN)
-+#elif BOOST_ENDIAN_BIG_BYTE
- #define OSC_HOST_BIG_ENDIAN
- #else
- #error please define endianness
--- 
-2.26.2
-
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch b/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
deleted file mode 100644
index 8b1014d99919..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 5b655fbbf44ff5e67709667242a5feff707e1a51 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Mon, 1 Jun 2020 18:43:08 +0900
-Subject: [PATCH] Remove spurious Qt dependencies
-
----
- QtCollider/CMakeLists.txt     | 10 +++-------
- QtCollider/widgets/QcCanvas.h |  2 --
- README_LINUX.md               |  6 +++---
- README_RASPBERRY_PI.md        |  2 +-
- editors/sc-ide/CMakeLists.txt | 13 +++----------
- 5 files changed, 10 insertions(+), 23 deletions(-)
-
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index de38afb908..6b9437b9c0 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -7,19 +7,15 @@ option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
- set(
-   QT_COMPONENTS
-   Core
--  Widgets
-+  Gui
-   Network
-   PrintSupport
--  OpenGL
--  Quick
--  Qml
--  Sql
-   Svg
-+  Widgets
- )
- 
- set (QT_COLLIDER_LIBS
--  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
--  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
-+  Qt5::Core Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Svg Qt5::Widgets
-   ${MATH_LIBRARY})
- 
- if(SC_USE_QTWEBENGINE)
-diff --git a/QtCollider/widgets/QcCanvas.h b/QtCollider/widgets/QcCanvas.h
-index 3acb00fc23..ff230b8139 100644
---- a/QtCollider/widgets/QcCanvas.h
-+++ b/QtCollider/widgets/QcCanvas.h
-@@ -28,9 +28,7 @@
- #include <QBasicTimer>
- #include <QTime>
- #include <QPalette>
--#include <QGLWidget>
- 
--// using QcCanvasBase = QGLWidget;
- using QcCanvasBase = QWidget;
- 
- class QcCanvas : public QcCanvasBase {
-diff --git a/README_LINUX.md b/README_LINUX.md
-index d5818e9106..532ad9cc5a 100644
---- a/README_LINUX.md
-+++ b/README_LINUX.md
-@@ -75,7 +75,7 @@ Depending on your Debian flavor and version, your distribution's PPA may be stuc
- 
- If this displays version 5.7 or later, installing Qt is easy:
- 
--    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtdeclarative5-dev qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
-+    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
- 
- If you are on Ubuntu 14.04 (Trusty) or 16.04 (Xenial), check the next section. Otherwise, you will have to use the official Qt installer. Sorry.
- 
-@@ -87,13 +87,13 @@ On Xenial:
- 
-     sudo apt-add-repository ppa:beineri/opt-qt-5.11.0-xenial
-     sudo apt-get update
--    sudo apt-get install qt511base qt511location qt511declarative qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
-+    sudo apt-get install qt511base qt511location qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
- 
- On Trusty, only Qt 5.10 and below are available:
- 
-     sudo apt-add-repository ppa:beineri/opt-qt-5.10.1-trusty
-     sudo apt-get update
--    sudo apt-get install qt510base qt510location qt510declarative qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
-+    sudo apt-get install qt510base qt510location qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
- 
- [Stephan Binner's Launchpad PPAs]: https://launchpad.net/~beineri
- 
-diff --git a/README_RASPBERRY_PI.md b/README_RASPBERRY_PI.md
-index 974ea1822c..aae8250388 100644
---- a/README_RASPBERRY_PI.md
-+++ b/README_RASPBERRY_PI.md
-@@ -42,7 +42,7 @@ Install required libraries:
-     # For GUI builds:
-     sudo apt-get install libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
-         libreadline-dev libfftw3-dev libxt-dev libudev-dev cmake qttools5-dev qttools5-dev-tools \
--        qtdeclarative5-dev libqt5svg5-dev qjackctl
-+        qtbase5-dev libqt5svg5-dev qjackctl
-     # For GUI-less builds:
-     sudo apt-get install libsamplerate0-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
-         libreadline-dev libfftw3-dev libudev-dev cmake git
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index 1ee9ae4f43..6248668594 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -6,22 +6,15 @@ set(QT_IDE_COMPONENTS
-     Concurrent
-     Core
-     LinguistTools
--    # OpenGL
--    PrintSupport
--    Qml
--    Quick
--    Sql
-+    Network
-     Widgets
- )
- 
- set(QT_IDE_LIBRARIES
-     Qt5::Concurrent
-     Qt5::Core
--    # Qt5::OpenGL
--    Qt5::PrintSupport
--    Qt5::Qml
--    Qt5::Quick
--    Qt5::Sql
-+    Qt5::Network
-+    Qt5::Widgets
- )
- 
- if(SC_USE_QTWEBENGINE)
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch b/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
deleted file mode 100644
index 37f803312c28..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 244e55632cef86ecd363eb8df3f2352569f804f4 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Sun, 31 May 2020 21:24:52 +0900
-Subject: [PATCH 1/2] Fix build with Qt 5.15
-
----
- QtCollider/primitives/prim_QPen.cpp       | 1 +
- QtCollider/widgets/QcGraph.cpp            | 1 +
- QtCollider/widgets/QcLevelIndicator.cpp   | 1 +
- QtCollider/widgets/QcMultiSlider.cpp      | 1 +
- QtCollider/widgets/QcScopeShm.cpp         | 1 +
- QtCollider/widgets/soundfileview/view.cpp | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/QtCollider/primitives/prim_QPen.cpp b/QtCollider/primitives/prim_QPen.cpp
-index 8d531214d..4ba24519d 100644
---- a/QtCollider/primitives/prim_QPen.cpp
-+++ b/QtCollider/primitives/prim_QPen.cpp
-@@ -27,6 +27,7 @@
- #include "PyrKernel.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QVector2D>
- #include <QVector3D>
- #include <cmath>
-diff --git a/QtCollider/widgets/QcGraph.cpp b/QtCollider/widgets/QcGraph.cpp
-index 70215ae94..79e71d1ad 100644
---- a/QtCollider/widgets/QcGraph.cpp
-+++ b/QtCollider/widgets/QcGraph.cpp
-@@ -24,6 +24,7 @@
- #include "../style/routines.hpp"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QApplication>
- #include <QtCore/qmath.h>
-diff --git a/QtCollider/widgets/QcLevelIndicator.cpp b/QtCollider/widgets/QcLevelIndicator.cpp
-index 19c7d4874..8a60f354a 100644
---- a/QtCollider/widgets/QcLevelIndicator.cpp
-+++ b/QtCollider/widgets/QcLevelIndicator.cpp
-@@ -23,6 +23,7 @@
- #include "../QcWidgetFactory.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator);
- 
-diff --git a/QtCollider/widgets/QcMultiSlider.cpp b/QtCollider/widgets/QcMultiSlider.cpp
-index 046b18739..381ddd404 100644
---- a/QtCollider/widgets/QcMultiSlider.cpp
-+++ b/QtCollider/widgets/QcMultiSlider.cpp
-@@ -26,6 +26,7 @@
- #include <QApplication>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include <cmath>
- 
-diff --git a/QtCollider/widgets/QcScopeShm.cpp b/QtCollider/widgets/QcScopeShm.cpp
-index bb44623f4..edd38ef57 100644
---- a/QtCollider/widgets/QcScopeShm.cpp
-+++ b/QtCollider/widgets/QcScopeShm.cpp
-@@ -25,6 +25,7 @@
- #include "../debug.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTimer>
- #include <QResizeEvent>
- #include <QWindow>
-diff --git a/QtCollider/widgets/soundfileview/view.cpp b/QtCollider/widgets/soundfileview/view.cpp
-index a3eca811f..baba0b245 100644
---- a/QtCollider/widgets/soundfileview/view.cpp
-+++ b/QtCollider/widgets/soundfileview/view.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QGridLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- #include <QPaintEvent>
- #include <QCursor>
--- 
-2.26.2
-
diff --git a/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch b/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch
deleted file mode 100644
index a156a105f875..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 063f9a48300b0c1d0132f6e0448ca724ad9e7474 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Mon, 1 Jun 2020 18:43:08 +0900
-Subject: [PATCH] Remove spurious Qt dependencies
-
----
- QtCollider/CMakeLists.txt     | 10 +++-------
- QtCollider/widgets/QcCanvas.h |  2 --
- README_LINUX.md               |  6 +++---
- README_RASPBERRY_PI.md        |  2 +-
- editors/sc-ide/CMakeLists.txt | 13 +++----------
- 5 files changed, 10 insertions(+), 23 deletions(-)
-
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index de38afb90..6b9437b9c 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -7,19 +7,15 @@ option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
- set(
-   QT_COMPONENTS
-   Core
--  Widgets
-+  Gui
-   Network
-   PrintSupport
--  OpenGL
--  Quick
--  Qml
--  Sql
-   Svg
-+  Widgets
- )
- 
- set (QT_COLLIDER_LIBS
--  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
--  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
-+  Qt5::Core Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Svg Qt5::Widgets
-   ${MATH_LIBRARY})
- 
- if(SC_USE_QTWEBENGINE)
-diff --git a/QtCollider/widgets/QcCanvas.h b/QtCollider/widgets/QcCanvas.h
-index 3acb00fc2..ff230b813 100644
---- a/QtCollider/widgets/QcCanvas.h
-+++ b/QtCollider/widgets/QcCanvas.h
-@@ -28,9 +28,7 @@
- #include <QBasicTimer>
- #include <QTime>
- #include <QPalette>
--#include <QGLWidget>
- 
--// using QcCanvasBase = QGLWidget;
- using QcCanvasBase = QWidget;
- 
- class QcCanvas : public QcCanvasBase {
-diff --git a/README_LINUX.md b/README_LINUX.md
-index 0e9577637..7b728a9ba 100644
---- a/README_LINUX.md
-+++ b/README_LINUX.md
-@@ -78,7 +78,7 @@ Depending on your Debian flavor and version, your distribution's PPA may be stuc
- 
- If this displays version 5.7 or later, installing Qt is easy:
- 
--    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtdeclarative5-dev qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
-+    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
- 
- If you are on Ubuntu 14.04 (Trusty) or 16.04 (Xenial), check the next section. Otherwise, you will have to use the official Qt installer. Sorry.
- 
-@@ -90,13 +90,13 @@ On Xenial:
- 
-     sudo apt-add-repository ppa:beineri/opt-qt-5.11.0-xenial
-     sudo apt-get update
--    sudo apt-get install qt511base qt511location qt511declarative qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
-+    sudo apt-get install qt511base qt511location qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
- 
- On Trusty, only Qt 5.10 and below are available:
- 
-     sudo apt-add-repository ppa:beineri/opt-qt-5.10.1-trusty
-     sudo apt-get update
--    sudo apt-get install qt510base qt510location qt510declarative qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
-+    sudo apt-get install qt510base qt510location qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
- 
- [Stephan Binner's Launchpad PPAs]: https://launchpad.net/~beineri
- 
-diff --git a/README_RASPBERRY_PI.md b/README_RASPBERRY_PI.md
-index 0e89e26fc..7835fd25d 100644
---- a/README_RASPBERRY_PI.md
-+++ b/README_RASPBERRY_PI.md
-@@ -42,7 +42,7 @@ Install required libraries:
-     # For GUI builds:
-     sudo apt-get install libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
-         libreadline-dev libfftw3-dev libxt-dev libudev-dev libncurses5-dev cmake git qttools5-dev qttools5-dev-tools \
--        qtdeclarative5-dev libqt5svg5-dev qjackctl
-+        qtbase5-dev libqt5svg5-dev qjackctl
-     # For GUI-less builds:
-     sudo apt-get install libsamplerate0-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
-         libreadline-dev libfftw3-dev libudev-dev libncurses5-dev cmake git
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index 2ff4de774..5f9c1e64b 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -6,22 +6,15 @@ set(QT_IDE_COMPONENTS
-     Concurrent
-     Core
-     LinguistTools
--    # OpenGL
--    PrintSupport
--    Qml
--    Quick
--    Sql
-+    Network
-     Widgets
- )
- 
- set(QT_IDE_LIBRARIES
-     Qt5::Concurrent
-     Qt5::Core
--    # Qt5::OpenGL
--    Qt5::PrintSupport
--    Qt5::Qml
--    Qt5::Quick
--    Qt5::Sql
-+    Qt5::Network
-+    Qt5::Widgets
- )
- 
- if(SC_USE_QTWEBENGINE)
--- 
-2.26.2
-
diff --git a/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch b/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch
deleted file mode 100644
index d703b6073706..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From 9563fb5e73425a2ee0370162178964cceb559d5d Mon Sep 17 00:00:00 2001
-From: David Runge <dave@sleepmap.de>
-Date: Mon, 16 Nov 2020 12:00:22 +0100
-Subject: [PATCH] Backport #5014 for 3.11.2
-
-Backport the linker error patches
-(https://github.com/supercollider/supercollider/pull/5014) for 3.11.2.
----
- common/SC_Apple.hpp             | 14 ------
- common/SC_Apple.mm              | 60 -------------------------
- common/SC_AppleEventLoop.hpp    | 34 ++++++++++++++
- common/SC_AppleEventLoop.mm     | 80 +++++++++++++++++++++++++++++++++
- common/SC_EventLoop.hpp         |  3 +-
- server/scsynth/CMakeLists.txt   |  8 +++-
- server/supernova/CMakeLists.txt |  9 +++-
- 7 files changed, 131 insertions(+), 77 deletions(-)
- create mode 100644 common/SC_AppleEventLoop.hpp
- create mode 100644 common/SC_AppleEventLoop.mm
-
-diff --git a/common/SC_Apple.hpp b/common/SC_Apple.hpp
-index 958d097f36..c7e53e9fcc 100644
---- a/common/SC_Apple.hpp
-+++ b/common/SC_Apple.hpp
-@@ -23,19 +23,5 @@ namespace SC { namespace Apple {
- 
- void disableAppNap();
- 
--namespace EventLoop {
--
--// Setup the main application. This function must be called in the
--// main thread and before any other calls to Cocoa methods.
--void setup();
--// Run the event loop. This function must be called in the main thread.
--// It blocks until the event loop finishes.
--void run();
--// Ask the event loop to stop and terminate the program.
--// This function can be called from any thread.
--void quit();
--
--} // EventLoop
--
- } // namespace Apple
- } // namespace SC
-diff --git a/common/SC_Apple.mm b/common/SC_Apple.mm
-index a4e10a66cd..dbb7ddbb7d 100644
---- a/common/SC_Apple.mm
-+++ b/common/SC_Apple.mm
-@@ -42,65 +42,5 @@ void disableAppNap() {
-     }
- }
- 
--namespace EventLoop {
--
--static std::atomic_bool g_running;
--
--void setup() {
--    // The following code would transform the process into a foreground application.
--    // For now it's the plugin's responsibility to do this (early or lazily)
--    // because we don't want to always show an icon in the docker.
--    // ProcessSerialNumber psn = { 0, kCurrentProcess };
--    // TransformProcessType(&psn, kProcessTransformToForegroundApplication);
--
--    // Create NSApplication
--    [NSApplication sharedApplication];
--}
--
--void run() {
--#if 0
--    // this doesn't work...
--    [NSApp run];
--#else
--    // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html
--    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
--
--    [NSApp finishLaunching];
--    g_running = true;
--
--    while (g_running) {
--        [pool release];
--        pool = [[NSAutoreleasePool alloc] init];
--        NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
--                                            untilDate:[NSDate distantFuture]
--                                               inMode:NSDefaultRunLoopMode
--                                              dequeue:YES];
--        if (event) {
--            [NSApp sendEvent:event];
--            [NSApp updateWindows];
--        }
--    }
--    [pool release];
--#endif
--}
--
--void quit() {
--    // break from event loop instead of [NSApp terminate:nil]
--    g_running = false;
--    // send dummy event to wake up event loop
--    NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
--                                        location:NSMakePoint(0, 0)
--                                   modifierFlags:0
--                                       timestamp:0
--                                    windowNumber:0
--                                         context:nil
--                                         subtype:0
--                                           data1:0
--                                           data2:0];
--    [NSApp postEvent:event atStart:NO];
--}
--
--} // EventLoop
--
- } // namespace Apple
- } // namespace SC
-diff --git a/common/SC_AppleEventLoop.hpp b/common/SC_AppleEventLoop.hpp
-new file mode 100644
-index 0000000000..6f19bb2818
---- /dev/null
-+++ b/common/SC_AppleEventLoop.hpp
-@@ -0,0 +1,34 @@
-+/************************************************************************
-+ *
-+ * Copyright 2019 Christof Ressi <info@christofressi.com>
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ ************************************************************************/
-+
-+#pragma once
-+
-+namespace SC { namespace Apple { namespace EventLoop {
-+
-+// Setup the main application. This function must be called in the
-+// main thread and before any other calls to Cocoa methods.
-+void setup();
-+// Run the event loop. This function must be called in the main thread.
-+// It blocks until the event loop finishes.
-+void run();
-+// Ask the event loop to stop and terminate the program.
-+// This function can be called from any thread.
-+void quit();
-+
-+}}} // namespace SC::Apple::EventLoop
-diff --git a/common/SC_AppleEventLoop.mm b/common/SC_AppleEventLoop.mm
-new file mode 100644
-index 0000000000..cfcf42ddfe
---- /dev/null
-+++ b/common/SC_AppleEventLoop.mm
-@@ -0,0 +1,80 @@
-+/************************************************************************
-+ *
-+ * Copyright 2019 Christof Ressi <info@christofressi.com>
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ ************************************************************************/
-+
-+#include "SC_AppleEventLoop.hpp"
-+#include <atomic>
-+
-+#import <Cocoa/Cocoa.h>
-+
-+namespace SC { namespace Apple { namespace EventLoop {
-+
-+static std::atomic_bool g_running;
-+
-+void setup() {
-+    // The following code would transform the process into a foreground application.
-+    // For now it's the plugin's responsibility to do this (early or lazily)
-+    // because we don't want to always show an icon in the docker.
-+    // ProcessSerialNumber psn = { 0, kCurrentProcess };
-+    // TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-+
-+    // Create NSApplication
-+    [NSApplication sharedApplication];
-+}
-+
-+void run() {
-+    // this doesn't work...
-+    // [NSApp run];
-+    // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html
-+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-+
-+    [NSApp finishLaunching];
-+    g_running = true;
-+
-+    while (g_running) {
-+        [pool release];
-+        pool = [[NSAutoreleasePool alloc] init];
-+        NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
-+                                            untilDate:[NSDate distantFuture]
-+                                               inMode:NSDefaultRunLoopMode
-+                                              dequeue:YES];
-+        if (event) {
-+            [NSApp sendEvent:event];
-+            [NSApp updateWindows];
-+        }
-+    }
-+    [pool release];
-+}
-+
-+void quit() {
-+    // break from event loop instead of [NSApp terminate:nil]
-+    g_running = false;
-+    // send dummy event to wake up event loop
-+    NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
-+                                        location:NSMakePoint(0, 0)
-+                                   modifierFlags:0
-+                                       timestamp:0
-+                                    windowNumber:0
-+                                         context:nil
-+                                         subtype:0
-+                                           data1:0
-+                                           data2:0];
-+    [NSApp postEvent:event atStart:NO];
-+}
-+
-+}}} // namespace SC::Apple::EventLoop
-diff --git a/common/SC_EventLoop.hpp b/common/SC_EventLoop.hpp
-index 1d62b4de89..6e58208cc0 100644
---- a/common/SC_EventLoop.hpp
-+++ b/common/SC_EventLoop.hpp
-@@ -2,7 +2,7 @@
- 
- #include <functional>
- #ifdef __APPLE__
--#    include "SC_Apple.hpp"
-+#    include "SC_AppleEventLoop.hpp"
- #    include <thread>
- #endif
- 
-@@ -21,6 +21,7 @@ class EventLoop {
-         SC::Apple::EventLoop::setup();
- #endif
-     }
-+
-     // Run the event loop until 'waitFunction' returns.
-     static void run(std::function<void()> waitFunction) {
- #ifdef __APPLE__
-diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
-index fa8daf12aa..c60ae72ffc 100644
---- a/server/scsynth/CMakeLists.txt
-+++ b/server/scsynth/CMakeLists.txt
-@@ -230,7 +230,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- 	target_link_libraries(libscsynth rt)
- endif()
- 
--add_executable(scsynth scsynth_main.cpp)
-+add_executable(scsynth
-+    scsynth_main.cpp
-+
-+    # these files contain code only used in main()
-+    ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp
-+    $<$<BOOL:${APPLE}>: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm >
-+    )
- target_link_libraries(scsynth libscsynth)
- 
- if (PTHREADS_FOUND)
-diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
-index 923a3aa4e4..ce8388e475 100644
---- a/server/supernova/CMakeLists.txt
-+++ b/server/supernova/CMakeLists.txt
-@@ -182,7 +182,14 @@ if(WIN32)
- endif()
- 
- 
--add_executable(supernova server/main.cpp ${supernova_headers})
-+add_executable(supernova
-+    server/main.cpp
-+    ${supernova_headers}
-+
-+    # these files contain code only used in main()
-+    ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp
-+    $<$<BOOL:${APPLE}>: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm >
-+    )
- target_link_libraries(supernova libsupernova)
- 
- if(WIN32)
diff --git a/media-sound/supercollider/files/supercollider-3.13.0-boost-1.84.patch b/media-sound/supercollider/files/supercollider-3.13.0-boost-1.84.patch
new file mode 100644
index 000000000000..d3b2340a3d61
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.13.0-boost-1.84.patch
@@ -0,0 +1,110 @@
+From 6e4e12826fd144c874c93c2efb669fbb119b831a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 30 Jan 2024 23:56:14 +0100
+Subject: [PATCH] Import boost_string_file.hpp from boost-1.83 and put it to
+ use immediately
+
+string_file.hpp was deprecated in boost-1.79.0 and removed in 1.84.0
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ common/boost_string_file.hpp   | 59 ++++++++++++++++++++++++++++++++++
+ lang/LangSource/PyrLexer.cpp   |  2 +-
+ server/scsynth/SC_GraphDef.cpp |  2 +-
+ 3 files changed, 61 insertions(+), 2 deletions(-)
+ create mode 100644 common/boost_string_file.hpp
+
+diff --git a/common/boost_string_file.hpp b/common/boost_string_file.hpp
+new file mode 100644
+index 000000000..1ccb63de6
+--- /dev/null
++++ b/common/boost_string_file.hpp
+@@ -0,0 +1,59 @@
++//  filesystem/string_file.hpp  --------------------------------------------------------//
++
++//  Copyright Beman Dawes 2015
++
++//  Distributed under the Boost Software License, Version 1.0.
++//  See http://www.boost.org/LICENSE_1_0.txt
++
++//  Library home page: http://www.boost.org/libs/filesystem
++
++#ifndef BOOST_FILESYSTEM_STRING_FILE_HPP
++#define BOOST_FILESYSTEM_STRING_FILE_HPP
++
++#include <boost/filesystem/config.hpp>
++
++#include <cstddef>
++#include <limits>
++#include <string>
++#include <ios>
++#include <stdexcept>
++#include <boost/cstdint.hpp>
++#include <boost/filesystem/path.hpp>
++#include <boost/filesystem/fstream.hpp>
++#include <boost/filesystem/operations.hpp>
++
++#include <boost/filesystem/detail/header.hpp> // must be the last #include
++
++namespace boost {
++namespace filesystem {
++
++inline void save_string_file(path const& p, std::string const& str)
++{
++    filesystem::ofstream file;
++    file.exceptions(std::ios_base::failbit | std::ios_base::badbit);
++    file.open(p, std::ios_base::binary);
++    const std::size_t sz = str.size();
++    if (BOOST_UNLIKELY(sz > static_cast< boost::uintmax_t >((std::numeric_limits< std::streamsize >::max)())))
++        BOOST_FILESYSTEM_THROW(std::length_error("String size exceeds max write size"));
++    file.write(str.c_str(), static_cast< std::streamsize >(sz));
++}
++
++inline void load_string_file(path const& p, std::string& str)
++{
++    filesystem::ifstream file;
++    file.exceptions(std::ios_base::failbit | std::ios_base::badbit);
++    file.open(p, std::ios_base::binary);
++    const boost::uintmax_t sz = filesystem::file_size(p);
++    if (BOOST_UNLIKELY(sz > static_cast< boost::uintmax_t >((std::numeric_limits< std::streamsize >::max)())))
++        BOOST_FILESYSTEM_THROW(std::length_error("File size exceeds max read size"));
++    str.resize(static_cast< std::size_t >(sz), '\0');
++    if (sz > 0u)
++        file.read(&str[0], static_cast< std::streamsize >(sz));
++}
++
++} // namespace filesystem
++} // namespace boost
++
++#include <boost/filesystem/detail/footer.hpp>
++
++#endif // BOOST_FILESYSTEM_STRING_FILE_HPP
+diff --git a/lang/LangSource/PyrLexer.cpp b/lang/LangSource/PyrLexer.cpp
+index 7ebe3d726..06c1454ca 100644
+--- a/lang/LangSource/PyrLexer.cpp
++++ b/lang/LangSource/PyrLexer.cpp
+@@ -38,7 +38,7 @@
+ 
+ #include <boost/filesystem/path.hpp>
+ #include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/string_file.hpp>
++#include "boost_string_file.hpp"
+ 
+ #include "PyrParseNode.h"
+ #include "Bison/lang11d_tab.h"
+diff --git a/server/scsynth/SC_GraphDef.cpp b/server/scsynth/SC_GraphDef.cpp
+index 957aca193..5f8f15741 100644
+--- a/server/scsynth/SC_GraphDef.cpp
++++ b/server/scsynth/SC_GraphDef.cpp
+@@ -46,7 +46,7 @@
+ #include <string>
+ 
+ #include <boost/filesystem/operations.hpp> // recursive_directory_iterator
+-#include <boost/filesystem/string_file.hpp> // load_string_file
++#include "boost_string_file.hpp" // load_string_file
+ 
+ namespace bfs = boost::filesystem;
+ 
+-- 
+2.43.0
+
diff --git a/media-sound/supercollider/files/supercollider-3.13.0-gcc-13.patch b/media-sound/supercollider/files/supercollider-3.13.0-gcc-13.patch
new file mode 100644
index 000000000000..1ff8f5f92203
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.13.0-gcc-13.patch
@@ -0,0 +1,15 @@
+Gentoo-bug: https://bugs.gentoo.org/905127
+Upstream issue: https://github.com/supercollider/supercollider/issues/6021
+
+diff --git a/common/SC_PaUtils.cpp b/common/SC_PaUtils.cpp
+index e0f562c..9e45c63 100644
+--- a/common/SC_PaUtils.cpp
++++ b/common/SC_PaUtils.cpp
+@@ -3,6 +3,7 @@
+ #include "SC_PaUtils.hpp"
+ #include <cstring>
+ #include <cstdio>
++#include <cstdint>
+ 
+ #ifdef __APPLE__
+ #    include <pa_mac_core.h>
diff --git a/media-sound/supercollider/files/supercollider-3.13.0-no-ccache.patch b/media-sound/supercollider/files/supercollider-3.13.0-no-ccache.patch
new file mode 100644
index 000000000000..ad3b03509e61
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.13.0-no-ccache.patch
@@ -0,0 +1,169 @@
+From bab60d91bd362fd1e46b79d64aaba747fe7c60fa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 31 Jan 2024 00:31:11 +0100
+Subject: [PATCH] Make ccache detection an option
+
+Arguably it should not even be enabled by default,
+but at least it should be optional.
+
+Consolidate ccache detection in one block.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 122 +++++++++++++++++++++++++------------------------
+ 1 file changed, 62 insertions(+), 60 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad5ea5b49..73411ae9e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,32 +46,6 @@ CONFIGURE_FILE(
+   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+   IMMEDIATE @ONLY)
+ 
+-# workaround for using ccache with Xcode generator
+-# thanks to Craig Scott: https://crascit.com/2016/04/09/using-ccache-with-cmake/
+-get_property(RULE_LAUNCH_COMPILE GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
+-if(RULE_LAUNCH_COMPILE AND CMAKE_GENERATOR STREQUAL "Xcode")
+-
+-    # find ccache
+-    find_program(CCACHE_PROGRAM ccache)
+-
+-    message(STATUS "Xcode and ccache detected: using ccache to speed up build process")
+-
+-    # Set up wrapper scripts
+-    set(SC_LAUNCH_C_SCRIPT   "${CMAKE_BINARY_DIR}/launch-c")
+-    set(SC_LAUNCH_CXX_SCRIPT "${CMAKE_BINARY_DIR}/launch-cxx")
+-
+-    configure_file("cmake_modules/launch-c.in"   launch-c)
+-    configure_file("cmake_modules/launch-cxx.in" launch-cxx)
+-    execute_process(COMMAND chmod a+rx "${SC_LAUNCH_C_SCRIPT}" "${SC_LAUNCH_CXX_SCRIPT}")
+-
+-    # Set Xcode project attributes to route compilation and linking
+-    # through our scripts
+-    set(CMAKE_XCODE_ATTRIBUTE_CC         "${SC_LAUNCH_C_SCRIPT}")
+-    set(CMAKE_XCODE_ATTRIBUTE_CXX        "${SC_LAUNCH_CXX_SCRIPT}")
+-    set(CMAKE_XCODE_ATTRIBUTE_LD         "${SC_LAUNCH_C_SCRIPT}")
+-    set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${SC_LAUNCH_CXX_SCRIPT}")
+-endif()
+-
+ ADD_CUSTOM_TARGET(uninstall
+   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ 
+@@ -147,44 +121,11 @@ endif()
+ 
+ add_definitions(-DBOOST_CHRONO_HEADER_ONLY -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE)
+ 
+-
+-#############################################
+-# Detect CCache
+-
+-find_program(CCacheExectuable ccache)
+-if( CCacheExectuable )
+-  # only used with >=cmake-3.4
+-  set( CMAKE_C_COMPILER_LAUNCHER   "${CCacheExectuable}" )
+-  set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" )
+-  if(NOT CMAKE_GENERATOR MATCHES "Xcode" AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio")) # we already post a message when using Xcode or MSVC
+-    message(STATUS "Found ccache at ${CCacheExectuable}: using ccache to speed up build process")
+-  endif()
+-
+-  # fix for Visual Studio adapted from https://github.com/ccache/ccache/wiki/MS-Visual-Studio#usage
+-  # NOTE: there is an issue with ccache installed from chocolatey
+-  # since chocolatey puts a "shim" as opposed to the actual executable in the PATH
+-  # the solution is to add the path to the actual ccache executable earlier in the path
+-  # e.g. in bash: export PATH=`echo c:/ProgramData/chocolatey/lib/ccache/tools/ccache*`:$PATH
+-  if (MSVC)
+-    message(STATUS "Found ccache at ${CCacheExectuable}: using ccache with MSVC to speed up build process")
+-    file(COPY_FILE
+-      ${CCacheExectuable} ${CMAKE_BINARY_DIR}/cl.exe
+-      ONLY_IF_DIFFERENT)
+-
+-    set(CMAKE_VS_GLOBALS
+-      "CLToolExe=cl.exe"
+-      "CLToolPath=${CMAKE_BINARY_DIR}"
+-      "TrackFileAccess=false"
+-      "UseMultiToolTask=true"
+-      "DebugInformationFormat=OldStyle"
+-    )
+-  endif()
+-endif()
+-
+ #############################################
+ # Options
+ option(NOVA_SIMD "Build with nova-simd support." ON)
+ option(FINAL_BUILD "Build as single source file." OFF)
++option(USE_CCACHE "Use ccache if available." ON)
+ 
+ option(FFT_GREEN "Use internal 'Green' FFT lib rather than FFTW. (Not recommended.)" OFF)
+ 
+@@ -285,6 +226,67 @@ if(APPLE)
+     option(SC_VERIFY_APP "Run verify_app on the app bundle" OFF)
+ endif()
+ 
++#############################################
++# Detect CCache
++
++if(USE_CCACHE)
++    # workaround for using ccache with Xcode generator
++    # thanks to Craig Scott: https://crascit.com/2016/04/09/using-ccache-with-cmake/
++    get_property(RULE_LAUNCH_COMPILE GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
++    if(RULE_LAUNCH_COMPILE AND CMAKE_GENERATOR STREQUAL "Xcode")
++
++        # find ccache
++        find_program(CCACHE_PROGRAM ccache)
++
++        message(STATUS "Xcode and ccache detected: using ccache to speed up build process")
++
++        # Set up wrapper scripts
++        set(SC_LAUNCH_C_SCRIPT   "${CMAKE_BINARY_DIR}/launch-c")
++        set(SC_LAUNCH_CXX_SCRIPT "${CMAKE_BINARY_DIR}/launch-cxx")
++
++        configure_file("cmake_modules/launch-c.in"   launch-c)
++        configure_file("cmake_modules/launch-cxx.in" launch-cxx)
++        execute_process(COMMAND chmod a+rx "${SC_LAUNCH_C_SCRIPT}" "${SC_LAUNCH_CXX_SCRIPT}")
++
++        # Set Xcode project attributes to route compilation and linking
++        # through our scripts
++        set(CMAKE_XCODE_ATTRIBUTE_CC         "${SC_LAUNCH_C_SCRIPT}")
++        set(CMAKE_XCODE_ATTRIBUTE_CXX        "${SC_LAUNCH_CXX_SCRIPT}")
++        set(CMAKE_XCODE_ATTRIBUTE_LD         "${SC_LAUNCH_C_SCRIPT}")
++        set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${SC_LAUNCH_CXX_SCRIPT}")
++    endif()
++
++    find_program(CCacheExectuable ccache)
++    if( CCacheExectuable )
++        # only used with >=cmake-3.4
++        set( CMAKE_C_COMPILER_LAUNCHER   "${CCacheExectuable}" )
++        set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" )
++        if(NOT CMAKE_GENERATOR MATCHES "Xcode" AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio")) # we already post a message when using Xcode or MSVC
++            message(STATUS "Found ccache at ${CCacheExectuable}: using ccache to speed up build process")
++        endif()
++
++        # fix for Visual Studio adapted from https://github.com/ccache/ccache/wiki/MS-Visual-Studio#usage
++        # NOTE: there is an issue with ccache installed from chocolatey
++        # since chocolatey puts a "shim" as opposed to the actual executable in the PATH
++        # the solution is to add the path to the actual ccache executable earlier in the path
++        # e.g. in bash: export PATH=`echo c:/ProgramData/chocolatey/lib/ccache/tools/ccache*`:$PATH
++        if (MSVC)
++            message(STATUS "Found ccache at ${CCacheExectuable}: using ccache with MSVC to speed up build process")
++            file(COPY_FILE
++            ${CCacheExectuable} ${CMAKE_BINARY_DIR}/cl.exe
++            ONLY_IF_DIFFERENT)
++
++            set(CMAKE_VS_GLOBALS
++            "CLToolExe=cl.exe"
++            "CLToolPath=${CMAKE_BINARY_DIR}"
++            "TrackFileAccess=false"
++            "UseMultiToolTask=true"
++            "DebugInformationFormat=OldStyle"
++            )
++        endif()
++    endif()
++endif()
++
+ #############################################
+ # some default libraries
+ 
+-- 
+2.43.0
+
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
index 4fbc15376707..78543acc071f 100644
--- a/media-sound/supercollider/metadata.xml
+++ b/media-sound/supercollider/metadata.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marcan@marcan.st</email>
-		<name>Hector Martin</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		SuperCollider is a platform for audio synthesis and algorithmic
 		composition, used by musicians, artists, and researchers
 		working with sound. It is free and open source software
 		available for Windows, Mac OS X, and Linux.
 	</longdescription>
+	<maintainer type="person" proxied="yes">
+		<email>andieverbus@gmail.com</email>
+		<name>Andie Verbus</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">supercollider/supercollider</remote-id>
 	</upstream>
 	<use>
+		<flag name="ableton-link">Enable support for Ableton Link</flag>
 		<flag name="vim">Enable the SCVIM user interface</flag>
 		<flag name="emacs">Enable the SCEL user interface</flag>
 		<flag name="gedit">Enable the SCED user interface</flag>
diff --git a/media-sound/supercollider/supercollider-3.11.2.ebuild b/media-sound/supercollider/supercollider-3.11.2.ebuild
deleted file mode 100644
index 288d5aa5c6b9..000000000000
--- a/media-sound/supercollider/supercollider-3.11.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf"
-
-REQUIRED_USE="
-	qt5? ( X )
-	webengine? ( qt5 )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.70.0:=
-	media-libs/alsa-lib
-	sys-libs/readline:0=
-	virtual/libudev:=
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	!jack? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	server? ( !app-admin/supernova )
-	sndfile? ( media-libs/libsndfile )
-	webengine? (
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwebsockets:5
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
-	dev-libs/icu
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gedit? ( app-editors/gedit )
-	qt5? (
-		dev-qt/qtconcurrent:5
-	)
-	vim? ( app-editors/vim )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
-	"${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
-	"${FILESDIR}"/${P}-fix-libscsynth-linker-issue.patch # Upstream issue 4992
-)
-
-S="${WORKDIR}/SuperCollider-${PV}-Source"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_HELP=ON
-		-DSYSTEM_BOOST=ON
-		-DSYSTEM_YAMLCPP=ON
-		-DSSE=$(usex cpu_flags_x86_sse)
-		-DSSE2=$(usex cpu_flags_x86_sse2)
-		-DSC_EL=$(usex emacs)
-		-DFFT_GREEN=$(usex !fftw)
-		-DSC_ED=$(usex gedit)
-		-DNO_GPL3=$(usex !gpl3)
-		-DAUDIOAPI=$(usex jack jack portaudio)
-		-DSC_IDE=$(usex qt5)
-		-DSC_QT=$(usex qt5)
-		-DSCLANG_SERVER=$(usex server)
-		-DSUPERNOVA=$(usex server)
-		-DNO_LIBSNDFILE=$(usex !sndfile)
-		-DLIBSCSYNTH=$(usex !static-libs)
-		-DSC_VIM=$(usex vim)
-		-DNO_X11=$(usex !X)
-		-DNO_AVAHI=$(usex !zeroconf)
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DSC_USE_QTWEBENGINE=$(usex webengine)
-	)
-
-	use debug && mycmakeargs+=(
-		-DSC_MEMORY_DEBUGGING=ON
-		-DSN_MEMORY_DEBUGGING=ON
-		-DGC_SANITYCHECK=ON
-	)
-
-	append-flags $(usex debug '' -DNDEBUG)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	use emacs && newdoc editors/scel/README.md README.emacs
-	use gedit && newdoc editors/sced/README.md README.gedit
-	use vim && newdoc editors/scvim/README.md README.vim
-}
-
-src_test() {
-	export QT_QPA_PLATFORM=offscreen
-	cmake_src_test
-}
-
-pkg_postinst() {
-	einfo "Notice: SuperCollider is not very intuitive to get up and running."
-	einfo "The best course of action to make sure that the installation was"
-	einfo "successful and get you started with using SuperCollider is to take"
-	einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/supercollider/supercollider-3.11.0-r1.ebuild b/media-sound/supercollider/supercollider-3.13.0.ebuild
index 5132d3a2743b..a240f4f6df33 100644
--- a/media-sound/supercollider/supercollider-3.11.0-r1.ebuild
+++ b/media-sound/supercollider/supercollider-3.13.0.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake flag-o-matic readme.gentoo-r1 xdg-utils
+inherit cmake flag-o-matic xdg
 
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
+DESCRIPTION="Environment and programming language for real time audio synthesis"
 HOMEPAGE="https://supercollider.github.io/"
 SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"
+S="${WORKDIR}/SuperCollider-${PV}-Source"
 
 LICENSE="GPL-2 gpl3? ( GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf"
+IUSE="ableton-link cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X +zeroconf"
 
 REQUIRED_USE="
 	qt5? ( X )
@@ -25,7 +26,7 @@ BDEPEND="
 "
 RDEPEND="
 	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.70.0:=
+	dev-libs/boost:=
 	media-libs/alsa-lib
 	sys-libs/readline:0=
 	virtual/libudev:=
@@ -40,7 +41,6 @@ RDEPEND="
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 	)
-	server? ( !app-admin/supernova )
 	sndfile? ( media-libs/libsndfile )
 	webengine? (
 		dev-qt/qtwebchannel:5
@@ -57,26 +57,30 @@ DEPEND="${RDEPEND}
 	dev-libs/icu
 	emacs? ( >=app-editors/emacs-23.1:* )
 	gedit? ( app-editors/gedit )
-	qt5? (
-		dev-qt/qtconcurrent:5
-	)
+	qt5? ( dev-qt/qtconcurrent:5 )
 	vim? ( app-editors/vim )
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
-	"${FILESDIR}"/${P}-boost-1.72.patch # Upstream PR 4990
-	"${FILESDIR}"/${P}-qt-5.15.patch # Upstream PR 4986
-	"${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
+	"${FILESDIR}/${P}-boost-1.84.patch" # bug 921595
+	"${FILESDIR}/${P}-gcc-13.patch" # bug 905127
+	"${FILESDIR}/${P}-no-ccache.patch" # bug 922095
 )
 
-S="${WORKDIR}/SuperCollider-${PV}-Source"
-
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/927071
+	# https://github.com/supercollider/supercollider/issues/6245
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	local mycmakeargs=(
+		-DSC_CLANG_USES_LIBSTDCPP=ON
 		-DINSTALL_HELP=ON
 		-DSYSTEM_BOOST=ON
 		-DSYSTEM_YAMLCPP=ON
+		-DUSE_CCACHE=OFF
+		-DSC_ABLETON_LINK=$(usex ableton-link)
 		-DSSE=$(usex cpu_flags_x86_sse)
 		-DSSE2=$(usex cpu_flags_x86_sse2)
 		-DSC_EL=$(usex emacs)
@@ -113,7 +117,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	use emacs && newdoc editors/scel/README.md README.emacs
+	use emacs && newdoc editors/sc-el/README.md README.emacs
 	use gedit && newdoc editors/sced/README.md README.gedit
 	use vim && newdoc editors/scvim/README.md README.vim
 }
@@ -123,17 +127,18 @@ src_test() {
 	cmake_src_test
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
 	einfo "Notice: SuperCollider is not very intuitive to get up and running."
 	einfo "The best course of action to make sure that the installation was"
 	einfo "successful and get you started with using SuperCollider is to take"
 	einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-sound/synaesthesia/files/synaesthesia-2.4-dropping-register.patch b/media-sound/synaesthesia/files/synaesthesia-2.4-dropping-register.patch
new file mode 100644
index 000000000000..b45e168e1ab4
--- /dev/null
+++ b/media-sound/synaesthesia/files/synaesthesia-2.4-dropping-register.patch
@@ -0,0 +1,145 @@
+# The register keyword has been deprecated since c++14 and completely removed since c++17
+# Hence dropping the keyword
+# Bug: https://bugs.gentoo.org/897798
+--- a/core.cc
++++ b/core.cc
+@@ -117,7 +117,7 @@ inline void addPixelFast(unsigned char *p,int br1,int br2) {
+ }
+ 
+ void fadeFade() {
+-  register uint32_t *ptr = (uint32_t*)output;
++  uint32_t *ptr = (uint32_t*)output;
+   int i = outWidth*outHeight*2/sizeof(uint32_t);
+   do {
+     //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4;
+--- a/sdlwrap.cc
++++ b/sdlwrap.cc
+@@ -171,19 +171,19 @@ void SdlScreen::show(void) {
+   attempt(SDL_LockSurface(surface),"locking screen for output.");
+ 
+   if (scaling == 1) {
+-    register uint32_t *ptr2 = (uint32_t*)output;
++    uint32_t *ptr2 = (uint32_t*)output;
+     uint32_t *ptr1 = (uint32_t*)( surface->pixels );
+     int i = outWidth*outHeight/sizeof(*ptr2);
+ 
+     do {
+       // Asger Alstrup Nielsen's (alstrup@diku.dk)
+       // optimized 32 bit screen loop
+-      register unsigned int const r1 = *(ptr2++);
+-      register unsigned int const r2 = *(ptr2++);
++      unsigned int const r1 = *(ptr2++);
++      unsigned int const r2 = *(ptr2++);
+     
+       //if (r1 || r2) {
+   #ifdef LITTLEENDIAN
+-        register unsigned int const v = 
++        unsigned int const v = 
+             ((r1 & 0x000000f0ul) >> 4)
+           | ((r1 & 0x0000f000ul) >> 8)
+           | ((r1 & 0x00f00000ul) >> 12)
+@@ -194,7 +194,7 @@ void SdlScreen::show(void) {
+           | ((r2 & 0x00f00000ul) << 4)
+           | ((r2 & 0xf0000000ul)));
+   #else
+-        register unsigned int const v = 
++        unsigned int const v = 
+             ((r2 & 0x000000f0ul) >> 4)
+           | ((r2 & 0x0000f000ul) >> 8)
+           | ((r2 & 0x00f00000ul) >> 12)
+--- a/svgawrap.cc
++++ b/svgawrap.cc
+@@ -120,7 +120,7 @@ void SvgaScreen::inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &key
+ }
+ 
+ void SvgaScreen::show(void) {
+-  register uint32_t *ptr2 = (uint32_t*)output;
++  uint32_t *ptr2 = (uint32_t*)output;
+   uint32_t *ptr1 = (uint32_t*)scr;
+   int i = 320*200/sizeof(uint32_t);
+   // Asger Alstrup Nielsen's (alstrup@diku.dk)
+@@ -129,15 +129,15 @@ void SvgaScreen::show(void) {
+     //Original bytewize version:
+     //unsigned char v = (*(ptr2++)&15*16);
+     //*(ptr1++) = v|(*(ptr2++)>>4);
+-    register uint32_t const r1 = *(ptr2++);
+-    register uint32_t const r2 = *(ptr2++);
++    uint32_t const r1 = *(ptr2++);
++    uint32_t const r2 = *(ptr2++);
+ 
+     //Fade will continue even after value > 16
+     //thus black pixel will be written when values just > 0
+     //thus no need to write true black
+     //if (r1 || r2) {
+ #ifdef LITTLEENDIAN
+-      register uint32_t const v = 
++      uint32_t const v = 
+           ((r1 & 0x000000f0ul) >> 4)
+         | ((r1 & 0x0000f000ul) >> 8)
+         | ((r1 & 0x00f00000ul) >> 12)
+@@ -148,7 +148,7 @@ void SvgaScreen::show(void) {
+         | ((r2 & 0x00f00000ul) << 4)
+         | ((r2 & 0xf0000000ul)));
+ #else
+-      register uint32_t const v = 
++      uint32_t const v = 
+           ((r2 & 0x000000f0ul) >> 4)
+         | ((r2 & 0x0000f000ul) >> 8)
+         | ((r2 & 0x00f00000ul) >> 12)
+--- a/xlibwrap.cc
++++ b/xlibwrap.cc
+@@ -119,24 +119,24 @@ void XScreen::inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit
+ }
+  
+ void XScreen::show(void) { 
+-  register uint32_t *ptr2 = (uint32_t*)output;
++  uint32_t *ptr2 = (uint32_t*)output;
+   uint32_t *ptr1 = (uint32_t*)d->back;
+   int i = outWidth*outHeight/sizeof(uint32_t);
+   if (lowColor)
+     do {
+-      register uint32_t const r1 = *(ptr2++);
+-      register uint32_t const r2 = *(ptr2++);
++      uint32_t const r1 = *(ptr2++);
++      uint32_t const r2 = *(ptr2++);
+     
+       //if (r1 || r2) {
+ #ifdef LITTLEENDIAN
+-        register uint32_t const v = 
++        uint32_t const v = 
+              mapping[((r1&0xe0ul)>>5)|((r1&0xe000ul)>>10)]
+             |mapping[((r1&0xe00000ul)>>21)|((r1&0xe0000000ul)>>26)]*256U; 
+         *(ptr1++) = v | 
+              mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]*65536U
+             |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*16777216U; 
+ #else
+-        register uint32_t const v = 
++        uint32_t const v = 
+              mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]
+             |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*256U; 
+         *(ptr1++) = v | 
+@@ -149,12 +149,12 @@ void XScreen::show(void) {
+     do {
+       // Asger Alstrup Nielsen's (alstrup@diku.dk)
+       // optimized 32 bit screen loop
+-      register uint32_t const r1 = *(ptr2++);
+-      register uint32_t const r2 = *(ptr2++);
++      uint32_t const r1 = *(ptr2++);
++      uint32_t const r2 = *(ptr2++);
+     
+       //if (r1 || r2) {
+ #ifdef LITTLEENDIAN
+-        register uint32_t const v = 
++        uint32_t const v = 
+             ((r1 & 0x000000f0ul) >> 4)
+           | ((r1 & 0x0000f000ul) >> 8)
+           | ((r1 & 0x00f00000ul) >> 12)
+@@ -165,7 +165,7 @@ void XScreen::show(void) {
+           | ((r2 & 0x00f00000ul) << 16 -12)
+           | ((r2 & 0xf0000000ul) << 16 -16);
+ #else
+-        register uint32_t const v = 
++        uint32_t const v = 
+             ((r2 & 0x000000f0ul) >> 4)
+           | ((r2 & 0x0000f000ul) >> 8)
+           | ((r2 & 0x00f00000ul) >> 12)
diff --git a/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch b/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch
new file mode 100644
index 000000000000..ef93f24029bb
--- /dev/null
+++ b/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch
@@ -0,0 +1,14 @@
+--- a/syna.h
++++ b/syna.h
+@@ -73,9 +73,9 @@
+ #endif
+ 
+ void error(char *str,bool syscall=false);
+-void inline attempt(int x,char *y,bool syscall=false) { if (x == -1) error(y,syscall); }  
++inline void attempt(int x,char *y,bool syscall=false) { if (x == -1) error(y,syscall); }  
+ void warning(char *str,bool syscall=false);
+-void inline attemptNoDie(int x,char *y,bool syscall=false) { if (x == -1) warning(y,syscall); } 
++inline void attemptNoDie(int x,char *y,bool syscall=false) { if (x == -1) warning(y,syscall); } 
+ 
+ /* *wrap */
+ struct BaseScreen {
diff --git a/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch b/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch
new file mode 100644
index 000000000000..7a9523ee8b9a
--- /dev/null
+++ b/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -1664,8 +1664,6 @@
+           ac_config_commands="$ac_config_commands default-1"
+ 
+ 
+-CXXFLAGS="-O4"
+-CFLAGS="-O4"
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/media-sound/synaesthesia/metadata.xml b/media-sound/synaesthesia/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/synaesthesia/metadata.xml
+++ b/media-sound/synaesthesia/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/synaesthesia/synaesthesia-2.4-r2.ebuild b/media-sound/synaesthesia/synaesthesia-2.4-r2.ebuild
new file mode 100644
index 000000000000..fdad46d677d1
--- /dev/null
+++ b/media-sound/synaesthesia/synaesthesia-2.4-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Nice graphical accompaniment to music"
+HOMEPAGE="https://www.logarithmic.net/pfh/synaesthesia"
+SRC_URI="https://www.logarithmic.net/pfh-files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="
+	x11-libs/libX11
+	|| ( media-libs/libsdl
+		media-libs/svgalib )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-inline-keyword.patch
+	"${FILESDIR}"/${P}-dropping-register.patch
+)
diff --git a/media-sound/synaesthesia/synaesthesia-2.4.ebuild b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
deleted file mode 100644
index e431ff390070..000000000000
--- a/media-sound/synaesthesia/synaesthesia-2.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="a nice graphical accompaniment to music"
-HOMEPAGE="http://www.logarithmic.net/pfh/synaesthesia"
-SRC_URI="http://www.logarithmic.net/pfh-files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="sdl svga"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libSM
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( >=media-libs/svgalib-1.4.3 )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	sed -e '/CFLAGS=/s:-O4:${CFLAGS}:' \
-		-e '/CXXFLAGS=/s:-O4:${CXXFLAGS}:' -i configure || die "sed failed"
-	sed -e 's:void inline:inline void:' -i syna.h || die "sed failed"
-}
diff --git a/media-sound/taginfo/metadata.xml b/media-sound/taginfo/metadata.xml
index ec678cf53533..93423219a5bc 100644
--- a/media-sound/taginfo/metadata.xml
+++ b/media-sound/taginfo/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">taginfo</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch
new file mode 100644
index 000000000000..50c290d0ee15
--- /dev/null
+++ b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch
@@ -0,0 +1,10 @@
+--- a/data/tagtool.desktop.in
++++ b/data/tagtool.desktop.in
+@@ -3,6 +3,6 @@
+ _Comment=MP3 and Ogg Vorbis tag editor
+ Exec=tagtool
+ Icon=TagTool
+-Terminal=False
++Terminal=false
+ Type=Application
+ Categories=Audio;AudioVideo;AudioVideoEditing;
diff --git a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch
index 9569ad2fbaf5..40d1f5e80441 100644
--- a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch
+++ b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch
@@ -1,10 +1,11 @@
-Fix underlinking issues caused by missing libm and libogg linking
-Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=513012
+* Fix underlinking issues caused by missing libm and libogg linking
+  https://bugs.gentoo.org/513012
+* Fix spurious test failure caused by incomplete POTFILES.in
+  https://bugs.gentoo.org/631236
+* In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
 
-In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
-
---- tagtool-0.12.3/configure.ac
-+++ tagtool-0.12.3/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -13,20 +13,16 @@
  
  
@@ -57,8 +58,15 @@ In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
  
  AM_CONDITIONAL(ENABLE_MP3,    test "$enable_mp3" = "yes")
  AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes")
---- tagtool-0.12.3/src/Makefile.am
-+++ tagtool-0.12.3/src/Makefile.am
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -22,3 +22,4 @@
+ src/vorbis_edit.c
+ src/vorbis_edit_field.c
+ src/vorbis_file.c
++src/vcedit.c
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -28,7 +28,8 @@
  vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c 		\
  	vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c 	\
diff --git a/media-sound/tagtool/metadata.xml b/media-sound/tagtool/metadata.xml
index 12eb820c0950..cdf7a013bbf7 100644
--- a/media-sound/tagtool/metadata.xml
+++ b/media-sound/tagtool/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild b/media-sound/tagtool/tagtool-0.12.3-r2.ebuild
index be7039a613eb..65eb348ceaf0 100644
--- a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild
+++ b/media-sound/tagtool/tagtool-0.12.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger"
 HOMEPAGE="https://sourceforge.net/projects/tagtool/"
@@ -15,21 +15,20 @@ KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="mp3 +vorbis"
 REQUIRED_USE="|| ( mp3 vorbis )"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	>=gnome-base/libglade-2.6
 	mp3? ( >=media-libs/id3lib-3.8.3-r6 )
 	vorbis? ( >=media-libs/libvorbis-1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-QA-desktop.patch
 )
 
 src_prepare() {
-	# QA fix for wrong boolean value
-	sed -i -e 's/Terminal=False/Terminal=false/' data/tagtool.desktop.in || die
-
 	default
 	eautoreconf
 }
@@ -43,9 +42,8 @@ src_configure() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		GNOME_SYSCONFDIR="${D}/etc" \
-		sysdir="${D}/usr/share/applets/Multimedia" \
+		GNOME_SYSCONFDIR="${ED}"/etc \
+		sysdir="${ED}"/usr/share/applets/Multimedia \
 		install
-
-	dodoc ChangeLog NEWS README TODO THANKS
+	einstalldocs
 }
diff --git a/media-sound/takcd/Manifest b/media-sound/takcd/Manifest
deleted file mode 100644
index b04cb8d84c28..000000000000
--- a/media-sound/takcd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST takcd-0.10.tar.gz 95457 BLAKE2B 60e29a67d84fc600bcd55a7aa24e65bc042de13bc02686597a41cfd2e0490110ac66d60d0dc66977b4dce7bbdd34b7a20a1f6fe46474df16b11cbe1149b7d403 SHA512 a7211ec32adac1a9caf278cdceef9b9daf1ae47fa8ccb1d10eda51ca95566d8d6693f2f635b36e6d78f8f6f9e0efa711bc7263bbdd0f23c3f3ad884682b01e33
diff --git a/media-sound/takcd/files/takcd-0.10-fno-common.patch b/media-sound/takcd/files/takcd-0.10-fno-common.patch
deleted file mode 100644
index ec97e62eea30..000000000000
--- a/media-sound/takcd/files/takcd-0.10-fno-common.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/bsd_discid.c
-+++ b/bsd_discid.c
-@@ -29,7 +29,7 @@
- #include "config.h"
- 
- const char *cdrom_device=DEV_CDROM;
--int cdrom_fd;
-+extern int cdrom_fd;
- 
- int Discid_Init(void) {
- /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
---- a/darwin_discid.c
-+++ b/darwin_discid.c
-@@ -29,7 +29,7 @@
- #include "config.h"
- 
- const char *cdrom_device=DEV_CDROM;
--int cdrom_fd;
-+extern int cdrom_fd;
- 
- int Discid_Init(void) {
- /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
---- a/linux_discid.c
-+++ b/linux_discid.c
-@@ -31,7 +31,7 @@
- 
- char *cdrom_device = NULL;
- 
--int cdrom_fd;
-+extern int cdrom_fd;
- 
- int Discid_Init(void) {
- /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
---- a/sun_discid.c
-+++ b/sun_discid.c
-@@ -30,7 +30,7 @@
- #include "config.h"
- 
- const char *cdrom_device=DEV_CDROM;
--int cdrom_fd;
-+extern int cdrom_fd;
- 
- int Discid_Init(void) {
- /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
diff --git a/media-sound/takcd/files/takcd-0.10-overflow.patch b/media-sound/takcd/files/takcd-0.10-overflow.patch
deleted file mode 100644
index c3e7e16d286a..000000000000
--- a/media-sound/takcd/files/takcd-0.10-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config_api.c b/config_api.c
-index b62e41c..2b6a6cf 100644
---- a/config_api.c
-+++ b/config_api.c
-@@ -41,7 +41,7 @@ static void on_change(config_t *conf)
- int config_open(config_t *conf, const char *filename, int flag)
- {
- 	struct stat st;
--	char mode[2];
-+	char mode[3];
- 	
- 	/* set fopen() mode or return if flag is not valid */
- 	if (flag == C_WRITE) {
diff --git a/media-sound/takcd/metadata.xml b/media-sound/takcd/metadata.xml
deleted file mode 100644
index ee7258ac28eb..000000000000
--- a/media-sound/takcd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-sound/takcd/takcd-0.10-r1.ebuild b/media-sound/takcd/takcd-0.10-r1.ebuild
deleted file mode 100644
index 9bbbf1143850..000000000000
--- a/media-sound/takcd/takcd-0.10-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Command line CD player"
-HOMEPAGE="http://bard.sytes.net/takcd/"
-SRC_URI="http://bard.sytes.net/takcd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-overflow.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	doman *.1
-}
diff --git a/media-sound/tap-reverbed/metadata.xml b/media-sound/tap-reverbed/metadata.xml
index e450c6a8f182..3f765bf6eef8 100644
--- a/media-sound/tap-reverbed/metadata.xml
+++ b/media-sound/tap-reverbed/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild b/media-sound/tap-reverbed/tap-reverbed-0-r2.ebuild
index 94d080247bed..442112ce973f 100644
--- a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
+++ b/media-sound/tap-reverbed/tap-reverbed-0-r2.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 MY_P="${PN}-r0"
 DESCRIPTION="Standalone JACK counterpart of LADSPA plugin TAP Reverberator"
 HOMEPAGE="http://tap-plugins.sourceforge.net/reverbed.html"
-SRC_URI="mirror://sourceforge/tap-plugins/${MY_P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/tap-plugins/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,13 +18,11 @@ KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND="
 	media-libs/ladspa-sdk
 	media-plugins/tap-plugins
-	media-sound/jack-audio-connection-kit
+	virtual/jack
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-flags.patch
 	"${FILESDIR}"/${P}-fno-common.patch
diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
deleted file mode 100644
index e26ad09bcc40..000000000000
--- a/media-sound/tapestrea/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tapestrea-0.1.0.5.tgz 21987831 BLAKE2B 30ee2574acbb1a4577b0e952f9c474304ce6248bb6c4329c2788c0e640c6d82b35f3898e293a1e91ec38ca332bb4f910fd35278edf5c703dde456a6c006d14f4 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656
diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
deleted file mode 100644
index ca6e0370c957..000000000000
--- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h
---- tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h	2009-06-27 19:06:03.000000000 -0400
-+++ tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h	2009-06-27 19:06:54.000000000 -0400
-@@ -36,6 +36,7 @@
- #include "chuck_def.h"

- #include <string>

- #include <vector>

-+#include <cstdio>

- 

- 

- // itoa

-diff -ur tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp tapestrea-0.1.0.5/src/taps_birdbrain.cpp
---- tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp	2009-06-27 19:06:18.000000000 -0400
-+++ tapestrea-0.1.0.5/src/taps_birdbrain.cpp	2009-06-27 17:49:18.000000000 -0400
-@@ -35,6 +35,7 @@
- #include "taps_birdbrain.h"

- #include "util_thread.h"

- #include <stdarg.h>

-+#include <cstdio>

- 

- // for getcwd and chdir

- #ifdef __PLATFORM_WIN32__

-diff -ur tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp tapestrea-0.1.0.5/src/ui_audiofx.cpp
---- tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp	2009-06-27 19:06:18.000000000 -0400
-+++ tapestrea-0.1.0.5/src/ui_audiofx.cpp	2009-06-27 17:49:18.000000000 -0400
-@@ -36,6 +36,7 @@
- #include "taps_birdbrain.h"

- #include "ui_audiofx.h"

- #include <iostream>

-+#include <cstdio>

- using namespace std;

- 

- // Start FxStk

diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
deleted file mode 100644
index 3f866d5c88e5..000000000000
--- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/makefile.alsa
-+++ b/src/makefile.alsa
-@@ -3,7 +3,7 @@
- CHUCK_DIR=../scripting/chuck-1.2.1.2/src

- INCLUDES=-I$(CHUCK_DIR)

- FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c

--LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0`

-+LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0` -lpthread

- 

- TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \

- 	taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \

---- a/scripting/chuck-1.2.1.2/src/makefile.alsa
-+++ b/scripting/chuck-1.2.1.2/src/makefile.alsa
-@@ -5,7 +5,7 @@
- INCLUDES=

- CFLAGS?= -O3

- FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)

--LIBS=-lasound -lstdc++ -ldl -lm

-+LIBS=-lasound -lstdc++ -lm -lpthread -ldl

- SF_OBJ=util_sndfile.o

- 

- ifneq ($(CHUCK_DEBUG),)

-diff -Naur a/src/makefile.alsa b/src/makefile.alsa
---- a/src/makefile.alsa	2014-01-30 02:21:02.173891275 +0100
-+++ b/src/makefile.alsa	2014-01-30 02:21:23.026891253 +0100
-@@ -48,7 +48,7 @@
- OBJS+=ui_scripting.o

- # scripting disable needs most of chuck anyway due to includes 

- # in latest rtaudio.cpp, so always keep this line:

--LIBS+=$(CHUCK_OBJS)

-+LIBS+=$(CHUCK_OBJS) -ldl

- 

- # uncomment to use preconfigured sndfile

- #FLAGS+=-D__USE_SNDFILE_PRECONF__

diff --git a/media-sound/tapestrea/metadata.xml b/media-sound/tapestrea/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/media-sound/tapestrea/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
deleted file mode 100644
index 10909861c095..000000000000
--- a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Expressive Synthesis, Transformation, Rendering of Environmental Audio"
-HOMEPAGE="http://taps.cs.princeton.edu/"
-SRC_URI="http://taps.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa doc jack oss"
-
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit:0 )
-	alsa? ( >=media-libs/alsa-lib-0.9:0 )
-	media-libs/libsndfile:0
-	media-libs/freeglut:0
-	virtual/opengl:0
-	virtual/glu:0
-	x11-libs/gtk+:2"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison:0
-	sys-devel/flex:0"
-
-pkg_setup() {
-	if ! use alsa && ! use jack && ! use oss; then
-		eerror "One of the following USE flags is needed: jack, alsa or oss"
-		die "Please set at least one audio engine type"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-
-	# Respect LDFLAGS/CC
-	for bend in alsa jack oss; do
-		sed -i -e "s:gcc -o:\$(CC) \$(LDFLAGS) -o :" \
-			-e "s:-O3 -c:\$(CFLAGS) -c:" \
-			-e "s:make -C:\$(MAKE) -C :" \
-			"${S}/src/makefile.${bend}" || die
-	done
-
-	# Avoid "make jobserver unavailable" warning
-	sed -i -e "s:-make:\$(MAKE):g" \
-		"${S}/src/makefile" || die
-
-	sed -i -e "s:-make:\$(MAKE):g" \
-		"${S}/scripting/chuck-1.2.1.2/src/makefile" || die
-
-	epatch "${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
-}
-
-compile_backend() {
-	backend=$1
-	einfo "Compiling against ${backend}"
-
-	cd "${S}/scripting/chuck-1.2.1.2/src"
-	emake -f "makefile.${backend}" \
-		CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-	cd "${S}/src"
-	emake -f "makefile.${backend}" \
-		CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-	mv taps{,-${backend}} || die
-	emake -f makefile clean
-	cd "${S}/scripting/chuck-1.2.1.2/src"
-	emake -f makefile clean
-}
-
-src_compile() {
-	# When compiled 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
-	use oss && compile_backend oss
-}
-
-src_install() {
-	use jack && dobin src/taps-jack
-	use alsa && dobin src/taps-alsa
-	use oss && dobin src/taps-oss
-
-	dodoc AUTHORS BUGS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-
-	if use doc ; then
-		for tapedir in `find examples/* -type d -maxdepth 0`; do
-			docinto $tapedir
-			dodoc `find $tapedir/* -type f -maxdepth 0`
-			for tapedir2 in `find $tapedir/* -type d -maxdepth 0`; do
-				docinto $tapedir2
-				dodoc `find $tapedir2/* -type f -maxdepth 0`
-			done
-		done
-		docinto doc
-		dodoc doc/*
-	fi
-}
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 366410426f15..6d14d9ad72eb 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,3 +1,2 @@
-DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
-DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
-DIST teamspeak-client-5.0.0_beta36.tar.gz 112040920 BLAKE2B 9d75cdf6c21175aba6b015c97d35023e60c2e2831eca7ba8afa57bd3c62c799494a4d3973ba4316c3033393afb3b467e448eb46963d553c915c9f7fac9c5055c SHA512 ce103ca62b36963881439307c42db05d98739fdd30a6b8c7edb1d15a7a814dc17807bc4aae8971bd135f8bad6bb22c1c839c95645a8fb2882f655e0540884437
+DIST TeamSpeak3-Client-linux_amd64-3.6.2.run 110899830 BLAKE2B e832af37b3fe89741d6eed0214dcb790e69184ebfdf0cfbcebe8ec433eef62e42597a75bfb6bbf7d36cc172fa49e22c527023b787ad88584654b9297d5730d5f SHA512 09448086ed3322ba5a37905c5b893fdf0860e5e80852da2713a2d3aceddc071ff6cd7bc213f494759b9448615a027130579da7292f59447b3c31553e151d35eb
+DIST teamspeak-client-5.0.0_beta74.tar.gz 141049252 BLAKE2B d8f4265de82bf0c0cda60ff98acfeba76ecd1b56c13be15fd7a017aa1c3676e3311c4f57293f2f75914499d862a21f9bbfddab29d090bec8dee7c3b1f1de7537 SHA512 744b801fc304b4259903a8744a66695a41f990c1d7d2357636e5c5670e3439513f63075b0b598d17bef311136265561fba386f65db2a7302ff3f19a4351f17d3
diff --git a/media-sound/teamspeak-client/metadata.xml b/media-sound/teamspeak-client/metadata.xml
index 80b2e8647557..f215969f5e51 100644
--- a/media-sound/teamspeak-client/metadata.xml
+++ b/media-sound/teamspeak-client/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>conikost@gentoo.org</email>
@@ -14,5 +14,6 @@
 	</longdescription>
 	<use>
 		<flag name="system-libcxx">Use <pkg>sys-libs/libcxx</pkg> instead of shipped libs.</flag>
+		<flag name="system-quazip">Use <pkg>dev-libs/quazip</pkg> instead of shipped libs.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.6.2.ebuild
index 7a9b41fc5fc1..45b3721f0a2f 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.6.2.ebuild
@@ -1,36 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit desktop toolchain-funcs unpacker xdg-utils
+EAPI=8
 
 MY_PV="${PV/_/-}"
 
+inherit desktop toolchain-funcs unpacker xdg
+
 DESCRIPTION="A client software for quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
-	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )
-"
+SRC_URI="https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run"
+S="${WORKDIR}"
 
-KEYWORDS="-* amd64 x86"
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="3"
-IUSE="+alsa pulseaudio system-libcxx"
+KEYWORDS="-* amd64"
+IUSE="+alsa pulseaudio system-libcxx +system-quazip"
+
 REQUIRED_USE="|| ( alsa pulseaudio )"
+RESTRICT="bindist mirror"
 
 BDEPEND=">=dev-util/patchelf-0.10"
-
 RDEPEND="
-	app-arch/snappy:0/1
-	dev-libs/openssl:0
-	dev-libs/quazip
+	dev-libs/glib:2
 	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[accessibility,dbus,X(-)]
-		dev-qt/qtgui:5[accessibility,dbus,xcb(-)]
-	)
+	dev-qt/qtgui:5[accessibility,dbus,X(-)]
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
@@ -38,25 +32,20 @@ RDEPEND="
 	dev-qt/qtwebengine:5[geolocation(+),widgets]
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
-	net-libs/libsrtp:0
-	sys-libs/zlib:0/1
-	virtual/udev
 	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	system-libcxx? ( sys-libs/libcxx[libcxxabi] )
+	!system-libcxx? ( sys-libs/libunwind )
+	system-quazip? ( dev-libs/quazip:0/1[qt5(+)] )
 "
 
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
 QA_PREBUILT="
 	opt/teamspeak3-client/libc++.so.1
 	opt/teamspeak3-client/libc++abi.so.1
+	opt/teamspeak3-client/libquazip.so
 	opt/teamspeak3-client/error_report
 	opt/teamspeak3-client/package_inst
 	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
-	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
 	opt/teamspeak3-client/ts3client
 	opt/teamspeak3-client/update
 "
@@ -65,20 +54,29 @@ src_prepare() {
 	default
 
 	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
-	fi
-
-	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
+		rm soundbackends/libalsa_linux_*.so || die
 	fi
 
 	mv ts3client_linux_* ts3client || die
 
 	# Fixes QA Notice: Unresolved soname dependencies.
 	# Since this is a binary only package, it must be patched.
+	local quazip_so="libquazip1-qt5.so.1.0.0"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so.1"
+	fi
 	local soname_files=( "error_report" "ts3client" )
+	if use system-quazip; then
+		for soname_file in ${soname_files[@]}; do
+			patchelf --replace-needed libquazip.so "${quazip_so}" "${soname_file}" || die
+		done
+	fi
+
+	# Fixes QA Notice: Unresolved soname dependencies.
+	# Since this is a binary only package, it must be patched.
+	local soname_files=( "libc++abi.so.1" "libc++.so.1" )
 	for soname_file in ${soname_files[@]}; do
-		patchelf --replace-needed libquazip.so libquazip5.so.1 "${soname_file}" || die
+		patchelf --replace-needed libunwind.so.1 libunwind.so.8 "${soname_file}" || die
 	done
 
 	tc-export CXX
@@ -89,29 +87,18 @@ src_install() {
 	doexe error_report package_inst ts3client update
 	newexe "${FILESDIR}"/ts3client-bin-r2 ts3client-bin
 	! use system-libcxx && doexe libc++{,abi}.so.1
-
-	exeinto /opt/teamspeak3-client/soundbackends
-	doexe soundbackends/*.so
+	! use system-quazip && doexe libquazip.so
 
 	insinto /opt/teamspeak3-client
-	doins -r gfx html resources sound styles translations
+	doins -r gfx html resources sound styles soundbackends translations
 
 	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
 
 	dodir /opt/bin
 	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
 
-	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
+	newicon -s 128 styles/default/logo-128x128.png teamspeak3.png
+	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" teamspeak3 "Audio;AudioVideo;Network"
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta36.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta74.ebuild
index c10184fe8264..4d98a43b5e2b 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta36.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta74.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop xdg-utils
 
 DESCRIPTION="A client software for quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://files.teamspeak-services.com/pre_releases/client/${PV/_/-}/teamspeak-client.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
 
 KEYWORDS=""
 LICENSE="teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="5"
 
+IUSE="+alsa pulseaudio"
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
 RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	dev-libs/atk
+	app-accessibility/at-spi2-core
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
 	media-libs/fontconfig:1.0
-	media-sound/pulseaudio
 	net-print/cups
 	sys-power/upower
 	sys-apps/dbus
@@ -41,12 +43,12 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-libs/libpulse )
 "
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="
 	opt/teamspeak5-client/chrome-sandbox
 	opt/teamspeak5-client/hotkey_helper
@@ -56,9 +58,16 @@ QA_PREBUILT="
 	opt/teamspeak5-client/patcher
 	opt/teamspeak5-client/TeamSpeak
 	opt/teamspeak5-client/soundbackends/libalsa_linux_amd64.so
-	opt/teamspeak5-client/soundbackends/libpulseaudio_linux_amd64.so
 "
 
+src_prepare() {
+	default
+
+	if ! use alsa; then
+		rm soundbackends/libalsa_linux_*.so || die
+	fi
+}
+
 src_install() {
 	exeinto /opt/teamspeak5-client
 	doexe chrome-sandbox hotkey_helper patcher TeamSpeak libcef.so libtschat_client_lib.so libtschat_client_lib_export.so
@@ -70,7 +79,9 @@ src_install() {
 	dodir /opt/bin
 	dosym ../teamspeak5-client/TeamSpeak /opt/bin/ts5client
 
-	make_desktop_entry /opt/bin/ts5client "Teamspeak 5 Client" /opt/teamspeak5-client/html/client_ui/images/icons/teamspea "Audio;AudioVideo;Network"
+	make_desktop_entry \
+		/opt/bin/ts5client "Teamspeak 5 Client" \
+		/opt/teamspeak5-client/html/client_ui/images/icons/teamspeak_logo.svg "Audio;AudioVideo;Network"
 }
 
 pkg_postinst() {
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 279ae60383fa..7e25eff98f3a 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,4 +1,2 @@
-DIST teamspeak3-server_linux_amd64-3.12.1.tar.bz2 9428301 BLAKE2B aeab07edc31d1ee57ffd34b218aeb3f7e23f31ffb5b8b940cbc46bca91b6ef9caffb67f1a52c059439a64d73ceb8fce124c0e8101d3e04d752782344ff6c1843 SHA512 58bfb582deddc4137245fe73d3aabfbcd84c3c346fe5fd3db8c7756014fcdd1f0bd7798ee029aa9beebe454fa8021dd180dd577f147cc5f02c833b68d9253fc7
-DIST teamspeak3-server_linux_amd64-3.13.3.tar.bz2 9945408 BLAKE2B d714a046279c8cac11ff373a66ba41010e5839704030ae29f8d7f429759126dff8675b8b0b37b584115ad44d9e216cb5449d4b159dae53ece72f9e5bbe119f84 SHA512 39ad3a00f5e38a0601ed9e9df4227a7f00b4cb9bdaed6562ccf05e0fce22ed040cfd5a2ea36e9e97a18a74c335e90c0c080106cdaf5c0b32859819286727cb58
-DIST teamspeak3-server_linux_x86-3.12.1.tar.bz2 9268349 BLAKE2B 61d0794944775e4e9bfb57bc2ac331c5cc9da04d6a3956d4c1ec6c6d36ef87cb04ea1f0004d75251adc4baa1b9be999373d08ea36ca9f86e10b00e03d0f20f38 SHA512 83222586ff6e157af7242afc151c900eb339f05813f8b5fef602f9989a109b80de46bc86c7381b6acce240c62e9859b86df655a0b0219225162315337ca609ef
-DIST teamspeak3-server_linux_x86-3.13.3.tar.bz2 9779788 BLAKE2B 1ddb466dfc6a7d19dacfa05a0608487a8b086963186eb48e2480b83fb9eaa408ca45bc80bfc6fbfd1623c21caeb27e516f6d893ab84e442ba75c9f59daf4fa79 SHA512 9b14e1fd8b969c32ca63e3b9665e0941c3d1e67b3e49d5f2d6cc701aa4ee10a80f1c10428ef2d59bb3767cd03ad5503a527c47b1db11ea525cca8c7e07787621
+DIST teamspeak3-server_linux_amd64-3.13.7.tar.bz2 9968877 BLAKE2B 7c2f200b1e3a3184005aab213acc681326e16a776f529dbdac900f5b9a6ee9d91883d1aabfe4526e52e9a706a4856366291f061efc6eff581216d7450746322d SHA512 cd026e0c51d8269bd6965f9f274ff6478d4e179d23ee1b00f93a887997985b97afcb7eda05e34150d6fe0610f2715a61989a7f3ca05994067e71b9d3171e2962
+DIST teamspeak3-server_linux_x86-3.13.7.tar.bz2 9820644 BLAKE2B 37789bfe4c544b8eeb28a34d1fae933e2d2a11b23e85a6de66ac4c9772a061860803a3a767227d787efd90f7aa031b3ca77b229acca554aebd69f1f78b28128c SHA512 04278359a03cb9f8bc6db48b54976020da6a44629f17b503378bf0ffe554da838193ba590ab895e97c96e026aa87d96a3e167a009710adc4b9b03193d496201d
diff --git a/media-sound/teamspeak-server/files/ts3server.ini-r1 b/media-sound/teamspeak-server/files/ts3server.ini-r1
deleted file mode 100644
index 769e815a1997..000000000000
--- a/media-sound/teamspeak-server/files/ts3server.ini-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-machine_id=
-default_voice_port=9987
-voice_ip=
-licensepath=/opt/teamspeak3-server/
-filetransfer_port=30033
-filetransfer_ip=
-query_port=10011
-query_ip=0.0.0.0, ::
-query_ip_whitelist=query_ip_whitelist.txt
-query_ip_blacklist=query_ip_blacklist.txt
-dbplugin=ts3db_sqlite3
-dbpluginparameter=
-dbsqlpath=/opt/teamspeak3-server/sql/
-dbsqlcreatepath=create_sqlite/
-dbconnections=10
-logpath=/var/log/teamspeak3-server/
-logquerycommands=0
-dbclientkeepdays=30
-logappend=0
-query_skipbruteforcecheck=0
-query_buffer_mb=20
-http_proxy=
-license_accepted=1
-serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
-query_ssh_ip=0.0.0.0, ::
-query_ssh_port=10022
-query_protocols=raw
-query_ssh_rsa_host_key=ssh_host_rsa_key
-query_timeout=300
diff --git a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1 b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1
deleted file mode 100644
index 6b2a28d2976b..000000000000
--- a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-machine_id=
-default_voice_port=9987
-voice_ip=
-licensepath=/opt/teamspeak3-server/
-filetransfer_port=30033
-filetransfer_ip=
-query_port=10011
-query_ip=0.0.0.0, ::
-query_ip_whitelist=query_ip_whitelist.txt
-query_ip_blacklist=query_ip_blacklist.txt
-dbplugin=ts3db_mariadb
-dbpluginparameter=/etc/teamspeak3-server/ts3db_mariadb.ini
-dbsqlpath=/opt/teamspeak3-server/sql/
-dbsqlcreatepath=create_mariadb/
-dbconnections=10
-logpath=/var/log/teamspeak3-server/
-logquerycommands=0
-dbclientkeepdays=30
-logappend=0
-query_skipbruteforcecheck=0
-query_buffer_mb=20
-http_proxy=
-license_accepted=1
-serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
-query_ssh_ip=0.0.0.0, ::
-query_ssh_port=10022
-query_protocols=raw
-query_ssh_rsa_host_key=ssh_host_rsa_key
-query_timeout=300
diff --git a/media-sound/teamspeak-server/metadata.xml b/media-sound/teamspeak-server/metadata.xml
index 18a7d2a8f802..588ebf60c5dc 100644
--- a/media-sound/teamspeak-server/metadata.xml
+++ b/media-sound/teamspeak-server/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>conikost@gentoo.org</email>
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
deleted file mode 100644
index 8188b8163ba4..000000000000
--- a/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="A server software for hosting quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="doc mysql tsdns"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/teamspeak
-	acct-user/teamspeak
-"
-
-QA_PREBUILT="
-	opt/teamspeak3-server/libmariadb.so.2
-	opt/teamspeak3-server/libts3db_mariadb.so
-	opt/teamspeak3-server/libts3db_sqlite3.so
-	opt/teamspeak3-server/libts3_ssh.so
-	opt/teamspeak3-server/ts3server
-	opt/teamspeak3-server/tsdnsserver
-"
-
-src_unpack() {
-	default
-
-	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
-}
-
-src_install() {
-	diropts -o teamspeak -g teamspeak
-	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
-
-	diropts
-	keepdir /etc/teamspeak3-server
-
-	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
-
-	exeinto /opt/teamspeak3-server
-	doexe ts3server
-
-	dodir /opt/bin
-	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
-
-	exeinto /opt/teamspeak3-server
-	doexe libts3db_sqlite3.so libts3_ssh.so
-
-	insinto /opt/teamspeak3-server/serverquerydocs
-	doins -r serverquerydocs/.
-
-	insinto /opt/teamspeak3-server/sql
-	doins sql/*.sql
-	doins -r sql/create_sqlite
-
-	insinto /etc/teamspeak3-server
-	newins "${FILESDIR}"/ts3server.ini-r1 ts3server.ini
-
-	dodoc CHANGELOG
-	docinto ts3server
-	dodoc doc/*.txt
-
-	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
-	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
-
-	newenvd - 99teamspeak3-server <<- EOF
-		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
-	EOF
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/serverquery/.
-	fi
-
-	if use mysql; then
-		insinto /etc/teamspeak3-server
-		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r1 ts3server_mariadb.ini.sample
-		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
-
-		exeinto /opt/teamspeak3-server
-		doexe libts3db_mariadb.so
-		doexe redist/libmariadb.so.2
-
-		insinto /opt/teamspeak3-server/sql
-		doins -r sql/create_mariadb
-		doins -r sql/updates_and_fixes
-	fi
-
-	if use tsdns; then
-		exeinto /opt/teamspeak3-server
-		doexe tsdns/tsdnsserver
-		dodir /opt/bin
-		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
-
-		insinto /etc/teamspeak3-server
-		doins tsdns/tsdns_settings.ini.sample
-
-		docinto tsdns
-		dodoc tsdns/{README,USAGE}
-	fi
-}
-
-pkg_postinst() {
-	elog "If you have a license,"
-	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
-	elog "Please note, that the license must be writeable by the teamspeak user,"
-	elog "as it will be automatically updated every six months."
-}
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
index 75790c371a7d..689e764c78d3 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="doc mysql postgres tsdns"
 
 RESTRICT="bindist mirror"
diff --git a/media-sound/tempest_for_eliza/metadata.xml b/media-sound/tempest_for_eliza/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/tempest_for_eliza/metadata.xml
+++ b/media-sound/tempest_for_eliza/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 65b3c158b6c4..c09151992ce3 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1 +1 @@
-DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
+DIST terminatorX-4.2.0.tar.bz2 1821474 BLAKE2B dc86555bdb0d837d12144b392cf6a1cdf707268a3634940bed66792432ef014d168dbee2fd540a253ad369ff4aeaf5d0b7dfb252f3c97550a2c4af5ad1a58945 SHA512 e10ac7acd91441dabad80ae7c144b56f39ebfb4c76f0e3bfab093937c69d2c6b0834a68a0a216994898ae05a7f9ae5ebac0b1fa52d65d627b7ed01785fc55941
diff --git a/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch b/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch
deleted file mode 100644
index 970b72f4de81..000000000000
--- a/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/terminatorX.desktop
-+++ b/terminatorX.desktop
-@@ -8,5 +8,5 @@ Comment=Versatile DJ scratching and mixing application.
- Terminal=false
- Type=Application
- Icon=terminatorX
--Categories=Application;AudioVideo;
-+Categories=AudioVideo;
- StartupNotify=true
--- 
-2.26.2
-
diff --git a/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch b/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch
deleted file mode 100644
index 566dfecc210b..000000000000
--- a/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix build failure on kfreebsd
-Author: Sebastian Ramacher <sramacher@debian.org>
-Bug-Debian: https://bugs.debian.org/741623
-Forwarded: yes
-Last-Update: 2014-04-25
-
---- a/src/tX_dialog.cc
-+++ b/src/tX_dialog.cc
-@@ -244,7 +244,7 @@ void append_alsa_device_list(GtkComboBox
- 	}
- }
- #else
--void append_alsa_device_list(GtkComboBoxText *combo) {
-+void append_alsa_device_list(GtkComboBoxText *combo, char* current) {
- }
- #endif
- 
diff --git a/media-sound/terminatorx/files/terminatorx-4.2.0-metadata-dir.patch b/media-sound/terminatorx/files/terminatorx-4.2.0-metadata-dir.patch
new file mode 100644
index 000000000000..6fe84c945d09
--- /dev/null
+++ b/media-sound/terminatorx/files/terminatorx-4.2.0-metadata-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 7c7e2ba..98f4fc8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -367,7 +367,7 @@ EXTRA_DIST = COPYING-DOCS\
+ # Destkop Entry
+ desktopdir = $(datadir)/applications
+ desktop_DATA = terminatorX.desktop
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metadata
+ appdata_DATA = terminatorX.appdata.xml
+ mimedir = $(datadir)/mime-info
+ mime_DATA = terminatorX.mime terminatorX.keys
diff --git a/media-sound/terminatorx/metadata.xml b/media-sound/terminatorx/metadata.xml
index f79bb67acbd9..a9e5a2191e05 100644
--- a/media-sound/terminatorx/metadata.xml
+++ b/media-sound/terminatorx/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!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>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">axkg/terminatorX</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild b/media-sound/terminatorx/terminatorx-4.2.0.ebuild
index 5940c58dd66f..e49c433efa9f 100644
--- a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.2.0.ebuild
@@ -1,54 +1,57 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 inherit gnome2
 
 MY_P=${P/terminatorx/terminatorX}
 
 DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
-HOMEPAGE="http://www.terminatorx.org/"
-SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.bz2"
+HOMEPAGE="https://terminatorx.org/"
+# this is the original location but there is an issue with their certificate so mirroring the file
+#SRC_URI="https://terminatorx.org/dist/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 # Making X optional fails when disabled: https://bugs.gentoo.org/636832
-IUSE="alsa debug mad pulseaudio vorbis sox"
+IUSE="+alsa debug jack mad pulseaudio vorbis sox"
 
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	mad? ( media-sound/madplay )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	sox? ( media-sound/sox
-		media-sound/mpg123 )
-	x11-libs/gtk+:3
-	>=dev-libs/glib-2.2:2
-
-	x11-libs/libXi
-	x11-libs/libXxf86dga
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
+RDEPEND="
+	dev-libs/glib:2
 	dev-libs/libxml2:2
 	media-libs/audiofile:=
 	media-libs/ladspa-sdk
 	media-libs/liblrdf
 	media-plugins/cmt-plugins
+	x11-libs/gtk+:3
+	x11-libs/libXi
+	x11-libs/libXxf86dga
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	mad? ( media-sound/madplay )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	sox? (
+		media-sound/sox
+		media-sound/mpg123
+	)
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
-	app-text/gnome-doc-utils
+"
+BDEPEND="
+	dev-util/itstool
 	virtual/pkgconfig
 "
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	# Fails to build with USE="X vorbis -alsa -debug -mad -pulseaudio
-	# -sox", bug #604288
-	"${FILESDIR}"/${P}-gtkcombotext.patch
-	# 740502
-	"${FILESDIR}"/${P}-desktop-QA.patch
+	"${FILESDIR}/${P}-metadata-dir.patch"
 )
 
 src_configure() {
@@ -56,6 +59,7 @@ src_configure() {
 		--enable-x11 \
 		$(use_enable alsa) \
 		$(use_enable debug) \
+		$(use_enable jack) \
 		$(use_enable mad) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable vorbis) \
diff --git a/media-sound/timemachine/metadata.xml b/media-sound/timemachine/metadata.xml
index 225c525448a1..0373193cee17 100644
--- a/media-sound/timemachine/metadata.xml
+++ b/media-sound/timemachine/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch b/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch
new file mode 100644
index 000000000000..6e29a11cad3b
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch
@@ -0,0 +1,78 @@
+From 41c0a19ae6e67e518f9f9c43bc7d7b61971bef4e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Nov 2022 03:27:57 +0000
+Subject: [PATCH] Fix configure with Clang 15
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/autoconf/utils.m4
++++ b/autoconf/utils.m4
+@@ -62,11 +62,12 @@ yes) i_dlfcn=define;;
+ *)   i_dlfcn=undef;;
+ esac
+ cat > dyna.c <<EOM
+-fred () { }
++int fred (void) { }
+ EOM
+ 
+ cat > fred.c <<EOM
+ #include <stdio.h>
++#include <stdlib,h>
+ #$i_dlfcn I_DLFCN
+ #ifdef I_DLFCN
+ #include <dlfcn.h>      /* the dynamic linker include file for Sunos/Solaris */
+@@ -76,9 +77,9 @@ cat > fred.c <<EOM
+ #include <link.h>
+ #endif
+ 
+-extern int fred() ;
++extern int fred(void) ;
+ 
+-main()
++int main(void)
+ {
+     void * handle ;
+     void * symbol ;
+--- a/configure.in
++++ b/configure.in
+@@ -696,6 +696,7 @@ dnl ***
+ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
+@@ -704,7 +705,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	int main() {
++	int main(void) {
+ 	  f (0, 42);
+ 	  return 0;
+ 	}]])],
+@@ -715,6 +716,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
+@@ -723,7 +725,7 @@ AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	int main() {
++	int main(void) {
+ 	  f (0, 42);
+ 	  return 0;
+ 	}]])],
+@@ -745,6 +747,7 @@ fi
+ AC_CACHE_CHECK([whether va_lists can be copied by value],lib_cv_va_val_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
diff --git a/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch b/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch
new file mode 100644
index 000000000000..2a9c9e8282e4
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/763612
+--- a/timidity/Makefile.am
++++ b/timidity/Makefile.am
+@@ -480,3 +480,6 @@ $(top_builddir)/utils/libutils.a:
+ 
+ objs: $(timidity_OBJECTS) $(timidity_DEPENDENCIES)
+ 	@:
++
++# Prevent .symver mixup with buggy alsa headers (global asm vs. LTO partitions)
++alsa_a.$(OBJEXT): CFLAGS += -fno-lto
diff --git a/media-sound/timidity++/metadata.xml b/media-sound/timidity++/metadata.xml
index 99d0e78559d8..20025b28ac8e 100644
--- a/media-sound/timidity++/metadata.xml
+++ b/media-sound/timidity++/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
index fdf335c638f8..46912c2f9e09 100644
--- a/media-sound/timidity++/timidity++-2.15.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools desktop elisp-common systemd toolchain-funcs user xdg
+inherit autotools desktop elisp-common flag-o-matic systemd xdg
 
-MY_PV=${PV/_/-}
-MY_P=TiMidity++-${MY_PV}
-S=${WORKDIR}/${MY_P}
+MY_PV="${PV/_/-}"
+MY_P="TiMidity++-${MY_PV}"
 
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
+DESCRIPTION="Handy MIDI to WAV converter with OSS and ALSA output support"
+HOMEPAGE="https://timidity.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/timidity/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses ogg oss selinux slang speex tk vorbis X Xaw3d"
 
 REQUIRED_USE="tk? ( X )"
 
@@ -24,23 +24,31 @@ DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	ao? ( >=media-libs/libao-0.8.5 )
 	emacs? ( >=app-editors/emacs-23.1:* )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	gtk? ( x11-libs/gtk+:2 )
 	jack? ( virtual/jack )
 	motif? ( >=x11-libs/motif-2.3:0 )
 	nas? ( >=media-libs/nas-1.4 )
 	ncurses? ( sys-libs/ncurses:0= )
+	ogg? ( media-libs/libogg )
 	slang? ( sys-libs/slang )
 	speex? ( media-libs/speex )
-	tk? ( dev-lang/tk:0= )
+	tk? ( dev-lang/tk:= )
 	vorbis? ( media-libs/libvorbis )
 	X? (
-		media-libs/libpng:0=
-		x11-libs/libXaw
+		media-libs/libpng:=
+		x11-libs/libX11
 		x11-libs/libXext
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
 	)
 "
-RDEPEND="${DEPEND}
+
+RDEPEND="
+	${DEPEND}
+	acct-group/audio
+	acct-group/nobody
+	acct-user/timidity
 	app-eselect/eselect-timidity
 	alsa? ( media-sound/alsa-utils )
 	selinux? ( sec-policy/selinux-timidity )
@@ -50,11 +58,6 @@ PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
 
 SITEFILE=50${PN}-gentoo.el
 
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewuser timidity -1 -1 /var/lib/timidity audio
-}
-
 DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
 
 PATCHES=(
@@ -63,10 +66,15 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
 	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
 	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
+	"${FILESDIR}"/${PN}-2.15.0-lto-workaround.patch
+	"${FILESDIR}"/${PN}-2.15.0-clang-16-configure.patch
 )
 
 src_prepare() {
 	default
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
@@ -74,6 +82,21 @@ src_configure() {
 	export EXTRACFLAGS="${CFLAGS}" #385817
 
 	local audios
+	# List by preference
+	local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw')
+
+	# configure workarounds: configure.in here is written for an old version
+	# of autoconf and upstream seems quite dead.
+	#
+	# 1. Avoid janky configure test breaking
+	# ```checking for sys/wait.h that is POSIX.1 compatible... yes
+	# ./configure: 7995: test: =: unexpected operator```
+	export ac_cv_header_sys_time_h=yes
+	#
+	# 2. And yes, we expect standard header locations (this configure test is flaky for us too)
+	# This avoids a bunch of implicit decl. errors which only happen with USE=-Xaw3d(?!)
+	append-cppflags -DSTDC_HEADERS
+
 	local myeconfargs=(
 		--localstatedir=/var/state/${PN}
 		--with-module-dir="${EPREFIX}/usr/share/timidity"
@@ -95,11 +118,13 @@ src_configure() {
 		$(use_enable gtk)
 		$(use_enable tk tcltk)
 		$(use_enable motif)
+		$(use_with Xaw3d xawlib ${xaw_provider})
 	)
 
 	use flac && audios+=",flac"
 	use speex && audios+=",speex"
 	use vorbis && audios+=",vorbis"
+	use ogg && audios+=",ogg"
 	use oss && audios+=",oss"
 	use jack && audios+=",jack"
 	use ao && audios+=",ao"
@@ -158,9 +183,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
-	diropts -o timidity -g nobody -m 0700
-	keepdir /var/lib/timidity
-
 	doicon "${FILESDIR}"/timidity.xpm
 	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
 
diff --git a/media-sound/timidity-eawpatches/metadata.xml b/media-sound/timidity-eawpatches/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/timidity-eawpatches/metadata.xml
+++ b/media-sound/timidity-eawpatches/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/timidity-freepats/metadata.xml b/media-sound/timidity-freepats/metadata.xml
index 39626a990be5..cd1cfc033621 100644
--- a/media-sound/timidity-freepats/metadata.xml
+++ b/media-sound/timidity-freepats/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
index ae79013f2cb2..d667ffe19ce6 100644
--- a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
+++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://freepats.opensrc.org/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 RESTRICT="binchecks strip"
 
 RDEPEND="app-eselect/eselect-timidity"
diff --git a/media-sound/tk707/metadata.xml b/media-sound/tk707/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/tk707/metadata.xml
+++ b/media-sound/tk707/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/tk707/tk707-0.8-r2.ebuild b/media-sound/tk707/tk707-0.8-r2.ebuild
index 03b31573728b..a8319e27411d 100644
--- a/media-sound/tk707/tk707-0.8-r2.ebuild
+++ b/media-sound/tk707/tk707-0.8-r2.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools desktop
 
-DESCRIPTION=" An 7x7 type midi drum sequencer for Linux"
-HOMEPAGE="http://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/"
+DESCRIPTION="An 7x7 type midi drum sequencer for Linux"
+HOMEPAGE="https://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE=""
-
 RDEPEND="
 	>=media-libs/alsa-lib-0.9.0
 	>=dev-lang/tcl-8.4:0=
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
deleted file mode 100644
index 9ff5a58e9902..000000000000
--- a/media-sound/tomahawk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
deleted file mode 100644
index 7ddf116eeccc..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 663981b4dd28fca6cac0b079bed26c411e7d1722 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 25 Jan 2019 21:13:05 +0100
-Subject: [PATCH] Fix build with <cmake-3.10
-
----
- CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b44d2ee43..9422a808e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,14 +2,18 @@ PROJECT( tomahawk )
- CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
- CMAKE_POLICY(SET CMP0017 NEW)
- CMAKE_POLICY(SET CMP0022 NEW)
--CMAKE_POLICY(SET CMP0075 NEW)
-+IF(POLICY CMP0075)
-+    CMAKE_POLICY(SET CMP0075 NEW)
-+ENDIF()
- 
- # TODO:
- # Update to NEW and fix things up
- CMAKE_POLICY(SET CMP0023 NEW)
- 
- # Let AUTOMOC and AUTOUIC process generated files
--CMAKE_POLICY(SET CMP0071 NEW)
-+IF(POLICY CMP0071)
-+    CMAKE_POLICY(SET CMP0071 NEW)
-+ENDIF()
- 
- # TODO:
- # Disable automatic qtmain linking
--- 
-2.20.1
-
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
deleted file mode 100644
index 9a53e0d69020..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 7c7b57e295aebcca9b09d8c5798e172cb8fd179c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 13 Jul 2020 02:11:06 +0200
-Subject: [PATCH] Import FindTaglib.cmake from ECM 5.72.0
-
-This version of ECM gained a module that is overriding Tomahawk's own, but
-variables are incompatible. Use the updated ECM module until we can depend
-on the necessary ECM version itself.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                         |   2 +-
- CMakeModules/CheckTagLibFileName.cmake |   5 +-
- CMakeModules/FindTaglib.cmake          | 173 +++++++++++++------------
- src/libtomahawk/CMakeLists.txt         |   4 +-
- 4 files changed, 93 insertions(+), 91 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9422a808e..2f1e72238 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,7 +213,7 @@ macro_optional_find_package(Lucene++ 3.0.0)
- macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
- 
- macro_optional_find_package(Taglib 1.8.0)
--macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
-+macro_log_feature(Taglib_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
- include( CheckTagLibFileName )
- check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
- 
-diff --git a/CMakeModules/CheckTagLibFileName.cmake b/CMakeModules/CheckTagLibFileName.cmake
-index e5b3706c9..7828dcf34 100644
---- a/CMakeModules/CheckTagLibFileName.cmake
-+++ b/CMakeModules/CheckTagLibFileName.cmake
-@@ -1,9 +1,8 @@
- # taglib changed filenames to be a char/wchar struct on some platforms, need to check for it
- macro (CHECK_TAGLIB_FILENAME TAGLIB_FILENAME_COMPLEX)
- 	include (CheckCXXSourceCompiles)
--	set (CMAKE_REQUIRED_FLAGS ${TAGLIB_CFLAGS})
--	set (CMAKE_REQUIRED_INCLUDES ${TAGLIB_INCLUDES})
--	set (CMAKE_REQUIRED_LIBRARIES ${TAGLIB_LIBRARIES})
-+	set (CMAKE_REQUIRED_INCLUDES ${Taglib_INCLUDE_DIRS})
-+	set (CMAKE_REQUIRED_LIBRARIES ${Taglib_LIBRARIES})
- 	check_cxx_source_compiles(
- 	"#include <tfile.h>
- 	int main()
-diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
-index d4ada2592..ad14c79cd 100644
---- a/CMakeModules/FindTaglib.cmake
-+++ b/CMakeModules/FindTaglib.cmake
-@@ -1,87 +1,90 @@
--# - Try to find the Taglib library
--# Once done this will define
-+#.rst:
-+# FindTaglib
-+# ----------
- #
--#  TAGLIB_FOUND - system has the taglib library
--#  TAGLIB_CFLAGS - the taglib cflags
--#  TAGLIB_LIBRARIES - The libraries needed to use taglib
--
--# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-+# Try to find the Taglib library.
- #
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--IF(TAGLIB_FOUND)
--	MESSAGE(STATUS "Using manually specified taglib locations")
--ELSE()
--
--	if(NOT TAGLIB_MIN_VERSION)
--	  set(TAGLIB_MIN_VERSION "1.6")
--	endif(NOT TAGLIB_MIN_VERSION)
--
--	if(NOT WIN32)
--		find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
--		   ${BIN_INSTALL_DIR}
--		)
--	endif(NOT WIN32)
--
--	#reset vars
--	set(TAGLIB_LIBRARIES)
--	set(TAGLIB_CFLAGS)
--
--#	MESSAGE( STATUS "PATHS: ${PATHS}")
--	# if taglib-config has been found
--	if(TAGLIBCONFIG_EXECUTABLE)
--
--	  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
--
--	  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--		 message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
--		 set(TAGLIB_FOUND FALSE)
--	  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--
--		 exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
--
--		 exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
--
--		 if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
--			set(TAGLIB_FOUND TRUE)
--#			message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
--		 endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
--		 string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--	  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--	  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
--
--	else(TAGLIBCONFIG_EXECUTABLE)
--
--	  include(FindLibraryWithDebug)
--	  include(FindPackageHandleStandardArgs)
--
--	  find_path(TAGLIB_INCLUDES
--		NAMES
--		tag.h
--		PATH_SUFFIXES taglib
--		PATHS
--		${INCLUDE_INSTALL_DIR}
--	  )
--
--	  find_library_with_debug(TAGLIB_LIBRARIES
--		WIN32_DEBUG_POSTFIX d
--		NAMES tag
--		PATHS
--		${LIB_INSTALL_DIR}
--	  )
--	  
--	  find_package_handle_standard_args(Taglib DEFAULT_MSG 
--										TAGLIB_INCLUDES TAGLIB_LIBRARIES)
--	endif(TAGLIBCONFIG_EXECUTABLE)
--ENDIF()
--
--if(TAGLIB_FOUND)
--  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
--    message(STATUS "Found TagLib: ${TAGLIB_LIBRARIES}")
--  endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
--else(TAGLIB_FOUND)
--  if(Taglib_FIND_REQUIRED)
--    message(FATAL_ERROR "Could not find Taglib")
--  endif(Taglib_FIND_REQUIRED)
--endif(TAGLIB_FOUND)
-+# This will define the following variables:
-+#
-+# ``Taglib_FOUND``
-+#       True if the system has the taglib library of at least the minimum
-+#       version specified by the version parameter to find_package()
-+# ``Taglib_INCLUDE_DIRS``
-+#       The taglib include dirs for use with target_include_directories
-+# ``Taglib_LIBRARIES``
-+#       The taglib libraries for use with target_link_libraries()
-+# ``Taglib_VERSION``
-+#       The version of taglib that was found
-+#
-+# If ``Taglib_FOUND`` is TRUE, it will also define the following imported
-+# target:
-+#
-+# ``Taglib::Taglib``
-+#       The Taglib library
-+#
-+# Since 5.72.0
-+#
-+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
-+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
-+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
-+# SPDX-License-Identifier: BSD-3-Clause
-+
-+find_package(PkgConfig QUIET)
-+
-+pkg_search_module(PC_TAGLIB QUIET taglib)
-+
-+find_path(Taglib_INCLUDE_DIRS
-+    NAMES tag.h
-+    PATH_SUFFIXES taglib
-+    HINTS ${PC_TAGLIB_INCLUDEDIR}
-+)
-+
-+find_library(Taglib_LIBRARIES
-+    NAMES tag
-+    HINTS ${PC_TAGLIB_LIBDIR}
-+)
-+
-+set(Taglib_VERSION ${PC_TAGLIB_VERSION})
-+
-+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
-+    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
-+        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
-+
-+        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
-+
-+        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
-+
-+        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
-+    endif()
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Taglib
-+    FOUND_VAR
-+        Taglib_FOUND
-+    REQUIRED_VARS
-+        Taglib_LIBRARIES
-+        Taglib_INCLUDE_DIRS
-+    VERSION_VAR
-+        Taglib_VERSION
-+)
-+
-+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
-+    add_library(Taglib::Taglib UNKNOWN IMPORTED)
-+    set_target_properties(Taglib::Taglib PROPERTIES
-+        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
-+    )
-+endif()
-+
-+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
-+
-+include(FeatureSummary)
-+set_package_properties(Taglib PROPERTIES
-+    URL "https://taglib.org/"
-+    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
-+)
-diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
-index 348d6b1dd..e0a342f0e 100644
---- a/src/libtomahawk/CMakeLists.txt
-+++ b/src/libtomahawk/CMakeLists.txt
-@@ -533,8 +533,8 @@ TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} PRIVATE
- )
- 
- # TagLib
--TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${TAGLIB_LIBRARIES})
--TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${TAGLIB_INCLUDES})
-+TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${Taglib_LIBRARIES})
-+TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${Taglib_INCLUDE_DIRS})
- 
- INSTALL( TARGETS ${TOMAHAWK_LIBRARY}
-     EXPORT TomahawkLibraryDepends
--- 
-2.27.0
-
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch
deleted file mode 100644
index 8e02e8e300c3..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cd5444573eec73a564263c20220ba0562cc655c5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 8 Nov 2018 15:10:56 +0100
-Subject: [PATCH] Fix "control reaches end of non-void function" in
- DelegateConfigWrapper
-
-Thanks-to: Fabian Vogt <fabian@ritter-vogt.de>
----
- src/libtomahawk/accounts/DelegateConfigWrapper.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
-index e78b64aec..875016ca1 100644
---- a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
-+++ b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
-@@ -247,6 +247,7 @@ DelegateConfigWrapper::getTestConfigMessage( int code )
- 	case Tomahawk::Accounts::ConfigTestResultAccountExpired:
- 	    return tr( "Your account has expired." );
-     }
-+    return QString();
- }
- 
- 
--- 
-2.19.1
-
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
deleted file mode 100644
index f07b746a03f7..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 4fb44c931be648d61ef3c8d10426b34de1b2a53b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 8 May 2020 23:55:43 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath)
-
----
- src/libtomahawk/utils/AnimatedSpinner.cpp               | 1 +
- src/libtomahawk/utils/TomahawkUtilsGui.cpp              | 1 +
- src/libtomahawk/widgets/DropDownButton.cpp              | 2 ++
- src/libtomahawk/widgets/HoverControls.cpp               | 1 +
- src/libtomahawk/widgets/SourceTreePopupDialog.cpp       | 1 +
- src/libtomahawk/widgets/searchlineedit/SearchButton.cpp | 9 +++++----
- src/tomahawk/widgets/AccountsPopupWidget.cpp            | 1 +
- src/tomahawk/widgets/SlideSwitchButton.cpp              | 1 +
- src/tomahawk/widgets/SocialWidget.cpp                   | 3 ++-
- 9 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/libtomahawk/utils/AnimatedSpinner.cpp b/src/libtomahawk/utils/AnimatedSpinner.cpp
-index b4778cbe9..a705cfaa2 100644
---- a/src/libtomahawk/utils/AnimatedSpinner.cpp
-+++ b/src/libtomahawk/utils/AnimatedSpinner.cpp
-@@ -28,6 +28,7 @@
- #include <QApplication>
- #include <QHideEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QShowEvent>
- 
-diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
-index b35799723..d2733d4a7 100644
---- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
-+++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
-@@ -32,6 +32,7 @@
- 
- #include <QLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QBitmap>
- #include <QPalette>
-diff --git a/src/libtomahawk/widgets/DropDownButton.cpp b/src/libtomahawk/widgets/DropDownButton.cpp
-index 74aa344d1..106e8b882 100644
---- a/src/libtomahawk/widgets/DropDownButton.cpp
-+++ b/src/libtomahawk/widgets/DropDownButton.cpp
-@@ -19,6 +19,8 @@
- #include "DropDownButton.h"
- 
- #include <QMouseEvent>
-+#include <QPaintEvent>
-+#include <QPainterPath>
- 
- #include "Artist.h"
- #include "Album.h"
-diff --git a/src/libtomahawk/widgets/HoverControls.cpp b/src/libtomahawk/widgets/HoverControls.cpp
-index 3e31bf236..0b6b20aa8 100644
---- a/src/libtomahawk/widgets/HoverControls.cpp
-+++ b/src/libtomahawk/widgets/HoverControls.cpp
-@@ -27,6 +27,7 @@
- #include <QPixmap>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- 
- using namespace Tomahawk;
- 
-diff --git a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
-index 807eb354a..1379c9c53 100644
---- a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
-+++ b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
-@@ -22,6 +22,7 @@
- #include <QApplication>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDialogButtonBox>
- #include <QVBoxLayout>
- #include <QHBoxLayout>
-diff --git a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
-index 1d9f1c4bd..97c5406f2 100644
---- a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
-+++ b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
-@@ -19,10 +19,11 @@
- 
- #include "SearchButton.h"
- 
--#include <qcompleter.h>
--#include <qevent.h>
--#include <qlineedit.h>
--#include <qpainter.h>
-+#include <QCompleter>
-+#include <QEvent>
-+#include <QLineEdit>
-+#include <QPainter>
-+#include <QPainterPath>
- 
- SearchButton::SearchButton(QWidget *parent)
-     : QAbstractButton(parent)
-diff --git a/src/tomahawk/widgets/AccountsPopupWidget.cpp b/src/tomahawk/widgets/AccountsPopupWidget.cpp
-index cb5739b97..ffd5dcaa1 100644
---- a/src/tomahawk/widgets/AccountsPopupWidget.cpp
-+++ b/src/tomahawk/widgets/AccountsPopupWidget.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QVBoxLayout>
- 
-diff --git a/src/tomahawk/widgets/SlideSwitchButton.cpp b/src/tomahawk/widgets/SlideSwitchButton.cpp
-index 3c61b4987..103562e00 100644
---- a/src/tomahawk/widgets/SlideSwitchButton.cpp
-+++ b/src/tomahawk/widgets/SlideSwitchButton.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPropertyAnimation>
- #include <QStyleOptionButton>
- #include <QPixmap>
-diff --git a/src/tomahawk/widgets/SocialWidget.cpp b/src/tomahawk/widgets/SocialWidget.cpp
-index f0901279d..b43f44c5d 100644
---- a/src/tomahawk/widgets/SocialWidget.cpp
-+++ b/src/tomahawk/widgets/SocialWidget.cpp
-@@ -29,8 +29,9 @@
- #include "Source.h"
- #include "Track.h"
- 
--#include <QPainter>
- #include <QDialog>
-+#include <QPainter>
-+#include <QPainterPath>
- #include <QPropertyAnimation>
- 
- #define ARROW_HEIGHT 6
--- 
-2.26.2
-
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
deleted file mode 100644
index 602a023a5bef..000000000000
--- a/media-sound/tomahawk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
deleted file mode 100644
index 442d0f525b7b..000000000000
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
-inherit cmake xdg-utils
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://github.com/tomahawk-player/tomahawk"
-SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="telepathy xmpp"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-cpp/lucene++
-	dev-cpp/sparsehash
-	dev-libs/boost:=
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/extra-cmake-modules:5
-	kde-frameworks/attica:5
-	>=media-libs/liblastfm-1.1.0_pre20150206
-	>=media-libs/taglib-1.8.0
-	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-	>=net-libs/gnutls-3.2:=
-	x11-libs/libX11
-	telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
-	xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/qca:2[ssl]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-warning.patch"
-	"${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
-	"${FILESDIR}/${P}-qt-5.15.patch" # git master
-	"${FILESDIR}/${P}-findtaglib.patch" # pending upstream
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CRASHREPORTER=OFF
-		-DBUILD_TESTS=OFF
-		-DBUILD_TOOLS=OFF
-		-DBUILD_HATCHET=OFF
-		-DWITH_TelepathyQt=$(usex telepathy)
-		-DWITH_Jreen=$(usex xmpp)
-	)
-
-	[[ ${PV} != *9999* ]] && mycmakeargs+=( -DBUILD_RELEASE=ON )
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/toolame/metadata.xml b/media-sound/toolame/metadata.xml
index b24fd1523aab..c42085af9651 100644
--- a/media-sound/toolame/metadata.xml
+++ b/media-sound/toolame/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
index 45c946562688..91b2908b8fa9 100644
--- a/media-sound/toolame/toolame-02l-r4.ebuild
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,11 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder"
 HOMEPAGE="http://www.planckenergy.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch
diff --git a/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch
new file mode 100644
index 000000000000..e6243dfae77e
--- /dev/null
+++ b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/721988
+
+--- a/ttaenc.c
++++ b/ttaenc.c
+@@ -525,7 +525,7 @@ __inline void memshl (register int *pA, register int *pB) {
+ 	*pA   = *pB;
+ }
+ 
+-__inline void hybrid_filter (fltst *fs, int *in, int mode) {
++static void hybrid_filter (fltst *fs, int *in, int mode) {
+ 	register int *pA = fs->dl;
+ 	register int *pB = fs->qm;
+ 	register int *pM = fs->dx;
diff --git a/media-sound/ttaenc/files/ttaenc-3.4.1-fix-musl.patch b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-musl.patch
new file mode 100644
index 000000000000..674782fec91f
--- /dev/null
+++ b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-musl.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/646188
+--- a/ttaenc.h
++++ b/ttaenc.h
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <stdint.h>
+ #endif
+ 
+ #ifdef _MSC
+@@ -101,8 +102,8 @@
+ typedef unsigned __int32 uint32;
+ typedef unsigned __int64 uint64;
+ #else
+-typedef __uint32_t uint32;
+-typedef __uint64_t uint64;
++typedef uint32_t uint32;
++typedef uint64_t uint64;
+ #endif
+ 
+ #define PREDICTOR1(x, k)	((int)((((uint64)x << k) - x) >> k))
diff --git a/media-sound/ttaenc/metadata.xml b/media-sound/ttaenc/metadata.xml
index 1952b25ee908..45f519cc10a0 100644
--- a/media-sound/ttaenc/metadata.xml
+++ b/media-sound/ttaenc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
index 34f01191dd63..ca9a6e3c2b85 100644
--- a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,15 +6,19 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="True Audio Compressor Software"
-HOMEPAGE="http://tta.sourceforge.net"
-SRC_URI="mirror://sourceforge/tta/${P}-src.tgz"
+HOMEPAGE="https://tta.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/tta/${P}-src.tgz"
+S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-S="${WORKDIR}/${P}-src"
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-fix-hybrid-filter.patch
+	"${FILESDIR}"/${P}-fix-musl.patch
+)
 
 src_configure() {
 	tc-export CC
diff --git a/media-sound/tudor-volumed/metadata.xml b/media-sound/tudor-volumed/metadata.xml
index fbda2a228105..d20b1cee24a9 100644
--- a/media-sound/tudor-volumed/metadata.xml
+++ b/media-sound/tudor-volumed/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index 1ae373c260eb..f866c4b3eebe 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,2 +1 @@
-DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
 DIST twolame-0.4.0.tar.gz 890908 BLAKE2B f61a49aed06dcd2a60744dd758b480670f14f0eece0586b62a0b21fe2d9ff8280f8f7324b7daf88e85675c6200a1c68815ddd6bafa308b503a52df4552031bb1 SHA512 cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03
diff --git a/media-sound/twolame/files/0.3.13-perl-tests.patch b/media-sound/twolame/files/0.3.13-perl-tests.patch
deleted file mode 100644
index 5ec5b6601770..000000000000
--- a/media-sound/twolame/files/0.3.13-perl-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 11a5ecb89de1e61b016f3d7f358b09a4e611f1ad Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Tue, 17 Jan 2017 12:18:10 +1300
-Subject: [PATCH] tests/test.pl: stat the right file
-
-stat(@_) is effectively stat scalar @_
-
-becasue "stat" has a signature of "$" which coerces arrays to
-scalars, which here, returns the length of the array.
-
-This is going to be number 1, instead of the desired argument,
-     the filename.
----
- tests/test.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test.pl b/tests/test.pl
-index 658eadf..5513d6e 100755
---- a/tests/test.pl
-+++ b/tests/test.pl
-@@ -185,7 +185,7 @@ sub input_filepath {
- }
- 
- sub filesize {
--  return (stat(@_))[7];
-+  return (stat($_[0]))[7];
- }
- 
- sub md5_file {
--- 
-2.11.0
-
diff --git a/media-sound/twolame/metadata.xml b/media-sound/twolame/metadata.xml
index 9a145f2f8a0c..bb3e69eb46c5 100644
--- a/media-sound/twolame/metadata.xml
+++ b/media-sound/twolame/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
deleted file mode 100644
index e1df62fc0a0f..000000000000
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune multilib-minimal
-
-DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
-HOMEPAGE="https://www.twolame.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PV}-perl-tests.patch" )
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-O3::' configure || die
-	# remove -Werror, bug 493940
-	sed -i -e '/WARNING_CFLAGS/s:-Werror::' configure || die
-
-	if [[ ${CHOST} == *solaris* ]]; then
-		# libsndfile doesn't like -std=c99 on Solaris
-		sed -i -e '/CFLAGS/s:-std=c99::' configure || die
-		# configure isn't really bourne shell (comment 0) or dash (comment 6)
-		# compatible, bug #388885
-		export CONFIG_SHELL=${BASH}
-	fi
-
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-		econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild
index 5de8a1adca08..21e96fb6f22c 100644
--- a/media-sound/twolame/twolame-0.4.0.ebuild
+++ b/media-sound/twolame/twolame-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,11 @@ inherit multilib-minimal
 
 DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
 HOMEPAGE="https://www.twolame.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+sndfile static-libs test"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
diff --git a/media-sound/umix/Manifest b/media-sound/umix/Manifest
deleted file mode 100644
index ff09605f4d77..000000000000
--- a/media-sound/umix/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST umix-1.0.2.tar.gz 225866 BLAKE2B 8ab2b3246440fcab64edea366dafd5d8f734c42483fd78410a1f884c2b046a27fdb6959023d6c537900c64409ad0f606e7d2c2e91f23bdd03dda61940ba7d29b SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468
diff --git a/media-sound/umix/files/umix-1.0.2-tinfo.patch b/media-sound/umix/files/umix-1.0.2-tinfo.patch
deleted file mode 100644
index 65c0d7158375..000000000000
--- a/media-sound/umix/files/umix-1.0.2-tinfo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -89,6 +89,7 @@
- 	then
- 		AC_CHECK_LIB(curses, initscr, NCURSLIB="curses", NCURSLIB="")
- 	fi
-+	AC_SEARCH_LIBS(stdscr,tinfo)
- fi
- if test "x$NCURSLIB" != "x"
- then
-@@ -97,6 +98,7 @@
- 	AC_DEFINE(HAVE_NCURSES)
- 	LIBS="$LIBS -l$NCURSLIB"
- 	umix_CONDOBJS="$umix_CONDOBJS ui_ncurses.o"
-+	AC_SEARCH_LIBS(stdscr,tinfo)
- else
- 	have_ncurses="no"
- fi
diff --git a/media-sound/umix/metadata.xml b/media-sound/umix/metadata.xml
deleted file mode 100644
index 3ebfdeab3689..000000000000
--- a/media-sound/umix/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">umix</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/umix/umix-1.0.2-r1.ebuild b/media-sound/umix/umix-1.0.2-r1.ebuild
deleted file mode 100644
index dd633418564d..000000000000
--- a/media-sound/umix/umix-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Program for adjusting soundcard volumes"
-HOMEPAGE="http://umix.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="ncurses oss"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use ncurses || myconf="--disable-ncurses"
-	use oss || myconf="${myconf} --disable-oss"
-	econf ${myconf}
-}
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
deleted file mode 100644
index a456aa42469b..000000000000
--- a/media-sound/umurmur/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2 SHA512 bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656
diff --git a/media-sound/umurmur/files/umurmur.conf b/media-sound/umurmur/files/umurmur.conf
deleted file mode 100644
index cebcca28a583..000000000000
--- a/media-sound/umurmur/files/umurmur.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-# This configuration is based on the official example configuration. More information can be found
-# at http://code.google.com/p/umurmur/wiki/Configuring02x
-
-max_bandwidth = 48000;
-welcometext = "Welcome to uMurmur!";
-certificate = "/etc/umurmur/cert.crt";
-private_key = "/etc/umurmur/key.key";
-password = "";
-max_users = 10;
-
-# Specify port and/or address to bind to. Typically not needed.
-# Default is '*' for address and 64738 for port. 
-# Can also be specified on the command line, which takes precedence if
-# both are specified.
-# bindport = 64738;
-# bindaddr = "192.168.1.1";
-
-# Specify this for privilege dropping. If username is specified but not 
-# the groupname, the user's login group is used.
-username = "murmur";
-groupname = "murmur";
-
-# Root channel must always be defined first.
-# If a channel has a parent, the parent must be defined before the child channel(s).
-channels = ( {
-         name = "Root";
-         parent = "";
-         description = "The Root of all channels";
-         noenter = true;
-         },
-         {
-         name = "Lobby";
-         parent = "Root";
-         description = "Lobby channel";
-         },
-         {
-         name = "Red team";
-         parent = "Lobby";
-         description = "The Red team channel";
-         },
-         {
-         name = "Blue team";
-         parent = "Lobby";
-         description = "The Blue team channel";
-         }
-);
-# Channel links configuration.
-channel_links = ( {
-         source = "Lobby";
-         destination = "Red team";
-         },
-         {
-         source = "Lobby";
-         destination = "Blue team";
-         }
-);
-
-default_channel = "Lobby";
diff --git a/media-sound/umurmur/files/umurmurd.confd b/media-sound/umurmur/files/umurmurd.confd
deleted file mode 100644
index d83461ce725d..000000000000
--- a/media-sound/umurmur/files/umurmurd.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Additional flags to be passed to umurmurd
-UMURMURD_OPTS="-r"
-
diff --git a/media-sound/umurmur/files/umurmurd.initd b/media-sound/umurmur/files/umurmurd.initd
deleted file mode 100644
index d0dd5517d626..000000000000
--- a/media-sound/umurmur/files/umurmurd.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="umurmurd - A minimalistic mumble server"
-pidfile="/run/umurmurd/umurmurd.pid"
-command="/usr/bin/umurmurd"
-command_args="-c /etc/umurmur/umurmur.conf -p ${pidfile} ${UMURMURD_OPTS}"
-start_stop_daemon_args="-p ${pidfile} -w 100"
-
-depend() {
-	need net
-	use logger
-}
-
-start_pre() {
-	checkpath -d -o murmur ${pidfile%/*}
-}
diff --git a/media-sound/umurmur/files/umurmurd.service b/media-sound/umurmur/files/umurmurd.service
deleted file mode 100644
index 12ad2aec6459..000000000000
--- a/media-sound/umurmur/files/umurmurd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=A minimalistic Mumble server
-After=network.target
-
-[Service]
-Type=simple
-User=murmur
-Group=murmur
-PIDFile=/run/umurmurd.pid
-ExecStartPre=/usr/bin/umurmurd -t -c /etc/umurmur/umurmur.conf
-ExecStart=/usr/bin/umurmurd -d -r -p /run/umurmurd.pid -c /etc/umurmur/umurmur.conf
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
deleted file mode 100644
index e7684f6b35d1..000000000000
--- a/media-sound/umurmur/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<longdescription lang="en">
-		uMurmur is a minimalistic Mumble server primarily targeted to
-		run on routers with an open OS like OpenWRT. The server part
-		of Mumble is called Murmur, hence the name uMurmur.
-	</longdescription>
-	<use>
-		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
-		<flag name="shm">Enable shared memory support</flag>
-	</use>
-	<upstream>
-		<maintainer status="active">
-			<email>fatbob.snack@gmail.com</email>
-			<name>Martin Johansson</name>
-		</maintainer>
-		<bugs-to>https://code.google.com/p/umurmur/issues/list</bugs-to>
-		<changelog>
-			https://code.google.com/p/umurmur/wiki/Changelog</changelog>
-		<doc lang="en">https://code.google.com/p/umurmur/w/list</doc>
-		<remote-id type="google-code">umurmur</remote-id>
-		<remote-id type="github">umurmur/umurmur</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
deleted file mode 100644
index 5f27975b77c8..000000000000
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-LICENSE="BSD"
-SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
-	dev-libs/libconfig:=
-	gnutls? (
-		dev-libs/nettle:=
-		>=net-libs/gnutls-3.0.0:=
-	)
-	!gnutls? (
-		mbedtls? ( net-libs/mbedtls:= )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}
-	acct-group/murmur
-	acct-user/murmur
-"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may	want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-S="${WORKDIR}/${P/_}"
-
-get_ssl_impl() {
-	local ssl_provider=()
-
-	use gnutls && ssl_provider+=( gnutls )
-	use mbedtls && ssl_provider+=( mbedtls )
-	use libressl && ssl_provider+=( libressl )
-
-	if ! use gnutls && ! use mbedtls && ! use libressl ; then
-		ssl_provider+=( openssl )
-	fi
-	echo ${ssl_provider[@]}
-}
-
-pkg_pretend() {
-	local ssl_provider=( $(get_ssl_impl) )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[@]}"
-		$(use_enable shm shmapi)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/umurmur/umurmur-0.2.18.ebuild b/media-sound/umurmur/umurmur-0.2.18.ebuild
deleted file mode 100644
index 2eaae13bc97a..000000000000
--- a/media-sound/umurmur/umurmur-0.2.18.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-LICENSE="BSD"
-SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
-	dev-libs/libconfig:=
-	gnutls? (
-		dev-libs/nettle:=
-		>=net-libs/gnutls-3.0.0:=
-	)
-	!gnutls? (
-		mbedtls? ( net-libs/mbedtls:= )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}
-	acct-group/murmur
-	acct-user/murmur
-"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-S="${WORKDIR}/${P/_}"
-
-get_ssl_impl() {
-	local ssl_provider=()
-
-	use gnutls && ssl_provider+=( gnutls )
-	use mbedtls && ssl_provider+=( mbedtls )
-	use libressl && ssl_provider+=( libressl )
-
-	if ! use gnutls && ! use mbedtls && ! use libressl ; then
-		ssl_provider+=( openssl )
-	fi
-	echo ${ssl_provider[@]}
-}
-
-pkg_pretend() {
-	local ssl_provider=( $(get_ssl_impl) )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[@]}"
-		$(use_enable shm shmapi)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
deleted file mode 100644
index 2eaae13bc97a..000000000000
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-LICENSE="BSD"
-SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
-	dev-libs/libconfig:=
-	gnutls? (
-		dev-libs/nettle:=
-		>=net-libs/gnutls-3.0.0:=
-	)
-	!gnutls? (
-		mbedtls? ( net-libs/mbedtls:= )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}
-	acct-group/murmur
-	acct-user/murmur
-"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-S="${WORKDIR}/${P/_}"
-
-get_ssl_impl() {
-	local ssl_provider=()
-
-	use gnutls && ssl_provider+=( gnutls )
-	use mbedtls && ssl_provider+=( mbedtls )
-	use libressl && ssl_provider+=( libressl )
-
-	if ! use gnutls && ! use mbedtls && ! use libressl ; then
-		ssl_provider+=( openssl )
-	fi
-	echo ${ssl_provider[@]}
-}
-
-pkg_pretend() {
-	local ssl_provider=( $(get_ssl_impl) )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[@]}"
-		$(use_enable shm shmapi)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 12761f4fa0a5..28ef27fe3ad3 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,3 +1,2 @@
-DIST upmpdcli-1.5.2.tar.gz 550460 BLAKE2B e9905fb2f6c07d7374651fd0a9d7ec821d6ea25d4debe1b6e69bbf7def8b75d0b35b245a5e4ca2477832f71a9fe950f7f7635d1b6fc29add0e59405c0c69b338 SHA512 4d6cd44b64637c5a07996a416f0cf15e27e24b84aa04ee3ee9f6f5eda3164a5b964915587a4342cc0a8f95fa175dd106b99242de5c50d3cb603e48450694009e
-DIST upmpdcli-1.5.5.tar.gz 550726 BLAKE2B 1a32f5a3126e037f6663ab60244d7af3fd7aeb79c5878ba1ca4d8029b97917a70f5b06a82e6006fcf14642b96cb5539488b3bba03860a2dd23e6bce0efe54bdc SHA512 90ce69b4ef004e1b5db3229b3bc99637ecba0f5f7e82d0e9f567da163295b4a572d059accbeb679194d1846eb822d48378acc743ee334ffd9859f3e025f6a0f3
-DIST upmpdcli-1.5.7.tar.gz 552203 BLAKE2B fe8e8aa3f4c777925dce2a143aec201462cb2da9e33f604d48848f27acc51fad42e1c626c17b5325918f0d1de1b37c1c456240f811af118b83bc7ce3260e0687 SHA512 ce86b8f9b4e7614433ab542facbf7452426b66bf026bb21ea0e868cde9b492b09a86ee8aa259a9353f2ede6a22d1055987986747aa8e284714c5e60f73a3a55a
+DIST upmpdcli-1.8.10.tar.gz 620252 BLAKE2B d79a84cfd8c779f05a05034d1fa3bfde50f713ec9eb800d4a4206087ba1dbc64ccec7b53e67c139af548425e6d3e85bb2a72ddb6fa933ebd47ab794d76ea81af SHA512 4f8b430a293d62ca82f8bb88bfe57c13694b1972d16402a492700b0ddf8a3689987d2e0a2b4acc7f982c18c6419e22657057e4037d338ddc1392002fa025b672
+DIST upmpdcli-1.8.9.tar.gz 658086 BLAKE2B 61aa8752f7c2611fd27be5c8114630f9be00f84d27ad2ccbb32320cf7ba00c0dc5a983222de50f9bc361c6a695634c0c0d6896d355bc90bb26637f35bc4432be SHA512 f7fc474d91076acfe1d1482db6ea3e9a4a15612cfdef854e11721673f5822f1d2adf1b353b39bdbfbb6cbf869f4b6e8b6995c78e11555cd03c44140f4104b087
diff --git a/media-sound/upmpdcli/files/configure.patch b/media-sound/upmpdcli/files/configure.patch
new file mode 100644
index 000000000000..d708186f652b
--- /dev/null
+++ b/media-sound/upmpdcli/files/configure.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2023-06-10 10:21:38.770760698 -0500
++++ b/configure.ac	2023-06-10 10:22:01.670904090 -0500
+@@ -86,7 +86,7 @@
+ 
+ #### Functions
+ AC_LINK_IFELSE(
+-    [AC_LANG_PROGRAM([#include <math.h>], [double x = exp10(1.0);])],
++    [AC_LANG_PROGRAM([#include <math.h>], [double exp10(double x);], [double x = exp10(1.0);])],
+     [AC_DEFINE([HAVE_EXP10], [1], [Define to 1 if you have the 'exp10' function])],
+   [])
+ 
diff --git a/media-sound/upmpdcli/files/makefile.patch b/media-sound/upmpdcli/files/makefile.patch
new file mode 100644
index 000000000000..dd259a1406a6
--- /dev/null
+++ b/media-sound/upmpdcli/files/makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.in	2023-02-08 13:40:15.504842769 -0600
++++ b/Makefile.in	2023-02-08 13:40:30.175898082 -0600
+@@ -2002,7 +2002,7 @@
+ @MAKECONFGUI_TRUE@                prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) \
+ @MAKECONFGUI_TRUE@                install
+ 
+-install-data-hook:
++install-data-hook: install-dist_sysconfDATA
+ 	(cd $(DESTDIR)$(sysconfdir); test -f upmpdcli.conf || \
+ 		mv upmpdcli.conf-dist upmpdcli.conf; chmod 600 upmpdcli.conf)
+ 	(cd $(DESTDIR)$(pkgdatadir); test -d src_scripts || mkdir src_scripts)
+--- a/Makefile.am	2023-02-08 13:45:02.076935272 -0600
++++ b/Makefile.am	2023-02-08 13:45:20.889007724 -0600
+@@ -285,7 +285,7 @@
+     systemd/upmpdcli.service
+ 
+ 
+-install-data-hook:
++install-data-hook: install-dist_sysconfDATA
+ 	(cd $(DESTDIR)$(sysconfdir); test -f upmpdcli.conf || \
+ 		mv upmpdcli.conf-dist upmpdcli.conf; chmod 600 upmpdcli.conf)
+ 	(cd $(DESTDIR)$(pkgdatadir); test -d src_scripts || mkdir src_scripts)
diff --git a/media-sound/upmpdcli/metadata.xml b/media-sound/upmpdcli/metadata.xml
index 49bf49af07ac..ee2f900864b1 100644
--- a/media-sound/upmpdcli/metadata.xml
+++ b/media-sound/upmpdcli/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
 	<email>stasibear@gentoo.org</email>
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
deleted file mode 100644
index 90bdff1ab338..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.20.0-r1
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/upmpdcli
-	acct-user/upmpdcli
-	app-misc/recoll
-	thirdparty? ( dev-python/requests )
-"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild b/media-sound/upmpdcli/upmpdcli-1.8.10.ebuild
index 0eb2b288b4ea..c929aea886e6 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.8.10.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit systemd
+inherit meson systemd
 
 DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
 HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="thirdparty"
 
 DEPEND="
+	net-misc/curl
 	dev-libs/jsoncpp
 	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.20.0-r1
+	net-libs/libmicrohttpd:=
+	>net-libs/libupnpp-0.26.4
 "
 RDEPEND="
 	${DEPEND}
@@ -29,21 +30,8 @@ RDEPEND="
 "
 
 src_install() {
-	default
+	meson_src_install
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 	systemd_dounit systemd/upmpdcli.service
 }
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild b/media-sound/upmpdcli/upmpdcli-1.8.9.ebuild
index a3c936e6337c..db09e520668f 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.8.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit systemd
+inherit autotools systemd
 
 DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
 HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="thirdparty"
@@ -17,8 +17,8 @@ IUSE="thirdparty"
 DEPEND="
 	dev-libs/jsoncpp
 	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.20.0-r1
+	net-libs/libmicrohttpd:=
+	net-libs/libupnpp
 "
 RDEPEND="
 	${DEPEND}
@@ -28,6 +28,33 @@ RDEPEND="
 	thirdparty? ( dev-python/requests )
 "
 
+PATCHES=(
+	"${FILESDIR}"/makefile.patch
+	"${FILESDIR}"/configure.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+
+	eautoconf
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--disable-dependency-tracking \
+		--disable-silent-rules \
+		"--docdir=/usr/share/doc/${P}" \
+		"--htmldir=/usr/share/doc/${P}/html" \
+		--libdir=/usr/lib64 \
+		|| die "Configure failed"
+
+}
+
 src_install() {
 	default
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
@@ -41,9 +68,4 @@ pkg_postinst() {
 	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
 	einfo "Probably it is though, so be sure your mpd is built with"
 	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
 }
diff --git a/media-sound/vb2rip/metadata.xml b/media-sound/vb2rip/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/vb2rip/metadata.xml
+++ b/media-sound/vb2rip/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch b/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch
index 89e20e3aade0..d2473e81d8f5 100644
--- a/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch
+++ b/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch
@@ -1,11 +1,31 @@
-diff -ur vbrfixc-0.24/vbrfixc/vbrfix.cpp vbrfixc-0.24.dmd/vbrfixc/vbrfix.cpp
---- vbrfixc-0.24/vbrfixc/vbrfix.cpp	2003-07-17 13:58:21.000000000 -0400
-+++ vbrfixc-0.24.dmd/vbrfixc/vbrfix.cpp	2008-06-11 11:26:42.000000000 -0400
-@@ -16,6 +16,7 @@
+--- a/vbrfixc/vbrfix.cpp
++++ b/vbrfixc/vbrfix.cpp
+@@ -16,6 +16,8 @@
   ***************************************************************************/
  #include "vbrfix.h"
  //#include "stdafx.h"//include in mfc version
 +#include <cstring>
++#include <stdint.h>
  int getXHpos(int ver,int chan);
  VbrFix::VbrFix(){
    frameptrs=NULL;flags=0;
+@@ -295,7 +297,7 @@
+       }
+       lyrics3Pos=mp3.getpos()-8-4;
+       //find its length
+-      bool e=false;unsigned char c;uint correctv1=0,correctv2=0,p=0;char ev1[]="LYRICSEND";char ev2[]="LYRICS200";
++      bool e=false;unsigned char c;uint32_t correctv1=0,correctv2=0,p=0;char ev1[]="LYRICSEND";char ev2[]="LYRICS200";
+       while(!e && mp3.getpos()< mp3length){
+         mp3.fRead(&c,1);
+         if(c==255){logi("Error byte value of 255 in the lyrics3 tag!, asuming tag has ended");e=true;}
+--- a/vbrfixc/wputil.h
++++ b/vbrfixc/wputil.h
+@@ -199,7 +199,7 @@
+     ofstream out(output, ios::out|ios::binary|ios::trunc);
+     if(out.fail())return false;
+     // fast portable file copy
+-    return out << in.rdbuf();
++    return bool(out << in.rdbuf());
+   }
+   static wps loadSetting(const char *file,wps setting,wps defaultValue){
+     ifstream in(file, ios::in);
diff --git a/media-sound/vbrfixc/metadata.xml b/media-sound/vbrfixc/metadata.xml
index 5e46f4547c73..c5a6f5184df6 100644
--- a/media-sound/vbrfixc/metadata.xml
+++ b/media-sound/vbrfixc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
diff --git a/media-sound/vbrfixc/vbrfixc-0.24.ebuild b/media-sound/vbrfixc/vbrfixc-0.24-r1.ebuild
index 696cce119952..6aea3451bdef 100644
--- a/media-sound/vbrfixc/vbrfixc-0.24.ebuild
+++ b/media-sound/vbrfixc/vbrfixc-0.24-r1.ebuild
@@ -1,22 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Vbrfix fixes MP3s and re-constructs VBR headers"
-HOMEPAGE="http://home.gna.org/vbrfix/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="ftp://mirror.bytemark.co.uk/gentoo/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-# bin endian ones need vbrfixc-0.24-bigendian.diff from gentoo-x86 cvs Attic
+# big-endian ones need vbrfixc-0.24-bigendian.diff from gentoo-x86 cvs Attic
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
 
 src_install() {
 	HTML_DOCS=( vbrfixc/docs/en/*.html )
diff --git a/media-sound/vimpc/files/vimpc-0.09.2-wformat-security.patch b/media-sound/vimpc/files/vimpc-0.09.2-wformat-security.patch
new file mode 100644
index 000000000000..2d8c09e416e5
--- /dev/null
+++ b/media-sound/vimpc/files/vimpc-0.09.2-wformat-security.patch
@@ -0,0 +1,103 @@
+https://github.com/boysetsfrog/vimpc/commit/055ecdce0720fdfc9ec2528c520b6c33da36271b
+
+From 055ecdce0720fdfc9ec2528c520b6c33da36271b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Wed, 3 Nov 2021 08:25:58 +0000
+Subject: [PATCH] vimpc: always use "%s"-style format for printf()-style
+ functions
+
+`ncuses-6.3` added printf-style function attributes and now makes
+it easier to catch cases when user input is used in palce of format
+string when built with CFLAGS=-Werror=format-security:
+
+    src/window/listwindow.cpp:120:16:
+      error: format not a string literal and no format arguments [-Werror=format-security]
+      120 |       mvwprintw(window, line, 0, BlankLine.c_str());
+          |       ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Let's wrap all the missing places with "%s" format.
+--- a/src/screen.cpp
++++ b/src/screen.cpp
+@@ -1489,7 +1489,7 @@ void Screen::ClearStatus() const
+       wattron(statusWindow_, A_REVERSE);
+    }
+ 
+-   mvwprintw(statusWindow_, 0, 0, BlankLine.c_str());
++   mvwprintw(statusWindow_, 0, 0, "%s", BlankLine.c_str());
+ 
+    if (settings_.Get(Setting::ColourEnabled) == true)
+    {
+@@ -1516,7 +1516,7 @@ void Screen::UpdateTabWindow() const
+       wattron(tabWindow_, COLOR_PAIR(settings_.colours.TabWindow));
+    }
+ 
+-   mvwprintw(tabWindow_, 0, 0, BlankLine.c_str());
++   mvwprintw(tabWindow_, 0, 0, "%s", BlankLine.c_str());
+    wmove(tabWindow_, 0, 0);
+ 
+    std::string name   = "";
+--- a/src/window/directorywindow.cpp
++++ b/src/window/directorywindow.cpp
+@@ -220,8 +220,8 @@ void DirectoryWindow::Print(uint32_t line) const
+ 
+       wattron(window, A_BOLD);
+       std::string const Directory = "/" + directory_.CurrentDirectory();
+-      mvwprintw(window, line, 0, BlankLine.c_str());
+-      mvwprintw(window, line, 1, Directory.c_str());
++      mvwprintw(window, line, 0, "%s", BlankLine.c_str());
++      mvwprintw(window, line, 1, "%s", Directory.c_str());
+       wattroff(window, A_BOLD);
+ 
+       if (settings_.Get(Setting::ColourEnabled) == true)
+@@ -250,7 +250,7 @@ void DirectoryWindow::Print(uint32_t line) const
+             wattron(window, A_REVERSE);
+          }
+ 
+-         mvwprintw(window, line, 0, BlankLine.c_str());
++         mvwprintw(window, line, 0, "%s", BlankLine.c_str());
+ 
+          uint8_t expandCol = 1;
+ 
+@@ -276,7 +276,7 @@ void DirectoryWindow::Print(uint32_t line) const
+       }
+       else
+       {
+-         mvwprintw(window, line, 0, BlankLine.c_str());
++         mvwprintw(window, line, 0, "%s", BlankLine.c_str());
+       }
+    }
+ }
+--- a/src/window/help.cpp
++++ b/src/window/help.cpp
+@@ -64,7 +64,7 @@ void HelpWindow::Print(uint32_t line) const
+    WINDOW * window = N_WINDOW();
+ 
+    std::string const BlankLine(Columns(), ' ');
+-   mvwprintw(window, line, 0, BlankLine.c_str());
++   mvwprintw(window, line, 0, "%s", BlankLine.c_str());
+    wmove(window, line, 0);
+ 
+    if ((FirstLine() + line) < help_.Size())
+--- a/src/window/listwindow.cpp
++++ b/src/window/listwindow.cpp
+@@ -117,7 +117,7 @@ void ListWindow::Print(uint32_t line) const
+    else
+    {
+       std::string const BlankLine(Columns(), ' ');
+-      mvwprintw(window, line, 0, BlankLine.c_str());
++      mvwprintw(window, line, 0, "%s", BlankLine.c_str());
+    }
+ #else
+    SelectWindow::Print(line);
+--- a/src/window/lyricswindow.cpp
++++ b/src/window/lyricswindow.cpp
+@@ -61,7 +61,7 @@ void LyricsWindow::Print(uint32_t line) const
+    WINDOW * window = N_WINDOW();
+ 
+    std::string const BlankLine(Columns(), ' ');
+-   mvwprintw(window, line, 0, BlankLine.c_str());
++   mvwprintw(window, line, 0, "%s", BlankLine.c_str());
+    wmove(window, line, 0);
+ 
+    if ((FirstLine() == 0) && (line == 0))
+
diff --git a/media-sound/vimpc/metadata.xml b/media-sound/vimpc/metadata.xml
index 94f386b3b1c7..8315b736c242 100644
--- a/media-sound/vimpc/metadata.xml
+++ b/media-sound/vimpc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild b/media-sound/vimpc/vimpc-0.09.2-r2.ebuild
index 06b1c98bc5b5..42d1fa28e1f5 100644
--- a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild
+++ b/media-sound/vimpc/vimpc-0.09.2-r2.ebuild
@@ -1,27 +1,37 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="An ncurses based mpd client with vi-like key bindings"
 HOMEPAGE="https://github.com/boysetsfrog/vimpc"
-SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/boysetsfrog/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
 IUSE="boost taglib"
 
-RDEPEND="dev-libs/libpcre
+RDEPEND="
+	dev-libs/libpcre
 	media-libs/libmpdclient
 	boost? ( dev-libs/boost:= )
-	taglib? ( media-libs/taglib )"
+	taglib? ( media-libs/taglib )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-boost.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-boost.patch
+	"${FILESDIR}"/${P}-wformat-security.patch
+)
 
 src_prepare() {
 	default
@@ -29,9 +39,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Tests here seem to make cppunit linked into the main vimpc binary
+	# Not clear how to run them either
 	econf \
 		$(use_enable boost) \
-		$(use_enable taglib)
+		$(use_enable taglib) \
+		--disable-test
 }
 
 src_install() {
diff --git a/media-sound/vimpc/vimpc-0.09.2.ebuild b/media-sound/vimpc/vimpc-0.09.2.ebuild
deleted file mode 100644
index e6968fffae96..000000000000
--- a/media-sound/vimpc/vimpc-0.09.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="An ncurses based mpd client with vi-like key bindings"
-HOMEPAGE="https://github.com/boysetsfrog/vimpc"
-SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost taglib"
-
-RDEPEND="dev-libs/libpcre
-	media-libs/libmpdclient
-	boost? ( dev-libs/boost:= )
-	taglib? ( media-libs/taglib )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS README.md doc/vimpcrc.example )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable taglib)
-}
-
-src_install() {
-	default
-
-	# vimpc will look for help.txt
-	docompress -x /usr/share/doc/${PF}/help.txt
-}
diff --git a/media-sound/vimpc/vimpc-9999.ebuild b/media-sound/vimpc/vimpc-9999.ebuild
index 5d7ee52d0a6e..a6a60a208193 100644
--- a/media-sound/vimpc/vimpc-9999.ebuild
+++ b/media-sound/vimpc/vimpc-9999.ebuild
@@ -1,26 +1,37 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools git-r3
+inherit autotools
 
-DESCRIPTION="An ncurses based mpd client with vi like key bindings"
+DESCRIPTION="An ncurses based mpd client with vi-like key bindings"
 HOMEPAGE="https://github.com/boysetsfrog/vimpc"
-EGIT_REPO_URI="https://github.com/boysetsfrog/${PN}.git"
-
-LICENSE="GPL-3"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/boysetsfrog/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="boost taglib"
 
-RDEPEND="dev-libs/libpcre
+RDEPEND="
+	dev-libs/libpcre
 	media-libs/libmpdclient
 	boost? ( dev-libs/boost:= )
-	taglib? ( media-libs/taglib )"
+	taglib? ( media-libs/taglib )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS README.md doc/vimpcrc.example )
+PATCHES=(
+	"${FILESDIR}"/${P}-boost.patch
+	"${FILESDIR}"/${P}-wformat-security.patch
+)
 
 src_prepare() {
 	default
@@ -28,12 +39,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# Tests here seem to make cppunit linked into the main vimpc binary
+	# Not clear how to run them either
 	econf \
 		$(use_enable boost) \
-		$(use_enable taglib)
+		$(use_enable taglib) \
+		--disable-test
 }
 
 src_install() {
+	local DOCS=( AUTHORS README.md doc/vimpcrc.example )
 	default
 
 	# vimpc will look for help.txt
diff --git a/media-sound/vkeybd/metadata.xml b/media-sound/vkeybd/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/vkeybd/metadata.xml
+++ b/media-sound/vkeybd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/vlevel/metadata.xml b/media-sound/vlevel/metadata.xml
index 25aad767d276..49e2ee09469b 100644
--- a/media-sound/vlevel/metadata.xml
+++ b/media-sound/vlevel/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/vlevel/vlevel-0.5-r1.ebuild b/media-sound/vlevel/vlevel-0.5-r1.ebuild
index 3878e4aedc2c..9db5bbc373d0 100644
--- a/media-sound/vlevel/vlevel-0.5-r1.ebuild
+++ b/media-sound/vlevel/vlevel-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,10 +6,10 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Dynamic compressor to amplify quiet parts of music"
-HOMEPAGE="http://vlevel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vlevel/${P}.tar.gz"
+HOMEPAGE="https://vlevel.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/vlevel/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 
diff --git a/media-sound/vlorb/metadata.xml b/media-sound/vlorb/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/vlorb/metadata.xml
+++ b/media-sound/vlorb/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 985859ac40fa..703c453b0f91 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,2 +1 @@
-DIST vmpk-0.7.2.tar.bz2 438006 BLAKE2B 78b1f50ce4ec6a430e4b82b500687261c448043d07fcd8e5a8fabcf0554f0488b7a87abf4a208a1d102a86c7b399c0637210c23f7d5b45a5166d6909aeb26b1f SHA512 69e31d6fd91a6604b7482b18840ed0b274723f380d7fe59827391e9031c3c670cb4e331c8bff01aacf6271973689f0bdb8c1dad4b749524095b398063634a477
-DIST vmpk-0.8.0.tar.bz2 466517 BLAKE2B 9fee766b71ad7f9cd96f9dfd859dc31434f14c913c75f5a8e76c66150522dbf04c6e28582269d1603c6d53d6db436e9e7f73cab1172c0d6b004cc71edccb21c8 SHA512 b3e1e40792661c1e4ce3a5274513b4b75742ca861a6233c2653d6df90b7a89e086d15a4196d59c7021c48e9e2aae83116ba29c3395960179d602f0cb06c1f608
+DIST vmpk-0.8.7.tar.bz2 483742 BLAKE2B 788c70034fcfb53edfb4c6b0faf80c06e2ae096c06819bc727359d4597cb217ca60efc9ebbbb19b223dc0d7106ddd9083abbce881f175b98203f3b6acc9b44e2 SHA512 83867aed8be8e620e18070d5eba9f5e4026b1f39ff9d7fe55e342d4a040c96e2353844296191c0efb46483254b1d2d30824894077562a165f7474d02a882cfc6
diff --git a/media-sound/vmpk/metadata.xml b/media-sound/vmpk/metadata.xml
index 8e297e92c1a6..6eb946fd6677 100644
--- a/media-sound/vmpk/metadata.xml
+++ b/media-sound/vmpk/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
@@ -13,7 +13,7 @@
 	the Virtual MIDI Piano Keyboard to display the played MIDI notes from
 	another instrument or MIDI file player. To do so, connect the other MIDI
 	port to the input port of VMPK.
-</longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">vmpk</remote-id>
 	</upstream>
diff --git a/media-sound/vmpk/vmpk-0.7.2-r1.ebuild b/media-sound/vmpk/vmpk-0.7.2-r1.ebuild
deleted file mode 100644
index 227a4e14dd2e..000000000000
--- a/media-sound/vmpk/vmpk-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Virtual MIDI Piano Keyboard"
-HOMEPAGE="https://vmpk.sourceforge.io/"
-SRC_URI="mirror://sourceforge/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
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	=media-sound/drumstick-1*
-	x11-libs/libxcb
-	dbus? ( dev-qt/qtdbus:5 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DBUS=$(usex dbus)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	rm -rf "${D}/usr/share/doc/packages" || die
-}
diff --git a/media-sound/vmpk/vmpk-0.8.0.ebuild b/media-sound/vmpk/vmpk-0.8.7.ebuild
index cd6827e95032..652ccbe41250 100644
--- a/media-sound/vmpk/vmpk-0.8.0.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.7.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
 DESCRIPTION="Virtual MIDI Piano Keyboard"
 HOMEPAGE="https://vmpk.sourceforge.io/"
-SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 BDEPEND="
@@ -25,7 +25,7 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	>=media-sound/drumstick-2.0.0
+	>=media-sound/drumstick-2.6.0
 	x11-libs/libxcb
 	dbus? ( dev-qt/qtdbus:5 )
 "
diff --git a/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch b/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch
new file mode 100644
index 000000000000..bdfaa4f11a2d
--- /dev/null
+++ b/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch
@@ -0,0 +1,22 @@
+From 78a9c23775ebe12d3f3be93c0798144a6e732d90 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john.lindgren@aol.com>
+Date: Wed, 30 Dec 2015 20:50:46 -0500
+Subject: [PATCH] Add missing space in NOTIFY_CFLAGS.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6ad78d5..c8b72bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,7 +86,7 @@ fi
+ if test "x${notify}" = xyes; then
+ # Check for libnotify
+ PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.5.0])
+-NOTIFY_CFLAGS+="-DCOMPILEWITH_NOTIFY"
++NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY"
+ AC_SUBST(NOTIFY_CFLAGS)
+ AC_SUBST(NOTIFY_LIBS)
+ fi
diff --git a/media-sound/volumeicon/metadata.xml b/media-sound/volumeicon/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/volumeicon/metadata.xml
+++ b/media-sound/volumeicon/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild b/media-sound/volumeicon/volumeicon-0.5.1-r2.ebuild
index 9843572f6c72..37b89992df4f 100644
--- a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
+++ b/media-sound/volumeicon/volumeicon-0.5.1-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="A lightweight volume control that sits in your systray"
 HOMEPAGE="http://nullwise.com/volumeicon.html"
 SRC_URI="http://nullwise.com/${PN}/${P}.tar.gz"
@@ -19,12 +21,20 @@ RDEPEND="
 	x11-libs/libX11
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.5.1-fix-libnotify.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
 	econf $(use_enable libnotify notify)
diff --git a/media-sound/volwheel/Manifest b/media-sound/volwheel/Manifest
index 954e115d423f..1958eefc02b3 100644
--- a/media-sound/volwheel/Manifest
+++ b/media-sound/volwheel/Manifest
@@ -1 +1 @@
-DIST volwheel-0.2.8.tar.gz 43140 BLAKE2B 87e23aa333485f31b2d21d79825d61aa421283d7ef62fc20e30e21cd11a2c379f5ae536cdba08883ced2a112a4ef0f8de9e719908afdcf5cd94d0431ce92f8b6 SHA512 ee2d121d2a9e2c987407a30187a313db128f1557932d003421e0fbda683cf80d52b5fb3c4c4ab2d07b642e86bb580bb3764a1c091ea57f5068660a035e78721b
+DIST volwheel-0.2.9.tar.gz 43921 BLAKE2B 9f555d8666373127de8a02cb4f83b12a2f6dab4c78087c3cef711fc6c59343d69af2f36e68a9354390bd820aff5ea41405b5cf5eef8d196da010efaf5d878b80 SHA512 9a16a9813953d2acfe7bae25c366094f244f34b6031e8d75761468590e76d63005580c26b0f27f26ac6e6537a179d15fdaa4348d94c84d0bb1fb7ec97e092e5d
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
deleted file mode 100644
index 11af8697af6a..000000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/volwheel.desktop
-+++ b/volwheel.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=VolWheel
- GenericName=VolWheel
- Comment=Easy sound volume adjustment
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
deleted file mode 100644
index 4a801cf5192f..000000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://code.google.com/p/olwtools/issues/detail?id=8
-
---- a/install.pl
-+++ b/install.pl
-@@ -2,7 +2,6 @@
- 
- use strict;
- use warnings;
--use Shell qw(install cp);
- 
- my $package = "volwheel";
- 
-@@ -33,17 +32,17 @@
- 	system("sed -i 's|/usr/local|$prefix|g\' volwheel");
- }
- 
--my $output = install ("-v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}");
-+my $output = qx|install -v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}|;
- print $output;
--$output = install ("-v -m755 volwheel $bindir");
-+$output = qx|install -v -m755 volwheel $bindir|;
- print $output;
--$output = install ("-v -m644 lib/* $libdir");
-+$output = qx|install -v -m644 lib/* $libdir|;
- print $output;
--$output = cp      ("-v -r icons $datadir/");
-+$output = qx|cp -v -r icons $datadir/|;
- print $output;
--$output = install ("-v -m644 icons/volwheel.svg $hicolor");
-+$output = qx|install -v -m644 icons/volwheel.svg $hicolor|;
- print $output;
--$output = install ("-v -m644 volwheel.desktop $desktop");
-+$output = qx|install -v -m644 volwheel.desktop $desktop|;
- 
- print "\nVolWheel has been succesfully installed.\n\n";
- 
diff --git a/media-sound/volwheel/metadata.xml b/media-sound/volwheel/metadata.xml
index 87c2a98ca835..5eec01a213d8 100644
--- a/media-sound/volwheel/metadata.xml
+++ b/media-sound/volwheel/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.9.ebuild
index 49e02ece502f..128246afb82c 100644
--- a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
+++ b/media-sound/volwheel/volwheel-0.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit xdg
 
 DESCRIPTION="A volume control trayicon with mouse wheel support"
 HOMEPAGE="https://oliwer.net/b/volwheel.html"
-SRC_URI="https://olwtools.googlecode.com/files/${P}.tar.gz"
+SRC_URI="https://github.com/oliwer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -19,11 +19,6 @@ RDEPEND="${DEPEND}
 	dev-perl/Gtk2
 	alsa? ( media-sound/alsa-utils )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-perl516.patch
-	"${FILESDIR}"/${P}-desktop-QA.patch
-)
-
 src_install() {
 	./install.pl prefix="${EPREFIX}"/usr destdir="${D}" || die
 	einstalldocs
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index dac34365d6e8..a898479f8ebe 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1 +1 @@
-DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
+DIST vorbis-tools-1.4.2.tar.gz 1389947 BLAKE2B 6cec240a2c069a74accfadd4d4a5a2a75bb4ad40c83aff86e190f7b19a87d4348d7a932e69a9ae9dd2efff636f47d3465b3d26d39393b4fec925cb7d1543f77e SHA512 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
deleted file mode 100644
index a643f1cb82f6..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Patches taken as references: 
-https://github.com/mark4o/opus-tools/commit/8c412e619b83eb6dd32191909cf6672e93e5802e
-https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
-To fix bug report:
-http://www.openwall.com/lists/oss-security/2015/08/29/1
-    https://bugs.gentoo.org/show_bug.cgi?id=559170
-https://bugs.gentoo.org/show_bug.cgi?id=537422
---- a/oggenc/audio.h
-+++ b/oggenc/audio.h
-@@ -25,7 +25,7 @@
- 
- typedef struct {
-     short format;
--    short channels;
-+    unsigned short channels;
-     int samplerate;
-     int bytespersec;
-     short align;
-@@ -44,7 +44,7 @@
- } wavfile;
- 
- typedef struct {
--    short channels;
-+    unsigned short channels;
-     int totalframes;
-     short samplesize;
-     int rate;
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -245,8 +245,8 @@
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- {
-     int aifc; /* AIFC or AIFF? */
--    unsigned int len;
--    unsigned char *buffer;
-+    unsigned int len,readlen;
-+    unsigned char buffer[22];
-     unsigned char buf2[8];
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@
-         return 0; /* Weird common chunk */
-     }
-
--    buffer = alloca(len);
--
--    if(fread(buffer,1,len,in) < len)
-+    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
-+    if(fread(buffer,1,readlen,in) < readlen ||
-+        (len > readlen && !seek_forward(in, len-readlen)))
-     {
-         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
-         return 0;
-@@ -277,11 +277,18 @@
-         return 0;
-     }
- 
--    format.channels = READ_U16_BE(buffer);
-+    format.channels = (short)READ_U16_BE(buffer);
-     format.totalframes = READ_U32_BE(buffer+2);
-     format.samplesize = READ_U16_BE(buffer+6);
-     format.rate = (int)read_IEEE80(buffer+8);
- 
-+    if(format.channels <=0)
-+    {
-+    	fprintf(stderr, _("ERROR: Invalid channel count in AIFF header\n"));
-+	return 0;
-+
-+    }
-+
-     aiff->bigendian = 1;
- 
-     if(aifc)
-@@ -449,11 +449,17 @@
-     }
-
-     format.format =      READ_U16_LE(buf);
--    format.channels =    READ_U16_LE(buf+2);
-+    format.channels =    (short)READ_U16_LE(buf+2);
-     format.samplerate =  READ_U32_LE(buf+4);
-     format.bytespersec = READ_U32_LE(buf+8);
-     format.align =       READ_U16_LE(buf+12);
-     format.samplesize =  READ_U16_LE(buf+14);
-+
-+    if(format.channels == 0)
-+    {
-+      fprintf(stderr, _("ERROR: Zero channels in WAV header\n"));
-+      return 0;
-+    }
-
-     if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
-     {
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
deleted file mode 100644
index 51c23b062aff..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch taken from: 
-https://trac.xiph.org/changeset/19117
-To fix bug report:
-https://bugs.gentoo.org/show_bug.cgi?id=537422
---- vorbis-tools-1.4.0/oggenc/oggenc.c	
-+++ vorbis-tools-1.4.0/oggenc/oggenc.c
-@@ -97,6 +97,8 @@
-               .3,-1,
-               0,0,0.f,
-               0, 0, 0, 0, 0};
-+    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
-+        N_("RAW file reader")};
- 
-     int i;
- 
-@@ -239,8 +241,6 @@
- 
-         if(opt.rawmode)
-         {
--            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
--                N_("RAW file reader")};
- 
-             enc_opts.rate=opt.raw_samplerate;
-             enc_opts.channels=opt.raw_channels;
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch
deleted file mode 100644
index 501300ca6171..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vorbis-tools-1.4.0.orig/ogg123/status.c
-+++ vorbis-tools-1.4.0/ogg123/status.c
-@@ -148,7 +148,7 @@
- 
-     switch (stats->type) {
-     case stat_noarg:
--      len += sprintf(str+len, stats->formatstr);
-+      len += sprintf(str+len, "%s", stats->formatstr);
-       break;
-     case stat_intarg:
-       len += sprintf(str+len, stats->formatstr, stats->arg.intarg);
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
deleted file mode 100644
index 9aee38e0b19e..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://bugs.gentoo.org/513942
-
-Fix building with `./configure --enable-ogg123 --without-flac --without-speex --without-kate` and `make`:
-
-libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--hash-style=gnu -o oggenc oggenc.o audio.o encode.o platform.o resample.o skeleton.o  -Wl,--as-needed ../share/libutf8.a ../share/libgetopt.a -lvorbisenc -lvorbis -logg
-resample.o:resample.c:function res_init: error: undefined reference to 'sin'
-collect2: error: ld returned 1 exit status
-
-libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -o ogg123 audio.o buffer.o callbacks.o cfgfile_options.o cmdline_options.o file_transport.o format.o http_transport.o ogg123.o oggvorbis_format.o playlist.o status.o remote.o transport.o vorbis_comments.o vgfilter.o  ../share/libutf8.a ../share/libgetopt.a -lvorbisfile -lvorbis -logg -lao -lnsl -lcurl -lpthread
-vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
-vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
-vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
-vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
-collect2: error: ld returned 1 exit status
-
-This is using the new GNU gold linker:
-
-$ ld -v
-GNU gold (GNU Binutils 2.24) 1.11
-
-Happens because -lm gets appended to the libraries list only with, for example, --with-flac but vgfilter.c and resample.c are always
-using functions from the mathlib.
-
-Therefore, always link to mathlib:
-
---- a/ogg123/Makefile.am
-+++ b/ogg123/Makefile.am
-@@ -30,7 +30,7 @@
- ogg123_LDADD = @SHARE_LIBS@ \
- 	       @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
-                @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
--               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@
-+               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ -lm
- 
- ogg123_DEPENDENCIES = @SHARE_LIBS@
- ogg123_SOURCES = audio.c buffer.c callbacks.c \
---- a/oggenc/Makefile.am
-+++ b/oggenc/Makefile.am
-@@ -23,7 +23,7 @@
- 
- oggenc_LDADD = @SHARE_LIBS@ \
- 	       @VORBISENC_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ \
--	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@
-+	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@ -lm
- 
- oggenc_DEPENDENCIES = @SHARE_LIBS@
- 
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-clang16.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-clang16.patch
new file mode 100644
index 000000000000..2d9b1158e635
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-clang16.patch
@@ -0,0 +1,22 @@
+https://gitlab.xiph.org/xiph/vorbis-tools/-/merge_requests/6
+
+From ec3a1a1de87168f575b93bc9cedcfaeb82c048a4 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 7 Feb 2023 08:48:05 +0100
+Subject: [PATCH] Fix C99 compatibility glitch in ogginfo/codec_skeleton.c
+
+Include "utf8.h" for a prototype of the utf8_decode function.
+This avoids an implicit function declaration and build issues
+with future compilers.
+--- a/ogginfo/codec_skeleton.c
++++ b/ogginfo/codec_skeleton.c
+@@ -25,6 +25,7 @@
+ #include <ogg/ogg.h>
+ 
+ #include "i18n.h"
++#include "utf8.h"
+ 
+ #include "private.h"
+ 
+-- 
+GitLab
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-fix-buffer-overflow.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-fix-buffer-overflow.patch
new file mode 100644
index 000000000000..20d4b65e2630
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-fix-buffer-overflow.patch
@@ -0,0 +1,32 @@
+fix from https://gitlab.xiph.org/xiph/vorbis-tools/-/merge_requests/7
+
+ diff --git a/oggenc/platform.c b/oggenc/platform.c
+ index 6d9f4ef..b66e47a 100644
+ --- a/oggenc/platform.c
+ +++ b/oggenc/platform.c
+ @@ -136,18 +136,22 @@ int create_directories(char *fn, int isutf8)
+  {
+      char *end, *start;
+      struct stat statbuf;
+ -    char *segment = malloc(strlen(fn)+1);
+ +    const size_t fn_len = strlen(fn);
+ +    char *segment = malloc(fn_len+1);
+  #ifdef _WIN32
+      wchar_t seg[MAX_PATH+1];
+  #endif
+  
+      start = fn;
+  #ifdef _WIN32
+ -    if(strlen(fn) >= 3 && isalpha(fn[0]) && fn[1]==':')
+ +    // Strip drive prefix
+ +    if(fn_len >= 3 && isalpha(fn[0]) && fn[1]==':') {
+ + 
+          start = start+2;
+  #endif
+  
+ -    while((end = strpbrk(start+1, PATH_SEPS)) != NULL)
+ +    // Loop through path segments, creating directories if necessary
+ +    while((end = strpbrk(start + strspn(start, PATH_SEPS), PATH_SEPS)) != NULL)
+      {
+          int rv;
+          memcpy(segment, fn, end-fn);
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-r3-docdir.patch
index d3fdde0e11d7..6e78b0d6b7d2 100644
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-r3-docdir.patch
@@ -1,14 +1,12 @@
-Thanks-to: Chris Mayo
-https://bugs.gentoo.org/533774
+https://bugs.gentoo.org/869662
 
---- a/ogg123/Makefile.am
-+++ b/ogg123/Makefile.am
-@@ -19,7 +19,7 @@
+--- vorbis-tools-1.4.2/ogg123/Makefile.am
++++ vorbis-tools-1.4.2/ogg123/Makefile.am
+@@ -25,7 +25,6 @@
  localedir = $(datadir)/locale
  DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = @docdir@
  mandir = @MANDIR@
  
  bin_PROGRAMS = ogg123
diff --git a/media-sound/vorbis-tools/metadata.xml b/media-sound/vorbis-tools/metadata.xml
index fb45cda8412c..eb1459d8412d 100644
--- a/media-sound/vorbis-tools/metadata.xml
+++ b/media-sound/vorbis-tools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
deleted file mode 100644
index 51e642dbe33a..000000000000
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Tools for using the Ogg Vorbis sound file format"
-HOMEPAGE="http://www.vorbis.com"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="flac kate nls +ogg123 speex"
-
-RDEPEND="
-	>=media-libs/libvorbis-1.3.0
-	flac? ( media-libs/flac )
-	kate? ( media-libs/libkate )
-	ogg123? (
-		>=media-libs/libao-1.0.0
-		net-misc/curl
-	)
-	speex? ( media-libs/speex )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-CVE-2014-9640.patch
-	"${FILESDIR}"/${P}-CVE-2014-9638.patch
-	"${FILESDIR}"/${P}-docdir.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ogg123) \
-		$(use_with flac) \
-		$(use_with speex) \
-		$(use_with kate)
-}
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild
new file mode 100644
index 000000000000..525d5192918a
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="https://xiph.org/vorbis/"
+SRC_URI="https://ftp.osuosl.org/pub/xiph/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="flac kate nls +ogg123 speex"
+
+RDEPEND="
+	media-libs/libvorbis
+	media-libs/opusfile
+	flac? ( media-libs/flac:= )
+	kate? ( media-libs/libkate )
+	ogg123? (
+		media-libs/libao
+		net-misc/curl
+	)
+	speex? ( media-libs/speex )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-r3-docdir.patch
+	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-fix-buffer-overflow.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with flac)
+		$(use_with kate)
+		$(use_enable nls)
+		$(use_enable ogg123)
+		$(use_with speex)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-sound/vorbisgain/files/vorbisgain-0.37-wformat-security.patch b/media-sound/vorbisgain/files/vorbisgain-0.37-wformat-security.patch
new file mode 100644
index 000000000000..eecf45675fac
--- /dev/null
+++ b/media-sound/vorbisgain/files/vorbisgain-0.37-wformat-security.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/634994
+--- a/misc.c
++++ b/misc.c
+@@ -57,8 +57,7 @@
+     vfprintf(stderr, message, args);

+     va_end(args);

+ 

+-    fprintf(stderr, strerror(err_num));

+-    fprintf(stderr, "\n");

++    fprintf(stderr, "%s\n", strerror(err_num));

+ }

+ 

+ 

diff --git a/media-sound/vorbisgain/metadata.xml b/media-sound/vorbisgain/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/vorbisgain/metadata.xml
+++ b/media-sound/vorbisgain/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild b/media-sound/vorbisgain/vorbisgain-0.37-r4.ebuild
index 5491f2e4e0ef..885e785ad58c 100644
--- a/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild
+++ b/media-sound/vorbisgain/vorbisgain-0.37-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Calculator of perceived sound level for Ogg Vorbis files"
 HOMEPAGE="https://sjeng.org/vorbisgain.html"
@@ -9,8 +9,7 @@ SRC_URI="https://sjeng.org/ftp/vorbis/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	media-libs/libogg
@@ -20,9 +19,15 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	# bug 200931
 	"${FILESDIR}"/${P}-fix-errno-and-warnings.patch
+	# bug 634994
+	"${FILESDIR}"/${P}-wformat-security.patch
 )
-DOCS=( NEWS README vorbisgain.txt )
 
 src_configure() {
 	econf --enable-recursive
 }
+
+src_install() {
+	default
+	dodoc vorbisgain.txt
+}
diff --git a/media-sound/vsound/metadata.xml b/media-sound/vsound/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/vsound/metadata.xml
+++ b/media-sound/vsound/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/wav2json/files/wav2json-0.4-Makefile.patch b/media-sound/wav2json/files/wav2json-0.4-Makefile.patch
new file mode 100644
index 000000000000..ea616509e45a
--- /dev/null
+++ b/media-sound/wav2json/files/wav2json-0.4-Makefile.patch
@@ -0,0 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,23 +4,7 @@ UNAME := $(shell uname)
+ BINARY=../bin/$(UNAME)/wav2json
+ SRC=../src
+ 
+-ifeq ($(UNAME), Linux)
+ LD_PLATFORM_FLAGS=-lboost_program_options -lsndfile
+-CC=g++
+-endif
+-ifeq ($(UNAME), Darwin)
+-CC=clang++
+-LD_PLATFORM_FLAGS=\
+-	/usr/local/lib/libboost_program_options-mt.a \
+-	/usr/local/lib/libsndfile.a \
+-	/usr/local/lib/libogg.a \
+-	/usr/local/lib/libvorbis.a \
+-	/usr/local/lib/libvorbisenc.a \
+-	/usr/local/lib/libFLAC.a
+-
+-INCLUDES=\
+-	-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/usr/X11/include/
+-endif
+ 
+ ifdef USE_FLOAT
+   LD_PLATFORM_FLAGS+=-DUSE_FLOAT
+@@ -42,7 +26,7 @@ $(SRC)/version.hpp: Makefile version.txt
+ 
+ $(BINARY): $(SRC)/*.cpp $(SRC)/*.hpp $(SRC)/version.hpp
+ 	mkdir -p `dirname $(BINARY)`
+-	$(CC) -O3 -Wall -Werror -std=c++11 $(SRC)/*.cpp $(INCLUDES) $(LD_PLATFORM_FLAGS) -o $(BINARY)
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -Wall -std=c++11 $(SRC)/*.cpp $(INCLUDES) $(LD_PLATFORM_FLAGS) -o $(BINARY)
+ 
+ ../examples/%.json : ../example_data/%.wav
+ 	$(BINARY) $+ --precision 2 --channels left right mid side min max -o $@
diff --git a/media-sound/wav2json/metadata.xml b/media-sound/wav2json/metadata.xml
index a78826423e1b..760193435905 100644
--- a/media-sound/wav2json/metadata.xml
+++ b/media-sound/wav2json/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>pavel.a.denisov@gmail.com</email>
     <name>Pavel Denisov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-sound/wav2json/wav2json-0.4.ebuild b/media-sound/wav2json/wav2json-0.4.ebuild
index 6907ef34757d..9929abd646df 100644
--- a/media-sound/wav2json/wav2json-0.4.ebuild
+++ b/media-sound/wav2json/wav2json-0.4.ebuild
@@ -1,26 +1,31 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 COMMIT_ID="e412923f1f792408e8ae1096ca40fb5307ddfc74"
 DESCRIPTION="Generate waveformjs.org compatible json data out of wav files"
 HOMEPAGE="https://github.com/beschulz/wav2json"
 SRC_URI="https://github.com/beschulz/wav2json/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-S=${WORKDIR}/${PN}-${COMMIT_ID}/build
+S="${WORKDIR}/${PN}-${COMMIT_ID}/build"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	dev-libs/boost:=
-	media-libs/libsndfile
-"
+	media-libs/libsndfile:="
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_configure() {
+	tc-export CXX
+}
+
 src_install() {
 	dobin ../bin/Linux/wav2json
 }
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index 0fa4723d14cb..050241fe7b95 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1 +1 @@
-DIST wavbreaker-0.11.tar.gz 496733 BLAKE2B 2ecdad2f19071d672eea4960883af3f1e5b034d43307896cbd9caed9fb087579124851cab6fbfbc54276945c6b229f2ac6f2e7b9b839d02487569b08d65b0210 SHA512 3dee23ef7c0db651cd1ebae78db3f950b5b22ae4f0a323f66e1243a88c0e41390f9f4abde663ef7a1d1c841e0cbb779612d6078cd327a0f1d48e6a812c8ce4e1
+DIST wavbreaker-0.16.tar.gz 389319 BLAKE2B dea20ea4c3b1750f108dd2cfca86610d3bad12724645cc1ae89f05b33088460f0a41417a79cebd4196cf895004fddc5097751269f8b6cbb088a19d5a996478a0 SHA512 46f87dbbc38063b9a05b0d5cf77fe1bce3a5ea891596241fa442a45550e73cf2a27f0579c527a2a3e5909326a4cc1c80ca5119fd04c549dafaae71fe0646b168
diff --git a/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch b/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch
deleted file mode 100644
index 06a3d04adcba..000000000000
--- a/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur wavbreaker-0.10.orig/configure.in wavbreaker-0.10/configure.in
---- wavbreaker-0.10.orig/configure.in	2008-06-02 09:44:27.000000000 +0300
-+++ wavbreaker-0.10/configure.in	2008-06-14 15:28:26.000000000 +0300
-@@ -30,6 +30,7 @@
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_LN_S
-+PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- AC_CHECK_LIB([m], [cos])
diff --git a/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch b/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch
deleted file mode 100644
index c382e5e5dd19..000000000000
--- a/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/wavbreaker.desktop
-+++ b/wavbreaker.desktop
-@@ -9,5 +9,5 @@
- Icon=wavbreaker
- Terminal=false
- Type=Application
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;Audio;
- MimeType=audio/x-wav
diff --git a/media-sound/wavbreaker/metadata.xml b/media-sound/wavbreaker/metadata.xml
index 66ce1ead9f22..64f5007de75f 100644
--- a/media-sound/wavbreaker/metadata.xml
+++ b/media-sound/wavbreaker/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">thp/wavbreaker</remote-id>
 		<remote-id type="sourceforge">wavbreaker</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/wavbreaker/wavbreaker-0.11.ebuild b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
deleted file mode 100644
index 157cac408b8e..000000000000
--- a/media-sound/wavbreaker/wavbreaker-0.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
-HOMEPAGE="http://wavbreaker.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa nls oss pulseaudio"
-
-RDEPEND="
-	dev-libs/libxml2:=
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib:= )
-	pulseaudio? ( media-sound/pulseaudio:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10-pkgconfig.patch
-	"${FILESDIR}"/${PN}-0.11-QA-desktop-file.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable alsa) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable oss)
-}
diff --git a/media-sound/wavbreaker/wavbreaker-0.16.ebuild b/media-sound/wavbreaker/wavbreaker-0.16.ebuild
new file mode 100644
index 000000000000..f0e296e2ca5b
--- /dev/null
+++ b/media-sound/wavbreaker/wavbreaker-0.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
+HOMEPAGE="https://wavbreaker.sourceforge.io/ https://github.com/thp/wavbreaker"
+SRC_URI="https://github.com/thp/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="mp3 vorbis"
+
+RDEPEND="
+	dev-libs/glib
+	media-libs/libao
+	x11-libs/gtk+:3
+	mp3? ( media-sound/mpg123 )
+	vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use mp3)
+		$(meson_use vorbis ogg_vorbis)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/wavegain/files/wavegain-1.3.1-clang16.patch b/media-sound/wavegain/files/wavegain-1.3.1-clang16.patch
new file mode 100644
index 000000000000..7b14c14a0498
--- /dev/null
+++ b/media-sound/wavegain/files/wavegain-1.3.1-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/874903
+--- a/wavegain.c
++++ b/wavegain.c
+@@ -51,2 +51,4 @@
+ #include <windows.h>

++#else

++#include <unistd.h>

+ #endif

diff --git a/media-sound/wavegain/metadata.xml b/media-sound/wavegain/metadata.xml
index 39626a990be5..cd1cfc033621 100644
--- a/media-sound/wavegain/metadata.xml
+++ b/media-sound/wavegain/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/wavegain/wavegain-1.3.1.ebuild b/media-sound/wavegain/wavegain-1.3.1-r1.ebuild
index 9790a1958c4e..4af03be1334b 100644
--- a/media-sound/wavegain/wavegain-1.3.1.ebuild
+++ b/media-sound/wavegain/wavegain-1.3.1-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="ReplayGain for WAVE audio files"
-HOMEPAGE="http://www.rarewares.org/files/others/"
-SRC_URI="http://www.rarewares.org/files/others/${P}srcs.zip"
+HOMEPAGE="https://www.rarewares.org/files/others/"
+SRC_URI="https://www.rarewares.org/files/others/${P}srcs.zip"
+S="${WORKDIR}/WaveGain-${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -15,15 +16,15 @@ KEYWORDS="amd64 x86"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${P/wavegain/WaveGain}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.1-makefile.patch
 	"${FILESDIR}"/${PN}-1.3.1-fno-common.patch
+	"${FILESDIR}"/${PN}-1.3.1-clang16.patch
 )
 
 src_configure() {
 	tc-export CC
+	append-cflags -fno-strict-aliasing #860981
 }
 
 src_install() {
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 1d072a234576..f64eb9557ec6 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,2 +1 @@
-DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
-DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
+DIST wavpack-5.7.0.tar.xz 814324 BLAKE2B eda7c40137c873447e90e527bdda21ad861b5bcbaeeea8e020f516fbc0313677c71209e67fbb289dbb5b5e55ddc06c91397015678e107b3175441d2de8ec2718 SHA512 63ef6eb5ff71bf6417175691e8377624ade02619c761d80e265c8e0e7305bfe22eeaa1402e36d20c13d20847279f95150ac014019688389da1b87b86558446bd
diff --git a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch b/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
deleted file mode 100644
index fbbd40ba8bd9..000000000000
--- a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 89df160596132e3bd666322e1c20b2ebd4b92cd0 Mon Sep 17 00:00:00 2001
-From: David Bryant <david@wavpack.com>
-Date: Tue, 29 Dec 2020 20:47:19 -0800
-Subject: [PATCH] issue #91: fix integer overflows resulting in buffer overruns
- and sanitize a few more encoding parameters for clarity
-
----
- src/pack_utils.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/pack_utils.c b/src/pack_utils.c
-index 17d9381..480ab90 100644
---- a/src/pack_utils.c
-+++ b/src/pack_utils.c
-@@ -200,8 +200,13 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64
-         return FALSE;
-     }
- 
--    if (!num_chans) {
--        strcpy (wpc->error_message, "channel count cannot be zero!");
-+    if (num_chans <= 0 || num_chans > NEW_MAX_STREAMS * 2) {
-+        strcpy (wpc->error_message, "invalid channel count!");
-+        return FALSE;
-+    }
-+
-+    if (config->block_samples && (config->block_samples < 16 || config->block_samples > 131072)) {
-+        strcpy (wpc->error_message, "invalid custom block samples!");
-         return FALSE;
-     }
- 
-@@ -523,7 +528,7 @@ int WavpackPackInit (WavpackContext *wpc)
-         if (wpc->config.num_channels == 1)
-             wpc->block_samples *= 2;
- 
--        while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 300000)
-+        while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 300000)
-             wpc->block_samples /= 2;
-     }
-     else {
-@@ -534,10 +539,10 @@ int WavpackPackInit (WavpackContext *wpc)
- 
-         wpc->block_samples = wpc->config.sample_rate / divisor;
- 
--        while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 75000)
-+        while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 75000)
-             wpc->block_samples /= 2;
- 
--        while (wpc->block_samples * wpc->config.num_channels < 20000)
-+        while ((int64_t) wpc->block_samples * wpc->config.num_channels < 20000)
-             wpc->block_samples *= 2;
-     }
- 
diff --git a/media-sound/wavpack/metadata.xml b/media-sound/wavpack/metadata.xml
index ee7258ac28eb..93423219a5bc 100644
--- a/media-sound/wavpack/metadata.xml
+++ b/media-sound/wavpack/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/wavpack/wavpack-5.3.2-r1.ebuild b/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
deleted file mode 100644
index c34faa9eee4a..000000000000
--- a/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-# Need to fetch a commit because upstream didn't tag the minor release
-COMMIT="e4e8d191e8dd74cbdbeaef3232c16a7ef517e68d"
-
-DESCRIPTION="Hybrid lossless audio compression tools"
-HOMEPAGE="https://www.wavpack.com/"
-SRC_URI="https://github.com/dbry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/libiconv-0-r1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/WavPack-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-overflows.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		--disable-static \
-		$(use_enable test tests) \
-		$(multilib_native_enable apps)
-}
-
-multilib_src_test() {
-	cli/wvtest --default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.7.0.ebuild
index 2d12827f2435..bb4c395fb5f0 100644
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Hybrid lossless audio compression tools"
 HOMEPAGE="https://www.wavpack.com/"
@@ -11,22 +11,13 @@ SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=virtual/libiconv-0-r1"
 DEPEND="${RDEPEND}"
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable test tests) \
-		$(multilib_native_enable apps)
-}
-
-multilib_src_test() {
-	cli/wvtest --default || die
+	ECONF_SOURCE="${S}" econf $(multilib_native_enable apps)
 }
 
 multilib_src_install_all() {
diff --git a/media-sound/wavplay/metadata.xml b/media-sound/wavplay/metadata.xml
index 9967d62bd156..f68ebdfae49b 100644
--- a/media-sound/wavplay/metadata.xml
+++ b/media-sound/wavplay/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/wavplay/wavplay-2.0.ebuild b/media-sound/wavplay/wavplay-2.0.ebuild
index 4abbf1af7f6b..9ff1dad6f397 100644
--- a/media-sound/wavplay/wavplay-2.0.ebuild
+++ b/media-sound/wavplay/wavplay-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="A command line player/recorder for wav files"
 HOMEPAGE="https://sourceforge.net/projects/wavplay/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/wavsplit/metadata.xml b/media-sound/wavsplit/metadata.xml
index ab322105f25c..d123a5d3b8d4 100644
--- a/media-sound/wavsplit/metadata.xml
+++ b/media-sound/wavsplit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
index 4f4669af7bd7..3a49284a4f4a 100644
--- a/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
+++ b/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Simple command line tool to split WAV files"
 HOMEPAGE="https://sourceforge.net/projects/wavsplit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index ba710ca070b6..71ac45bbd967 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1 +1 @@
-DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7
+DIST whipper-0.10.0.tar.gz 256546 BLAKE2B c673aaefa8fe621e11a1140c2927bb2f62d5b07e94f6cec5b95ba290e5eab215c98b9a59c144b26c71bde211a45d603ba08c477d12b12ed1c73f9f8c2ebdb9a7 SHA512 728ad98185aa2d29f4fb215a597136691bb2c3590b3cac4f659238f90a3b4328c377fafe830a725b655f050538739f404b3eca853db4c39001d1b9d721dc7fd8
diff --git a/media-sound/whipper/files/whipper-0.10.0-ruamel-yaml.patch b/media-sound/whipper/files/whipper-0.10.0-ruamel-yaml.patch
new file mode 100644
index 000000000000..206547e4b3e9
--- /dev/null
+++ b/media-sound/whipper/files/whipper-0.10.0-ruamel-yaml.patch
@@ -0,0 +1,109 @@
+From e0942417a1c267781a8b676789730457dcb2e6fa Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Sun, 20 Jun 2021 15:18:37 +0200
+Subject: [PATCH] Use custom YAML subclass to be compatible with
+ ruamel_yaml>=0.17
+
+Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
+---
+ whipper/common/yaml.py             | 18 ++++++++++++++++++
+ whipper/result/logger.py           | 11 ++++++-----
+ whipper/test/test_result_logger.py | 14 ++++++--------
+ 3 files changed, 30 insertions(+), 13 deletions(-)
+ create mode 100644 whipper/common/yaml.py
+
+diff --git a/whipper/common/yaml.py b/whipper/common/yaml.py
+new file mode 100644
+index 00000000..4edb0b36
+--- /dev/null
++++ b/whipper/common/yaml.py
+@@ -0,0 +1,18 @@
++from ruamel.yaml import YAML as ruamel_YAML
++from ruamel.yaml.compat import StringIO
++
++# https://yaml.readthedocs.io/en/latest/example.html#output-of-dump-as-a-string
++class YAML(ruamel_YAML):
++    def __init__(self, *args, **kwargs):
++        super().__init__()
++        self.width = 4000
++        self.default_flow_style = False
++
++    def dump(self, data, stream=None, **kw):
++        inefficient = False
++        if stream is None:
++            inefficient = True
++            stream = StringIO()
++        ruamel_YAML.dump(self, data, stream, **kw)
++        if inefficient:
++            return stream.getvalue()
+diff --git a/whipper/result/logger.py b/whipper/result/logger.py
+index b7043adc..f4471a00 100644
+--- a/whipper/result/logger.py
++++ b/whipper/result/logger.py
+@@ -1,12 +1,12 @@
+ import time
+ import hashlib
+ import re
+-import ruamel.yaml as yaml
+ from ruamel.yaml.comments import CommentedMap as OrderedDict
+ 
+ import whipper
+ 
+ from whipper.common import common
++from whipper.common.yaml import YAML
+ from whipper.result import result
+ 
+ 
+@@ -148,11 +148,12 @@ def logRip(self, ripResult, epoch):
+         data["EOF"] = "End of status report"
+         riplog["Conclusive status report"] = data
+ 
++        yaml = YAML(
++            typ="rt",
++            pure=True
++        )
+         riplog = yaml.dump(
+-            riplog,
+-            default_flow_style=False,
+-            width=4000,
+-            Dumper=yaml.RoundTripDumper
++            riplog
+         )
+         # Add a newline after the "Log creation date" line
+         riplog = re.sub(
+diff --git a/whipper/test/test_result_logger.py b/whipper/test/test_result_logger.py
+index 411b61af..98c89ab5 100644
+--- a/whipper/test/test_result_logger.py
++++ b/whipper/test/test_result_logger.py
+@@ -3,8 +3,8 @@
+ import os
+ import re
+ import unittest
+-import ruamel.yaml
+ 
++from whipper.common.yaml import YAML
+ from whipper.result.result import TrackResult, RipResult
+ from whipper.result.logger import WhipperLogger
+ 
+@@ -163,16 +163,14 @@ def testLogger(self):
+             ))
+         )
+ 
+-        yaml = ruamel.yaml.YAML()
++        yaml = YAML(
++            typ='rt',
++            pure=True
++        )
+         parsedLog = yaml.load(actual)
+         self.assertEqual(
+             actual,
+-            ruamel.yaml.dump(
+-                parsedLog,
+-                default_flow_style=False,
+-                width=4000,
+-                Dumper=ruamel.yaml.RoundTripDumper
+-            )
++            yaml.dump(parsedLog)
+         )
+         log_body = "\n".join(actualLines[:-1]).encode()
+         self.assertEqual(
diff --git a/media-sound/whipper/metadata.xml b/media-sound/whipper/metadata.xml
index 46be9b4141ca..57bca9f12210 100644
--- a/media-sound/whipper/metadata.xml
+++ b/media-sound/whipper/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@wizzup.org</email>
 		<name>Merlijn Wajer</name>
 		<description>Whipper project developer</description>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">whipper-team/whipper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/whipper/whipper-0.10.0-r1.ebuild b/media-sound/whipper/whipper-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..48549099d453
--- /dev/null
+++ b/media-sound/whipper/whipper-0.10.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
+HOMEPAGE="https://github.com/whipper-team/whipper"
+SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsndfile:=
+"
+# bug https://bugs.gentoo.org/923339
+# upstream https://github.com/whipper-team/whipper/issues/605
+# upstream https://github.com/whipper-team/whipper/issues/606
+RDEPEND="
+	${DEPEND}
+	app-cdr/cdrdao
+	>=dev-libs/libcdio-paranoia-0.94_p2
+	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
+	>=dev-python/pycdio-2.1.0[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/discid[${PYTHON_USEDEP}]
+	<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-sound/sox[flac]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch"
+)
+
+python_prepare_all() {
+	# accurip test totally depends on network access
+	rm "${PN}"/test/test_common_accurip.py || die
+
+	# Test fails with
+	# Log [82 chars]28Z\n\nRipping phase information:\n  Drive: HL[2290 chars]31\n
+	# !=
+	# Log [82 chars]28Z\nRipping phase information:\n  Drive: HL-D[2274 chars]31\n
+	# assertion. TODO: fix test.
+	rm "${PN}"/test/test_result_logger.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	distutils-r1_python_prepare_all
+}
diff --git a/media-sound/whipper/whipper-0.9.0.ebuild b/media-sound/whipper/whipper-0.10.0-r2.ebuild
index 8875ed087dc4..4458574acf2f 100644
--- a/media-sound/whipper/whipper-0.9.0.ebuild
+++ b/media-sound/whipper/whipper-0.10.0-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -15,26 +16,35 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="media-libs/libsndfile:="
+DEPEND="
+	media-libs/libsndfile:=
+"
 RDEPEND="
 	${DEPEND}
 	app-cdr/cdrdao
 	>=dev-libs/libcdio-paranoia-0.94_p2
+	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
 	>=dev-python/pycdio-2.1.0[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/discid[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-sound/sox[flac]"
+	media-sound/sox[flac]
+"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests unittest
 
-PATCHES=( "${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch"
+	"${FILESDIR}/${PN}-0.10.0-ruamel-yaml.patch"
+)
 
 python_prepare_all() {
 	# accurip test totally depends on network access
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index 9e30ac003bb5..4c5d4869e7bb 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,2 +1,2 @@
-DIST wildmidi-0.3.13.tar.gz 132407 BLAKE2B 5f603adb7583d47ca0595a48a385412d09ca8b19e99c93ba474d91076fa17a54e12e08bb39ea73d16c07addeab86e6c9d8b778d19045ef6b7d551d041bbc58fa SHA512 e9ede8a98c97e57a7bd34e63fc725a1b47bbff6b41f5dca101249917f0e7756ce4d93a84b8d5b6f592687fd3deed369c22c727873c9bdd1bea6e8c31fdbb4fdb
-DIST wildmidi-0.4.3.tar.gz 196750 BLAKE2B 580903dd1e7dc61193b593f3706d5070ae5cf26394919f8d632098aa0dda14d8d65631c902a6a01d02d046e639df4d66727849954b5d6f76dba8d12235e20b8d SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f
+DIST wildmidi-0.4.5.tar.gz 197793 BLAKE2B a0b43e19b4e4ced6c4f536dd5e1ac313acd26ad0c3c9deed7068181666a175f4dfdf5cb522d70fdaf0636cc4b3b1af3cedfda54a6c048b05e828a4d1ad185b77 SHA512 0229914ecc60091b649b790a82ad5e755a2b9dfab7443fb3e3c19f4ae64b82817cafe74d78c27f05c68c3c8fb30092c96da732d27ff82fbd7dd7d577facc23d6
+DIST wildmidi-0.4.6.tar.gz 199971 BLAKE2B 797d50e9e1a4ca52c6ddf610964dfa993833d7c78cbe12d333364e29940af1e334ef764730e94b1f09b3d5930e46fa1c5c4e8070026bf7b892dcdbdb9f0af1f6 SHA512 b7259578c1b334de13b49e27aef32ad43e41bc04f569601b765ecea789b8da536d07afdb581986b7c91de552db2a625b13d061e52a2c8c51652f3cf3d1a30000
diff --git a/media-sound/wildmidi/metadata.xml b/media-sound/wildmidi/metadata.xml
index 17ff7e7576a6..07338cab867b 100644
--- a/media-sound/wildmidi/metadata.xml
+++ b/media-sound/wildmidi/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="player">Install the wildmidi player</flag>
+		<flag name="sndio">Enable support for the media-sound/sndio backend</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Mindwerks/wildmidi</remote-id>
diff --git a/media-sound/wildmidi/wildmidi-0.3.13.ebuild b/media-sound/wildmidi/wildmidi-0.3.13.ebuild
deleted file mode 100644
index dfe904340d1f..000000000000
--- a/media-sound/wildmidi/wildmidi-0.3.13.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
-SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
-IUSE="+alsa openal oss +player"
-
-DEPEND="
-	player? (
-		alsa? ( media-libs/alsa-lib )
-		openal? ( media-libs/openal )
-	)
-"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats
-"
-
-REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
-
-DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
-	For more information please read the ${PN}.cfg manpage."
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
-	if ! use player && (use alsa || use openal || use oss); then
-		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
-		ewarn "the 'player' use flags is selected and as a result they will be"
-		ewarn "ignored in this build"
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_OPENAL=$(usex openal)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PLAYER=$(usex player)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /etc/${PN}/
-	doins cfg/${PN}.cfg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
-		elog
-		elog "Old /etc/${PN}.cfg detected!"
-		elog "Please migrate your configuration file to"
-		elog "/etc/${PN}/ directory which is now the default"
-		elog "location for the ${PN} configuration file."
-		elog
-	fi
-}
diff --git a/media-sound/wildmidi/wildmidi-0.4.3.ebuild b/media-sound/wildmidi/wildmidi-0.4.5.ebuild
index af143f999127..40eac15ced28 100644
--- a/media-sound/wildmidi/wildmidi-0.4.3.ebuild
+++ b/media-sound/wildmidi/wildmidi-0.4.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake readme.gentoo-r1
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="+alsa openal oss +player"
 
 DEPEND="
diff --git a/media-sound/wildmidi/wildmidi-0.4.6.ebuild b/media-sound/wildmidi/wildmidi-0.4.6.ebuild
new file mode 100644
index 000000000000..f21610603570
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.4.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="MIDI processing library and player using the GUS patch set"
+HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
+SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+alsa openal oss +player sndio"
+
+DEPEND="
+	player? (
+		alsa? ( media-libs/alsa-lib )
+		openal? ( media-libs/openal )
+		sndio? ( media-sound/sndio )
+	)
+"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats
+"
+
+DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
+	For more information please read the ${PN}.cfg manpage."
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	cmake_src_prepare
+	# Fix location of media-sound/timidity-freepats
+	# See #749759
+	sed -i -e "s:midi/freepats:timidity/freepats:" cfg/wildmidi.cfg || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PLAYER=$(usex player)
+		-DWANT_SNDIO=$(usex sndio)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/${PN}/
+	doins cfg/wildmidi.cfg
+
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/wmsound-data/metadata.xml b/media-sound/wmsound-data/metadata.xml
index c870d0eef0ab..b69a849fd57e 100644
--- a/media-sound/wmsound-data/metadata.xml
+++ b/media-sound/wmsound-data/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>sound@gentoo.org</email>
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index 4d5d9fcf2c31..9804cd51d34d 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1 +1 @@
-DIST xfmpc-0.3.0.tar.bz2 443234 BLAKE2B ee0f491baadfb6be9148de8060758f788f773bdbc0354d6061889e979fb16eeb7a44357b61e698908c972714616b4268ed443d1d6323cbf0f457cdfd6cdf0fc1 SHA512 6e876aca2c2a6764fe97f061c97dc0fa9ce72b7ab6a2597b5f54bdce39789cc73bd038a0ef69b87d826c225efb9c3a2d19aa9ed7872ce7ee9ac5d7bd275444a3
+DIST xfmpc-0.3.1.tar.bz2 455660 BLAKE2B 2391217f1695ab0962a3ee52ea27ef44febbd8cf982d1bfba0c6952423c718f32dbea590930b9cef9cd3d932b2297cafb87870e27fb7579a764ad948e62918d6 SHA512 771835828cd89298d79c31cec2716b308889e6b835a2b16d0ef25eab6ed1667b055158f845ebf897df8f3f9f45a07fb6ad2994a9981695e74be2d56408e4abe0
diff --git a/media-sound/xfmpc/metadata.xml b/media-sound/xfmpc/metadata.xml
index 359901b31db4..2b8ef06e9a39 100644
--- a/media-sound/xfmpc/metadata.xml
+++ b/media-sound/xfmpc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>xfce@gentoo.org</email>
diff --git a/media-sound/xfmpc/xfmpc-0.3.0.ebuild b/media-sound/xfmpc/xfmpc-0.3.0.ebuild
deleted file mode 100644
index 3f00933bf48b..000000000000
--- a/media-sound/xfmpc/xfmpc-0.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2=
-	>=media-libs/libmpd-0.15:=
-	>=x11-libs/gtk+-3.22:3=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog IDEAS NEWS README THANKS )
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/xfmpc/xfmpc-0.3.1.ebuild b/media-sound/xfmpc/xfmpc-0.3.1.ebuild
new file mode 100644
index 000000000000..53bd5b151eaf
--- /dev/null
+++ b/media-sound/xfmpc/xfmpc-0.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/apps/xfmpc/start
+	https://gitlab.xfce.org/apps/xfmpc/
+"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86"
+
+DEPEND="
+	>=dev-libs/glib-2.38.0:2=
+	>=media-libs/libmpd-0.15.0:=
+	>=x11-libs/gtk+-3.22.0:3=
+	>=xfce-base/libxfce4ui-4.12.0:=
+	>=xfce-base/libxfce4util-4.12.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/xineadump/metadata.xml b/media-sound/xineadump/metadata.xml
index 394a1171eb6c..f00f96d16f42 100644
--- a/media-sound/xineadump/metadata.xml
+++ b/media-sound/xineadump/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
diff --git a/media-sound/xineadump/xineadump-0.1-r1.ebuild b/media-sound/xineadump/xineadump-0.1-r2.ebuild
index df5b84d849c1..32e1a16d073f 100644
--- a/media-sound/xineadump/xineadump-0.1-r1.ebuild
+++ b/media-sound/xineadump/xineadump-0.1-r2.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Utility for Xine decoding support in transKode"
 HOMEPAGE="https://sourceforge.net/projects/transkode"
-SRC_URI="mirror://sourceforge/transkode/${P}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/transkode/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="media-libs/xine-lib
+RDEPEND="
+	media-libs/xine-lib
 	media-libs/alsa-lib"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 PATCHES=(
 	"${FILESDIR}/${P}-gcc-4.3.patch"
 	"${FILESDIR}/${P}-gcc-4.4.patch"
diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
deleted file mode 100644
index 66a2b910f862..000000000000
--- a/media-sound/xmms2-scrobbler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmms2-scrobbler-0.4.0.tar.gz 19831 BLAKE2B 84194a2359b825c5571637e4d875003262235f8bce550ffeb54a123c53b1aeee49b7fd21c5549903e24348869abba96ba9b7e78cade4dc44dcbb798f4604d8fa SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
deleted file mode 100644
index 383bb0596eb9..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/src/submission.c b/src/submission.c
-index 422db0a..326b003 100644
---- a/src/submission.c
-+++ b/src/submission.c
-@@ -24,2 +24,3 @@
- #include <stdlib.h>
-+#include <stdio.h>
- #include "submission.h"
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
deleted file mode 100644
index 1ba5443a9264..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 096ee717070bdde9c1adc29f02fcb537920daca9
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Sat Mar 3 20:24:21 2012 +0300
-
-    Makefile: set proper link order for libraries
-    
-    '-Wl,--as-needed' enforces libraries to go in proper dependency order:
-    
-        $ x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -Wl,--hash-style=gnu `pkg-config xmms2-client --libs` `pkg-config libcurl --libs` src/xmms2-scrobbler.o src/list.o src/queue.o src/strbuf.o src/md5.o src/submission.o -o bin/xmms2-scrobbler
-        src/xmms2-scrobbler.o: In function `save_profile_submissions_queue':
-        xmms2-scrobbler.c:(.text+0x281): undefined reference to `xmmsc_userconfdir_get'
-        src/xmms2-scrobbler.o: In function `load_config':
-        xmms2-scrobbler.c:(.text+0x3e2): undefined reference to `xmmsc_userconfdir_get'
-        src/xmms2-scrobbler.o: In function `maybe_submit_to_profile':
-        xmms2-scrobbler.c:(.text+0x7e3): undefined reference to `xmmsc_medialib_get_info'
-        xmms2-scrobbler.c:(.text+0x7f7): undefined reference to `xmmsc_result_notifier_set'
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/Makefile b/Makefile
-index 7693bd2..4207cda 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
-+	$(QUIET_LINK)$(CC) $(OBJECTS) -o $@ $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(LIBS)
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
deleted file mode 100644
index a570548ed4e9..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 8b97319c1a03acecc21b5608516859daaf5bca75
-Author: James Le Cuirot <chewi@aura-online.co.uk>
-Date:   Fri Mar 26 20:10:54 2010 +0100
-
-    Fixed the build if the --as-needed linker option is enabled.
-
-diff --git a/Makefile b/Makefile
-index dad3fcb..3331e30 100644
---- a/Makefile
-+++ b/Makefile
-@@ -35,7 +35,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
-+	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
deleted file mode 100644
index 959f1232e6d5..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 3331e30..7693bd2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,5 @@
- CFLAGS += -std=gnu99 -Wall -Wwrite-strings -pthread
-+LIBS = -lrt -lpthread
- ENDIAN_CFLAGS=
- PREFIX ?= /usr/local
- 
-@@ -35,7 +36,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
-+	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
deleted file mode 100644
index 950509b3d2d7..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/xmms2-scrobbler.c b/src/xmms2-scrobbler.c
-index 244fccb..8cd06ed 100644
---- a/src/xmms2-scrobbler.c
-+++ b/src/xmms2-scrobbler.c
-@@ -534,3 +534,3 @@ on_medialib_get_info2 (xmmsv_t *val, void *udata)
- {
--	bool reset_current_id = XPOINTER_TO_INT (udata);
-+	bool reset_current_id = (bool)(uintptr_t)(udata);
- 
-@@ -572,3 +572,3 @@ maybe_submit_to_profile (bool reset_current_id)
- 	                           on_medialib_get_info2,
--	                           XINT_TO_POINTER (reset_current_id));
-+	                           (void*)(uintptr_t)(reset_current_id));
- 	xmmsc_result_unref (mediainfo_result);
diff --git a/media-sound/xmms2-scrobbler/metadata.xml b/media-sound/xmms2-scrobbler/metadata.xml
deleted file mode 100644
index dbb50391915b..000000000000
--- a/media-sound/xmms2-scrobbler/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<longdescription>
-		XMMS2-Scrobbler is a client for XMMS2 that feeds information about the songs
-		you played to last.fm, formerly known as AudioScrobbler.
-		XMMS2-Scrobbler supports "multi-scrobbling", i.e. it can talk to more than
-		one AudioScrobbler server.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
deleted file mode 100644
index 52966af24d73..000000000000
--- a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="XMMS2 AudioScrobbler client"
-HOMEPAGE="https://code-monkey.de/pages/xmms2-scrobbler"
-SRC_URI="ftp://ftp.code-monkey.de/pub/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-sound/xmms2
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-libs.patch
-	"${FILESDIR}"/${P}-ld-order.patch
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-no-XPTR.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" VERBOSE=1
-}
-
-src_install() {
-	emake PREFIX="${EROOT}/usr" DESTDIR="${D}" install
-	dodoc README AUTHORS
-}
-
-pkg_postinst() {
-	einfo "xmms2-scrobbler will fail to start until you create a configfile"
-	einfo ""
-	einfo "mkdir -p ~/.config/xmms2/clients/xmms2-scrobbler/lastfm"
-	einfo "echo 'user: foo' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo "echo 'password: bar' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo "echo 'handshake_url: http://post.audioscrobbler.com' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo ""
-	einfo "More info and configuration-options can be found in xmms2-scrobbler's README file"
-}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index a2ed2cb69e18..e525b78e09a6 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,2 +1 @@
-DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
-DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
+DIST xmms2-0.9.3.tar.xz 1741548 BLAKE2B 19a99d66d3b6991811c1124b76becaa05d04602a84725ca166141947272a3a033545a2e315a70751e8fab83a9b3b16235f1e408dd13caac0a8e7cbf9e8101e34 SHA512 03f2f6b66a35a8e80fdba3afb2a550c19ce2b7b6d53c63c7a735eb787f79b27a325b0715a31544e87c86e386f54a5a9a89aa3a9e81ae5ed29e362bd7b5bfa1ad
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
deleted file mode 100644
index 2e9fac380ea0..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
-===================================================================
---- xmms2-0.8DrO_o.orig/src/plugins/avcodec/avcodec.c
-+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
-@@ -29,6 +29,10 @@
- 
- #define AVCODEC_BUFFER_SIZE 16384
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#endif
-+
- typedef struct {
- 	AVCodecContext *codecctx;
- 
diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
deleted file mode 100644
index 20be34273883..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add knob to disable valgrind at test runtime.
-
-When valgrind is installed in system but is not
-working we should still be able to run tests.
-
-Reported-by: Diego Elio Pettenò
-Bug: https://bugs.gentoo.org/424377
-diff --git a/waftools/unittest.py b/waftools/unittest.py
-index 4317287..6179dfd 100644
---- a/waftools/unittest.py
-+++ b/waftools/unittest.py
-@@ -64,7 +64,8 @@ def generate_coverage(bld):
- 
- def configure(conf):
-     conf.load("waf_unit_test")
--    conf.find_program("valgrind", var="VALGRIND", mandatory=False)
-+    if conf.options.enable_valgrind is True:
-+        conf.find_program("valgrind", var="VALGRIND", mandatory=False)
-     conf.find_program("lcov", var="LCOV", mandatory=False)
-     conf.find_program("genhtml", var="GENHTML", mandatory=False)
- 
-diff --git a/wscript b/wscript
-index 99c1fa3..a98d5e3 100644
---- a/wscript
-+++ b/wscript
-@@ -501,6 +501,10 @@ def options(opt):
-                    dest='ldconfig', help="Run ldconfig after install even if not root")
-     opt.add_option('--without-ldconfig', action='store_false',
-                    dest='ldconfig', help="Don't run ldconfig after install")
-+    opt.add_option('--with-valgrind', action='store_true', default=None,
-+                   dest='enable_valgrind', help="Run testsuite under valgrind (if present).")
-+    opt.add_option('--without-valgrind', action='store_false', default=None,
-+                   dest='enable_valgrind', help="Don't run testsuite under valgrind.")
- 
-     opt.sub_options("src/xmms")
-     for o in optional_subdirs + subdirs:
diff --git a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
deleted file mode 100644
index 220e91e68136..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix build failure when user has non-core xsubpp.
-
-> Could not find a typemap for C type 'xmmsv_t *' in XMMSClientPlaylist.xs, line 132
-> Undefined subroutine &ExtUtils::ParseXS::errors called at /usr/lib/perl5/5.12.4/ExtUtils/xsubpp line 41.
-> Undefined subroutine &ExtUtils::ParseXS::errors called at /usr/lib/perl5/5.12.4/ExtUtils/xsubpp line 41.
-> Could not find a typemap for C type 'const unsigned char *' in XMMSClient.xs, line 1179
-
-Use xsubpp from @INC instead of bundled one with perl.
-
-Original bug: https://bugs.gentoo.org/380469
-Related: https://bugs.gentoo.org/378783
-Updated for perl-5.20.2: https://bugs.gentoo.org/578778
-diff --git a/waflib/Tools/perl.py b/waflib/Tools/perl.py
-index 2c69fe5..a75b069 100644
---- a/waflib/Tools/perl.py
-+++ b/waflib/Tools/perl.py
-@@ -60,8 +60,8 @@ def check_perl_ext_devel(self):
- 	env['LINKFLAGS_PERLEXT']=read_out(" -MConfig -e'print $Config{lddlflags}'")
- 	env['INCLUDES_PERLEXT']=read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'")
- 	env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'")
--	env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'")
--	env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'")
-+	env["XSUBPP"]           = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::xsubpp\")'")
-+	env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::typemap\")'")
- 	if not getattr(Options.options,'perlarchdir',None):
- 		env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'")
- 	else:
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
deleted file mode 100644
index 5fa43298cf7f..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d97c8b8239e8b3c5ddb951d427b7d78ea7faad25 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 30 Jul 2017 23:08:02 +0100
-Subject: [PATCH] OTHER: _xmmsv_dict_hash: make hash function
- endianness-agnostic
-
-The following code:
-    uint32_t k;
-    memcpy (&k, data, sizeof (k));
-computes different data depending on platform endianness.
-
-That causes test_xmmsv_serialize_coll_match test to fail
-as collection order is serialized in wrong order.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/lib/xmmstypes/xmmsv_dict.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/xmmstypes/xmmsv_dict.c b/src/lib/xmmstypes/xmmsv_dict.c
-index 5ebe4eb3..32533285 100644
---- a/src/lib/xmmstypes/xmmsv_dict.c
-+++ b/src/lib/xmmstypes/xmmsv_dict.c
-@@ -66,8 +66,10 @@ _xmmsv_dict_hash (const void *key, int len)
- 
- 	while (len >= 4)
- 	{
--		uint32_t k;
--		memcpy (&k, data, sizeof (k));
-+		uint32_t k = data [0]
-+			| data [1] << 8
-+			| data [2] << 16
-+			| data [3] << 24;
- 
- 		k *= m;
- 		k ^= k >> r;
--- 
-2.13.3
-
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
deleted file mode 100644
index cedc87fcc469..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://github.com/xmms2/xmms2-devel/pull/5
-
-From 82741bf3094c8e0bca8eb1b7f3bc147eeb51ea06 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 6 Dec 2018 07:19:08 +0000
-Subject: [PATCH] OTHER: fix c++ client dangling reference
-
-On #xmm2 Chewi reported c++/tut7 to be broken at start:
-
-```
-GLib-WARNING **: glib-2.56.2/glib/giounix.c:410
-Error while getting flags for FD: Bad file descriptor (9)
-```
-
-valgrind shows the problem as read of uninitialized data:
-
-```
-$ valgrind ./tut7
-
-==32268== Conditional jump or move depends on uninitialised value(s)
-==32268==    at 0x49DC36B: xmmsc_mainloop_gmain_init (xmmsclient-glib.c:80)
-==32268==    by 0x49E11BE: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:11)
-==32268==    by 0x10C64D: main (in /home/slyfox/dev/git/xmms2-devel/doc/tutorial/c++/tut7)
-==32268==  Uninitialised value was created by a stack allocation
-==32268==    at 0x49E119A: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:8)
-```
-
-This happens due to use of dangling C++ reference to stack variable:
-
-```
-// somewhere in src/include/xmmsclient/xmmsclient++/mainloop.h
-class MainloopInterface {
-    MainloopInterface( xmmsc_connection_t* conn ) :
-        running_( false ), conn_( conn ) { }
-  protected:
-    bool running_;
-    xmmsc_connection_t*& conn_;
-}
-```
-
-Note: `conn_` refers to dangling local variable of
-`MainloopInterface::MainloopInterface` constructor.
-
-The fix is to pass through pointer reference.
-`MainLoop::MainLoop()` already does it.
-
-Reported-by: James Le Cuirot
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/include/xmmsclient/xmmsclient++/mainloop.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/include/xmmsclient/xmmsclient++/mainloop.h b/src/include/xmmsclient/xmmsclient++/mainloop.h
-index de97e20d..268ca6f7 100644
---- a/src/include/xmmsclient/xmmsclient++/mainloop.h
-+++ b/src/include/xmmsclient/xmmsclient++/mainloop.h
-@@ -41,7 +41,7 @@ namespace Xmms
- 			 *  @note The constructor should only initialize the
- 			 *        mainloop, not start it!
- 			 */
--			MainloopInterface( xmmsc_connection_t* conn ) :
-+			MainloopInterface( xmmsc_connection_t*& conn ) :
- 				running_( false ), conn_( conn ) { }
- 
- 			/** Destructor.  Should also stop the loop.
--- 
-2.19.2
-
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
deleted file mode 100644
index 29a8311d2197..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/s4/tests/s4/t_transactions.c
-+++ b/src/lib/s4/tests/s4/t_transactions.c
-@@ -19,7 +19,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- 
--s4_t *s4;
-+extern s4_t *s4;
- s4_val_t *val;
- 
- SETUP (Transactions) {
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
deleted file mode 100644
index df3e4d2af852..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e87745721deaf46d7054ac40cc55838561c9f552 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= <cJ@zougloub.eu>
-Date: Tue, 24 Oct 2017 18:43:26 -0400
-Subject: [PATCH] plugins: mac: support newer mac API version
-
----
- src/plugins/mac/mac.cpp          | 6 +++++-
- src/plugins/mac/source_adapter.h | 8 +++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/mac/mac.cpp b/src/plugins/mac/mac.cpp
-index cec43e52..d8d3d1b9 100644
---- a/src/plugins/mac/mac.cpp
-+++ b/src/plugins/mac/mac.cpp
-@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
- 				gchar *name;
- 
- 				field_name = pTagField->GetFieldName ();
--				name = (gchar *)GetUTF8FromUTF16 (field_name);
- 
-+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
-+				name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name);
-+#else
-+				name = (gchar *)GetUTF8FromUTF16 (field_name);
-+#endif
- 				memset (field_value, 0, 255);
- 				int size = 255;
- 				p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
-diff --git a/src/plugins/mac/source_adapter.h b/src/plugins/mac/source_adapter.h
-index 94f75359..70617514 100644
---- a/src/plugins/mac/source_adapter.h
-+++ b/src/plugins/mac/source_adapter.h
-@@ -38,7 +38,13 @@ public:
- 	~CSourceAdapter () {};
- 
- 	// open / close
--	int Open (const wchar_t * pName) { return ERROR_SUCCESS; }
-+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
-+	int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE)
-+#else
-+	int Open (const wchar_t * pName)
-+#endif
-+	{ return ERROR_SUCCESS; }
-+
- 	int Close () { return ERROR_SUCCESS; }
- 
- 	// read / write
--- 
-2.15.0
-
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
deleted file mode 100644
index eef49b13f16f..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/utils/gen-changelog.py b/utils/gen-changelog.py
-index b539088a..301c0461 100755
---- a/utils/gen-changelog.py
-+++ b/utils/gen-changelog.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- from subprocess import check_output
- import os
- 
-diff --git a/utils/gen-tarball.py b/utils/gen-tarball.py
-index 2ae2a4d1..09ed5074 100755
---- a/utils/gen-tarball.py
-+++ b/utils/gen-tarball.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from subprocess import check_output, call
- import tarfile
- import os
-@@ -40,15 +40,19 @@ def add_files(ball, prefix, template, files):
- 
- VERSION = check_output(["git", "describe"]).strip()
- 
-+# TODO: derive paths from submodule configuration
- TUTORIAL_DIR="doc/tutorial"
-+S4_DIR="src/lib/s4"
- 
- PREFIX="xmms2-%s" % VERSION
- PREFIX_TUTORIAL="%s/%s" % (PREFIX, TUTORIAL_DIR)
-+PREFIX_S4="%s/%s" % (PREFIX, S4_DIR)
- 
- DIST_DIR="dist"
- DIST_XMMS2="%s/xmms2-%s.tar" % (DIST_DIR, VERSION)
- DIST_XMMS2_BZ2="%s/xmms2-%s.tar.bz2" % (DIST_DIR, VERSION)
- DIST_TUTORIAL="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
-+DIST_S4="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
- 
- if not os.path.exists(DIST_DIR):
-     os.mkdir(DIST_DIR)
-@@ -62,6 +66,9 @@ if os.path.exists(DIST_XMMS2_BZ2):
- if os.path.exists(DIST_TUTORIAL):
-     os.unlink(DIST_TUTORIAL)
- 
-+if os.path.exists(DIST_S4):
-+    os.unlink(DIST_S4)
-+
- # Tar up XMMS2
- call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), shell=True)
- 
-@@ -69,9 +76,11 @@ call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), s
- call("git submodule init", shell=True)
- call("git submodule update", shell=True)
- call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (TUTORIAL_DIR, PREFIX_TUTORIAL, DIST_TUTORIAL), shell=True)
-+call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (S4_DIR, PREFIX_S4, DIST_S4), shell=True)
- 
--# Append the tutorials to the XMMS2 archive
-+# Append the tutorials and s4 to the XMMS2 archive
- call("tar -Af %s %s" % (DIST_XMMS2, DIST_TUTORIAL), shell=True)
-+call("tar -Af %s %s" % (DIST_XMMS2, DIST_S4), shell=True)
- 
- # Append ChangeLog and a summary of all file hashes."
- add_files(DIST_XMMS2, PREFIX, get_template(DIST_XMMS2, os.path.join(PREFIX, "wscript")), [
-diff --git a/utils/gen-tree-hashes.py b/utils/gen-tree-hashes.py
-index 7f8b9e4f..9d27adb0 100755
---- a/utils/gen-tree-hashes.py
-+++ b/utils/gen-tree-hashes.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from subprocess import check_output
- from operator import itemgetter
- import os
-@@ -21,3 +21,4 @@ def collect_hashes(*paths):
- 
- print check_output("git describe", shell=True)
- print collect_hashes(".", "doc/tutorial")
-+print collect_hashes(".", "src/lib/s4")
diff --git a/media-sound/xmms2/files/xmms2-0.9.1-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.9.1-cpp-client.patch
new file mode 100644
index 000000000000..491c6fb9771d
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.9.1-cpp-client.patch
@@ -0,0 +1,13 @@
+https://github.com/xmms2/xmms2-devel/pull/5
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 6 Dec 2018 07:19:08 +0000
+Subject: [PATCH] OTHER: fix c++ client dangling reference
+--- a/src/include/xmmsclient/xmmsclient++/mainloop.h
++++ b/src/include/xmmsclient/xmmsclient++/mainloop.h
+@@ -42,5 +42,5 @@
+ 			 *        mainloop, not start it!
+ 			 */
+-			MainloopInterface( xmmsc_connection_t* conn ) :
++			MainloopInterface( xmmsc_connection_t*& conn ) :
+ 				running_( false ), conn_( conn ) { }
+ 
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.9.1-faad.patch
index 00aa5d770823..6c282ed6d0a4 100644
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
+++ b/media-sound/xmms2/files/xmms2-0.9.1-faad.patch
@@ -3,16 +3,11 @@ release. XMMS2 upstream were informed via IRC but have yet to act on
 it. I've run XMMS2 with this patch for months without issue.
 
 -- Chewi
-
-diff --git a/src/plugins/faad/faad.c b/src/plugins/faad/faad.c
-index 50835d27..7074e1b5 100644
 --- a/src/plugins/faad/faad.c
 +++ b/src/plugins/faad/faad.c
-@@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform)
- 	 * and durations calculations... So we cheat and tell libfaad2 we're feeding
+@@ -243,5 +243,4 @@
  	 * it frame 1.
  	 */
 -	NeAACDecPostSeekReset (data->decoder, 1);
  
  	/* FIXME: Because for HE AAC files some versions of libfaad return the wrong
- 	 * samplerate in init, we have to do one read and let it decide the real
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 2019a968d215..6c6bd5cb82c2 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -1,51 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
 	</maintainer>
-	<longdescription>
-		It features a client-server model, allowing multiple (even simultaneous!) user
-		interfaces, both textual and graphical. All common audio formats are supported
-		using plugins. On top of this, there is a flexible media library to organize
-		your music.
-
-		List of features currently offered by XMMS2:
-
-		Client-server model:
-		* Allows XMMS2 to have various multiple interfaces (as clients).
-		o Command line interfaces
-		o GTK clients (matching GNOME &amp; XFCE4 look and feel)
-		o KDE clients (matching KDE look and feel)
-		* Network transparency means you can run and control XMMS2 remotely, (e.g. run XMMS2 on your 'media box' and control it over network using a bluetooth-enabled PDA (TCP))
-
-		Wide format support:
-		* Can play FLAC, mp3, MOD, SID, speex, ogg vorbis, wave files.
-		* Clean separation of transport and decoder subsystems
-		Allows for more flexible access to media. (e.g. play mp3 files from a Samba
-		share without having to mount it on the local filesystem)
-
-		Medialib:
-		Database-driven media library stores metadata about songs as they're played,
-		so songs can be quickly recalled and new playlists easily made.
-	</longdescription>
 	<use>
 		<flag name="airplay">Support for airplay format</flag>
-		<flag name="asf">Support for Monkey's Audio (APE) format with help of bundled libasf</flag>
 		<flag name="fluidsynth">Enable fluidsynth support (MIDI)</flag>
+		<flag name="gme">Support for various game audio formats using <pkg>media-libs/game-music-emu</pkg></flag>
 		<flag name="ices">Icecast source output plugin</flag>
-		<flag name="mac">Support for Monkey's Audio (APE) format with help of <pkg>media-sound/mac</pkg></flag>
-		<flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag>
-		<flag name="phonehome">This client sends anonymous usage-statistics to the xmms2</flag>
+		<flag name="libvisual">Install xmms2-libvisual for use with the 'visualization' effect</flag>
+		<flag name="mac">Support for Monkey's Audio (APE) format using <pkg>media-sound/mac</pkg></flag>
+		<flag name="mlib-update">Enable building of xmms2-mlib-updater client</flag>
 		<flag name="server">Build xmms2 player daemon (otherwise only clients are built)</flag>
-		<flag name="sid">Support for C64 SID</flag>
-		<flag name="valgrind">Run unit tests under valgrind.</flag>
+		<flag name="tremor">Support Vorbis using an alternate fixed-point decoder with <pkg>media-libs/tremor</pkg></flag>
 		<flag name="vocoder">Phase vocoder effect plugin</flag>
-		<flag name="mlib-update">Enable building of xmms2-mlib-updater client</flag>
 		<flag name="xml">Enable support for various XML based playlists and sources: RSS, XSPF</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">xmms2</remote-id>
+		<remote-id type="github">xmms2/xmms2-devel</remote-id>
+		<remote-id type="github">xmms2/s4</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
deleted file mode 100644
index 93e6b7087cd3..000000000000
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit eutils multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
-
-# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
-MY_P="${P%_p*}DrO_o-949-gca15e830"
-WAF_VER="2.0.19"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
-HOMEPAGE="https://xmms2.org/wiki/Main_Page"
-#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2
-	https://waf.io/waf-${WAF_VER}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
-
-IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
-jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
-perl phonehome pulseaudio python ruby samba +server sid sndfile speex
-test valgrind +vorbis vocoder wavpack xml zeroconf"
-
-RDEPEND="server? (
-		>=dev-db/sqlite-3.3.4
-
-		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl:0= )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		cdda? ( dev-libs/libcdio-paranoia
-			>=media-libs/libdiscid-0.1.1
-			>=media-sound/cdparanoia-3.9.8 )
-		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( media-video/ffmpeg )
-		flac? ( media-libs/flac )
-		fluidsynth? ( media-sound/fluidsynth )
-		ices? ( media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis )
-		jack? ( virtual/jack )
-		mac? ( media-sound/mac )
-		mms? ( media-video/ffmpeg
-			>=media-libs/libmms-0.3 )
-		modplug? ( media-libs/libmodplug )
-		mad? ( media-libs/libmad )
-		mp3? ( >=media-sound/mpg123-1.5.1 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? ( media-libs/libofa )
-		opus? ( media-libs/opus
-			media-libs/opusfile )
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( >=net-fs/samba-4.2 )
-		sid? ( media-sound/sidplay
-			media-libs/resid )
-		sndfile? ( media-libs/libsndfile )
-		speex? ( media-libs/speex
-			media-libs/libogg )
-		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	)
-
-	>=dev-libs/glib-2.12.9
-	cxx? ( >=dev-libs/boost-1.32 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-
-DEPEND="${RDEPEND}
-	dev-lang/python
-	virtual/pkgconfig
-	perl? ( dev-perl/Module-Build
-		virtual/perl-Module-Metadata )
-	python? ( >=dev-python/cython-0.15.1 )
-	test? ( dev-util/cunit
-		valgrind? ( dev-util/valgrind ) )
-"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# needs port
-	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
-
-	"${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
-
-	"${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
-
-	# required to build tarball from git tree
-	"${FILESDIR}/${P}"-tarball.patch
-
-	# fix hash to be the same on LE/BE platforms
-	"${FILESDIR}/${P}"-be-hash.patch
-
-	# handle mac-3 -> -4 API change
-	"${FILESDIR}/${P}"-mac-4.patch
-
-	# C++ client dangling reference: https://github.com/xmms2/xmms2-devel/pull/5
-	"${FILESDIR}/${P}"-cpp-client.patch
-
-	# gcc-10 stopped putting globals into common section
-	"${FILESDIR}/${P}"-gcc-10.patch
-
-	# fix required since faad 2.9.0
-	"${FILESDIR}/${P}"-faad.patch
-)
-
-pkg_setup() {
-	# used both for building xmms2 and
-	# optionally linking client library
-	# against python
-	python-single-r1_pkg_setup
-}
-
-# use_enable() is taken as proto
-# $1 - useflag
-# $2 - xmms2 option/plugin name (equals to $1 if not set)
-
-xmms2_flag() {
-	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
-
-	local UWORD=${2:-$1}
-
-	case $1 in
-		ENABLED)
-			echo ",${UWORD}"
-			;;
-		DISABLED)
-			;;
-		*)
-			use $1 && echo ",${UWORD}"
-			;;
-	esac
-}
-
-src_prepare() {
-	mv "${WORKDIR}/waf-${WAF_VER}"/{waf,waflib/} . || die
-	default
-}
-
-src_configure() {
-	# ./configure alike options.
-	local waf_params=(
-		--prefix=/usr
-		--libdir=/usr/$(get_libdir)
-		--with-target-platform="${CHOST}"
-		--mandir=/usr/share/man
-		--infodir=/usr/share/info
-		--datadir=/usr/share
-		--sysconfdir=/etc
-		--localstatedir=/var/lib
-	)
-
-	local optionals=""
-	local plugins=""
-	if ! use server ; then
-		waf_params+=( --without-xmms2d )
-	else
-		# some fun static mappings:
-		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
-					"phonehome	et"
-					"ENABLED	launcher"
-					"mlib-update	medialib-updater"
-					"ENABLED	nycli"
-					"		perl"
-					"ENABLED	pixmaps"
-					"		python"
-					"		ruby"
-					"DISABLED	tests"
-					"DISABLED	vistest"
-					"cxx		xmmsclient++"
-					"cxx		xmmsclient++-glib"
-					"DISABLED	xmmsclient-cf"
-					"DISABLED	xmmsclient-ecore" # not in tree
-
-					"test		tests"
-				)
-
-		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
-					"		alsa"
-					"		airplay"
-					"		ao"
-					"ffmpeg		apefile"
-					"ffmpeg		avcodec"
-					"		asf"
-					"ENABLED	asx"
-					"		cdda"
-					"DISABLED	coreaudio" # MacOS only?
-					"		curl"
-					"ENABLED	cue"
-					"zeroconf	daap"
-					"ENABLED	diskwrite"
-					"ENABLED	equalizer"
-					"aac		faad"
-					"ENABLED	file"
-					"		flac"
-					"		fluidsynth"
-					"ffmpeg		flv"
-					"ffmpeg		tta"
-					"DISABLED	gme" # not in tree
-					"DISABLED	gvfs" # obsolete #647604
-					"ENABLED	html"
-					"		ices"
-					"ENABLED	icymetaint"
-					"ENABLED	id3v2"
-					"		jack"
-					"ENABLED	karaoke"
-					"ENABLED	m3u"
-					"		mac"
-					"		mms"
-					"		mad"
-					"ENABLED	midsquash"
-					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
-					"mp3		mpg123"
-					"		modplug"
-					"		musepack"
-					"DISABLED	nms" # not in tree
-					"ENABLED	normalize"
-					"ENABLED	null"
-					"ENABLED	nulstripper"
-					"		ofa"
-					"		opus"
-					"		oss"
-					"ENABLED	pls"
-					"pulseaudio	pulse"
-					"ENABLED	replaygain"
-					"xml		rss"
-					"		samba"
-					"DISABLED	sc68" #not in tree
-					"		sid"
-					"		sndfile"
-					"		speex"
-					"DISABLED	sun" # {Open,Net}BSD only
-					"DISABLED	tremor" # not in tree
-					"		vorbis"
-					"		vocoder"
-					"ffmpeg		tta"
-					"ENABLED	wave"
-					"DISABLED	waveout" # windows only
-					"		wavpack"
-					"xml		xspf"
-					"ENABLED	xml"
-				)
-
-		local option
-		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag $option)
-		done
-
-		local plugin
-		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag $plugin)
-		done
-
-		if use perl; then
-			perl_set_version
-			waf_params+=( --with-perl-archdir="${ARCH_LIB}" )
-		fi
-	fi # ! server
-
-	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=(
-		--with-optionals="${optionals:1}" # skip first ',' if yet
-		--with-plugins="${plugins:1}"
-		$(use_with valgrind)
-	)
-
-	CC="$(tc-getCC)"         \
-	CPP="$(tc-getCPP)"       \
-	AR="$(tc-getAR)"         \
-	RANLIB="$(tc-getRANLIB)" \
-	CXX="$(tc-getCXX)"       \
-	    ./waf configure "${waf_params[@]}" || die "'waf configure' failed"
-}
-
-src_compile() {
-	# waf is very keen to run tests in build phase (bug #424377) but
-	# it does not bother running tests twice, so the hack below works:
-	./waf --verbose build || ./waf --verbose build || die "waf build failed"
-}
-
-src_test() {
-	# rerun tests
-	./waf --alltests || die "waf --alltests failed"
-}
-
-src_install() {
-	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO
-
-	python_optimize
-
-	# waftools/man.py always compresses man pages with gzip.
-	# to avoid code changed let's just un-gzip manpages
-	local m
-	for m in "${ED}"/usr/share/man/man1/*.gz; do
-		# For some combination of USEs no mans are installed.
-		if [[ -f $m ]]; then
-			einfo "Uncompressing '${m#${ED}}' back."
-			gzip -d "${m}" || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This version is built on experimental development code"
-	elog "If you encounter any errors report them at https://bugs.xmms2.org"
-	elog "and visit #xmms2 at irc://irc.freenode.net"
-	if use phonehome ; then
-		einfo ""
-		einfo "The phone-home client xmms2-et was activated"
-		einfo "This client sends anonymous usage-statistics to the xmms2"
-		einfo "developers which may help finding bugs"
-		einfo "Disable the phonehome useflag if you don't like that"
-	fi
-}
diff --git a/media-sound/xmms2/xmms2-0.9.3-r1.ebuild b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..a466553f269a
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+inherit flag-o-matic optfeature perl-functions python-single-r1 waf-utils
+
+DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
+HOMEPAGE="https://github.com/XMMS2"
+SRC_URI="https://github.com/xmms2/xmms2-devel/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~loong ppc ~riscv x86"
+
+# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
+# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
+# (if have a use for some of these disabled features, please file a bug)
+XMMS2_OPTIONALS=(
+	cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater
+	:nycli perl :pixmaps python server:s4 test:tests libvisual:vistest
+	# disabled: et,mdns,migrate-collections,ruby,sqlite2s4,xmmsclient-cf,xmmsclient-ecore
+)
+XMMS2_PLUGINS=(
+	aac:faad airplay alsa ao :asx cdda :cue curl :diskwrite :equalizer
+	ffmpeg:apefile,asf,avcodec,flv,tta :file flac fluidsynth:fluidsynth,mid1,midsquash
+	gme :html ices :icymetaint :id3v2 jack :karaoke :m3u mac +mad modplug
+	mp3:mpg123 :mp4 musepack :normalize :null :nulstripper opus oss :pls
+	pulseaudio:pulse :replaygain samba sid sndfile speex tremor vocoder +vorbis
+	:wave wavpack :xml xml:rss,xspf zeroconf:daap
+	# disabled: coreaudio,gvfs,mms,nms,ofa,sc68,sun,waveout
+)
+
+IUSE="
+	${XMMS2_OPTIONALS[@]%:*}
+	${XMMS2_PLUGINS[@]%:*}
+	+server"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( server )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	sys-libs/readline:=
+	libvisual? (
+		media-libs/libsdl[opengl,video]
+		media-libs/libvisual:0.4
+	)
+	server? (
+		aac? ( media-libs/faad2 )
+		airplay? ( dev-libs/openssl:= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? (
+			dev-libs/libcdio-paranoia:=
+			dev-libs/libcdio:=
+			media-libs/libdiscid
+		)
+		curl? ( net-misc/curl )
+		ffmpeg? ( media-video/ffmpeg:= )
+		flac? ( media-libs/flac:= )
+		fluidsynth? ( media-sound/fluidsynth:= )
+		gme? ( media-libs/game-music-emu )
+		ices? (
+			media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis
+		)
+		jack? ( virtual/jack )
+		mac? ( <=media-sound/mac-4.12 )
+		mad? ( media-libs/libmad )
+		modplug? ( media-libs/libmodplug )
+		mp3? ( media-sound/mpg123 )
+		musepack? ( media-sound/musepack-tools )
+		opus? ( media-libs/opusfile )
+		pulseaudio? ( media-libs/libpulse )
+		samba? ( net-fs/samba )
+		sid? ( media-libs/libsidplay:2 )
+		sndfile? ( media-libs/libsndfile )
+		speex? (
+			media-libs/libogg
+			media-libs/speex
+		)
+		tremor? ( media-libs/tremor )
+		vocoder? (
+			media-libs/libsamplerate
+			sci-libs/fftw:3.0=
+		)
+		vorbis? ( media-libs/libvorbis )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? (
+			net-dns/avahi[mdnsresponder-compat]
+			net-misc/curl
+		)
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/glib-perl
+		virtual/perl-Carp
+		virtual/perl-IO
+		virtual/perl-Scalar-List-Utils
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	cxx? ( dev-libs/boost )
+	test? ( dev-util/cunit )"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	perl? (	dev-perl/Pod-Parser )
+	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	avcodec_free_frame # succcessfully detects that this is gone in newer ffmpeg
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-cpp-client.patch
+	"${FILESDIR}"/${PN}-0.9.1-faad.patch
+)
+
+src_prepare() {
+	default
+
+	# meant to be configured, but give a default for out-of-the-box midi
+	sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \
+		-i src/plugins/fluidsynth/fluidsynth.c || die
+}
+
+src_configure() {
+	filter-lto # `xmms2 add somefile` breaks with lto + fortify=2
+
+	local wafargs=(
+		--boost-includes="${ESYSROOT}"/usr/include
+		--with-target-platform="${CHOST}"
+		--without-valgrind
+	)
+
+	xmms2_flag() {
+		local IFS=:
+		set -- ${1#+}
+
+		if [[ ${1} ]]; then
+			usev ${1} ,${2:-${1}}
+		else
+			echo ,${2}
+		fi
+	}
+
+	local flag optionals plugins
+
+	if use server; then
+		for flag in "${XMMS2_PLUGINS[@]}"; do
+			plugins+=$(xmms2_flag ${flag})
+		done
+	else
+		wafargs+=( --without-xmms2d )
+	fi
+
+	for flag in "${XMMS2_OPTIONALS[@]}"; do
+		optionals+=$(xmms2_flag ${flag})
+	done
+
+	wafargs+=(
+		# pass even if empty to avoid automagic
+		--with-optionals=${optionals:1}
+		--with-plugins=${plugins:1}
+	)
+
+	if use perl; then
+		perl_set_version
+		wafargs+=( --with-perl-archdir="${ARCH_LIB}" )
+	fi
+
+	waf-utils_src_configure "${wafargs[@]}"
+}
+
+src_compile() {
+	waf-utils_src_compile --notests
+}
+
+src_test() {
+	waf-utils_src_compile --alltests
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.mdown *.ChangeLog )
+	waf-utils_src_install --without-ldconfig --notests
+
+	use libvisual && dobin _build_/src/clients/vistest/xmms2-libvisual
+
+	use python && python_optimize
+
+	# to avoid editing waftools/man.py (use find given not always installed)
+	find "${ED}" -type f -name '*.gz' -exec gzip -d {} + || die
+}
+
+pkg_postinst() {
+	use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont
+}
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
deleted file mode 100644
index 29297a9fb636..000000000000
--- a/media-sound/xnoise/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xnoise-0.2.21.tar.gz 3222030 BLAKE2B c58561f4e042ccf7d7fdeb271801ccc2d447138cf5c1afb2f8f0bb098135d957aa289799e59f2c96a76a01ccfeeb9574d87f0d987b1e3ace9d22a3ced8ec88b9 SHA512 e25f42795638a5b93f1922f1c761b0bdaf754414dfa0f7172407e0d10514c52844d0dc3146a32f93e6107a0b5bb0f8e9e5d098954e9659f28177c56f607d9851
diff --git a/media-sound/xnoise/files/xnoise-0.2.21-QA-fix-desktop-file.patch b/media-sound/xnoise/files/xnoise-0.2.21-QA-fix-desktop-file.patch
deleted file mode 100644
index d57cb4b6f393..000000000000
--- a/media-sound/xnoise/files/xnoise-0.2.21-QA-fix-desktop-file.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/data/misc/xnoise.desktop.in
-+++ b/data/misc/xnoise.desktop.in
-@@ -16,24 +16,19 @@
- [Desktop Action Play]
- _Name=Play/Pause
- Exec=xnoise --play-pause
--OnlyShowIn=Unity;
- 
- [Desktop Action Stop]
- _Name=Stop
- Exec=xnoise --stop
--OnlyShowIn=Unity;
- 
- [Desktop Action Next]
- _Name=Goto next track
- Exec=xnoise --next
--OnlyShowIn=Unity;
- 
- [Desktop Action Previous]
- _Name=Goto previous track
- Exec=xnoise --previous
--OnlyShowIn=Unity;
- 
- [Desktop Action Quit]
- _Name=Quit application
- Exec=xnoise --quit
--OnlyShowIn=Unity;
---- a/data/misc/xnoise.desktop.in.in
-+++ b/data/misc/xnoise.desktop.in.in
-@@ -16,24 +16,19 @@
- [Desktop Action Play]
- _Name=Play/Pause
- Exec=xnoise --play-pause
--OnlyShowIn=Unity;
- 
- [Desktop Action Stop]
- _Name=Stop
- Exec=xnoise --stop
--OnlyShowIn=Unity;
- 
- [Desktop Action Next]
- _Name=Goto next track
- Exec=xnoise --next
--OnlyShowIn=Unity;
- 
- [Desktop Action Previous]
- _Name=Goto previous track
- Exec=xnoise --previous
--OnlyShowIn=Unity;
- 
- [Desktop Action Quit]
- _Name=Quit application
- Exec=xnoise --quit
--OnlyShowIn=Unity;
diff --git a/media-sound/xnoise/metadata.xml b/media-sound/xnoise/metadata.xml
deleted file mode 100644
index 236fa82f3dfa..000000000000
--- a/media-sound/xnoise/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<use>
-		<flag name="lastfm">Enable support for lastfm cover art fetching and scrobbling</flag>
-		<flag name="lyrics">Enable support for lyrics fetching</flag>
-	</use>
-	<upstream>
-		<remote-id type="bitbucket">shuerhaaken/xnoise</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/xnoise/xnoise-0.2.21.ebuild b/media-sound/xnoise/xnoise-0.2.21.ebuild
deleted file mode 100644
index b91eefbc5398..000000000000
--- a/media-sound/xnoise/xnoise-0.2.21.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of features"
-HOMEPAGE="http://www.xnoise-media-player.com/"
-SRC_URI="https://www.bitbucket.org/shuerhaaken/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator +lastfm +lyrics"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	media-libs/libtaginfo:=
-	media-plugins/gst-plugins-meta:1.0
-	x11-libs/cairo:=
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	appindicator? ( dev-libs/libappindicator:3= )
-	lastfm? ( net-libs/libsoup:2.4= )
-	lyrics? (
-		net-libs/libsoup:2.4=
-		dev-libs/libxml2:2=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2.21-QA-fix-desktop-file.patch )
-
-src_configure() {
-	econf \
-		--enable-magnatune \
-		--enable-mediakeys \
-		--enable-mpris \
-		--enable-soundmenu2 \
-		$(use_enable appindicator) \
-		$(use_enable lastfm) \
-		$(use_enable lyrics lyricwiki) \
-		$(use_enable lyrics chartlyrics) \
-		$(use_enable lyrics azlyrics)
-}
-
-src_install() {
-	default
-	rm -rf "${ED}"/usr/share/${PN}/license || die
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index e68a47af1443..419a623a486b 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1 +1 @@
-DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4
+DIST xwax-1.9.tar.gz 87599 BLAKE2B 69a759b927ffce5501772ec4936436193a03976d529a212152bb5975f9519ab00ed7a245176048c6a0f6c101a4ee167acd694e54b548346f5a5588160048cbb2 SHA512 8bfd97097dc6425448d9a05516f93dbae6060c2d908d89be25d93396fcbe9c5047c9c43bc0d901a05881886d9994c31afa04a0cf95b47a942be2d97a23b284c6
diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml
index aa4bd1f8dd50..d0c34ffa0920 100644
--- a/media-sound/xwax/metadata.xml
+++ b/media-sound/xwax/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/xwax/xwax-1.7.ebuild b/media-sound/xwax/xwax-1.9.ebuild
index 20b519759a8b..e88ea020ee84 100644
--- a/media-sound/xwax/xwax-1.7.ebuild
+++ b/media-sound/xwax/xwax-1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs user
+inherit toolchain-funcs
 
 DESCRIPTION="Digital vinyl emulation software"
 HOMEPAGE="https://xwax.org/"
@@ -12,10 +12,12 @@ SRC_URI="https://xwax.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
+IUSE="+alsa cdda +fallback jack mp3 oss"
 
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
+REQUIRED_USE="
+	|| ( cdda mp3 fallback )
+	|| ( alsa jack oss )
+"
 
 DEPEND="
 	media-fonts/dejavu
@@ -29,7 +31,11 @@ DEPEND="
 	jack? ( virtual/jack )
 	mp3? ( media-sound/mpg123 )
 "
-RDEPEND="${DEPEND}"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/xwax
+"
 
 DOCS=( README CHANGES )
 
@@ -47,7 +53,7 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 	econf \
-		--prefix "${EROOT}/usr" \
+		--prefix "${EPREFIX}/usr" \
 		$(use_enable alsa) \
 		$(use_enable jack) \
 		$(use_enable oss)
@@ -59,10 +65,6 @@ src_compile() {
 	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
 }
 
-pkg_preinst() {
-	enewgroup ${PN}
-}
-
 src_install() {
 	# This is easier than setting all the environment variables
 	# needed, running the sed script required to get the man directory
diff --git a/media-sound/yarock/metadata.xml b/media-sound/yarock/metadata.xml
index 789a20e09848..d49e848cea41 100644
--- a/media-sound/yarock/metadata.xml
+++ b/media-sound/yarock/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>asturm@gentoo.org</email>
diff --git a/media-sound/yarock/yarock-1.4.0-r1.ebuild b/media-sound/yarock/yarock-1.4.0-r3.ebuild
index 39414485b05d..2d7d556e68e6 100644
--- a/media-sound/yarock/yarock-1.4.0-r1.ebuild
+++ b/media-sound/yarock/yarock-1.4.0-r3.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+MY_P="Yarock_${PV}_Sources"
 inherit cmake
 
-MY_P="Yarock_${PV}_Sources"
 DESCRIPTION="Qt-based music player"
-HOMEPAGE="https://seb-apps.github.io/yarock/"
+HOMEPAGE="https://code.launchpad.net/yarock"
 SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="mpv phonon vlc"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
 RDEPEND="
 	dev-cpp/htmlcxx
 	dev-qt/qtcore:5
@@ -29,18 +27,20 @@ RDEPEND="
 	dev-qt/qtxml:5
 	media-libs/taglib
 	x11-libs/libX11
-	phonon? ( >=media-libs/phonon-4.11.0 )
+	mpv? ( media-video/mpv:=[libmpv] )
+	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
 	vlc? ( media-video/vlc:= )
 "
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 	dev-qt/qtx11extras:5
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 DOCS=( CHANGES.md README.md )
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	cmake_src_prepare
 	sed -e "/^install.*org.yarock.appdata.xml/s:share/appdata:share/metadata:" \
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 8299e872d6b5..6a6d97be6836 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1 +1 @@
-DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9
+DIST yoshimi-2.3.2.tar.gz 8720491 BLAKE2B 37a1c1ee9d07aba2b4fa22bbff200c16abf3437b6c4b48b53842be6a7b8e7999dd4bc294446d9b80b5a5a9e7485a5e3c3c73f2cf4029581e60f9644b705f47ee SHA512 6ddca4a5cffc609880fcbb625eca471b9926cb3cc0bef9f349ef3fafe6280f5e3957e62db0c103856c680d0a3dde0b15225569d7171553ae74ee4c78c848b598
diff --git a/media-sound/yoshimi/metadata.xml b/media-sound/yoshimi/metadata.xml
index 117f33bc9f0a..a8a7b379b414 100644
--- a/media-sound/yoshimi/metadata.xml
+++ b/media-sound/yoshimi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/yoshimi/yoshimi-1.7.2.ebuild b/media-sound/yoshimi/yoshimi-2.3.2-r1.ebuild
index 0d9ef3eefcc6..d52b5bb9ab3d 100644
--- a/media-sound/yoshimi/yoshimi-1.7.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.3.2-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+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"
@@ -16,7 +17,7 @@ IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
-	>=dev-libs/mxml-2.5
+	dev-libs/mxml:0
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/libsndfile
@@ -31,8 +32,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P}/src"
-
 DOCS=( ../Changelog ../README.txt )
 
 src_prepare() {
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 57b7d0923fc5..748fcac41684 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1 +1,2 @@
-DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
+DIST zyn-fusion-ui-src-3.0.6.tar.bz2 5266884 BLAKE2B d9715c319bfd313792f550e12a47939dec665eda6ef395f8bb7a175b11f0922a4037428f99dc95fe749c40074ce8976fa9d257b6bc1e8f1feb63ca943c3bdd76 SHA512 7f195cf6a193376160441863d725383640bc75ad0c21b8ef7786da67a42fe014be103e3c3d9c29c83ffc3d78b9e11a4031a6b3922d457a336d184228c16077cd
+DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea
diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch
new file mode 100644
index 000000000000..005b1733e5e2
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch
@@ -0,0 +1,19 @@
+--- i/Makefile
++++ w/Makefile
+@@ -16,10 +16,14 @@ linux:
+ 	$(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
+ 		./deps/libnanovg.a \
+ 		src/osc-bridge/libosc-bridge.a \
+-		`pkg-config --libs libuv` -lm -lX11 -lGL -lpthread
++		$(CFLAGS) \
++		`pkg-config --libs libuv` -lm -lX11 -lGL -lpthread \
++		$(LDFLAGS)
+ 	$(CC) test-libversion.c deps/pugl/pugl/pugl_x11.c \
++		$(CFLAGS) \
+ 		  -DPUGL_HAVE_GL \
+-		  -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs
++		  -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs \
++			$(LDFLAGS)
+ 
+ osx: deps/libuv.a
+ 	ruby ./rebuild-fcache.rb
diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch
new file mode 100644
index 000000000000..a24921196fe6
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch
@@ -0,0 +1,11 @@
+--- i/test-libversion.c
++++ w/test-libversion.c
+@@ -660,7 +660,7 @@ int main(int argc, char **argv)
+     if(!handle)
+         handle = dlopen("libzest.so", RTLD_LAZY);
+     if(!handle)
+-        handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY);
++        handle = dlopen("/usr/lib64/zynaddsubfx/libzest.so", RTLD_LAZY);
+ #endif
+     if(!handle) {
+         printf("[ERROR] Cannot Open libzest.so\n");
diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch
new file mode 100644
index 000000000000..77cc47913f57
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch
@@ -0,0 +1,69 @@
+From c1f5fcbad97c20b14a35e894477081d69519f6b0 Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Sat, 21 May 2022 13:19:48 +0200
+Subject: [PATCH] Use find internals instead of piping into grep
+
+Makefile:
+Use GNU find internals (e.g. `-iname`, `-exec` and conditionals) instead
+of piping into multiple instances of grep.
+Simplify line counting by using wc from find.
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ linux:
+ # force rebuilding all code that depends on hotloading.
+ 	touch src/mruby-widget-lib/src/api.c  
+ 	cd mruby             && $(HOTLOADING) MRUBY_CONFIG=../build_config.rb rake
+-	$(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
++	$(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \
+ 		./deps/libnanovg.a \
+ 		src/osc-bridge/libosc-bridge.a \
+ 		`pkg-config --libs libuv` -lm -lX11 -lGL -lpthread
+@@ -30,7 +30,7 @@ osx: deps/libuv.a
+ 	cd deps/pugl         && python2 ./waf
+ 	cd src/osc-bridge    && CFLAGS="-I ../../deps/libuv/include " make lib
+ 	cd mruby             && MRUBY_CONFIG=../build_config.rb rake
+-	$(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
++	$(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` ./deps/libnanovg.a \
+ 		./deps/libnanovg.a \
+ 		src/osc-bridge/libosc-bridge.a \
+ 		./deps/libuv/.libs/libuv.a  -lm -framework OpenGL -lpthread
+@@ -41,7 +41,7 @@ windows: buildpuglwin deps/libuv-win.a
+ 	$(AR) rc deps/libnanovg.a deps/nanovg/src/*.o
+ 	cd src/osc-bridge    && CFLAGS="-mstackrealign -I ../../deps/libuv/include " make lib
+ 	cd mruby             && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake
+-	$(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \
++	$(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \
+         ./deps/libnanovg.a \
+         src/osc-bridge/libosc-bridge.a \
+         ./deps/libuv-win.a \
+@@ -98,21 +98,21 @@ stats:
+ 	@echo 'mruby-qml-parse  commits: ' `cd src/mruby-qml-parse && git log --oneline | wc -l`
+ 	@echo 'mruby-qml-spawn  commits: ' `cd src/mruby-qml-spawn && git log --oneline | wc -l`
+ 	@echo 'osc-bridge       commits: ' `cd src/osc-bridge      && git log --oneline | wc -l`
+-	@echo 'number of qml    files:' `find src/ -type f | grep -e qml$$ | wc -l`
+-	@echo 'number of ruby   files:' `find src/ -type f | grep -e rb$$ | wc -l`
+-	@echo 'number of c      files:' `find src/ -type f | grep -e c$$ | wc -l`
+-	@echo 'number of header files:' `find src/ -type f | grep -e h$$ | wc -l`
++	@echo 'number of qml    files:' `find src/ -type f -iname "*.qml" | wc -l`
++	@echo 'number of ruby   files:' `find src/ -type f -iname "*.rb" | wc -l`
++	@echo 'number of c      files:' `find src/ -type f -iname "*.c" | wc -l`
++	@echo 'number of header files:' `find src/ -type f -iname "*.h" | wc -l`
+ 	@echo 'lines of OSC schema:' `wc -l src/osc-bridge/schema/test.json`
+ 	@echo 'lines of qml:'
+-	@wc -l `find src/ -type f | grep qml$$` | tail -n 1
++	@`find src/ -type f -iname "*.qml" -exec wc -l {} +` | tail -n 1
+ 	@echo 'lines of ruby:'
+-	@wc -l `find src/ -type f | grep -e rb$$ | grep -v fcache` | tail -n 1
++	@`find src/ -type f \( -iname "*.rb" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1
+ 	@echo 'lines of c source:'
+-	@wc -l `find src/ -type f | grep -e c$$` | tail -n 1
++	@`find src/ -type f -iname "*.c" -exec wc -l {} +` | tail -n 1
+ 	@echo 'lines of c header:'
+-	@wc -l `find src/ -type f | grep -e h$$` | tail -n 1
++	@`find src/ -type f -iname "*.h" -exec wc -l {} +` | tail -n 1
+ 	@echo 'total lines of code:'
+-	@wc -l `find src/ -type f | grep -Ee "(qml|rb|c|h)$$" | grep -v fcache` | tail -n 1
++	@`find src/ -type f \( -iname "*.qml" -o -iname "*.rb" -o -iname "*.c" -o -iname "*.h" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1
+ 
+ 
+ verbose: ## Compile mruby with --trace
diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch
new file mode 100644
index 000000000000..3001e08754dc
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch
@@ -0,0 +1,40 @@
+--- i/src/mruby-widget-lib/mrblib/script.rb
++++ w/src/mruby-widget-lib/mrblib/script.rb
+@@ -160,13 +160,13 @@ class ZRunner
+         search   = @search_path
+         search ||= ""
+         font_error = false
+-        sans = [search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"]
++        sans = ["/usr/share/fonts/roboto/Roboto-Regular.ttf", search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"]
+         if(@vg.create_font('sans', sans[0]) == -1 && @vg.create_font('sans', sans[1]) == -1)
+            GL::debug "[ERROR] could not find sans font"
+             font_error = true
+         end
+ 
+-        bold = [search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"]
++        bold = ["/usr/share/fonts/roboto/Roboto-Bold.ttf", search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"]
+         if(@vg.create_font('bold', bold[0]) == -1 && @vg.create_font('bold', bold[1]) == -1)
+            GL::debug "[ERROR] could not find bold font"
+             font_error = true
+--- i/src/mruby-widget-lib/src/api.c
++++ w/src/mruby-widget-lib/src/api.c
+@@ -110,7 +110,7 @@ zest_open(char *address)
+         if(strstr(path, "libzest"))
+             strstr(path, "libzest")[0] = 0;
+         char path2[256];
+-        snprintf(path2, sizeof(path2), "%s%s", path, "./qml/MainWindow.qml");
++        snprintf(path2, sizeof(path2), "%s%s", path, "../../share/zynaddsubfx/qml/MainWindow.qml");
+         FILE *f = fopen(path2, "r");
+         if(f) {
+             printf("[INFO:Zyn] Found Assets at %s\n", path);
+--- i/src/osc-bridge/src/bridge.c
++++ w/src/osc-bridge/src/bridge.c
+@@ -431,7 +431,7 @@ schema_t br_get_schema(bridge_t *br, uri_t uri)
+     schema_t sch;
+ 
+     //printf("[debug] loading json file\n");
+-    FILE *f = fopen("schema/test.json", "r");
++    FILE *f = fopen("/usr/share/zynaddsubfx/schema/test.json", "r");
+     if(!f && br->search_path) {
+         char tmp[256];
+         snprintf(tmp, sizeof(tmp), "%s%s", br->search_path, "schema/test.json");
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
deleted file mode 100644
index 8fbcf9aca56a..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix missing CMake include
-
-Authored by:  Simon van der Veldt 2020-09-30
-Committed by:  Mark McCurry 2020-10-03
-
---- a/src/Nio/CMakeLists.txt
-+++ b/src/Nio/CMakeLists.txt
-@@ -21,6 +21,7 @@
- add_definitions(-DIN_DEFAULT="${DefaultInput}")
- 
- if(JackEnable)
-+    include(CheckIncludeFiles)
-     include_directories(${JACK_INCLUDE_DIR})
-     list(APPEND zynaddsubfx_nio_SRCS JackEngine.cpp JackMultiEngine.cpp)
-     list(APPEND zynaddsubfx_nio_lib ${JACK_LIBRARIES})
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch
index 44060eaf4824..0db30ed2395c 100644
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch
@@ -1,10 +1,10 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
+@@ -35,9 +35,6 @@ include(CTestConfig.cmake)
  add_subdirectory(src)
  add_subdirectory(doc) # Doxygen only
-
--install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+ 
+-install(FILES AUTHORS.txt COPYING README.adoc
 -	DESTINATION share/doc/zynaddsubfx
 -	)
  install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch
new file mode 100644
index 000000000000..79e9e30083e5
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch
@@ -0,0 +1,11 @@
+--- i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
++++ w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
+@@ -68,7 +68,7 @@ public:
+ #else
+         handle = dlopen("./libzest.so", RTLD_LAZY);
+         if(!handle)
+-            handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY);
++            handle = dlopen("/usr/lib64/zynaddsubfx/libzest.so", RTLD_LAZY);
+         if(!handle)
+             handle = dlopen("libzest.so", RTLD_LAZY);
+ #endif
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch
new file mode 100644
index 000000000000..3c1bd7937810
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch
@@ -0,0 +1,121 @@
+--- zynaddsubfx-3.0.6/src/Params/ADnoteParameters.h
++++ zynaddsubfx-3.0.6.mod/src/Params/ADnoteParameters.h
+@@ -16,6 +16,7 @@
+ 
+ #include "../globals.h"
+ #include "PresetsArray.h"
++#include <cstdint>
+ 
+ namespace zyn {
+ 
+--- zynaddsubfx-3.0.6/src/Params/Controller.h
++++ zynaddsubfx-3.0.6.mod/src/Params/Controller.h
+@@ -17,6 +17,7 @@
+ 
+ #include <stdint.h>
+ #include "../globals.h"
++#include <cstdint>
+ 
+ namespace zyn {
+ 
+--- zynaddsubfx-3.0.6/src/Params/EnvelopeParams.h
++++ zynaddsubfx-3.0.6.mod/src/Params/EnvelopeParams.h
+@@ -17,6 +17,7 @@
+ #include "../globals.h"
+ #include "../Misc/XMLwrapper.h"
+ #include "Presets.h"
++#include <cstdint>
+ 
+ namespace zyn {
+ 
+--- zynaddsubfx-3.0.6/src/Params/FilterParams.h
++++ zynaddsubfx-3.0.6.mod/src/Params/FilterParams.h
+@@ -17,6 +17,7 @@
+ #include "../globals.h"
+ #include "../Misc/XMLwrapper.h"
+ #include "PresetsArray.h"
++#include <cstdint>
+ 
+ namespace zyn {
+ 
+--- zynaddsubfx-3.0.6/src/Params/LFOParams.h
++++ zynaddsubfx-3.0.6.mod/src/Params/LFOParams.h
+@@ -17,6 +17,7 @@
+ #include <Misc/Time.h>
+ #include <rtosc/ports.h>
+ #include "Presets.h"
++#include <cstdint>
+ 
+ #define LFO_SINE      0
+ #define LFO_TRIANGLE  1
+--- zynaddsubfx-3.0.6/src/Params/PADnoteParameters.h
++++ zynaddsubfx-3.0.6.mod/src/Params/PADnoteParameters.h
+@@ -19,7 +19,7 @@
+ #include "Presets.h"
+ #include <string>
+ #include <functional>
+-
++#include <cstdint>
+ namespace zyn {
+ 
+ /**
+--- zynaddsubfx-3.0.6/src/Params/SUBnoteParameters.h
++++ zynaddsubfx-3.0.6.mod/src/Params/SUBnoteParameters.h
+@@ -17,6 +17,7 @@
+ #include <stdint.h>
+ #include "../globals.h"
+ #include "Presets.h"
++#include <cstdint>
+ 
+ namespace zyn {
+ 
+--- zynaddsubfx-3.0.6.old/src/Misc/Bank.cpp
++++ zynaddsubfx-3.0.6/src/Misc/Bank.cpp
+@@ -17,6 +17,7 @@
+ #include <cstring>
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstdint>
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <algorithm>
+--- zynaddsubfx-3.0.6.old/src/Misc/Bank.h
++++ zynaddsubfx-3.0.6/src/Misc/Bank.h
+@@ -16,6 +16,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ #include "../globals.h"
+ #include "Config.h"
+ 
+--- zynaddsubfx-3.0.6.old/src/Nio/InMgr.cpp
++++ zynaddsubfx-3.0.6/src/Nio/InMgr.cpp
+@@ -17,6 +17,7 @@
+ #include "../Misc/MiddleWare.h"
+ #include <rtosc/thread-link.h>
+ #include <iostream>
++#include <cstdint>
+ using namespace std;
+ 
+ extern zyn::MiddleWare *middleware;
+--- zynaddsubfx-3.0.6.old/src/Nio/MidiIn.cpp
++++ zynaddsubfx-3.0.6/src/Nio/MidiIn.cpp
+@@ -15,6 +15,7 @@
+ #include "../globals.h"
+ #include "InMgr.h"
+ #include <string.h>
++#include <cstdint>
+ 
+ namespace zyn {
+ 
+--- zynaddsubfx-3.0.6.old/src/Nio/MidiIn.h
++++ zynaddsubfx-3.0.6/src/Nio/MidiIn.h
+@@ -17,6 +17,7 @@
+ #define MIDI_IN_H
+ 
+ #include "Engine.h"
++#include <cstdint>
+ 
+ namespace zyn {
+ 
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index 63c95289a8f5..52c14139a51e 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild
index 36d58edcadf9..da2c1db9b0e1 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild
@@ -1,34 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake flag-o-matic
 
 DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+HOMEPAGE="https://zynaddsubfx.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa doc dssi +fltk jack lash portaudio"
-
+IUSE="+alsa doc dssi +fltk jack lash portaudio"
 REQUIRED_USE="|| ( alsa jack portaudio )"
 
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
 DEPEND="
-	>=dev-libs/mxml-2.2.1
+	dev-libs/mxml:0
 	media-libs/liblo
 	sci-libs/fftw:3.0
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-texlive/texlive-fontutils )
 	dssi? ( media-libs/dssi )
 	fltk? (
-		>=x11-libs/fltk-1.3:1
+		x11-libs/fltk:1
 		x11-libs/libX11
 		x11-libs/libXpm
 	)
@@ -37,13 +33,18 @@ DEPEND="
 	portaudio? ( media-libs/portaudio )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-docs.patch
-	"${FILESDIR}"/${P}-cmake.patch # bug 761823
+	"${FILESDIR}"/${P}-stdint.patch
 )
 
-DOCS=( ChangeLog HISTORY.txt README.adoc )
+DOCS=( AUTHORS.txt NEWS.txt README.adoc )
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild
new file mode 100644
index 000000000000..2820c94f905f
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="https://zynaddsubfx.sourceforge.net/"
+
+SRC_URI="
+	https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2
+	https://downloads.sourceforge.net/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+alsa doc dssi jack lash portaudio"
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+DEPEND="
+	dev-libs/mxml:0
+	media-libs/liblo
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-texlive/texlive-fontutils )
+	dssi? ( media-libs/dssi )
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="
+	${DEPEND}
+	media-fonts/roboto
+"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${P}-stdint.patch
+	"${FILESDIR}"/${P}-libzest_location.patch
+)
+ZYN_FUSION_UI_PATCHES=(
+	"${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch
+	"${FILESDIR}"/zyn-fusion-ui-${PV}-libzest_location.patch
+	"${FILESDIR}"/zyn-fusion-ui-${PV}-makefile_find.patch
+	"${FILESDIR}"/zyn-fusion-ui-${PV}-system_wide_location.patch
+)
+
+DOCS=( AUTHORS.txt NEWS.txt README.adoc )
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use dssi; then
+		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use jack; then
+		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+	fi
+	if ! use lash; then
+		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use portaudio; then
+		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+
+	# FIXME upstream: sandbox error
+	sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
+
+	cd ../zyn-fusion-ui-src-${PV}
+	eapply "${ZYN_FUSION_UI_PATCHES[@]}"
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		-DPluginLibDir=$(get_libdir)
+		-DGuiModule=zest
+		-DDefaultInput=jack
+		-DDefaultOutput=jack
+		$(cmake_use_find_package alsa Alsa)
+		$(cmake_use_find_package doc Doxygen)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+	emake -C ../zyn-fusion-ui-src-${PV}
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+
+	cd ../zyn-fusion-ui-src-${PV}
+	newbin zest zyn-fusion
+	insinto /usr/$(get_libdir)/${PN}
+	doins libzest.so
+	insinto /usr/share/${PN}/qml
+	doins -r src/mruby-zest/{example,qml}/*.qml
+	insinto /usr/share/${PN}/schema
+	doins src/osc-bridge/schema/test.json
+}