gentoo resync : 09.07.2022

91 files changed, 972 insertions, 2459 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1dc13b51d18a..52d7c4f7f1fe 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 65a3da84955c..31011d17157f 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -2,6 +2,6 @@ DIST abcMIDI-2022.05.20.zip 611325 BLAKE2B 1fd9c786ec0a7b3558f71502ceda261419b68
 DIST abcMIDI-2022.06.07.zip 611323 BLAKE2B 3b0a9a1bbf0265c8c2848aff267acf3fa0b98a6fe24b5878e70db5da3e892c8658ff236511a5524cf5dcf5217bf09ccb762102539cdd12a7d23c6573bd0ed14d SHA512 1e4daf647238e28b3c4c644dfcfbffdacd0e5b9e007a3a9cb8393ba879690c74d5ea2970254d5d3f19a68c5742de80bf5aa387a7f9aa241abec2e952f1bdc0c8
 DIST abcMIDI-2022.06.14.zip 612729 BLAKE2B f9644ea59bb43d50a39f60f31f440e9d4e425701c71877fb812adeaa0757da37d2aabab5c2b3593f38a5a135adc0925545337860452317e558cbfb037c95d4af SHA512 4e8a9a770925e166dabdbf459227b26373c33ed0ec356d093d8f4de457cc9034cd9237d445f31883e7c3974c3fd4b69a6f6fb156b26e03483bcd70793e7457ec
 EBUILD abcmidi-2022.05.20.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
-EBUILD abcmidi-2022.06.07.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.06.07.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.06.14.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.06.07.ebuild b/media-sound/abcmidi/abcmidi-2022.06.07.ebuild
index 11f547f4cb8e..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2022.06.07.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.06.07.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/audiotools/Manifest b/media-sound/audiotools/Manifest
index 3ab4b54a955c..66df98489d2f 100644
--- a/media-sound/audiotools/Manifest
+++ b/media-sound/audiotools/Manifest
@@ -1,5 +1,4 @@
 AUX audiotools-3.1.1-libcdio-paranoia.patch 1337 BLAKE2B 2594bf98a09df1064009dfa27764f64aeda7d92e43c82aaff3e44f6742db28f6fa2e87bd19d1f7eba8b82ac8ab338c9d7e7e7817817d49985809b927383d218d SHA512 cabc5f86e2977171c6616722640fa271d3c339bb223e229ec31697c81bd2c06c620a4b3d7a9057d7a90e05a2db7e2c7ca4d26403d60612ceebaaca0370845e10
 DIST audiotools-3.1.1.tar.gz 6325408 BLAKE2B 065b5dc23796ea8d1dc72dc581a8929fe26e08180af2f0719470d80d5c82be2455ffda28fe8fd5ca63ae078f7fa5c6b5153e8fae496736da8f97a4eae38c4876 SHA512 dfba0dab8ef1573a12366bb4d46552eeb6c23c4abde34d9df51238fc97f573135b564cc3e5dbcaf7691c4502d8173dc926d8eb5ecd169fe619278ae89ff24c3a
-EBUILD audiotools-3.1.1-r1.ebuild 1895 BLAKE2B 8ae3a8f94e4b4fdee94d8a27a90f7377cbe7a1b1f2a26cd7dacbdfa19585a01058d0251b737a392e0f724d4accc50a90172122d95d78fbcf1628824495cda135 SHA512 c534e3be945d237272f6113ad24fb2ffd05670a1f415f75b569f5381347779f584276697a621a3358a2f6f3170535815abc5e7c45862a88ef107d7bc1e098c1c
-EBUILD audiotools-3.1.1.ebuild 1895 BLAKE2B 424ac509d1e5bf0140ecd828930e78776b69da181b2ac0806194178b5cc83f0768820584d49e6e27c5b206e1d7678ed643240828e2e0a8859912991bc33ebd40 SHA512 a3a8b877c4cb9383bf340d7fe361c072c457a1459d0f215a180e12c8e8f7ce5b28a564a2eda50ba38898c5e511b534fa5cdc7deb804e266634423cc604279970
+EBUILD audiotools-3.1.1-r1.ebuild 1894 BLAKE2B ccf25e8a14b2b83f37cf9f799170aad36e0a97b801155ddb05570c733ca2500aede6cbf7db088758ce88e5010012a5b4a31000213589c27c6eee644707eabe01 SHA512 26d7ff763b9261c5c2d6ecbf4cbf2536ffc6676aab35816c49cff58842c35bc7d3d4bc74d4b28c2ae601b43229bc50351e76cd6b8786421d9328beaefdc82c2d
 MISC metadata.xml 534 BLAKE2B b6b669f321a1091210f4abb7935bae1c2101f9ec2dfbf45150b61d3b9b98c966c45da7230f7a2cdf5b634ecdbfc6c5c1c3ae2dcf7eca755face9d47d2301d9e8 SHA512 5b21b6527a7a134fbce106ff8948e834cadd0286e4ef2b3d56921799fa2cfac69666b74498d9ad64564c20d3ba2e90b610e1ede30f85b0362155bfb582657d5b
diff --git a/media-sound/audiotools/audiotools-3.1.1-r1.ebuild b/media-sound/audiotools/audiotools-3.1.1-r1.ebuild
index e564fa51638b..82bedd956825 100644
--- a/media-sound/audiotools/audiotools-3.1.1-r1.ebuild
+++ b/media-sound/audiotools/audiotools-3.1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 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"
diff --git a/media-sound/audiotools/audiotools-3.1.1.ebuild b/media-sound/audiotools/audiotools-3.1.1.ebuild
deleted file mode 100644
index b63f0e4b37a6..000000000000
--- a/media-sound/audiotools/audiotools-3.1.1.ebuild
+++ /dev/null
@@ -1,92 +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="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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa cdda cdr cue dvda flac gui twolame mp3 opus pulseaudio vorbis wavpack"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia:0= )
-	dvda? ( media-libs/libdvd-audio )
-	twolame? ( media-sound/twolame )
-	mp3? ( || ( media-sound/mpg123 media-sound/lame ) )
-	opus? (
-		media-libs/opus
-		media-libs/opusfile
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-"
-RDEPEND="${DEPEND}
-	aac? (
-		media-libs/faad2
-		media-libs/faac
-	)
-	cdr? ( app-cdr/cdrtools )
-	cue? ( app-cdr/cdrdao )
-	flac? ( media-libs/flac )
-	gui? (
-		$(python_gen_impl_dep 'tk(+)')
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/urwid[${PYTHON_USEDEP}]
-	)
-"
-
-# lots of random failures
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-libcdio-paranoia.patch )
-
-src_prepare() {
-	default
-
-	local USEFLAG_LIBS=(
-		cdda:libcdio_paranoia
-		dvda:libdvd-audio
-		pulseaudio:libpulse
-		alsa:alsa
-		mp3:libmpg123
-		mp3:mp3lame
-		vorbis:vorbisfile
-		vorbis:vorbisenc
-		opus:opusfile
-		opus:opus
-		twolame:twolame
-	)
-
-	# enable/disable deps based on USE flags
-	local flag_lib flag lib
-	for flag_lib in "${USEFLAG_LIBS[@]}"; do
-		flag=${flag_lib/:*}
-		lib=${flag_lib/*:}
-		use ${flag} || { sed -i "/^${lib}:/s/probe/no/" setup.cfg || die; }
-	done
-}
-
-python_compile_all() {
-	emake -C docs
-}
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test.py || die
-}
-
-python_install_all() {
-	doman docs/*.{1,5}
-	distutils-r1_python_install_all
-}
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 934854ee86c2..bc9b0908abf3 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,4 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
-AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
 DIST cadence-0.9.2.tar.gz 2202164 BLAKE2B a5422e4d74618e2e45d9c6f275393a6e918783fc37d60a54142725aa54e691435c41f76dd0346fae7684c452988b07a18d817902abd917dbceaff5fb4aaa6c47 SHA512 d8a1b52c361e3e18a193d1c283bb69abe18ce667b554fc53cb9b752d92747269145144ae512895ffbb5df76efe8671cfc0782f29e59d0d7cd3d97c97240bdecf
 EBUILD cadence-0.9.2.ebuild 2434 BLAKE2B 0ae7d58942830a368ec7102708adad2bf729b24b0b737a298528d878de91af3323aba5a604d9c6be68d7fc71cd2b9609cd75f945f91bb8146335fd2941292606 SHA512 2c11f655b1c4a36058446490f1fdb72f4e6e651f59adf0b5dc5085ee1115cf9d47fbcb530a8c9eec50c1cd896955ddbc4234d7c4ea773c38c6894e3cc3fe7237
 EBUILD cadence-9999.ebuild 2435 BLAKE2B 69f1d663fd990ff5bc56233d40178674711e769c29962723706b2dacfc0761a59d1af76b771639fb9a5c6e0bc5797166b117349797d164f355507a8883405320 SHA512 77f12ae78c79de7d3ada83208c1b069ec2d0161a38a0f3d06ff0eb8a793a29f5b86a84147da1940cc2d854b4ebbde8944e55ce4504df5c668f16be7ed7797207
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/cmus/Manifest b/media-sound/cmus/Manifest
index 1e4688d280db..7021cd1016c2 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,5 +1,7 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
+DIST cmus-2.10.0.tar.gz 324121 BLAKE2B 7a9b17b04f9461b5375f51584f1dce35dcb6863d57eb9b28391cbfb6abb4eae1f541ee6f10cbbf4c7048c08fd77307647700fd08e41eb56bbad89b67657dd876 SHA512 c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c
 DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
+EBUILD cmus-2.10.0.ebuild 3694 BLAKE2B 98129cb9b83de7e13b9a99df381dc075e35db72ae2227315da4fa3f8a4fd8953318b03e1fe9fb1c4ec643d9a03a01cedcbd9e45e95407e768ad8f356ed15526b SHA512 435470c60676204e8ebe1801993487b204f3cb8a247284de6cb988ae37a59883cecabf8af9ee120750b6b186e185669e6384d2ebd548db4f3f5929da5e51ef72
 EBUILD cmus-2.9.1-r1.ebuild 3722 BLAKE2B fc54675860b8a3835fcec0f2d09c80f060365e21095bf87f4df8cd7d9eb3258329f7e87dfd9db9c17f55cac2069c39bc26ae945fb964434aa84fe3019b979a67 SHA512 6812d75688aa21e548679f788b16310ab95d7732304cc619915e4cf42cba924a0061846110c464113986b787ceb302525ddc0053d25729710df1d1a0e3c56add
-EBUILD cmus-9999.ebuild 3667 BLAKE2B da52cc5e70612f744fa9f4d8d4f86024078d7c796ec53e0449eb4a5e9d8c3e0c041dc55c0b361b84660db872ef33d03d07593b6b033b0a473cfde755868d593f SHA512 2a5e039d01cba09309d8a9de2d4e2ce54e1dffcf330cdfb212e28f13e91952b6a96be424e0230ea60e709e99f152d25b3907288fabd7a02763683cf3940758c5
+EBUILD cmus-9999.ebuild 3694 BLAKE2B 98129cb9b83de7e13b9a99df381dc075e35db72ae2227315da4fa3f8a4fd8953318b03e1fe9fb1c4ec643d9a03a01cedcbd9e45e95407e768ad8f356ed15526b SHA512 435470c60676204e8ebe1801993487b204f3cb8a247284de6cb988ae37a59883cecabf8af9ee120750b6b186e185669e6384d2ebd548db4f3f5929da5e51ef72
 MISC metadata.xml 885 BLAKE2B 567dfdb0b27aa4de21f2f0e1c26450d335365328623280881c04b8ebf43a4e56582bf9bc121375b11d1d80a8054f5606dd81e1afd7a71f429148ecbeb97ad168 SHA512 5731cffcef8ce3c0b9a04c71426b18909a8d0f1872ac97a3746f1c25eccb02263eb9cff9037a253d5db7dda7599a18b10f1c6d1f819ed1d769cf470e94aeed9b
diff --git a/media-sound/cmus/cmus-2.10.0.ebuild b/media-sound/cmus/cmus-2.10.0.ebuild
new file mode 100644
index 000000000000..7a06ebbe8099
--- /dev/null
+++ b/media-sound/cmus/cmus-2.10.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 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/"
+
+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
+	+vorbis wavpack"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+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-sound/pulseaudio )
+	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
+	)
+"
+
+# 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() {
+		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 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 3a73e7ed9e71..7a06ebbe8099 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.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 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"
@@ -30,7 +30,7 @@ BDEPEND="
 DEPEND="
 	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 )
@@ -40,16 +40,16 @@ DEPEND="
 	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 )
 	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}
@@ -67,6 +67,10 @@ DOCS=( AUTHORS README.md )
 
 S="${WORKDIR}/${P/_/-}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.9.1-atomic.patch"
+)
+
 src_configure() {
 	my_config() {
 		local value
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index aa7ce87d8d4a..d6222874ac60 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -3,9 +3,11 @@ AUX csound-6.15.0-lame.patch 737 BLAKE2B 5febfbd58a9f4591f2ac06fbdc311552d18153c
 AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1
 DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb SHA512 e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754 SHA512 18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
-DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd SHA512 2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e
+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.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
-EBUILD csound-6.16.1.ebuild 7132 BLAKE2B 134d88291b5af94d99a8c2e0b6b421b3a75722db07b204eb0e8e98991365ecc78a260f691ba3fb37191da4b506ec8bd57392174e191a9ed3185b38280c89a882 SHA512 30a822eea460f01ba8b6201c8978d1fc1f40ff9cdea8ebb1fbe99ed7c3b6adac686ab400a5ec1adc9321b978c3919408ad79f22b393fc3d34e003dc860ac987f
+DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61 SHA512 b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa
 EBUILD csound-6.16.2.ebuild 7132 BLAKE2B 134d88291b5af94d99a8c2e0b6b421b3a75722db07b204eb0e8e98991365ecc78a260f691ba3fb37191da4b506ec8bd57392174e191a9ed3185b38280c89a882 SHA512 30a822eea460f01ba8b6201c8978d1fc1f40ff9cdea8ebb1fbe99ed7c3b6adac686ab400a5ec1adc9321b978c3919408ad79f22b393fc3d34e003dc860ac987f
-EBUILD csound-9999.ebuild 5166 BLAKE2B ae5a7585fe35ccab9efd9d5da3c09ed6e94a18e156ad5b69473cf59db54cacf140d30f4dbf6202a983c6b4b7fe7eae6ad2c15cf5402344709bca5ee9e5e395b4 SHA512 e9e9fe4de713c770d3ef60541ef5024f5829b6e1d5d5d8dad33f29dcd27391ffefe6e33f7f35e82c08bb03fcfaf5c5660e37c3200ff0cc510758838bea44a9d1
+EBUILD csound-6.17.0.ebuild 5434 BLAKE2B b4db909f1ce178512d66e828b0a42c8988fb037e8672d2f3f263677f73084705dfb1ef3b161c9c4a1711b0e69c826339218f508f40ddf3ad1e8c74633a95ab68 SHA512 1d68aec981ecf44973220afea4fe1dd0a49e738ab7dfca85bb6871f7048a3e49bdde0b0cc2cb6e0cb43eb6ebe4a96be0499b084908c73d7e2333c6d87978fda3
+EBUILD csound-9999.ebuild 5191 BLAKE2B 7a6d621f017b4785480fbe72cc9d377060152e5cfe107e5d3e49b329acea363c20d932b1766dfc5d6a6f28c67dae49a577bc5c2c174b3c2b0cffb82496faec86 SHA512 41aa47513261bba2779f41b625cb8e29101bc7e0f2c4eab17a4ef7f73981bbaa396c56ae1273bbd46291f679b72fd1d47c70b0bf09e3cdcbf768ebafaadae2ec
 MISC metadata.xml 1244 BLAKE2B cd28c168f6625c7ab090f3b3812fbdcb8a7f2e17d649083c54761ea3a109d4ec90f9d6241cacf8502f386d10fa682e5c2d0be1a77a6f19d94820d80115b290a9 SHA512 96e697c02828da5fa3ca22a3a564f76ad06b55d8479f5bd2c207aa2427675b814f351fd5d9e5ec61e9c3b88d2e803137288a11e15dc92c149c015a2dcd315cbc
diff --git a/media-sound/csound/csound-6.16.1.ebuild b/media-sound/csound/csound-6.17.0.ebuild
index 58046967e8a0..6e52221543fd 100644
--- a/media-sound/csound/csound-6.16.1.ebuild
+++ b/media-sound/csound/csound-6.17.0.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..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"
 	inherit git-r3
 else
-	DOC_P="Csound$(ver_cut 1-2).0"
+	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"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
@@ -30,36 +30,31 @@ HOMEPAGE="https://csound.github.io/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 jack java 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="
+	${PYTHON_REQUIRED_USE}
 	alsa? ( threads )
 	java? ( cxx )
-	linear? ( double-precision )
 	lua? ( ${LUA_REQUIRED_USE} cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
 
 BDEPEND="
+	sys-devel/bison
 	sys-devel/flex
 	virtual/yacc
-	chua? ( dev-libs/boost )
+	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
 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 )
@@ -68,25 +63,19 @@ CDEPEND="
 		media-libs/dssi
 		media-libs/ladspa-sdk
 	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
 	jack? ( virtual/jack )
 	java? ( >=virtual/jdk-1.8:* )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
 	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:= )
 "
-RDEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
 DEPEND="
 	${CDEPEND}
 	dev-libs/boost
@@ -101,15 +90,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() {
@@ -130,47 +116,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_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
 		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
 		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-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_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)
@@ -178,12 +138,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
@@ -193,7 +150,7 @@ src_configure() {
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
+		-DUSE_VCPKG=OFF
 	)
 
 	use java && mycmakeargs+=(
@@ -219,9 +176,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
@@ -241,7 +195,7 @@ 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")
 
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 0486ace1f63d..ae7b8aae361e 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -8,7 +8,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake lua-single python-single-r1
 
@@ -44,6 +44,7 @@ BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
 	virtual/yacc
+	doc? ( media-libs/libpng )
 	lua? ( dev-lang/swig )
 	nls? ( sys-devel/gettext )
 	test? (
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index fcfe8b2f9cec..01c4b268e649 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,7 +1,9 @@
 DIST easyeffects-6.2.3.tar.gz 2621460 BLAKE2B fb73c635b10dec5808d046a4df63cdaaada1c3534f1e9275fdd4f28db52a9111a850367b564b5d008a1bdb7c7e55864e38cc1d50fc363b5614fb138bd0fe0cc1 SHA512 79babe59ef0c86d138b29a4c2dfaa1a937da9de8d7ae7cc40bee6ae5e011b6c43d6ff9554885ce116114943976d50c24c44c4e30775933b5ee8a2bf350d55525
 DIST easyeffects-6.2.4.tar.gz 2648725 BLAKE2B 8d4f10f286ed4b3468ffa2e3b5331b9dfd9c266b0a6a35b373856be14c8465032c79ebad2826ff7ebb1a8db3d81a57fef398880fa7601282da672d5348dae817 SHA512 1c7a9fb95bab3fe039d96420d465d8dfa0d42bf3c04081c5b258f3f227923229f658d6e8152587bf38b26e0a3f3c73b5b89a1a8c9b42807b7e02b776f419e361
 DIST easyeffects-6.2.5.tar.gz 2673461 BLAKE2B b254dbee930d4ed3c87f27e41321f5b2151bcda258cece4a6fbb7f1465b839851bf82b3fb5517bee44c23bef34f53fe7dce8f54295d93473e7e19622131c3274 SHA512 260b864e5928191dd5574e23a5f51f4df0dcc552c44ecf2d0c1166d589fc1b4320b9da786de88c8837dcb28527163051dc80b5a5a33a9cdde2466405c73248f2
+DIST easyeffects-6.2.6.tar.gz 2743298 BLAKE2B 242faa7a819f7986a292bc587a841b130284e9770ff299af741a9f8df56807fd878a5c66a3323af09cd7672c403af725e8f6c3c5109f90a35868e09d37fce742 SHA512 0c93c6afdc337bd5fe60beab00475087eece250ac7014a8b5ac0e6cad9154b3ac22cfa61a44bbbaa99aff79d4706772e903a056c3719a58d9507772684d6f767
 EBUILD easyeffects-6.2.3.ebuild 2008 BLAKE2B 9b434e4192e1948618cc9f596461d462e30df5c4cced38fc7ba0d9bc18e3c8d6bf743ec3086eb4c781539a20caf42125145830f686936ee5f9db211478b68cf0 SHA512 f81af4dba50434c0bedc5311e6a4d0445235088463bf430300c3cb869384a085ec3f747e3fda2b551acce8165ef7d365d3fcccd0e0985ead8e631fde72f57e08
 EBUILD easyeffects-6.2.4.ebuild 2008 BLAKE2B 5cf9a3ddf54274a37e560ba7cc69aebe2b76b5ce8138737c02ed40c679babba900e4fa024bd65ed9113282eb2e5c8959b1c552ae95debf26cf3b85778cd379a6 SHA512 7e95820c05679a86f92715b725a33ee61b7b5381fb1e3f2cd73fba0185de18bb2b24e3a25bafdbb0c25380c837ba5ddfa17a98de98b6ade47f3825e68ea27795
 EBUILD easyeffects-6.2.5.ebuild 2173 BLAKE2B e006c6bb1c6d5d4acd1daefb33750288fa7dd7bbff9d566d8f9d05f2772f55c94ba76ba0319d1e55d492357b54e6f7a3e686fb6a82a71873aa592880f7e4aa8c SHA512 f3e3b8aad7c09a060452ce5292f264749c02d13e9fed7638ef166caec3398095251802c210e3b6fc257266d2645c12e4428dd84079c174a61e9940e112dd37e3
+EBUILD easyeffects-6.2.6.ebuild 2051 BLAKE2B a07ee0e8f1de9f8a82039ee3f203a77aeced2da5fc5d5095f7642f996f5662fe50bad4eb5261c86be9eaadbe286b294024da35aae54ad669d08fe3f00c443771 SHA512 bdfd04dc62f7a0125c50f9c7d1a0b1211cf9a341b0d86c076779f66852e5b23fd693ced02adc230e512aae9cd9bd8d2bccfc650b08075e1a026c7102d761c3be
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.2.6.ebuild b/media-sound/easyeffects/easyeffects-6.2.6.ebuild
new file mode 100644
index 000000000000..9250f1d82ccd
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-6.2.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils flag-o-matic 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"
+
+DEPEND="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.2.1:4
+	gui-libs/libadwaita:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/rubberband[ladspa]
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}
+	>=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 )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! test-flag-CXX -std=c++20 ; then
+			die "${PN} requires degree of C++20 support only available since GCC 10 or Clang 10"
+		fi
+
+		if tc-is-gcc && [[ $(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/ecasound/Manifest b/media-sound/ecasound/Manifest
index cc3fef8b4639..0af1ba246a40 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,6 +1,6 @@
 AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54
 AUX ecasound-2.9.3-ldflags.patch 2718 BLAKE2B c37cfbe326e7219d97286ce1c298af6d5eb21989f986a80f58cc7fef8392f169757395cb0e72f3dce2221e9fe128856b252279d4ba85a77218264faad2053c86 SHA512 2f27fbb2ebfc85ecd91333e17a24964409471f791bed1f4f94210b13277bc836969d4d7f9ff3f70791f72fe32edb2ffa04a07ebbb2528be92ef33624861e39ee
 DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140
-EBUILD ecasound-2.9.3-r1.ebuild 2387 BLAKE2B 013484b2b2196f308859ee89ce0c2c39a30c1d3f698182d611a6df28b195049e89d365fe3b58fce169f9eae6db82be6e6384a71fad6451e47a658a8052ea4171 SHA512 3c028ffef5bd421e0ecccbc80ffaa38abdec4fbab02022a857aac1862eb472cb51596f64d0067e63f46984b5d3b5a1b0e355943a59cae95d090e613c86de1e6e
+EBUILD ecasound-2.9.3-r1.ebuild 2386 BLAKE2B e988212ad382c381e122da6bfdf6a700f42dee926ad16411e3781d9c316198b2024bd58dfdd6966b91c28f45a29b50d5bf871a013362c5da9a70e32a02623cd8 SHA512 1b7753238e5e9c7e3a8515cce3f870ff45c91f11d2d26a9d5b3e8bbce6ffb33cf9c27a36348390e4bffe13712074ee98f38c57fc4b9460e95a048fd3afaf1762
 EBUILD ecasound-2.9.3.ebuild 2393 BLAKE2B 36a63ab78fc859c09dbadf479ec45a871c86ce8c77cd252421c773bef03deaec08c37d3c7efa4ecf4aa481734771b2e1029649e05efb707fa2b126c867245d15 SHA512 693a5d74279f69704ab9cbcd157c760f3d2707e0b43b95fdeaecd946c499fca5209d44db2db551ae86aaa4e85ce9e706b21f1c64daa0aaa1116c76a82ece7998
 MISC metadata.xml 1074 BLAKE2B 9301046a8443aa5ee5db4a2c09f65b1cf24991fafa6920061ab1bd668bf31eb74b6659e5346fe3493dbf154eed47e60a8ae9c936bcdd7f7c5fcdaa0e2a9e0b6f SHA512 81f59c71f4869241fce6ba622a2139502e9a21340aa21057dbd01b3d8dd16e100b55bfa804a2eea712ab9c010112101705349697297a3ea8f2aef37358c20d7e
diff --git a/media-sound/ecasound/ecasound-2.9.3-r1.ebuild b/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
index 69f8abd3682c..42ec0f087a4d 100644
--- a/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
 python ruby sndfile static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 3fd8d5f4aa1a..6ec641359576 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-21.12.3.tar.xz 1748236 BLAKE2B 5e3ea6a5cd1f7bb9aa7a99e33ddfe97f7f239f3594d8e7684639861966b16e812ba9f46cbc5a6c9ceb5c19acd75c3bb56567875dacb01ebade88a59ec81cb865 SHA512 f2ef0c2669d171e42e55460d464f019751a4fdea174cf8224c90bf6002d7d181e101cac46c8fb3e8e13bfac0b0f79bd16fae3b55f02808a4172ba994f8ac667b
-DIST elisa-22.04.2.tar.xz 1747560 BLAKE2B f573d52b57c135ba8c620934100c4ca15e554c2a198185dafc750b101cf56d652ddb10cf65f1c7138176f3684ff862cc3f130758739482d621cfa41d13011177 SHA512 3a4ece498fb2a0f290b5678c6ec4140b42080f4962f416762789b118b152d4e89ecc454b877a2c4118416ab14230da2feba3ab44b127ed518295d10518c626bc
+DIST elisa-22.04.3.tar.xz 1747400 BLAKE2B c4f3a91f1f32e8735221961291c9a1fe998dadd648bced18f8f7c8e03f973397feda9d9d143901f26f28eb3e808468f1c780e646343858706be30609521f47e8 SHA512 ac1ba9b06eb263f409e798001093cb0ca0b56df565a38a69c78f61bd8820bdd0f3aa53510a0ef0efcab56bea001798ef4c028d48f425499942369e5d5b718040
 EBUILD elisa-21.12.3.ebuild 1645 BLAKE2B ec831acd144a025a100cb7d0f49a613b816bbf146525ee421b15f993f6a557822ff8613fdfe9fb986f8ef72b93e690c409c661642f24d15c41dee7131ae646c0 SHA512 2285070d1b030af7458be231dc0689c2b2d9ade3a7b6f526f43bc1e9cc34fb1728d56b2c3a1aa24d32b480bd181d00c57c0ca74adfe5638a9255d84757836689
-EBUILD elisa-22.04.2.ebuild 1648 BLAKE2B 05bfd7c2ecb6fd3fc649c9dc93f5cf511e1ea7fbce402b6e2940597927d13cb68fe761f7fbb17398bbdb16a7e045cc50839eed0bdbe380565fd7bf6ad509be7a SHA512 e985d23d2760ed584bf5e69bf7f86752424180e1c45141ef771e3f79a0de9fcb1892c8064093be69eac255192bb373076cfcaafa2038351228e279f67679dd0b
+EBUILD elisa-22.04.3.ebuild 1648 BLAKE2B dfd421dad6af50b6df662a53ee566d43f367f6241697724a1c7525e78b033b6777cb96821e61cbb91f68a7fad3d22c5099057cc118bfc4cf485f92ee997455e3 SHA512 46122ca18337c5b625c6f0a025704f3ee6cda7aa9d969ba9784a2443d8dd6c9c32623c925e58eddabe70bac63b5ba552229b2778a0be9ad62fa1e8656980ea18
 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751
diff --git a/media-sound/elisa/elisa-22.04.2.ebuild b/media-sound/elisa/elisa-22.04.3.ebuild
index ad63da6072e3..66a84037f9a7 100644
--- a/media-sound/elisa/elisa-22.04.2.ebuild
+++ b/media-sound/elisa/elisa-22.04.3.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 KDE_GEAR="true"
 KFMIN=5.92.0
-QTMIN=5.15.3
+QTMIN=5.15.4
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 6eb13d03ed19..dfb89b6c366f 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,6 +1,5 @@
 AUX exaile-4.1.1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e
 DIST exaile-4.1.1.tar.gz 3641073 BLAKE2B 34222ddba782dd51897c017d7a77da9a796e45dad69983f934e76cc559c2e52f2173ee418004943ca087fd894439bc42a6eff2a5d6146e6189ec1cd478f5d08b SHA512 babf37253054fbeb6dad33aedafe969201860d4f35222d577343256730be943682c1a5f2f7cec7c574695624cb2b7abbdff4e6eaada848d22fea073c2c44bd23
-EBUILD exaile-4.1.1-r1.ebuild 1663 BLAKE2B 490eb0d3572540c2dcd8a0e2b1228eb1722fe46b26ab29213d415664ccfb98e3e3b7ab771c869084b7802af1a48a1a17373bf38840fdcbbdfab4c0a4210d83df SHA512 ae634ce670b814355358a61a2031f22571c7906e85d577bb73d624fcb2df6203041f3d5d84ee433e7f159c566284b1cbb9279159282f020b08f64a9444ccf3d6
-EBUILD exaile-4.1.1.ebuild 1703 BLAKE2B b2dab1ea5dbb7188d1276c95d50cfe5b702f46c6854109f44e4320f27fe8d522e396abbc974e5cf3521c48d14821bc483ba25a71be80efdd63dda181efd7992c SHA512 3e6a8eebee581fb2d5bd25dd09e98fc1a412f4e14d39803e099db275501a5930f59abb3a5460d7588e86e2bc15cd3f382fc8f57c59e518066f734e05b8f04e56
+EBUILD exaile-4.1.1-r1.ebuild 1662 BLAKE2B 21a6b213f5f35d79d145e22fbc23ce4688aa296b5c7bc68cb3a742cd5b529aab9d5dea42da4352f26859dd4dfc6129f5017978fa2c8ee6d9c8529fe47999223e SHA512 f6c837c994063cb2ef07c4bbdd933f0793f37811809f9e876669b01e94c6fe4454be3dbe3afcb2786fa4f19183ede20de41d193262c3089b32298584ff2964c3
 EBUILD exaile-9999.ebuild 1670 BLAKE2B b1c52f10c2111f15a124d2a5eaee505b3a7c9faf45b1b41da1667707908a02f47255fa5b6fcf5175493fa192b9a6ae2e4b19f055220befe46b653f53ee55aed3 SHA512 c71a9e2afc4c6da2a7f054b69157dd42ccc9273f3c27fcd79672f6d5dd742583e00b442e7381a305ac917200e43193a0a55c22a8d2cd31a77bffbe6c296dfdb1
 MISC metadata.xml 466 BLAKE2B 8c2ae9dfde18d1976a3c38a77de336e5f0489879adcdb030c9c6b3cb765e440d8bf908c57b2fe1670b090d90c570b3219201319d81319dda87c92c777c82757e SHA512 5bdedc04863ba9c8632a818d8f7a834687e3474cfe906b0ee82378f6c957ecc9778206f8b7f7abefda5cba06c4c0df930e5e170754fa8c59467dd4f1857be4f8
diff --git a/media-sound/exaile/exaile-4.1.1-r1.ebuild b/media-sound/exaile/exaile-4.1.1-r1.ebuild
index a8ee142fac0e..adfea4458e8a 100644
--- a/media-sound/exaile/exaile-4.1.1-r1.ebuild
+++ b/media-sound/exaile/exaile-4.1.1-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
diff --git a/media-sound/exaile/exaile-4.1.1.ebuild b/media-sound/exaile/exaile-4.1.1.ebuild
deleted file mode 100644
index de0775df2e39..000000000000
--- a/media-sound/exaile/exaile-4.1.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-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_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
-		>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_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/flacon/Manifest b/media-sound/flacon/Manifest
index 401b4b8bc684..c6a3c7c0e9b9 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -2,6 +2,8 @@ AUX flacon-5.5.1-ninja-warning.patch 2227 BLAKE2B 07957a0d79d3c6d8c228ba00f1232c
 AUX flacon-5.5.1-no-man-compress.patch 1089 BLAKE2B e4757b39f3ccbfb60e0298ed091718c809fa224d53d4cc0e15ae1f65e11d8698a5434bd3099bae3932b4931a7624ce9c00334e8503c2131a0d61d075642dc730 SHA512 a975329808a5642d4684d03c9261073633f394d789ac5b28dd30e0028a7ee8503a447644d5911a1bcd24c89fbab6279e3228dc21462f277aec9ef040b784703f
 DIST flacon-5.5.1.tar.gz 2336502 BLAKE2B 524fe5fa28126f56452515ca1ce1572343dad8b06c28fc8e3a22a11e9ad8f3a51a25b3c19ddd29a7e3c658f1d7fb3316a2554a12a4ba3dd22370fc1394d38022 SHA512 36900b011135b61cf3cc1f05d94f852fc7e127972f3fed09e0fb7e66fec944ed1c3bfc61307494aff87c2fe24e16479605043a79e0634bc23940d01fc337c6c1
 DIST flacon-8.2.0.tar.gz 3757221 BLAKE2B dff0dc849c326a53ad167efea3106ca2d057121081822a821f2daa4cc2140a858960f1b4cdc2935f3e569aac25c25ceece2d171056788b9f541355c540457550 SHA512 9799c1a27426a2f67d782f15a3a1d210c5dc61b00b30b9c4143047a243f2d46cb0eb651c18919fa1ac2a8fdc2f54c83ec2e0b46a00254c908230e7ffb34965bc
+DIST flacon-9.0.0.tar.gz 3762192 BLAKE2B abebc21e31fee43f4970b6e56724bfb0b6f2cc7d33e2539def102b329f1228886f7f0fcbb20a2e100a7ba77f6f45bf5ac032151ab0f830676dbf4ce24da0ce3f SHA512 3780f94a4c6c6812eb0a0efd4e677926d8cc53c15f692701cd20df0441f551d4639b632c08a36146873ad11cdb9cdaa4e726845eb05ae15ecc29a1dac250a928
 EBUILD flacon-5.5.1.ebuild 1944 BLAKE2B 0afa69737ffe96fb91799505de744eb1a4522e628c945b346cdff399aa8006a2855bbc6f82b7bcce0616e8bc402ed7f76a255a3ebb788158fc915ba3e34635a4 SHA512 bed116792c593ce302e1d5316c3b383079461a6b4f9ecb9e32da6d96757f24a708befa2c9b5edb95f1383226405d64de52ef3fbf5681bd4a10b6c94176e2959b
 EBUILD flacon-8.2.0.ebuild 1857 BLAKE2B ae35909b2dc2e32f3dd13d490d91c1c0091ee0c7d03350c34194668ce03e8b5b4de11de1935633aa49c7b1db6efa35f721036b35ea125ce4dcab9e648e2be56d SHA512 b3399449ab554f8fbbcfbf13a42e01905030315772c791ec8ce91bbfd52a391da9aa79a4b97c2f464bc3fda99180bc13f01482cca0fea4f3fd8d151d16fa03b5
-MISC metadata.xml 246 BLAKE2B e0d07a3c91f7569af181b932beaa2930098f5d2dc0fd8c8910340dc9df7b136420c0a28cfe4fb912b15bd7914114fe379e4adf7fb5639e275644b79cd5582826 SHA512 b602668bd3a36db851e8853ac0588776fce12f69897114d8f029fae5dacc7116b5faa35f46c5a2fdb3c151e09d4c117920b44eda4bbb4f766508d8961178d19a
+EBUILD flacon-9.0.0.ebuild 1916 BLAKE2B 0a44efb1c42c53edfd5a60604ab6a20999603b11a795d58b63c695fef9a55a1d6952ac610a93ca5f2d10fecb71d94809ed36b86b0921f0c2bb24f30cf84814c0 SHA512 ec6ad6dc62697a8ea0398612de6bbac76b4c0de17c96f023f0c2bb766df29d272c5f903e050f1aabdce08b606812239f463191c899d1dae0ce99acd5dee214ed
+MISC metadata.xml 483 BLAKE2B 795d557d1298374afb1a7b7e944258091e5a1a33cbba44ffb89d2b41545a13bc079ea406012351256e9aa3be08aa0277adb6757e68ac5d55e3fd636bce5efca9 SHA512 3d744c253befad102285251d40d891aef8ddab615f095a717951706fd64ac12f4fc7191d1b5ce0c4e9c3870eec5b427fcf5158771349a4a8c5219f7b797386ac
diff --git a/media-sound/flacon/flacon-9.0.0.ebuild b/media-sound/flacon/flacon-9.0.0.ebuild
new file mode 100644
index 000000000000..ed4cffb9c113
--- /dev/null
+++ b/media-sound/flacon/flacon-9.0.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 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
+	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/shntool
+		media-sound/ttaenc
+		media-sound/wavpack
+	)
+"
+
+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() {
+	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 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
+}
+
+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 39b7db36d101..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 "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/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index e50a1472edbf..d5cd7923bd77 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,4 +1,4 @@
 DIST gmusicbrowser-1.1.16.tar.gz 2369434 BLAKE2B 952c4a75d8018b890a787e69cdde06f1c1d588384e220950ab46d0ddcd785cd30d477c52926421b72c7cae4078342e6f5f07fa0b41fe6d0ef2a0b4ec4e15c8ce SHA512 76213a6634208c66cff33ab947450553e656d121e8aff99e47bc983f752f6095019aa67bef834681594a81f6f5fdb241bb98d374027622704d961c1d816bd12a
 EBUILD gmusicbrowser-1.1.16.ebuild 1172 BLAKE2B 1e9ffce36766183ab4bfb3a261e527e15db218f708462e4b9086ad151eca408584b6c9e2f45de1fe6a7478fed02d8ef1b94a2cf6969647f41da8abb36e5f25ec SHA512 bce9ae6096616ba55f1cd7847ba87c8a166720d8518551c3cd8e8f18817c1abcbf9650c671998319e8e76517ece04ea1ce363d5324f7c1c18a74bc93a1a24156
 EBUILD gmusicbrowser-9999.ebuild 1292 BLAKE2B b4afccbea10450521e079aa4b69373a454b177baaea7c7f95cacd217cec81b8a66e69487e80ea257d55c3502a4436b0837667e973761d681d20b449aca0f0219 SHA512 a37a9f3c65866cd0586fa3f6470500dbf452bf7b70f152e1f993301a639bf5c4dfdb3c44a971cbf7a2dee73686872c73f5121a037474738db9c92789bb19a383
-MISC metadata.xml 480 BLAKE2B faf3b3aec8758c6634828ebce5437c328c725520517fb273bd2b9a2268176231d812f76bd9169a6944153a638bbf5b5bd0d29ec525d826cf9cc7bd4c43fcf7a4 SHA512 73e348de2115fafc407b2a9ce27c1dbbc17ba86f0435f6ae0f9e60ad1561741fb17c2186707641a919d66f16a3a9d6444380729e2e2507258dbf12b78b6df2e3
+MISC metadata.xml 349 BLAKE2B 5b27767111bc039f85fdc5726611d10413cdcad14cea7c4ce7edc06748350b30fce4d9e19de99d0c1b41b306246a4a36637c756c9d231f7595f73da9304b74cb SHA512 6ef84acd52780aa7c537a7828eb86b08ad11d3dabc9dfdbc0c9b57119be3e3e79d870f2af98dcaebce21cc2b1e999ecba7c75350ae33aa9750d8881ade452338
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
index 9311060ff29b..af7bb91007dc 100644
--- a/media-sound/gmusicbrowser/metadata.xml
+++ b/media-sound/gmusicbrowser/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Sergiy.Borodych@gmail.com</email>
-		<name>Sergiy Borodych</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 0f4d25e6dd49..e2f455e48d6d 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -4,6 +4,5 @@ AUX lash-0.5.4-strcmp.patch 252 BLAKE2B f2b002772df6dab5c2942039d36e681697894cc5
 AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434b823740c1cdd1bddd3c7a52ed505bc1acea64ddc145e1e7f9ffe7da31b7fd500f296b26c64d07c2a59149c49d18e0e4e0dc4e9e1a2 SHA512 39c3d82372592d6864a2c1e0de94ee150a434e107357ab549cf406cd58b7eb2f79cded6e97775f50e2e602906315aaf167869a53adb1b143eb3b5bb7147705bc
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
-EBUILD lash-0.5.4-r4.ebuild 2587 BLAKE2B c88135133e9c6401c309e936611b909c901e912485d1af5b946ff2af54f1e8c2911936dc927a0a96889f213a79033bc502e1d1c016961490672e21aa6f37b738 SHA512 74f9459771d9275fccc8f883d141e9c72bc5a652db3713ca89651748ab59cd8410d13eaafe59d8e7ddc67b855383c7f92adc8e0bb012ed3fd8986e5347f46c3f
 EBUILD lash-0.5.4-r5.ebuild 2587 BLAKE2B e339534113e547c462a196e756be87ee4ddab21fbab94795cf792958d5453cff1671854c24785f475d0551ba3b6c66e42f25cfaecc7d26faf1d737fda43c26c3 SHA512 9dfbbb4eceeb95289bd756755399fed1bc93a08388256f2321dc301dd2787064e85bddf1f48758d7d43ef32ab6a5275f5d2da9aa2e5fa7ccc23d34d4397a7fdf
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
deleted file mode 100644
index 686eaf212890..000000000000
--- a/media-sound/lash/lash-0.5.4-r4.ebuild
+++ /dev/null
@@ -1,124 +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} )
-
-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 ppc ppc64 ~riscv sparc x86"
-IUSE="alsa debug gtk python static-libs" # doc
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/libxml2
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	gtk? ( x11-libs/gtk+:2 )
-	python? ( ${PYTHON_DEPS} )
-	|| ( sys-libs/readline dev-libs/libedit )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-"
-# doc? ( >=app-text/texi2html-5 )
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-HTML_DOCS=( docs/lash-manual-html-one-page/lash-manual.html )
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc2.8.patch
-	"${FILESDIR}"/${P}-swig_version_comparison.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-strcmp.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/texi2html/s:-number:&-sections:' \
-		docs/Makefile.am || die #422045
-
-	default
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-multilib_src_configure() {
-	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
-	export ac_cv_prog_lash_texi2html=no #422045
-
-	# --enable-pylash would disable it
-	local myconf=()
-	if ! multilib_is_native_abi || ! use python; then
-		myconf+=( --disable-pylash )
-	fi
-
-	if ! multilib_is_native_abi; then
-		# disable remaining configure checks
-		myconf+=(
-			JACK_CFLAGS=' '
-			JACK_LIBS=' '
-			XML2_CFLAGS=' '
-			XML2_LIBS=' '
-
-			vl_cv_lib_readline=no
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable alsa alsa-midi) \
-		$(multilib_native_use_enable gtk gtk2) \
-		$(multilib_native_use_enable debug) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C liblash
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		# headers
-		emake -C lash DESTDIR="${D}" install
-		# library
-		emake -C liblash DESTDIR="${D}" install
-		# pkg-config
-		emake DESTDIR="${D}" install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-	use python && python_optimize
-}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 0c1cd5ab4fbb..ae6d2a096ea9 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,9 +6,11 @@ DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d
 DIST mpd-0.23.5.tar.xz 770700 BLAKE2B 91f0d37bca0632a414083f6ecf8838ba5dc4ef4965692b14e56587d3d145140f61bcc120fe4b2bf83eb41f2a7e085da4d999efc19ca9717d2552d92fc6359c65 SHA512 3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34
 DIST mpd-0.23.6.tar.xz 770812 BLAKE2B 5ccb4a7c06c4317e3285846a261438bdcc10db5eaf71fcba969bcae8321ca50bb26fe9317e23e38eca1c4a8785015596064d5bfc692bf66f8007d0d2a1b71cbb SHA512 1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d
 DIST mpd-0.23.7.tar.xz 771992 BLAKE2B 2c75196c37eb8d075cca2881bb7ed10e434a071d3c64bb7cdb3bb96dfea74c30de2dce5bfdbc51da945df325d9f278cdf8dd03b7ba07c0ad51cea50971f4a143 SHA512 2a6b3eb2c8b61a22861ae75fe2f62c8ec6cd391f029438577127e309b910e99d7b735e40afae96d52ed4f161195a0ce7cb89cc51ad45df5a18e04736c16ce3a6
+DIST mpd-0.23.8.tar.xz 773280 BLAKE2B fd2dd32bc935cb78d9204bccea6ed52f5131ae4645efca91323db930373a5fa14115a767daa11d670aaf46e218c52578d155b9a463ed5aae007e1f55d0208d3a SHA512 62f7571de29a329b8ef1fc6f7c338125e70895e06fca134eb9ade19635498ec13da00511870bfadabc5a9ccb090c44543d3101361ffe109e4fadce66435b37ab
 EBUILD mpd-0.22.11.ebuild 8432 BLAKE2B 8f392818d046de9043ab4687b974e04bef7bd862250eeb9f54781b4379f399685a1c5e494e45737df426de23865b4b7ceda01cef76c3b9a2bf4938ed426b04f6 SHA512 9804fbcd13f02f6476f926502c926b008cbe9d765dabb17a15516cc7ec7d0cb1412274227c8c19564dfe47e6a2f2f397ea3a94b0bab3d812bb19ffd1ef421d11
 EBUILD mpd-0.22.3-r1.ebuild 8126 BLAKE2B 818d798cd6bc84639490e60456023bad57ba0b5e08533b903744e03fff1627811dde55f3b67f7600af10e00b17c6b490acf7fa3a616e3574001ffc5494f95aae SHA512 30f4ce07449598a93429ca88307fd5e9ee9471ce742f350ee0521ea68a6a9b4c7144c2c6ee8c93116a797dd36170189ef907d9cae77cc46b77a58df6be79ad1c
 EBUILD mpd-0.23.5.ebuild 8888 BLAKE2B 720e6e27f453b0a45f758674e15227953ad025a20b2d44e7c7e176a5f8a17126b1dea267b34ada121e39286fd8b90875750e7e75f9129d20a10562a84d331fb0 SHA512 76f547fee10a657ece1d41cbe9b0f4479525973ef616f6b1a5848096322326bd99d47d7f70c55bf48cbc83608c84f18ec60ab296c535a3ea870a2ad04625cb83
 EBUILD mpd-0.23.6-r1.ebuild 7845 BLAKE2B 3d90c4be809d911408d5a2733748d13718518816a9e163997a8b9b70bae4ae43c9f08bf1a4848813250f3c17d6e46b39bb86f61fc367491d7d1aeefe67ebffd4 SHA512 f2fdc13933b6d61b900bd107e81bdeaab17f415b80743684dbb38c912600d04b599665d391f67dcfb890d2b30a7031606a48b54d1dfcab170649eba175f4aefc
 EBUILD mpd-0.23.7.ebuild 7881 BLAKE2B e4820273b66cbb205dddcfb0a15f0ee9521065da432ec51eeacb9182c9aa659e5b3a856f8e52f8a0fcb7d197ff80159dbfd1fbbac951a5664f7f88442611603b SHA512 45d92eafff221fa6981baa3362a65e05233f2ccff64d3d2c165561aade154a8c257ba7b07e06b54a4f79acc2f0eb94de8ad84e5798d216c431273e3ec047261f
+EBUILD mpd-0.23.8.ebuild 7881 BLAKE2B e4820273b66cbb205dddcfb0a15f0ee9521065da432ec51eeacb9182c9aa659e5b3a856f8e52f8a0fcb7d197ff80159dbfd1fbbac951a5664f7f88442611603b SHA512 45d92eafff221fa6981baa3362a65e05233f2ccff64d3d2c165561aade154a8c257ba7b07e06b54a4f79acc2f0eb94de8ad84e5798d216c431273e3ec047261f
 MISC metadata.xml 2724 BLAKE2B 08bb2402db4224ccced73cb40aa2e3d7e9a9d699277c999e08f12bb0cb1bbd1406c6fb20b9b80cfe3a41eae05e28f4be30d5e59482132723a82d4ef6de81219f SHA512 112a969c9150a17bc99e18949bc32ef15fb2d06903c0ac5ab455d29ca0cae0f2150b90f0e94cd3a4755c5f545b23c0bd5ec2de93bd154df1d70f224a0f8011c0
diff --git a/media-sound/mpd/mpd-0.23.8.ebuild b/media-sound/mpd/mpd-0.23.8.ebuild
new file mode 100644
index 000000000000..a0d2135688ff
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.8.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2022 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 ~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
+	+ipv6 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 unicode 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:0= )
+	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-sound/pulseaudio )
+	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-1.68:=
+	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
+
+	elog "If you will be starting mpd via /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)
+		$(meson_feature ipv6)
+		$(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}
+
+	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
+
+	fowners mpd:audio -R /var/lib/mpd
+
+}
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index 809e0019e63d..b93e15af4ae1 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,5 +1,4 @@
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
-EBUILD mps-youtube-0.2.8-r2.ebuild 689 BLAKE2B 915acbe40e2e1bed1800c2c38856a0e9aa32bad2d9a8bf6caf0033c85f1271b720664c85529273c6d2532f160477def99f717659da4063d06aa2aabc6f748358 SHA512 24da8b4dc07aeab88c82ad253d32d4ab0d8596b59031f9178ef4787b3b7ca910ba72da791c8054ae3e076f8773a8344068e18f8d2a6f25a848222b811a24876d
-EBUILD mps-youtube-0.2.8-r3.ebuild 689 BLAKE2B 18ec30d46b4713e75f56e5fdd153d189ef82f9b7e1a681f00c2139eb3a84c462c4d1fd9aae36ea554c14ffbad6c7b31a5fb3bcb27ff6a607f23089641e746bd3 SHA512 105b015a98768357a71008c95dadbec41629e601e8ddbdeeae4476bcfb7037901615ef78267f45f6a57084be3dae488f6bc3b3374af5971d7c4f09ad99e268ec
+EBUILD mps-youtube-0.2.8-r3.ebuild 688 BLAKE2B aa1cf05164e338d1f8c62559fbb915e4c567e356a103e0e5cf99a902f04ffdb4bc30db61d6073a2add4665d38e7d0ab3484da8c89e541cfd1af72aee258cdd10 SHA512 40c96b609d56f267c06823301b118b25784c70a060d11b28176834c84b9dfaa29eb18936ffe634e4968bbe683ec3b3bdcc4c79459f3ef8a5b5b5a53399cfd9c3
 EBUILD mps-youtube-9999.ebuild 689 BLAKE2B 18ec30d46b4713e75f56e5fdd153d189ef82f9b7e1a681f00c2139eb3a84c462c4d1fd9aae36ea554c14ffbad6c7b31a5fb3bcb27ff6a607f23089641e746bd3 SHA512 105b015a98768357a71008c95dadbec41629e601e8ddbdeeae4476bcfb7037901615ef78267f45f6a57084be3dae488f6bc3b3374af5971d7c4f09ad99e268ec
 MISC metadata.xml 391 BLAKE2B 93a5e43c99faced434fcdbd25da8490e2cfa7792fc25543904ad8f6f1fca0a3c93a500f982ac8ce0033809ad5c046ea4bebe0e34385ac2d92bd376cca3b6a004 SHA512 066650abbdab944faa9e21bd8fc9a4773a7a02c52477b1608cce35b28e7bbf50f7bca295abbcf633be32be3340bc8fb7b291df7a8836dcb560d28051470c4c33
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 82b44f71fd65..000000000000
--- a/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild
+++ /dev/null
@@ -1,28 +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} )
-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-0.2.8-r3.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8-r3.ebuild
index 4c3f4d17ba0c..d7881bc30c99 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8-r3.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
deleted file mode 100644
index 6c3612cd8026..000000000000
--- a/media-sound/mumble/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX mumble-1.4.230-gcc12-include-memory.patch 934 BLAKE2B 2cbcb1983687effdcb183f034f76f05106bb2757b278a001da64a6c6c37c593776f391a23d23023d8c8c28ff5a53b1df0e4f2fb597904dee450b36a88abb8cd2 SHA512 8d00e760e5b49acba50cd6637de990d3b16f493327110cf768aef9d11aa309372996bf8c5a8a49fa3e4364dfec5f1611f855efe05284d9b388d3184e012278d5
-AUX mumble-1.4.230-poco-link-cmake.patch 476 BLAKE2B 91268125286d07820c98e941e443655b7edfb4f6c13815f988de8ed4ad50aa37fca557a88cee399418853cdd2e577f67acad7f8e3c2b7e1eefe8a64d4a26358c SHA512 9bab7ca52fd27f600215ceebac690ddae2702547a8519bdbb24be0df411a2ddd89750cfeeca77bcc47fec32b27526971a180519431b8e1637a224d902ec8de88
-DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
-DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
-DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
-EBUILD mumble-1.3.4.ebuild 3775 BLAKE2B dcf342af9e2a3ad6e19ac795931fd6df8bf8b1f9932dd12c78d58db453604da80e1c59cde9b87055777ab463ccec0b1e18da2fd8b025125d13ae88bc6b687f12 SHA512 157d75a84cdc693f34533aced498f57c28e19d00ca1b49d5f1a13736cc5d8fddb6e06bfafa5e48e154d3ae3e11ab8a10dd40a86501264ca148a5776438bb127e
-EBUILD mumble-1.4.230-r1.ebuild 3523 BLAKE2B f4a0eb1518e363e51f9d180b3877c2e53b514351e77e1ec73a4362606dd2585183e563e20e7465cb63cfcd1167f0e250800acd87dc69575dd439f4c5daf088b0 SHA512 5e434b8400e2ace89ee8e5552ff52e8b31fdfb77889f64ce3d90b70ecf0a7e4ee587f559775b0509403ed9b80f9f31572dbf716848084947c380bd7827c57e37
-EBUILD mumble-9999.ebuild 3431 BLAKE2B fc4dc79647b3e5be32154f22ebf18c42d7b8027482e6e6279c47f041ef28a8b4360a153f60feca40b6864a453c81db7b926038aa4f2d6882c13b83b97039d0e1 SHA512 5c4960c560b69beb10f10dbc054da32da571c0af1eb5fc1eaef125260b3ebfc9533cbd31bc98193473b0e09a4d4553f8bfc8b3f32dfd35d3c282ff2e3df42510
-MISC metadata.xml 586 BLAKE2B 00bc1ee6485b27fcd11b763c79542826ebab1e89cb4e428e14469ef5eeed04ce87f924de973e8b29b23a7e6c9da93188ca513441cfd378512602c361cf06efea SHA512 f4018f4099d281e370641f3c7e9267c358404051372620db33dcdfe48d4e226372d53f7215fc5c7b0c270bf3d96120827ba7b113ad0025b0dc43feaf5b934b03
diff --git a/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch b/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
deleted file mode 100644
index 624a8594d995..000000000000
--- a/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/mumble-voip/mumble/commit/36398fb3b293fc889bbc38df29665359f5c2a0ca
-
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Sun, 27 Feb 2022 10:59:57 +0000
-Subject: [PATCH] BUILD(positional-audio): Fix missing <memory> include
-
-Without the change the build fails on upcoming gcc-12 as:
-
-    /build/mumble/plugins/gtav/gtav.cpp:13:13:
-      error: 'unique_ptr' in namespace 'std' does not name a template type
-       13 | static std::unique_ptr< Game > game;
-          |             ^~~~~~~~~~
-    /build/mumble/plugins/gtav/gtav.cpp:12:1:
-      note: 'std::unique_ptr' is defined in header '<memory>';
-        did you forget to '#include <memory>'?
-       11 | #include <cstring>
-      +++ |+#include <memory>
-       12 |
---- a/plugins/gtav/gtav.cpp
-+++ b/plugins/gtav/gtav.cpp
-@@ -9,6 +9,7 @@
- #include "mumble_positional_audio_utils.h"
- 
- #include <cstring>
-+#include <memory>
- 
- static std::unique_ptr< Game > game;
- 
diff --git a/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch b/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch
deleted file mode 100644
index d1b4dee11d51..000000000000
--- a/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/842984
-https://github.com/mumble-voip/mumble/commit/fefdd79ebcd53a3035967789d004938ee39e2030
-
-Fix underlinking against Poco.
---- a/src/mumble/CMakeLists.txt
-+++ b/src/mumble/CMakeLists.txt
-@@ -383,11 +383,16 @@ target_include_directories(mumble
- 		"${PLUGINS_DIR}"
- )
- 
--find_pkg(Poco COMPONENTS Zip)
-+find_pkg(Poco
-+	COMPONENTS
-+		XML
-+		Zip
-+)
- 
- if(TARGET Poco::Zip)
- 	target_link_libraries(mumble
- 		PRIVATE
-+			Poco::XML
- 			Poco::Zip
- 	)
- else()
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
deleted file mode 100644
index 5f267356bf46..000000000000
--- a/media-sound/mumble/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
-		<flag name="pipewire">Enable pipewire support for audio output.</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.4.ebuild b/media-sound/mumble/mumble-1.3.4.ebuild
deleted file mode 100644
index 5c1fc367dd3e..000000000000
--- a/media-sound/mumble/mumble-1.3.4.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 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 +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 )
-	>=dev-libs/openssl-1.0.0b:0=
-	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)
-		$(usex rnnoise bundled-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.4.230-r1.ebuild b/media-sound/mumble/mumble-1.4.230-r1.ebuild
deleted file mode 100644
index 690186d97251..000000000000
--- a/media-sound/mumble/mumble-1.4.230-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2022 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 3rdparty/FindPythonInterpreter )
-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/v${MY_PV}/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}.src"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.4-openssl3.patch.xz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.0b:0=
-	dev-libs/poco[util,xml,zip]
-	>=dev-libs/protobuf-2.2.0:=
-	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
-	>=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 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	pipewire? ( media-video/pipewire )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qttest:5
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-1.4-openssl3.patch"
-	"${FILESDIR}/${PN}-1.4.230-gcc12-include-memory.patch"
-	"${FILESDIR}/${PN}-1.4.230-poco-link-cmake.patch"
-)
-
-src_prepare() {
-	# required because of xdg.eclass also providing src_prepare
-	cmake_src_prepare
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-Dalsa="$(usex alsa)"
-		-Dtests="$(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)"
-		-Doverlay-xcompile="$(usex multilib)"
-		-Dpipewire="$(usex pipewire)"
-		-Dpulseaudio="$(usex pulseaudio)"
-		-Drnnoise="$(usex rnnoise)"
-		-Dserver="OFF"
-		-Dspeechd="$(usex speech)"
-		-Dtranslations="$(usex nls)"
-		-Dupdate="OFF"
-		-Dwarnings-as-errors="OFF"
-		-Dzeroconf="$(usex zeroconf)"
-	)
-
-	if [[ "${PV}" != 9999 ]] ; then
-		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use amd64 && use multilib ; then
-		# The 32bit overlay library gets built when multilib is enabled.
-		# 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/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
deleted file mode 100644
index 009f89b12418..000000000000
--- a/media-sound/mumble/mumble-9999.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 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 3rdparty/FindPythonInterpreter 3rdparty/tracy )
-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/v${MY_PV}/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}.src"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.0b:0=
-	dev-libs/poco[util,xml,zip]
-	>=dev-libs/protobuf-2.2.0:=
-	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
-	>=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 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	pipewire? ( media-video/pipewire )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-qt/qtconcurrent:5
-	dev-qt/qttest:5
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
-
-	# required because of xdg.eclass also providing src_prepare
-	cmake_src_prepare
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-Dalsa="$(usex alsa)"
-		-Dbundled-celt="ON"
-		-Dbundled-json="OFF"
-		-Dbundled-opus="OFF"
-		-Dbundled-speex="OFF"
-		-Ddbus="$(usex dbus)"
-		-Dg15="$(usex g15)"
-		-Djackaudio="$(usex jack)"
-		-Doverlay="ON"
-		-Dportaudio="$(usex portaudio)"
-		-Doverlay-xcompile="$(usex multilib)"
-		-Dpipewire="$(usex pipewire)"
-		-Dpulseaudio="$(usex pulseaudio)"
-		-Drnnoise="$(usex rnnoise)"
-		-Dserver="OFF"
-		-Dspeechd="$(usex speech)"
-		-Dtests="$(usex test)"
-		-Dtracy="OFF"
-		-Dtranslations="$(usex nls)"
-		-Dupdate="OFF"
-		-Dwarnings-as-errors="OFF"
-		-Dzeroconf="$(usex zeroconf)"
-	)
-
-	if [[ "${PV}" != 9999 ]] ; then
-		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use amd64 && use multilib ; then
-		# The 32bit overlay library gets built when multilib is enabled.
-		# 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/murmur/Manifest b/media-sound/murmur/Manifest
deleted file mode 100644
index 2edd932f1344..000000000000
--- a/media-sound/murmur/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
-AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
-AUX murmur.initd-r2 511 BLAKE2B 2ff09ffdb62c5131f97f52960ac71360eb4959bb974c8cbc7f0fb0a27da91f34826a3065840be5a5ef9c24e243185cee0106c85285aa2aefbb534934cff9621d SHA512 3153254ec2c31e1b19e4991cce65ae9df7a609ad61c13ff569bbe822fc728dcf562c63c0a0d3198de3bd1599524db3f0e122004d1491b6bceafdbb28066a56cc
-AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
-AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
-DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
-DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
-DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
-DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
-EBUILD murmur-1.3.3.ebuild 3717 BLAKE2B b696165aaefb36ddc61ca17008bfc128d01664bccac3dd02729865a8d9f0b12b5d9f75648099d1b43d374e5cba18ff99c89cbec7174130e8c4598d6569c86958 SHA512 a76d12a2cc60d016cd4527b9776898e7dae75a4aa438eee36617afa40d118cd619396cec8db5eff2cd5579aac2cf61941cc77e027120a5996fbe5f574e7b0320
-EBUILD murmur-1.3.4.ebuild 3719 BLAKE2B 3b0dd3378a043e2bbfc5ebde7832985365a83ac4b524e818f5bb2a70963824376e3bf2973c6a43f02edf8b59c33947572150e250206595a73cf21a95f4a59d21 SHA512 5ecf3483b8c9e1c5bd74f385e5e4bd129f0997df9b51c18595797bfb60a624757be69592f0b0ed7b7b7e9a339eb52412ce9a0d9fbd309ca16d88382a6ffeea27
-EBUILD murmur-1.4.230-r2.ebuild 4016 BLAKE2B 6a7350a393ae2b6b3a4d24d61599d26743aaf44bdd3f169d2278530170e6f6e566f15e1088de4b3d3d45c93bfce39e532984b2659e14935e9c301f34a67388cd SHA512 593f839dc5424fa882dfac43a77e1ff666a44981e6d0a6445b125684789a6154cb6dc2dc6532105538cc0add6f41515c58dbe3335381fd45e997aa48621930fc
-EBUILD murmur-9999.ebuild 3884 BLAKE2B bbfa6d7cd82edb3ac5397899683135c1e0c57e9fda5f15ea2651c992ec669ad7a1fac6bd554255e8a351a08643b0560b2778b54a8cea54144f5b2bc2296e9e8a SHA512 bf9c39c4e2da08252330ac1910d26dfa3292521532ef372ed2d1ce36fae6d4167d19ae586513e8ef530020389351658268d4f971a5166673268dba1a995dc761
-MISC metadata.xml 447 BLAKE2B 8dc5c1361b69c9c18d1b2db580eb4b1dca40a61eb17a8d873dc386246cea40e765ce68a081c881b68c4195fa751e0683e8ccba2e3b59fcf6c292ab9c243677a9 SHA512 18e8952a6077781c00115915ea10a9e15ff38d4c296aaa5b85d1caf5b61637a600f0b7b0cf58e226aebf46be5f61483f1fb964666a722ec3bb38c0cd5209ffcd
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.initd-r2 b/media-sound/murmur/files/murmur.initd-r2
deleted file mode 100644
index b754c242462b..000000000000
--- a/media-sound/murmur/files/murmur.initd-r2
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-
-pidfile="/run/murmur/murmur.pid"
-command="/usr/bin/mumble-server"
-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 f10ed85aa0ea..000000000000
--- a/media-sound/murmur/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<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.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
deleted file mode 100644
index 9131ecb5514c..000000000000
--- a/media-sound/murmur/murmur-1.3.3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd readme.gentoo-r1 tmpfiles
-
-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
-	newtmpfiles "${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() {
-	tmpfiles_process ${PN}.conf
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-1.3.4.ebuild b/media-sound/murmur/murmur-1.3.4.ebuild
deleted file mode 100644
index 6af71f6272f0..000000000000
--- a/media-sound/murmur/murmur-1.3.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd readme.gentoo-r1 tmpfiles
-
-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
-	newtmpfiles "${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() {
-	tmpfiles_process ${PN}.conf
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-1.4.230-r2.ebuild b/media-sound/murmur/murmur-1.4.230-r2.ebuild
deleted file mode 100644
index d0e26545bd3d..000000000000
--- a/media-sound/murmur/murmur-1.4.230-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd readme.gentoo-r1 tmpfiles
-
-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/_*}.src"
-	fi
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/mumble-1.4-openssl3.patch.xz"
-
-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
-	dev-qt/qttest:5
-"
-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.
-"
-
-PATCHES=(
-	"${WORKDIR}/mumble-1.4-openssl3.patch"
-)
-
-src_prepare() {
-	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} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed \
-		-e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-e "s@murmurd@mumble-server@" \
-		-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)"
-	)
-	if [[ "${PV}" != 9999 ]] ; then
-		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
-	fi
-	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}
-	doins scripts/${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-r2 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	newtmpfiles "${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() {
-	tmpfiles_process ${PN}.conf
-	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 d5c37496cf5d..000000000000
--- a/media-sound/murmur/murmur-9999.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd readme.gentoo-r1 tmpfiles
-
-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/_*}.src"
-	fi
-	KEYWORDS="~amd64 ~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
-	dev-qt/qttest:5
-"
-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() {
-	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} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed \
-		-e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-e "s@murmurd@mumble-server@" \
-		-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)"
-	)
-	if [[ "${PV}" != 9999 ]] ; then
-		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
-	fi
-	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}
-	doins scripts/${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-r2 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	newtmpfiles "${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() {
-	tmpfiles_process ${PN}.conf
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index bcb4d7a5de65..faec6cdcfac9 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,7 +2,6 @@ AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8
 AUX musescore-3.6.1-rename-audioitem.patch 491 BLAKE2B 9ecdccb1e3aec15c7233baaeb07d1b962b487dfa1c88cbb1c79616e92d36fc8e0d46635b9bda851550145086bfef2bba56a53ed033325b6bd98378a9f6928bb3 SHA512 55cb0187dfe4e590ec47c772d3c820f64324d748a2b95d0529b516cd048f2862477117dd711c335fd7abf8e3693e9e0b8b60cc270aab5a5960a173fa8bd7ad85
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-EBUILD musescore-3.6.2-r1.ebuild 3060 BLAKE2B 661f3962a5ab3260c5580eb2dc91836015c62744c69d05e51edffa0891c7a2f49c8b959958cbd96da380d9419642f4f01b06bfec6ffa23cee08ceee2f681cb24 SHA512 4560550c5a7d7ab386a01241f1f33cc55a51d731a40f0dc271b77e0e9ea196c6c2c219894687c37f25a4459562b967113382b301e0df44216a7e1941cc24540f
-EBUILD musescore-3.6.2.ebuild 3057 BLAKE2B 9dfb828479b96449388e0738ca1072857ca6ab068c00624b01b0a9d9be374ed84a777596791bdd9c11c7889b67aadaa50b5c10b92c19dc915cae21f603d40db4 SHA512 aaa7030ae4d9d297f689201f8b2472d5e6af47df1cf1036f605f1f0aff9c76ad20ce21827e47215a2e92b03e272eac3e58e707e47c8d404324ac438dc330f54d
+EBUILD musescore-3.6.2-r1.ebuild 3058 BLAKE2B 5352d979ff5f5f7a704f589f747d8a04900976e8da82b62cd9d65de6feede64bd78d604f38264c1a3302b3084c9a00a14f542a0c3ecbfa08d5d07bf3e8b143fe SHA512 2f07e56fe6d81bc00590839d2d5a1f30bea863a5d36aa9c5ae159b8719f39abafe08edde4a43683c24c6bf67962a2dc67696921a0a7e5d458cbfdf10f6fdf525
 EBUILD musescore-9999.ebuild 3001 BLAKE2B c5de983af93a21e83218b7dcf1a11c046fe6c2b6b8118ee098104531c325944bb0e94b836d380b789da75e7e546d5df5d4aa05f967a4aa213020bd0d5a2ce12f SHA512 f2162b78542524277a33f064a098d56b04859acd8d9e8acd1e39309dc3ff2693913bd1af11c63f5a5ddd7e6149afc5a25c97cead4f3be4ae93fbbfcf8a77a1fc
 MISC metadata.xml 882 BLAKE2B a8ead5437d77a6c39262770afc3409f3a68072fbc796af0b029641126521299e45e921a666b97b168de79b92d3359ecd4032e26fca798188fa9bd503f394db5a SHA512 4146e03299dd9a646e713dc9baacdba9578c5fb204eeeb81397e25fe5d7b19ae07aa1bb0c550ffff5cb53194f9ee53d0b35fbc26b04658d0e50f08e1a0e441f7
diff --git a/media-sound/musescore/musescore-3.6.2-r1.ebuild b/media-sound/musescore/musescore-3.6.2-r1.ebuild
index d9fdbd5e6e56..c5afad3d5f44 100644
--- a/media-sound/musescore/musescore-3.6.2-r1.ebuild
+++ b/media-sound/musescore/musescore-3.6.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
 
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
deleted file mode 100644
index 5cc3b579f8cd..000000000000
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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 qmake-utils xdg check-reqs
-
-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="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	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/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	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] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${PN}-3.6.1-rename-audioitem.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"
-}
-
-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_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
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 45f4fb844e86..7e886e519063 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,5 @@
 DIST ncmpc-0.46.tar.xz 289332 BLAKE2B e57a931f5a512c543d48a9b6e532c7944e655d28d02fe9ec2b5b41563e2e6a5806924a668ae592f3fee58a2bb04a681fee0903b8046a61ce39a453092dfd8623 SHA512 34cbb9ff527bfa4d849069694b6d1a1e54c932b64538e799c9ef9b9ccc42ed24932b6bcbf3552af6ce846af6b7399916e1aabc6c79ac564f1c9fe56a33b6332f
+DIST ncmpc-0.47.tar.xz 291400 BLAKE2B 4b9e5bcc435b6064c054ad84000986942a699993e78decb26b73b4f3ec8d261e4e752e11d40ed5bdcbaab260b37f1a59b99708be05ade44973fee3f2b1e6d9d1 SHA512 6c9990ca9a0781eef67fae8b20ceec5fc00177b1db2b08cfdf122dd1f61f87a92030baadcaac154d73ddee622c963481d4e37d46f76a4ef21e51d4f18a6f3e6a
 EBUILD ncmpc-0.46.ebuild 1998 BLAKE2B df0ed8f7a833b4199a642f37c0b00b87ff74fcd9fe36d68f65b7873f842db2802fbfc27f8734d6419096973efdf63a8eac129c73f19363ae696a020519b7f151 SHA512 134fd475dc962dae8feca0994c9fe42dafc71f025c631bca508b184a078e39e9a3b41062a005a7a8d064706b85837e23501eb9a25a7ecfbc668ba53dc8e2cf19
+EBUILD ncmpc-0.47.ebuild 1996 BLAKE2B 4761d217cc72b17f743b211040e795e56358de5b498ef45530d5f785bc0cb1dd6889704c4602be67ff437d9ed15722cf9018b7244c172626a55fae25d2fd7503 SHA512 100461d7036788fe6bdb1984ade3938a359d915acf6dfdfdb2b62c36612dbf7af5d153d7ac5e1aa3e97a5817fc2f6d76eb237ce5649ae596b2ea728150757a8f
 MISC metadata.xml 948 BLAKE2B 712f8c8832f3c6ff6c35609c2042ae62f00b59753ebd648457c919d78f03297b646fc704331e6a605018115fd25ed3752cb5ff41d12c2b072d7929d7357d5e14 SHA512 231ff1ad361ee547df64e26ab6a37bfcddcc373e8e8421e0bc8e594547c844fe3c73fa7d8aa3fb7594f4c2b83b91bb2f52a1268f711a6c8a2a295cdf94f59d72
diff --git a/media-sound/ncmpc/ncmpc-0.47.ebuild b/media-sound/ncmpc/ncmpc-0.47.ebuild
new file mode 100644
index 000000000000..007bfb703b0a
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.47.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+	sys-libs/ncurses:=[unicode(+)]
+	lirc? ( app-misc/lirc )
+	pcre? ( dev-libs/libpcre2 )
+"
+DEPEND="${RDEPEND}"
+
+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/paprefs/Manifest b/media-sound/paprefs/Manifest
index 03d2f9ce9502..2e1ab002713f 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,3 +1,3 @@
 DIST paprefs-1.2.tar.xz 74820 BLAKE2B 5b4e3b2e4e0e940a7685dbff287cf42951931da1aad6f011a72115a8393bae11f6e80dc09a3e5724afaaac0e6580dcc7a37a9b9b4ab6fc6a53f29647d9980a4d SHA512 2bc50116528c150060711899c66976179e433f6be36f6b7806f0fd3f66346ce14037875e7f119dc205d2047c3998d78105fa7d7c397dfcf02fb8d3bfec34154c
-EBUILD paprefs-1.2-r1.ebuild 874 BLAKE2B d80a61d6419d41dcfe98f0591a63b09047034b24eab1a7df7bb579be96b1bab48849c1e8eab368897f78714c1ea1053529633c5ea053190ba9aa338cc53b9a34 SHA512 0dfc8d53ab9c16bf8c0252ff74b5200e587c98fb0f1093bdd1c70a442d57d35c7365cf1d0b4dbf35ef457dc389d2cbdc80b67496213ec3a579b90c0c8d0ba002
+EBUILD paprefs-1.2-r2.ebuild 874 BLAKE2B a7738ac5d04fc5eb1961e6fe5b5d541ac008648a505caa0b90e26b42600dd53ad61c5ff92c7dacb6c12354690c07506ff9a24e6a21d045bedd7694471dea88d1 SHA512 e926c19af56a88997ad3f1967d00698962da55f7231a9190f77e34d70b72c3d567cb884a084e6f05d0e4d1ff7eb3579245b1f8b43f68ecde89ffade3997ba1ed
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/paprefs/paprefs-1.2-r1.ebuild b/media-sound/paprefs/paprefs-1.2-r2.ebuild
index 299081971142..10b075e5e054 100644
--- a/media-sound/paprefs/paprefs-1.2-r1.ebuild
+++ b/media-sound/paprefs/paprefs-1.2-r2.ebuild
@@ -31,7 +31,8 @@ BDEPEND="
 
 src_configure() {
 	append-cxxflags -std=c++11 #568590
-	local mymesonargs=(
+
+	local emesonargs=(
 		-Dlynx=false
 	)
 	meson_src_configure
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 4a7b1b9b4cc1..a2408163ba07 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,3 +1,3 @@
 DIST pasystray-0.8.0.tar.gz 58770 BLAKE2B dff11dec46986d3b086acdff43aa7eda97e8edcdef0ef85a246087a3a0da9407cb4475ab4b579a370f90c23327d065ae704685124915b27e03f0be1a44e50a58 SHA512 104c68e41659306ca1e750d0d580d6ffcf4411da2da51a4f2780f551e12da9e104eb66ea841234292769f05a15f8f14ceaefc55893cf551a47124d086b1fb291
-EBUILD pasystray-0.8.0-r1.ebuild 823 BLAKE2B 0022d224711b071c37d87d97804ca8ff37bed9b68aa237d3e5fa70933ce4f594195f17b9317cec38649e7990079e7486b34174c280a4afd6995951c1ed8fd7ce SHA512 d76c55fe739ffd67ec3dd398e6fd316ddd8433bb2ead0df628dd6203acbb72d9b953a15229d44d942d55e0129b39a1c5b514f50ceb91d977d3c4ac077bf400fb
+EBUILD pasystray-0.8.0-r1.ebuild 830 BLAKE2B ec8cd17c60d790ecf16e28934c375d40d626ffb4b3bdf3bfa9fc5debdd136efb0b5d0afbeee29e2584066ec80126b95b118ff456995da7c9f449e644a5fb486e SHA512 f9ced3dbb4e8c0991f8696f90eb04bbf883957aaca2d68660af0a9274795aca6b0a9d70b3dd0fa5873dfdd82a68cfdb3b0679228495e6d7a7e6089721b648817
 MISC metadata.xml 666 BLAKE2B 6729f9a6e3bbfeaa9f8319c53770972326a0ffe851c02b5238d0e928c02d222d93bf569d00a9b6c1f33602fc13b764f9750d4473f67b1fc5d36da06e52fe96c0 SHA512 11a383b58d521ce5ca4bdcf3505e45b8dbd3053cf3e075c39c8dc4b83c94e3e7654141ffc8048cacdf8b4cc0c4d6565fe0d9609a3e14bf14bc248578978cf39d
diff --git a/media-sound/pasystray/pasystray-0.8.0-r1.ebuild b/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
index a58c48834bef..a91da3725210 100644
--- a/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
+++ b/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/christophgysin/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="libnotify zeroconf"
 
 RDEPEND="
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 79098347d48f..4b821bf10d83 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,6 @@
 DIST picard-2.8.1.tar.gz 5060681 BLAKE2B e649407e12fe0a5f627feaa4e1ac347b27bcb22960f6b1adac67444ebb1f0ad4bcc5732cb218cb3ba67147fdd3bc9f4a5fe3eb3836c6bd1a43ea29bb2add1d9a SHA512 0f15dccacb1d95232235b7c8251b59f02d9cd7836fc10e624951a04f889d12206301aea77d9503fd0f4fed2ae400a150ac159ce6cefd9e8a914a62f8257c7ffb
-DIST picard-2.8.tar.gz 5060056 BLAKE2B b5ba78c910a615e7e2bab148e83514d4fc929d8dc910dcd07dff3af75b502bc9036eb7843bdd3d95b2e5d07902ffcefb529ad1aa19d101565f9c4e66eba693e2 SHA512 bd5b4e7b457603eb8c1895452a7b00cb5de48e28e72c8f377ad73e49aa272a2d09338ea4585f40f1a8401e860a9be3d210db3f44a39956b200d85aa24a89562c
-EBUILD picard-2.8.1.ebuild 1413 BLAKE2B ef1c81a19e42fedffb65c47278e340c0b7ca27b0f2da934c3f4d232db314f05efd7499c1a818c842a0a94f18afdf18b01e16ab8f8a75ee3d1a03026a2002e8c4 SHA512 d464908123fc47a3770b920ac36d649913a08322d1dfedf4f748fc91bffe2e4eb0ef0a411326411d561aaf312faaf1de890619dacf8c7e5cacd0f51d62ac0786
-EBUILD picard-2.8.ebuild 1411 BLAKE2B 1eca988cde74b9b7ca3de813b8d5262e432b2c9f055fa8f528b0551842e0192d7f28ba8f3eae283309ed3265d3bb4fda5b0f134e36bfd55e9b3924a50789c07b SHA512 b73760154b1d29344a91fbfc8e5406de9ac4d561e01384ba84a4f631d1cfad54bb743fc6020da26fa69d4bb9fbb4e43f8e2c8971ddcd99edb32355dd8989023d
-EBUILD picard-9999.ebuild 1413 BLAKE2B e4c2e7e17203d3ea53580b91ca547dd1fb8a600fb736a9004c73a3759189796c6813fa500e715dfac2c0070b7b0cdc10eecb529a690dfb55e47876cef65cd2ad SHA512 fd01f4fee1be7998f084b2c2371076c5f54e003003f092cb72e264fe1ac0e927f7e8d03a78dd0cd9936f08a3b6a0d14793ced3593f2b9794bde6de4f0e9ef9a9
+DIST picard-2.8.2.tar.gz 5095347 BLAKE2B ddaab9e7d09bd7848d55ac385cd901b5f7b3e2044811cd63b16027159586e01028f2885202c4d2bbfa20926305e110e075778f0b907ff8812c937fe0905a8fef SHA512 18b4ebc6e898f4e2910d4d022a12c0516030133318467c38a77325ce088a9dd632d3d8105944570f75b918d3f4dc32b1a501e93bc92a7315ec9ff35ed3e56699
+EBUILD picard-2.8.1.ebuild 1448 BLAKE2B 694d79f9a133a075eeaa985e500600e2310e45e7671285303f96c02a5a78d7a7c44df9e99b9851842f338f1dea5dccf8e2c1a193d09f8960f3c9ad41275b891f SHA512 aaa97fddb14ab0500dce3533314c8ebe3892b7a8a0a4741e29bb83e99e7be5e7c32c77a14bcb5130888d1a9170ba5155086fe148d046e8dfb0c9b0eb6a78332b
+EBUILD picard-2.8.2.ebuild 1450 BLAKE2B ef2f46ea8d3fcc2d59ba7de0265d8780c1c1fc02cc7c3a03456cf89ef710604372c21c39c85742c328ac6fad55fab55a6a37649f6e6416998abc1047596b1479 SHA512 4173a90be211aa96379eb0121cd2bd04ebbafe619146b1525f362c98eac979d71ba37db9022245378c2c8ec9b3491cab6a292c8bfe42e403745afed12dc3685c
+EBUILD picard-9999.ebuild 1450 BLAKE2B ef2f46ea8d3fcc2d59ba7de0265d8780c1c1fc02cc7c3a03456cf89ef710604372c21c39c85742c328ac6fad55fab55a6a37649f6e6416998abc1047596b1479 SHA512 4173a90be211aa96379eb0121cd2bd04ebbafe619146b1525f362c98eac979d71ba37db9022245378c2c8ec9b3491cab6a292c8bfe42e403745afed12dc3685c
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.8.1.ebuild b/media-sound/picard/picard-2.8.1.ebuild
index accbc2910dfb..e651b436e570 100644
--- a/media-sound/picard/picard-2.8.1.ebuild
+++ b/media-sound/picard/picard-2.8.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
@@ -30,6 +30,7 @@ BDEPEND="
 RDEPEND="
 	$(python_gen_cond_dep '
 		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}]
diff --git a/media-sound/picard/picard-2.8.ebuild b/media-sound/picard/picard-2.8.2.ebuild
index c57f433dd767..5e3533bb35fe 100644
--- a/media-sound/picard/picard-2.8.ebuild
+++ b/media-sound/picard/picard-2.8.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
@@ -30,6 +30,7 @@ BDEPEND="
 RDEPEND="
 	$(python_gen_cond_dep '
 		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}]
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index a096198a73fd..5e3533bb35fe 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,7 @@ BDEPEND="
 RDEPEND="
 	$(python_gen_cond_dep '
 		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}]
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index 0703aa356d9d..32973684b248 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -10,8 +10,8 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
-EBUILD pulseaudio-daemon-16.0-r1.ebuild 11998 BLAKE2B eae74c6cef4adc800de9d0f444c93ab95ad0c6943b5be4f18b46e530c8df0c33353442df9101a4ba51cc139262e03a0783d26b13cb6b94b8385f92dfd5e0d939 SHA512 a5d155ccaeb75414954dcabc4e539035dd188144c46d1e0818bd8014d505aeaaf4d4798a243eaf722372c305f4c1933420f43e138049e8175885ae304fa7d8f1
-EBUILD pulseaudio-daemon-16.0-r4.ebuild 11991 BLAKE2B a0cad25d3b04a7b7059c1c27b3b10e0917548643ca5fa3ef74e59b9c5cd75c48f66a5213b3ea608184ac35e2fa6deefb5de51bf6568ccbb257b43572975103d5 SHA512 1c1df7772101c0ec87496292f143239523400b2bf84cbdbdb464ca2c9fc340656dfed124725510274c87fa742d5d862001746bf666fa519782dd1d3f04f9996b
-EBUILD pulseaudio-daemon-16.0-r5.ebuild 12412 BLAKE2B e5f67f67e9c58a8c67f967f03ea842c244c7346edc056e57cec4ab603330741f7f824118127fa19aa5b911a2edb4eff138809e41829c4b468ba368f5b1a60807 SHA512 02d3977e39b6d66e68d42d9129c21434c98aea0ce8ef337dc886d900e494d77e0a70f855ea2832f42188163eabb6975b9a7469cb44a860a08eb08f5ffe0a7a15
-EBUILD pulseaudio-daemon-16.1.ebuild 12144 BLAKE2B 1a857785cb70eabd9409fddcb64540bfd1ae686b5a076095afb875d614f36a2c96c9a010766e4c85837739f4f84b5c9628699a65d09a9e709bb9f4791ef856c5 SHA512 e9a5bc1d12ca955f935c672898f5a7be40b92e896e8bbbe1d3582e39789573caf4a9432eb9c2740c4996cf42408e12e94915bf5992b9179da3d5ef5efec7840b
+EBUILD pulseaudio-daemon-16.0-r1.ebuild 11997 BLAKE2B 7af693e228ee587a7ffa5120bbd788ebf9b779e7fdc9550b04b6706e200a9bf036834fd7eb7ee461b1a62a2f9ca4ac56abdab78dd3b61d78a609629fcac05e8e SHA512 fb36604ef31b93b4077bd809e4edb2697e511eecd62bb029ffb67bf2f2ed8e14fef6f61cc6356a7d5e816586efdf0d4eac121896808610952c92fd43beac9e5f
+EBUILD pulseaudio-daemon-16.0-r4.ebuild 11990 BLAKE2B 96115d8d74d47d52246a81fd965e22ef10d505f1d9276168c193269e27b7b8af53b152a8f3b7bf26ab21c053aaf0d8007568cfc7b48afc24a8c064a1524c7c91 SHA512 a6b10c7fdce24b4857be63dc00b377357927581f01ee7b5a5186036970e3ccaafa6d856f954582c42e9e56d136c6326f43268ebd772b5e5c22c23ab7bc9d9bba
+EBUILD pulseaudio-daemon-16.0-r5.ebuild 12411 BLAKE2B 1e8ed59be58201cc876f735827e32ab24141a6c0b2a677bd6c641a125ad9539138fc0b65f47b67928a281e80c0ff90a7b1a766aedadd85a033a34d18eba56db5 SHA512 2cc8cb215a11982feccec978c84d754ae7ad4f3e40e7febc5efacc4660d0e7d58a53c8b8bc4f77efb40223321c2219127fd17a52b5396efde81683dd2660f679
+EBUILD pulseaudio-daemon-16.1.ebuild 12183 BLAKE2B 98ff39cf55af5dc670be1530d9f27ddb44e8d6851dfe504fd3a628501ef6c6bc9f3130a91f46ad19687b61dcb7cb48e0cbd3ded124e2a1b3f115aed9ea73383b SHA512 cff2c145c2f316ca299b94a95e99636620a9fbf14bd6c1e8e00722721259af1f26ebff3b0c1064fc450cbe894e2cbc7fc27b17d47c027964d3aab536f09fdce2
 MISC metadata.xml 3570 BLAKE2B 24d7b24a68f5e832708d9879769f55ec4cf146c47a41b5fa0ff33f63a5a9945736e227c6a6afa106f964fd91eb3b0ee441203c92f312ed835ef2197979b6fda9 SHA512 34aa5503ad5483eeff2f7c4713d96322dedbdd56b7d52a17ba0658aba24aef58239d5ee1943a276555c2508fd3d5e18639ec6417044adad512693fa6c673c5df
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
index b6489354786a..1dc4c81cf6e6 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?]
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
index 3ec78e0ac672..8c47aaf30579 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
index f9980628eb08..66f340cd76f7 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
index eddb6f54e7b5..01be6bb43748 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
@@ -138,6 +138,7 @@ RDEPEND="
 		ldac? ( media-plugins/gst-plugins-ldac )
 		aptx? ( media-plugins/gst-plugins-openaptx )
 	)
+	!media-video/pipewire[sound-server(+)]
 "
 unset gstreamer_deps
 
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index ce78f287b380..34afdeb5ab63 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -13,4 +13,5 @@ EBUILD pulseaudio-13.0-r1.ebuild 11420 BLAKE2B 9dbe3d7ca0e295c016925e23369ec3b49
 EBUILD pulseaudio-15.0-r2.ebuild 11169 BLAKE2B 87e797d697ecdf882c30da4bb573322dab4c2a24c92f18738c93cfad16cf9405d1a3745db130e2774758b459e131b06f66b5d794eb0fc40d760ef8b2bee16710 SHA512 d751359d6305ceb29957a325aa77b4a1b4206f5d86ed98346df1e9f272f06fb43867e5154ab65b8911d36816d74d7238970ceb06b792ea3e08ef5ef63fa5b663
 EBUILD pulseaudio-15.0-r3.ebuild 11216 BLAKE2B b6b81a19e36106b2faff1607539af5c11a612c1a9f686f2d76b1d3a22873fddec171821ffedb3224dab2e1737fe87019460869f9059f800627a0b842ac1792ed SHA512 eadd4841cda27faa7c86b31e3cb2d658e01096ce2c4bfe1e818387294d11de3f1199c54512166df0f3dda5470f2cf7b9e37e4fcdcfe69bc29c9fe5cceaab3817
 EBUILD pulseaudio-16.0.ebuild 879 BLAKE2B bf99843aea835578905b86529c2bc11d93b28b6457d5ed6b52157e90a98ad5d9be17208c52f9e9d7dfa290e4676fcc79279aa38afa59c51d694579d4f15ec8ee SHA512 644aa3f63973836971e5793451f2e1ea4d81ce46b82c36ec61fcbe3807c5920a3c6ee8684c87f9164a9806bfc1d719b091bf1674b6955c2b3d3d2ca7367203d6
+EBUILD pulseaudio-16.1.ebuild 885 BLAKE2B ffba2709e0ebc9e12e929bcd3911b9a964dc3fbaa03b213d471033c2d50f01c201ee40f71100d3b80a1089996e9fb72acab5a3649e3ef3111c3cf2590a16eae3 SHA512 65a551a4af36c376ac9610953fa5a17a83245a0150eae1948f3d5dc1e8013402da64c02c7a6134d29ca9b050567686aa33f5193f87223dd0f1294b4dc57e9488
 MISC metadata.xml 4111 BLAKE2B c2f5d0e123d9fee8d8d5e6a3f15cc4edb94c2ab8f6e0f4e0b8e0de778c67dc5482b4cfba550fec8653412b8dd026b66e0c2334d78144028d84d7ccd8a9e77cd1 SHA512 d3c949697b0be0cf3d0447b9691a77e97f2d77e099e0662a345e5c22f965a0d0a2dfd073dd601f28f39f4fb5676c0561c816335fa8ac8a019b55699637dac78c
diff --git a/media-sound/pulseaudio/pulseaudio-16.1.ebuild b/media-sound/pulseaudio/pulseaudio-16.1.ebuild
new file mode 100644
index 000000000000..a4098093c08f
--- /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/qtractor/Manifest b/media-sound/qtractor/Manifest
index 7c73c36355dc..8b0f13c169d7 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,5 @@
 DIST qtractor-0.9.26.tar.gz 1868666 BLAKE2B 3e0febf185ad5818bec00c3b66cfdcf8e2ff89909f3934facf3e371283b840847111b3eb175bcc7f5e0a073f06b01554aa5f61a0add1c21588124858849a3cfa SHA512 ca1a1cfcd7083bae83d26b0710cb7b884658176c060858f5f9fbc40a885a498731a544390be2a61f4f986d113ca112271eaf5c6218f6e3051b152dcae836b8d0
+DIST qtractor-0.9.27.tar.gz 1995105 BLAKE2B 08b3a18d37eb700960e24741178079deb728f909f80fc00491abbe832c1d1966022ec6bd2c24469047b53b168a7e084a7d76da96e587afff78662f2f1c9b1d26 SHA512 2bcd4c5676fda58c7cf9ad9a9dcc139eda11c69b1c608812ff912ff63da56fbd0ba6b76828b326038365c9d84519bc752c54572e8edbf573e6cd0d068a17faf6
 EBUILD qtractor-0.9.26.ebuild 2443 BLAKE2B 55b7a06d8840c4b0303511e5a2b790a80672f95d5e270b3bccc9232562902a1ca6eea92de9586fb598976de0b54190139f34342024358569d823d121ec313a5a SHA512 f71d82260c8ad9ff055ca1c881a70924338b86b2360d56b5cec580296ac8d99863ec27cdf9d84ba85883165eb454b1fbfccfd51fc4e5e8eaa0f9d29505e6f18c
+EBUILD qtractor-0.9.27.ebuild 2445 BLAKE2B 7508a7aea3d74dc68d3a8fffa85f733bf1772d5f87dd545d6dc3ab6ea2e75d8aa96b0320014236f855a667fabac9e14fb603859140c1f5ba733b0ecc4faf8abd SHA512 acddfa87c474e4876081bc1ad5b7607fde4ac785ab10d0ed5e97711b32f4de0c8e827833d2a3a91222ed5409e2913ea3eefdae5e13bc66634ecff0a168edafff
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.27.ebuild b/media-sound/qtractor/qtractor-0.9.27.ebuild
new file mode 100644
index 000000000000..f9f6cb16552b
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.27.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/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/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
+	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/libvorbis )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=0
+		-DCONFIG_VST=0
+		-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/umurmur/Manifest b/media-sound/umurmur/Manifest
deleted file mode 100644
index 67af13f64dfc..000000000000
--- a/media-sound/umurmur/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX umurmur-0.2.20-openssl3.patch 246 BLAKE2B b14bf838f72d901f2a6f99b6e33447e5a7dd51c767a88f90842d5f5aa6495cd86793b3a5d7a8f03e067e4784e89aa8f4ceaf52cd3e70180f9f4884b6893e8733 SHA512 0a12c34c870c050f46790fb387bd6b5313f0c0cf98dd5232d960963a9c1b88d6314b69c96b6c148c9f6c8dc5bece2d2fc3fa4a221cd966a0f1c7efbc76978171
-AUX umurmur.conf 1637 BLAKE2B ba9519dc2a09512c3b8398009c1ee41a8d49f1a18de5800dd53ad38e927c21dd58790504b4434b394ec3fa1c35614f49c512db55bde01e2956f90564b6d96ba5 SHA512 563573c405013bdf9d76003d68eb9619064659dc1e1b8b1fde24c0e587a807202bf62efe7f227cc95ff8b6db68a2ace3f0f359cef74c1bf5f1582815dd623501
-AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc4507528370b1b77d5c3335f61e0c0ab6cc28bb8530aa9876345bb9ff01bdb1db56f0d0e44b09ef7d6a12eff SHA512 4af070ab4d8f4a9a2d5b59b8be95cfb49c22faae809843d9c8ede954bdf39f1224bb31cc53e5cf0f771a2033dfe904890345a6031055c9e79fdd315447e54840
-AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
-AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
-DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb SHA512 4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768
-DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a SHA512 0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4
-EBUILD umurmur-0.2.17-r4.ebuild 2458 BLAKE2B f1d911fc058436e206787a66db17628553a189a5d481821f503f7eb1bf24948f3fe4c21cb903583326c94ff61a12d04dd490be8396488c732d1fd95a9b9ec46a SHA512 6f41066f29204504cbd530bac321f7cbc263e9ac15d7abc33a5145026807300db11a852902bf3a6b039a4c9950df3bf7a1606085ebbca4197cdffeff63e7b30f
-EBUILD umurmur-0.2.19.ebuild 2460 BLAKE2B 343e6d943fb866fb6fa2d9937cb4af430e2805f4b2a4ef8271b1409640aa88d9591ceae172b737532faedfc720c30ba180571f9936e6e3109bd5ed6378ff1322 SHA512 8337bf02e5591f36ce388ebc93336aa1a76732f528c2d7ab57bb9443c950ca174f7ff466a022903790ecf9b695a9e9cbfa80d60d6f103048b079109d59b3b5ca
-EBUILD umurmur-0.2.20.ebuild 2524 BLAKE2B 62d098501b0363cea6fba3bbbb66baad7258fd440abe6d0b2b59c3f29f87ee979cd76188ce61e5e8d7be15a21a2842257c8cc7ea35ae43336e8082c96895a288 SHA512 117bee1f600a4533f4f56541b6bd5c1235c7749fbe8436de54a4eddb46abcbbb46b03f9e5353115aa06b177ae13ae4ca188e7bd31ed0ea49fdb2010db2ef28b0
-EBUILD umurmur-9999.ebuild 2460 BLAKE2B 343e6d943fb866fb6fa2d9937cb4af430e2805f4b2a4ef8271b1409640aa88d9591ceae172b737532faedfc720c30ba180571f9936e6e3109bd5ed6378ff1322 SHA512 8337bf02e5591f36ce388ebc93336aa1a76732f528c2d7ab57bb9443c950ca174f7ff466a022903790ecf9b695a9e9cbfa80d60d6f103048b079109d59b3b5ca
-MISC metadata.xml 1008 BLAKE2B feba592603f9cb71e517192271e9379ae130c38fd5c8979571197ced233160e38a8fa2fb927989289a2be5ba3f2609b29c278195e392998c45aba3ad576d1363 SHA512 5ecfd76cf6be609fb5f41ddc48ddf1a5eaa3b6af0355c51be0457e87c79e66cc87666ca8f0b2eb8ca52a18047bedc25b25d978f6b69b1bb44cfcf7f8d8924943
diff --git a/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch b/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch
deleted file mode 100644
index ad7cc1177874..000000000000
--- a/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- umurmur-0.2.20/src/ssli_openssl.c
-+++ umurmur-0.2.20/src/ssli_openssl.c
-@@ -142,8 +142,6 @@
- 	
- 	Log_info("Generating new server certificate.");
- 	
--	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
--	
- 	x509 = X509_new();
- 	if (!x509)
- 		goto err_out;
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 f3ecd2642bfb..000000000000
--- a/media-sound/umurmur/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<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 a840c65de765..000000000000
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
+++ /dev/null
@@ -1,111 +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 mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls
-# 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? ( 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 )
-
-	if ! use gnutls && ! use mbedtls; 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=( $(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.19.ebuild b/media-sound/umurmur/umurmur-0.2.19.ebuild
deleted file mode 100644
index ca21485b1db5..000000000000
--- a/media-sound/umurmur/umurmur-0.2.19.ebuild
+++ /dev/null
@@ -1,110 +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 mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls 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? ( 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 )
-
-	if ! use gnutls && ! use mbedtls ; 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=( $(get_ssl_impl) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[0]}"
-		$(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.20.ebuild b/media-sound/umurmur/umurmur-0.2.20.ebuild
deleted file mode 100644
index 677e6fa4f97a..000000000000
--- a/media-sound/umurmur/umurmur-0.2.20.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 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 mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls 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? ( 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 "
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.20-openssl3.patch" #806154
-)
-
-S="${WORKDIR}/${P/_}"
-
-get_ssl_impl() {
-	local ssl_provider=()
-
-	use gnutls && ssl_provider+=( gnutls )
-	use mbedtls && ssl_provider+=( mbedtls )
-
-	if ! use gnutls && ! use mbedtls ; 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=( $(get_ssl_impl) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[0]}"
-		$(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 ca21485b1db5..000000000000
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ /dev/null
@@ -1,110 +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 mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls 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? ( 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 )
-
-	if ! use gnutls && ! use mbedtls ; 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=( $(get_ssl_impl) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[0]}"
-		$(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 7f1c8c2f415d..a1baa1910ab6 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
-DIST upmpdcli-1.5.13.tar.gz 579569 BLAKE2B 30af7f455c0564e46c627217853a230bdabd0209baaa62b247388814af8005ecd0125de242c98cc20bef28adc548b5e83fa61d797535daa00cf180cad0fe0217 SHA512 bf61f7befe5fd64cdeed94f7d82965991d95abf8f8f96b044934d64aa55c887b7f4cdbc48f72a4843a5b6a145d9ccae6166e38710ce2015ccba18ac13c365ac6
 DIST upmpdcli-1.5.17.tar.gz 585821 BLAKE2B dfd47d710751540743f5df38975e2775ac99355781c7d7bf8b50543148bc22aa85f4f851a5628291f11474342caec99ecfa664cd701fbe13c46be1d56cc6b042 SHA512 caaba9d6ee8564e9464f19c9462e2fe4ed917270a9a66a9608895ddc8e060cefa339749ffc284d83a05be78571241e1c0ee74c4b0058bda8c5b1d8ebbaf248a1
-EBUILD upmpdcli-1.5.13.ebuild 1032 BLAKE2B 77a9478420316c2c6a821a41f53c7736d048f641cc1d5e01c1e897afe3b37f1b9fdaa3f50353ba307013826ad00d0071fa3753b7fda37b5fda7b533f2864b555 SHA512 3d6fad7e7496e23114743ee897644284631565ed30d1f42227f44a1bd1b7f88db63a51482141d413597185fb4f78c303e0b676d9f767338c138fa21cb967eafd
-EBUILD upmpdcli-1.5.17.ebuild 1034 BLAKE2B 82488d168231ba9183534916f584a2b3677b55e6eac632ddcf49de5aafc0b1d67c0258ab18a3c827d531fda9444f1cfc20f2dcd8f6b9618428b76233c9167da2 SHA512 d417db2bc657f7f5bdfe32ec08c02d2c17c6e0823746382d92dc4fb9b1aa4bc71e0166fcf269b41d549e1957d6fe73e36d51f43a6f152e4b604335b1145327e5
+DIST upmpdcli-1.5.19.tar.gz 586888 BLAKE2B 1784d41dd09b8bee93e9bd8c650480f48cee8324a0cae85068bb628cb748b223f20a37608369b085c154327569203421d476ad5e6bc1a044fa5d5ad920e2a768 SHA512 517fae799e0d400268f968ea7983b1cb7e22759ad7a0b9fe194a5bbfbb2db16ea26a233cb1784fae6d7e3b8f28ff3443a8f8ab3e447719d05e48be36b49ded08
+EBUILD upmpdcli-1.5.17.ebuild 1328 BLAKE2B 3f12211a376e5e0f478e7a43bfa2d1a496f3291a17929807fea2b318e39a2a3a535e21c272cdb4307a5e6ebab5c53b09533d73950ed6a5be199ef997a5f88a98 SHA512 7a199b09cb0516053adc61b80b81ab72fa878ad00e2d9dc1f6a841a505393bbe26173a3d1f05be28fe0fd62114a0e1bf1f7cf0ae88740a60ab2da97ffe853105
+EBUILD upmpdcli-1.5.19.ebuild 1330 BLAKE2B 1b61c18473af40ec44be8b861730ccaf8f862891ed5ee3b07dd91de66b3708514bdf4fda81b7d2974a55e0dd2514304489dc337f1de2870117df08388558918a SHA512 65e0e351419c1dc1df5bbacb53ebb94a2070a43071461b7c37dd07c417d7ff9a7d11efc822c96e81516ad8d9eb98f7390249329aa9c12ec32e7338b7fc3e8d46
 MISC metadata.xml 324 BLAKE2B 53acf2369d1e3957218ea3634ed2fe10034b9d74109af9df7acfcf29a37697ade6488aefc5df3503754833b0f6dc5df777feb945355f633fa6e1a3ade8b13adf SHA512 871929dc11894dc91b3257a5e9e8f5164e3f5e1af0dce2cc7571dd106cc70bd777562bb56913ca45f3bf1cf0316938f7f2c0a8386bdcf408c0f834385db4d45d
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.17.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.17.ebuild
index 61ec5aab1fe0..c7e369caaab6 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.17.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.5.17.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="thirdparty"
 
 DEPEND="
@@ -28,6 +28,21 @@ RDEPEND="
 	thirdparty? ( dev-python/requests )
 "
 
+src_configure() {
+
+	./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}"
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.13.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.19.ebuild
index d5b5585b951c..68874e5bd6ed 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.13.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.5.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="thirdparty"
 
 DEPEND="
@@ -28,6 +28,21 @@ RDEPEND="
 	thirdparty? ( dev-python/requests )
 "
 
+src_configure() {
+
+	./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}"
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index ed273f4713a7..457279c349b9 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,3 +1,5 @@
 DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
+DIST wavpack-5.5.0.tar.xz 797996 BLAKE2B e2a00052ce887c4ac4e767a1852f0b94c7d23071f5974cb15f33700acaf5b6ae9e5e08a7dee8c66520d2178a4f9e3cc2139da78f040803d55d504b949000c8c9 SHA512 9758e8079618e45e585330cd472f8ddae6e0ffd9a79032e7ec60251fff331390a619855dcdcf92942f5192d6ae12e05b6feca36394d30f0fe7e65222ee2696fc
 EBUILD wavpack-5.4.0.ebuild 846 BLAKE2B 94ced432ab59947059e929f939a2a2ff4d7d06221dbbeb5ba5c6c6c5c2d01864d43647f3bf716c30b179518f4fb01d2cee74283791a2dcf7475e558180ce13a6 SHA512 4b0bdeadd930ba09dcfb105a1fb74fddee021038c980fab742525af8d2e5b22260e88d06a1d69558611b51f46935a64c0171ce28483e6f8c9bf17965129eed82
+EBUILD wavpack-5.5.0.ebuild 685 BLAKE2B 1523feaf34e4a7b151eb0b7d4be201215ef212ae74544481179a7c63cf141ff30413f8cf7f12cb3fe2ada5b5ef80676a72226443427cfe40c8e368a0b9bae919 SHA512 65d30e1af060c86cba16dee17256a3dd12b5fc03132a1a9e0f6795c29f553b18eed67dfb93c752f8de7095d037f1048086c6affbeda86612b2842ed7b61fc981
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/wavpack/wavpack-5.5.0.ebuild b/media-sound/wavpack/wavpack-5.5.0.ebuild
new file mode 100644
index 000000000000..3c0b3153eff3
--- /dev/null
+++ b/media-sound/wavpack/wavpack-5.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Hybrid lossless audio compression tools"
+HOMEPAGE="https://www.wavpack.com/"
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND=">=virtual/libiconv-0-r1"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(multilib_native_enable apps)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}