gentoo resync : 06.04.2022

48 files changed, 1081 insertions, 262 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 39c8d836fc6a..1ac134f9ee34 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 2f20aed26cad..80bf582ea52a 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,9 +1,7 @@
-DIST abcMIDI-2022.02.13.zip 608999 BLAKE2B 5b98d7cb4a51fbc1afca4a2423bb0904b224740bfb1a966fd540bb0dea546292c5c730b5a586422009ebb3090d3b063aa2e850369c95b789a71b59610c97d50e SHA512 b6f26f06a7dddb54f70c176e51a1ed21d78f96691d26bd6fd9780a098f1a1305325cbfa68b0c80cad2773e608005ac9814118bc93f0bf2a86633e89baa3408aa
 DIST abcMIDI-2022.02.21.zip 609368 BLAKE2B 0608d9539d0a66f739a820693c5a9884d1b39b68e4bcd3d21ce020ef240de6e19eacb52bc35ed7a9d4c4fde47e6265c415cf4d80711853904ccdc1ffd752cefe SHA512 515c6ebef75a5b0592578dab6f5d940ed5e25811dd66f15f85ebb1e6fdd7bcbcffdd4d361e0f16a78144323fac14a0cbd1a7ed6b14c7039e2d48986d40765171
 DIST abcMIDI-2022.03.08.zip 609510 BLAKE2B 231eb517a2d47993ed39e509d377d14ec2311fe49128bf559799ea1fabd3ba79c69307f2d7b9d44fec2279e42d0575141088463ca96aa0f9dda5bbecc305a92b SHA512 3267bcecad586e0aadc5fbc2801c0c992ba765094fdf5d3b71a8634f4433a950c64b0c863bec496bd21f8a630c0e768cbc39d50d58e6cf9d2769a66bf265a8c7
 DIST abcMIDI-2022.03.20.zip 609912 BLAKE2B 8972f6944897d49c1281be9d9b1368278d62fcbfc909651d1fb1347d3efef4ab145f049bac05e11f09118548e9c3c3a753f9367c9e90d933af96e74b71bd6b19 SHA512 138480f0d2a36b573e63a9214d7e2e2109a3e6b55e94999376a333da1978fea0addb5359b0d469d801924d6e039b0eb164a28a9cfad02d73cba1069a29dbfc9b
-EBUILD abcmidi-2022.02.13.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
-EBUILD abcmidi-2022.02.21.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.02.21.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.03.08.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 EBUILD abcmidi-2022.03.20.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.02.13.ebuild b/media-sound/abcmidi/abcmidi-2022.02.13.ebuild
deleted file mode 100644
index 3b11050a4f44..000000000000
--- a/media-sound/abcmidi/abcmidi-2022.02.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2022.02.21.ebuild b/media-sound/abcmidi/abcmidi-2022.02.21.ebuild
index 11f547f4cb8e..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2022.02.21.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.02.21.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/drumstick/Manifest b/media-sound/drumstick/Manifest
index 2eeb2d636e40..bad413bf549a 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-2.5.1.tar.gz 1917814 BLAKE2B b4e9957288a05cf74347e39d05a638a26abb72b1dbbda856ad81e7dab87069e9bd4d57ff9eadece1673c0cd5fc9e9149bc4c9a06ff1fadef77c1ad38fc58d24f SHA512 9dba509bb5ef519f78251787a7a2607cf1cee0255d74ab1f6707a0611abbf8963e51b2114d41d347e55d293336e2ca34d9e2b5ac7989fcfe24e355392bae024a
+DIST drumstick-2.6.0.tar.gz 1920439 BLAKE2B 755f252030626ec47359e48a4f8fdd007448dbd61ee41b9d09d3f5b83816bcb15f7555fe0855828c21623094a6845c974d62483bbaf2071dd8f21ed15a506d0b SHA512 68bf1875ce6622a6655c6bc3f768d3ea5b6754eff64b668235a24ab71a502204f34b0b5cf201d911929189a4dbcf1253c21e4388b5a71fdfd4fa5d83ad505326
 EBUILD drumstick-2.5.1.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
+EBUILD drumstick-2.6.0.ebuild 1282 BLAKE2B 1069a61fd6ed18ca150c90611bcf0ea9067bc87827c20af915737699ab1c260d159aa737f3e2823130ca72d72df92896075aea06957065827888365bee2ebd8d SHA512 f11550817d51d69f8fde501d9428850995e8b9956f863a25ebf94b7d280bf411c4639b3e3e0b2e07573c1098d94439eba96705365ed05a1b0f9af16c926806b3
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.6.0.ebuild b/media-sound/drumstick/drumstick-2.6.0.ebuild
new file mode 100644
index 000000000000..ec49cc915a19
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="https://drumstick.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth network pulseaudio"
+
+RESTRICT="test"
+
+BDEPEND="
+	dev-libs/libxslt
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/docbook-xsl-stylesheets
+	)
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( dev-qt/qtnetwork:5 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DUSE_DBUS=ON
+		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_NETWORK=$(usex network)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_DOCS=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 9c0f9ed8b4eb..3cdc1801218d 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,7 +1,5 @@
-DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6
 DIST easyeffects-6.2.3.tar.gz 2621460 BLAKE2B fb73c635b10dec5808d046a4df63cdaaada1c3534f1e9275fdd4f28db52a9111a850367b564b5d008a1bdb7c7e55864e38cc1d50fc363b5614fb138bd0fe0cc1 SHA512 79babe59ef0c86d138b29a4c2dfaa1a937da9de8d7ae7cc40bee6ae5e011b6c43d6ff9554885ce116114943976d50c24c44c4e30775933b5ee8a2bf350d55525
 DIST easyeffects-6.2.4.tar.gz 2648725 BLAKE2B 8d4f10f286ed4b3468ffa2e3b5331b9dfd9c266b0a6a35b373856be14c8465032c79ebad2826ff7ebb1a8db3d81a57fef398880fa7601282da672d5348dae817 SHA512 1c7a9fb95bab3fe039d96420d465d8dfa0d42bf3c04081c5b258f3f227923229f658d6e8152587bf38b26e0a3f3c73b5b89a1a8c9b42807b7e02b776f419e361
-EBUILD easyeffects-6.1.5.ebuild 2023 BLAKE2B 2f097197e93d3e4c62c05a3998c81129291f65c143a36c864eaceb3c941061eb54fd1cc93bda6ecf456dc22b546151e84cac23caeba4b467a8c08eb7e463d115 SHA512 542d72440be49b6229d2ce451fb3484775e1be14169d1570e8b68781c0808dc51f6ec521ff40df8153f084a90b5b279ae79c1856be88017b75355c46dd5107f5
 EBUILD easyeffects-6.2.3.ebuild 2008 BLAKE2B 9b434e4192e1948618cc9f596461d462e30df5c4cced38fc7ba0d9bc18e3c8d6bf743ec3086eb4c781539a20caf42125145830f686936ee5f9db211478b68cf0 SHA512 f81af4dba50434c0bedc5311e6a4d0445235088463bf430300c3cb869384a085ec3f747e3fda2b551acce8165ef7d365d3fcccd0e0985ead8e631fde72f57e08
 EBUILD easyeffects-6.2.4.ebuild 2009 BLAKE2B c8f52c14419c2dc8ce34bdc69c7adfc259bd63042ab8677925800fe25d68f7fb5ecb6fea41c4576716eb3e367044a251412bac3435b35d1bf6fac1494e36ebbd SHA512 6d4d9b07d2e08cc971a9ea543fa38830a9901444453ec80a0e65f8c0bfd28281477cab48944a559effb650744361c0229402c10cc0569372390b3d9d3f3e02e4
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.1.5.ebuild b/media-sound/easyeffects/easyeffects-6.1.5.ebuild
deleted file mode 100644
index ef8f7dcc1bb2..000000000000
--- a/media-sound/easyeffects/easyeffects-6.1.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils flag-o-matic meson
-
-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"
-
-# Tests fail since 6.1.0 due to upstream changes to the metainfo file.
-# TODO: check this every release.
-RESTRICT="test"
-
-DEPEND=">=dev-cpp/glibmm-2.68:2.68
-	>=dev-cpp/gtkmm-4.2.0:4.0
-	dev-cpp/nlohmann_json
-	dev-cpp/tbb
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-3.0.6:3
-	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.31
-	sci-libs/fftw:3.0
-	>=gui-libs/gtk-4.2.1:4"
-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
-	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/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index e2cc08790a66..0b0acd41c962 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,4 +1,6 @@
 AUX 40.1.1-fix-build-with-meson-0.61.1.patch 941 BLAKE2B b55eeaf227b092e11855fbd00ffadb3bc63c8cecb4689ea23351b525f4c8d1452b772edb344c07b6533b2831451e3c522f76290b85314e8db8760559f8c2aaab SHA512 a0e2940c11f8513b501e9f3561e68cbee93932a8b4ef967513399267b21f307b8b7a27eb1ffe89f6edfedf9e36f15a517dbef3fd3c0c4fc8d169356a80e7bbbe
 DIST gnome-music-41.0.tar.xz 898652 BLAKE2B cc72eb7be553ccefe10620a85aa3ee75aa30c1809e810a8ebb30a2ffbccebb9dc173cc79859e098be97fea9c964f0f6969f55c7c84ea9540a93a920376746ac1 SHA512 883f8862d5216ab30c3208a316378c2ef016ba52861c9261b8fa9ceb44f935e4dc35608ea66b333c3bf61c9dcc950fa338adfadc2d5e7f67a7a84467228d28a2
+DIST gnome-music-42.0.tar.xz 1651960 BLAKE2B 43ecee648441dab0b562e5a307554e62b3aac5f55f798bbcdbf99c50fd034b5fe52f9fafcac95a0e12e910499618337e37042ca7482e313b3854ed708f4f4cde SHA512 2e104188681337d200fabdfb2a332e4c01c8c0357580fc6f8c53fa0e44ebc4785c33acf0b32f201cad0acdfc0cb4a6dcf21b15842d0aa0b480add5f91d2a46e7
 EBUILD gnome-music-41.0.ebuild 2038 BLAKE2B 320ae70e53fbf0fd10d422c9474e8ad51e9fec306d44286fbf00cb204b4b7bdfdbf1b3353e34d233e7dde1f99dda502874c3fcb4afa6c7ed59c43797b5d68275 SHA512 c39ca3701a2d60bb50c410159307ef08eda5af203e13fc1d023bc003578d15d3cfd04081d3aba6b429bc03305dd7db3a20c079c04db1623d3b69837d995a1e82
+EBUILD gnome-music-42.0.ebuild 1849 BLAKE2B 3d05926c2893b92f9364e5e1117edb7bc344119488e89c6c43fcb0c84c07eb114f5f279f19083841dfc8ae091592543590402f49aee1679bd5416c9abeffa450 SHA512 c8b1f5e332642b3c3ad34893f80da7620b458707303509bc00b6df1ef1f03ea054307cfe1dd9f082d95f931a5ce97fc20e588c446c00e670578026b25a0f4cfe
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-music/gnome-music-42.0.ebuild b/media-sound/gnome-music/gnome-music-42.0.ebuild
new file mode 100644
index 000000000000..1ca03facd942
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-42.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music https://gitlab.gnome.org/GNOME/gnome-music/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.67.1:2
+	>=net-libs/gnome-online-accounts-3.35.90[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=gui-libs/gtk-4.5.0:4[introspection]
+	>=gui-libs/libadwaita-1.0:1=[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	app-misc/tracker:3=[introspection(+)]
+	>=x11-libs/pango-1.44:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.13:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.13:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		app-misc/tracker-miners:3[gstreamer]
+		app-misc/tracker-miners:3[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 439bc6d73bcd..48ad2baebfc3 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,4 +1,6 @@
 AUX 40.0-fix-build-with-meson-0.61.1.patch 1456 BLAKE2B 3326dd305dbb9ba2fb24de56d0d6d96507ac6d995f3b01ce2cbbe8fabda6a697e8a4f76043c75ea8415a751b547ef7a58a8d1bdfd8799855d5d1d846567b5bf6 SHA512 d409749979f8f2f07830ca36d902b886cd92daa47fa4fc23b837c988ed2fa272bfce63242bbc08b48e6e6df686139a220c3fb960008b0b7dcf929c0b9d3d9393
 DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
+DIST gnome-sound-recorder-42.0.tar.xz 162208 BLAKE2B 6f4f17ad5cb2cd893626defb3b91e62c0dfbfdae4c815df934a2d35a7b0e315f689f3ea222d9adef960935828095c337e00076aba60b4c1b3d243c274063aed3 SHA512 53fe2fe0646c5055cedc1c62cf87176dca52bf3d9452d83bcc849d9946179afbef826f08ff65a97ede7a0d14ade4da0755b2ef3780460d5a80f8f9e6c85fcfbd
 EBUILD gnome-sound-recorder-40.0.ebuild 1116 BLAKE2B 8598f16aa62a75219e15dc6c9249b14d80463c1814d89de996c6a58f2a4553ffd8a3e8544f7e1b21915455701c4c09a319e10e44bfa1039de55ad0ef03285ab9 SHA512 8499a041cf2d6cc1efc2a99d2eafac12f080f7176169579df21521b0eefb94909d074e09d1340f162de3d5673b97aeeae544700569b3cc14b89b7fa3a19784f4
+EBUILD gnome-sound-recorder-42.0.ebuild 1104 BLAKE2B face159f8593dc5fc1eb734f38486abae2eecda3c66a2bac545f832ff2a8ef38307224179baf6ca7d05f0fd8241cc8cafe555c6d9673cbe0b6dce30d2e3ffb36 SHA512 4b368c148c36ca8158c88a7bc78056ccd8fbacdee90db6f4e2c5de881ab5f47083c0e5ae006208117d779e48c6a7e2578d082c560f04058c204ef14688418269
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
new file mode 100644
index 000000000000..e125245f0098
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder https://gitlab.gnome.org/GNOME/gnome-sound-recorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-libs/gjs-1.54.0
+	>=dev-libs/glib-2.46:2
+	>=gui-libs/gtk-4.4.0:4[introspection]
+	media-libs/gst-plugins-bad:1.0
+	>=gui-libs/libadwaita-1.1.0:1=
+	>=dev-libs/gobject-introspection-1.31.6
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection,ogg]
+	x11-libs/gdk-pixbuf:2[introspection]
+"
+RDEPEND="${DEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-flac:1.0
+	media-plugins/gst-plugins-pulse:1.0
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 233071ee7dc9..58ce7553308a 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -3,5 +3,5 @@ DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b
 DIST lollypop-1.4.29.tar.xz 593980 BLAKE2B 8a3a985cb18c196665377c7c29670b98f352a86284ee8bb5af13b1017346b0b2b938dee6e53d56d0b8d98b191a64e5efd1c7126879c7017c3f10d5aa96570a39 SHA512 f81315a94cbcc726cd453d58faffe5c33ebcbdaef55a5a36d2a9dc20dec9340c2d263d935b5115148b049fca52e57c88eac36386e56f0965f22674eba26ae813
 EBUILD lollypop-1.2.35.ebuild 1486 BLAKE2B e3aa9b6c542c534cb8604b496f720c3f169aa2d2fad9ad42425e8c83469a71c70bff69db2d4931b7ab8867d106d5b882450f6c0abcb6aa945f0054b22f833fb0 SHA512 2991f22830609458fa978a7f780fcc41d0a60e24553aadf1e2c22c549c227c2225926581ca20d2e191744db7fafdd7968049bbceb2e8e4d1cced5ddb2b5054e8
 EBUILD lollypop-1.4.18.ebuild 1510 BLAKE2B d83df553154e9b877566350e892718b809885a841f1a631453e1b85ba7b5cb438e4700b171b49fcda3111487401adc2b9ee8328bea1499c49343bbf628d31578 SHA512 0bf50827296c1ae0ebf32277f6d54ea0a9e00799be2347ddd0c34ce132c4bad25aadc29d36b908d4f33311de391183e059a32a56c8c91673433e93ba071e21e5
-EBUILD lollypop-1.4.29.ebuild 1405 BLAKE2B a2045bad4bbe2e9c98d7385da95e69e374e16f225a89946e90dc48321b9570633c5cdcb53190fcbd9d4567bc3d5a128fa9aeb3ebf32dc25d1c50fb4400cb9cc4 SHA512 71f4d63d112431e7b33595cc213bdc403c9446d36c32141d53b18a79cf3a78a97c3fc73c848d7b9c501df22934f9f641301a1af35857014cb776f686ce8ccfc2
+EBUILD lollypop-1.4.29.ebuild 1404 BLAKE2B 02237dfbd2e5e43fee563919509e80728c81d90ea76b287d8603b0b6ad3fac02271107e9e5c2a7a26a8dfc31531b8113d59ed537f41e709c26081325e442a5ac SHA512 ebd7412582861f64cef259527ce0a27a0f4cd0709783be3f4387127796d3e8974acf0b9838ebfe32606c3916e5a37f2e183e835a2bda055b1792a5707c63f891
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-sound/lollypop/lollypop-1.4.29.ebuild b/media-sound/lollypop/lollypop-1.4.29.ebuild
index c123937bb8ea..eb8feda0a35f 100644
--- a/media-sound/lollypop/lollypop-1.4.29.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-sound/mp3diags/Manifest b/media-sound/mp3diags/Manifest
index 097301c6bade..b34a2817b344 100644
--- a/media-sound/mp3diags/Manifest
+++ b/media-sound/mp3diags/Manifest
@@ -1,3 +1,3 @@
 DIST MP3Diags-unstable-1.5.01.tar.gz 1234926 BLAKE2B f04a30d1418cde4b08aa744f2b280beac5af466a2657562ef9f8eafb3da84a357397975bb9c1cda4747a10ae1b9e0ac468f6666bd43c0f375fd99c2a90fd4698 SHA512 30ef7276e1be08c0d5d1d6af2a1f6f4fa61753fda65e0914c0e07a0823e1ba9a0e3a2718bde55d68e928cb965db510c80bd5f2419ac19d063edd1fa257a1ee18
 EBUILD mp3diags-1.5.01-r1.ebuild 1077 BLAKE2B 8cdbfdc2b545292fb2fc30a0da5c65b0bbbbe50f02290f4502e8f00bfccdec2790bdda3fa2d3502c3f6c2e919819ce0e03764b06306cec37ae2bc64d7325a3c4 SHA512 54b68ff39a52bcffb424690c8c78e0b0303177b5cfe9f0fa7cfb7be22f0cb2980b94789f2bf0cd467e70225235965ad72365195c0496f330c98cb61c015c8d17
-MISC metadata.xml 300 BLAKE2B f2320093cd6cc19aa656c6490cb33e50acd6157ccbddfae0405b1d2f227801606184e9fa8191432afc66aaf052c91c31d6d4fc6bf8825abac1a99b664f2bd498 SHA512 01e39fa4e9667eac2371a90016d8b8b96e89b39188b5c009619226d1d78923b02a2f0608ba58681a48f978dec05c1890a23466e03c62ebf274ee6c25a91e5b75
+MISC metadata.xml 332 BLAKE2B 5d432a595da0bc9ebe50c00d996813fc1b3a027e6c3773a3674e563c487efda6a0199d910bf96d9df9db03394423e2329200a1bd5256665235dbc7770ab52ce5 SHA512 f695c15ddc1c23b4ea5364e63da1c82ae4f8eda992be405f0fe3651d4062636e4ffc0f178ece68a6c5c2f0834dad11bdc4552c990c3b1b4e46e40b95f881b743
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
index d79ea07acc6d..27fa0e2a8c7a 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mp3diags</remote-id>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 88250688bc8e..8eac742aa967 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,7 +4,9 @@ AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b
 DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43
 DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
 DIST mpd-0.23.5.tar.xz 770700 BLAKE2B 91f0d37bca0632a414083f6ecf8838ba5dc4ef4965692b14e56587d3d145140f61bcc120fe4b2bf83eb41f2a7e085da4d999efc19ca9717d2552d92fc6359c65 SHA512 3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34
-EBUILD mpd-0.22.11.ebuild 8436 BLAKE2B a07747651ca6a8bcb3afefd608dd889c0db955eea2f023765f222b9bb6a69758a8723a1407a94c37781a065689435f23967d8065dba411a02a94066ea0739874 SHA512 4910fd0569efbbc21f8b592c11a29db6ddcc5a9bf426b596b358888028481f7e5fa6c919fab656383100e112f82568a914e8c5d1770c253c94e80f4c7ca3d0ae
+DIST mpd-0.23.6.tar.xz 770812 BLAKE2B 5ccb4a7c06c4317e3285846a261438bdcc10db5eaf71fcba969bcae8321ca50bb26fe9317e23e38eca1c4a8785015596064d5bfc692bf66f8007d0d2a1b71cbb SHA512 1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d
+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.ebuild 7776 BLAKE2B 464cc6ba1c6a135a731033025546c8778835dfeaf07c21407542fc3c396934f15ab862ac4df8acaa8e3eda46cec4470309f74264c6f784d192d554480aff39b8 SHA512 4af6f0e9bc4b7556cad0bc503ccff135a95a8e46eeb951dd3deac5dfeccded855147dda4edbec8dca7376a640b1b938b1bf7fbbe2ae756e25d09220c0d41507e
 MISC metadata.xml 2724 BLAKE2B 08bb2402db4224ccced73cb40aa2e3d7e9a9d699277c999e08f12bb0cb1bbd1406c6fb20b9b80cfe3a41eae05e28f4be30d5e59482132723a82d4ef6de81219f SHA512 112a969c9150a17bc99e18949bc32ef15fb2d06903c0ac5ab455d29ca0cae0f2150b90f0e94cd3a4755c5f545b23c0bd5ec2de93bd154df1d70f224a0f8011c0
diff --git a/media-sound/mpd/mpd-0.22.11.ebuild b/media-sound/mpd/mpd-0.22.11.ebuild
index 213a39d7a11d..b2e8c030c99e 100644
--- a/media-sound/mpd/mpd-0.22.11.ebuild
+++ b/media-sound/mpd/mpd-0.22.11.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+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
diff --git a/media-sound/mpd/mpd-0.23.6.ebuild b/media-sound/mpd/mpd-0.23.6.ebuild
new file mode 100644
index 000000000000..cd26cda82402
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.6.ebuild
@@ -0,0 +1,290 @@
+# 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 ~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
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	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:=
+	dev-libs/libfmt:=
+	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/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 8eaaab29d820..5b480c94644b 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -11,6 +11,6 @@ DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 EBUILD pulseaudio-13.0-r1.ebuild 11420 BLAKE2B 9dbe3d7ca0e295c016925e23369ec3b499dfa2d48c67289936c4211c07a72512251efc2e61688571ed5a0b6406a85f78efecaa8f5385283ea40d1659ceb54a86 SHA512 d5a27a4a1382dbaf0df03f72c020ed35ca221f98e3231cbd8a210656fd45a355091c7fdf1754e20ab63a97eeafedffa49b6a307a7bf0ce410a5cfaff998989c8
 EBUILD pulseaudio-15.0-r2.ebuild 11169 BLAKE2B 87e797d697ecdf882c30da4bb573322dab4c2a24c92f18738c93cfad16cf9405d1a3745db130e2774758b459e131b06f66b5d794eb0fc40d760ef8b2bee16710 SHA512 d751359d6305ceb29957a325aa77b4a1b4206f5d86ed98346df1e9f272f06fb43867e5154ab65b8911d36816d74d7238970ceb06b792ea3e08ef5ef63fa5b663
-EBUILD pulseaudio-15.0-r3.ebuild 11212 BLAKE2B cbf1479051d982919197e9013a00dc42e738dcefe38b58c019004d5ecf5b38e1da9d4d3aa20d1faf9eb9c10cd47453eadd8409f8c394fbdcb38739a325c254d7 SHA512 6dbe1a97baa02969d5552d4bf41369146db6f2892130a5181ef8817cc008a9b97dc456a2c3de3b9f9d63ade2e9966a4091b677bc5b0572d699d2d00344a83c8d
+EBUILD pulseaudio-15.0-r3.ebuild 11223 BLAKE2B 5e53bf307583e8cdc465d9c724397f7c6b89fe9070e8209568666200c9de4535fca1589a34ce26c47dc63537e43e582fae3b220a7546f4bd8ab477040c24ce42 SHA512 f20cd43da0a287aed5aada8d37610ec0c5ad063c525f549f575bdef646bada604d9a3736cb2d7be08a6477c7bff400cbf61a1f15089a2a73dc62ee7ec41eaf56
 EBUILD pulseaudio-15.99.1-r1.ebuild 927 BLAKE2B 88797ff7961be78ed9803c91b4a6c84698375013da41f45ffdb65c2704ce9e05caa2513d83ae8a98d1efffa91eb1d08ed7460959ed438d1946bc2521a4092996 SHA512 cae78b9ebcc65803ffde0b09300c5ff43fb7c085a6785f220a549f2e32cd5f8ac2db148487e452bc535d9b85055bc71cd00150aa36418f7128fbdeef4a646d7e
 MISC metadata.xml 3874 BLAKE2B 0aa44014b4b731a193e4bbf4f0eca2e3df5946d8e210f90679d7625b61f18ff29c5b3dd18999b489997471885fd1f3f8fcf722eae2cf1e4210e236f8b025540a SHA512 01c4d22c01cc92570dbfeaa749c82b434ae25520ace0258bc61f74fc51beba1235affb39b4eb1609c9e39d6215b46b721524f606bc391dbc6955084186cb1efd
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
index 21060b033fd1..df8a1deea80e 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
@@ -211,7 +211,7 @@ multilib_src_configure() {
 		$(meson_feature asyncns)
 		$(meson_native_use_feature zeroconf avahi)
 		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_feature gstreamer bluez5-gstreamer)
+		$(meson_native_use_feature gstreamer bluez5-gstreamer)
 		$(meson_native_use_bool native-headset bluez5-native-headset)
 		$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
 		$(meson_feature dbus)
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 6d961e947bd4..4179f0d5ae40 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,5 +1,7 @@
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
 DIST qjackctl-0.9.6.tar.gz 1271177 BLAKE2B 8d4d6a5ddb712c7ea8c7494a0392250e8128b4284addce797031294c19059e05f7db43ca2b421d7ebaf0abe8db95e2cf098dec3fb2b520a3ff282383fe169455 SHA512 0af54ffc9a4afa3672e5996273f2ba20c7b0aec2d64831944a3aed16b7d33a48eca7d71dd799f197e450c44010065ea9e8ca9d5cc307af926697a2f95a4fa023
+DIST qjackctl-0.9.7.tar.gz 1273517 BLAKE2B 7f6803868c079dfd6c734a32eff066b326cd89508a5c9c94ae29589e6f318e511c59404ab0fbc8e5ecf71695522c9b8130710c571dbd00233942e107e300f810 SHA512 dcec597019c0e59ae74efede555a5f1534fa4d17e6c3d30af43ac7292552cbe48298ae39dce739225b035c0daeaafac7f2ea0b8df6ff25c36e6bd9336e1827bc
 EBUILD qjackctl-0.9.6.ebuild 976 BLAKE2B a6a05372bde75dd58333c396065004ac4a1dcca0740602b66607c2034102c222e78e0df210a3232c9c1fe4889e0dadd1184453c5f6f851c7081b741398303589 SHA512 36e100173b637c3b4bea81f7f4134dbd6cd65a285be5ce93ee0b60cbb06551e7fb41f901fb4f9bf0c2aa27cd38b5cfe5c68c8cbcaa612c9e8f8aad7717838eab
-EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
+EBUILD qjackctl-0.9.7.ebuild 978 BLAKE2B 1cd97fba1596268e1b574e7712d53a4632c05f3e8dff249baf579ececaebb2e72fa03b3e7a24f6dd8843241ab13e6a5e0d19ab43607102955b4b074b609e5f30 SHA512 e14fba2be8e4de5a4781ea3806a8f60ff3ab430fb9f57860ed502efd83d5efb6d53cf983a34c3b3bcec218d39cf21b585561fdcf952d2dcb88cb84e760118339
+EBUILD qjackctl-9999.ebuild 920 BLAKE2B 1d966d83ed7d06090b7117259727d872cfcc78963b9fdd61324d321694fdb85d8f9592ff2b428feb13259dc276189ef032fc34bdba258e72d8dc5de699709c16 SHA512 b581805aff62535801ced064ed7ee16f72884ca4b7442062e6961dedd20d58abba68cc7ee292e759e52bbfe2868f442c8dba84ddfb4e1bed1f18535aded1f1b7
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-0.9.7.ebuild b/media-sound/qjackctl/qjackctl-0.9.7.ebuild
new file mode 100644
index 000000000000..127871210489
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-disable-git.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 7a871d8a3a0b..ba619f94a01f 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-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 xdg cmake git-r3
 
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 373838323a16..30c0a2c760b5 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1,6 @@
 DIST qmmp-1.5.3.tar.bz2 1388836 BLAKE2B 90fe166204125773d888f54f7f2b044215816ca337f079a73bca708440dc011c31a17afd7070a43103374f21879932527c123d5fe3066b46331abbdc91f8c224 SHA512 135802fde0d8ec0cad4ea1968dc6a4ab418d403ce2fd8fb4f96535420c84f7c56b67491e80b700960ab7d99600657dfe661cb2fd6bec3ae3a7c8cd809f16d9ba
+DIST qmmp-1.5.4.tar.bz2 1388941 BLAKE2B e1a205b6315cd841c7d7a94ed85dca7fcbc74416dcc09458637ccadab96c3a2614039007cdbab404098d2818f4b5cdb7a0bc5cf27e1bfdd0f146d73e2834f230 SHA512 5dcc543f75f3baa6115c7c692acaca00b1ad6b62c773ac18ad97447fc17978f067d85b132d1fdb65467474417b7d7e8d8b43e0284196978ca63dd5d431a23bf5
 EBUILD qmmp-1.5.3.ebuild 4110 BLAKE2B 7b193d02974a783fe90f39c8a698420517a64bfd616092873ad64799427c83deb633d128477fd62c7478afd6ed156f47888e57b3d8f6b050c0e198474c361fe8 SHA512 a58932662dbe4b47de5def1597b8d717ee428830248b1d394451660c873978bf880fa0199e43a717c1332020cdb18a2b5126131fae016b18ebb67cb354d7861e
+EBUILD qmmp-1.5.4.ebuild 4112 BLAKE2B bf5c0a3724e3670be2a65a996ced8fdf7bae069fee3d6012c2008b8f53ab23ff3713806ab3d546f413f16e8215ecb44fe7a8d89056eed1559c0124af34f1b80a SHA512 7e3755425e4c04ea312512077a52e90fb5965b701d99919e14f4b8d082e874b947584cec67a2d1399e5cb28aa37dda9ed710b210a4a1c57788efcce4e31ed537
 EBUILD qmmp-9999.ebuild 4112 BLAKE2B bf5c0a3724e3670be2a65a996ced8fdf7bae069fee3d6012c2008b8f53ab23ff3713806ab3d546f413f16e8215ecb44fe7a8d89056eed1559c0124af34f1b80a SHA512 7e3755425e4c04ea312512077a52e90fb5965b701d99919e14f4b8d082e874b947584cec67a2d1399e5cb28aa37dda9ed710b210a4a1c57788efcce4e31ed537
 MISC metadata.xml 1883 BLAKE2B 8f252d3c02181fe5c7897a6f23b689dc75b507af80e765248ba856c8cd6564d162cfa60190fdd57350e1cf00229391f5057c1a51853dd2e291b3bc7311049d8f SHA512 affecdc44bc4b87cae10aba228f52b6eee63f759fa70e609206c9a4e627dab7d89741cdf51a22fe4b502f8c8d62077512494c893c7963afeb7d0cc0c23f945c0
diff --git a/media-sound/qmmp/qmmp-1.5.4.ebuild b/media-sound/qmmp/qmmp-1.5.4.ebuild
new file mode 100644
index 000000000000..ee881e5be18c
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.5.4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit subversion
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		virtual/jack
+	)
+	ladspa? ( media-plugins/cmt-plugins )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
+	projectm? (
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia ; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index dbe6d0087b55..9bf252854010 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,5 +1,7 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
 DIST qsampler-0.9.5.tar.gz 222375 BLAKE2B 0051fc3bee7b3c544336b68ae36acbab265eb5dfd7750d525402d5ffea6ed69481fcccd77ba54df37c4eb2305ad25a6a56181aa4fa12d6a3afa86e012be5cb84 SHA512 2f79e4928ccb2cecafe63fc0b35349ed2ad4b26fe4436bdea0446f1d54a61478dbd5df87445bdd77c5ffd6c5e93e478c90b1576f4c1105276abe34a99b6a30e3
+DIST qsampler-0.9.6.tar.gz 222973 BLAKE2B 944616f522df1e4d5d8305f474f1aaf0f5c39d41860b26f057122463a866ccf95c283ec6a34ef204580627b1e9b6aaec4dd6bf65364fab67ceee91b9d08879dd SHA512 a2de808d3b4d41970b11eb41c972b09568fc478abb0e039725bb8d341b988986c239a82792ba5051d552264dd44d68d3d58f00e21412a154fbb476421262381d
 EBUILD qsampler-0.9.5.ebuild 1124 BLAKE2B c678830f8637123b03ab9b76ff3011646b3300a96bb97e714aee0371ed138315ae0db880e142706b0e9eaa791f920ac8dfed6b3ce6f3d156e16d2786cee39262 SHA512 a001fd94db2b62d6b8be35058e5a25af2b20e73ce67e073345ac20599e5e2d4f17a92fe6ae4b27d4294e1b512368e585ee87a5576dcbc128fe0a73e988dc60a5
+EBUILD qsampler-0.9.6.ebuild 1125 BLAKE2B a1c614c76d6bdb057cb7d82c595822b3fc3e0277547e6d49503a45805108c2bd2202677fdfcfc638ca6355160570a5f9795b1e42271fd445a93e7b5d00276ad0 SHA512 622132777a24f8e2ae8a8cf211bb553c895b967c93f8d5533681d35f1662b43b1f8eb087d54b03d85ab1ddbb2bda6b75f80c6bd0fb048c835319da984e3e7874
 EBUILD qsampler-9999.ebuild 1066 BLAKE2B fb8717ad1c4fa88cc5a0177a6fff158cfca12c0b5ef717d808ae70b721f733534895dc80ac9f3ae1a0862d44e3e1354535e72fceff18ba62d5d66794177659a2 SHA512 fb773e6378edccd26ad0e6be0deb16481b604432e505ac2581c4cdb5c431aaf70b9055abf5dcb6e5dd84d5e8b9d23467113e8bc7ba118aba40ffe873af3ae57e
 MISC metadata.xml 494 BLAKE2B e15f94a046f20f6430b293d548b1b9694e172b083d51542d398abf2de7beea5aa5915b670ac335bc31f797dbba71e82db55b72a93e88bfbdca8d862d9840975e SHA512 b136da53c09415395c0529c6d02d328520617737bce205ba1089725c3705ddea4be61e8208d814479976a420673498fba53caba64b5e0cb49ffe79694045f25a
diff --git a/media-sound/qsampler/qsampler-0.9.6.ebuild b/media-sound/qsampler/qsampler-0.9.6.ebuild
new file mode 100644
index 000000000000..f286d8199e11
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +libgig"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/liblscp:=
+	x11-libs/libX11
+	libgig? ( media-libs/libgig:= )
+"
+RDEPEND="${DEPEND}
+	media-sound/linuxsampler
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-cmake-no-git.patch"
+)
+
+DOCS=( ChangeLog README TRANSLATORS )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index f8f3250092df..f29d5a6a4218 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,5 +1,7 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
 DIST qsynth-0.9.6.tar.gz 334419 BLAKE2B daeb82f102a9a754b708b3d3ebc1963a1cf08180ec16971b4b6fb2ea3b35d7f1ca3a663bd9381d4c90052e1c781a6fef64c4cbf0d456f47ac12791da485979ea SHA512 4f596fefda29fad9298539aaf83bdcc699846416d10b1259041a414f3d89ecc76a6cad338742bac8ffa0ed78ff462fe70147e1ef6437c20241598bd7a1d41a84
+DIST qsynth-0.9.7.tar.gz 335564 BLAKE2B 7f74aebf0c635943e64be636035f86bb74e94514f97f199046cebed37675503c15225f626aba9bc862d07b13d941bb26bc3d3550f0f2c0dc32a8ed6db6c7f029 SHA512 1df8b96423a44d2a3db47417867319cea5df941e4e17e7b04c5b9c3839fff4c7d77cbc4a1ba86a2c17f5bbe13aefa59fc46a8769ecb1a2590c1f4c6c28ae6081
 EBUILD qsynth-0.9.6.ebuild 1409 BLAKE2B 3da591d928a9b272f52f4cb9a52701df395e07e6a5595b44bae22405c433de7a3d42f7831ad99e9a545e7abb50306bac1ef0f8b9ae170ba5200c29015bad303b SHA512 97c625f61f97787d161296943cd12582919faf498c44a09e43898bad69513dcf3b27bfd286cd0b48693b3aa4b62c4e7acf1dbba20fab8c1c029b7b4554a02310
-EBUILD qsynth-9999.ebuild 1347 BLAKE2B f1e4103cd0ba4bbdb8e8b5e263d00027002501f0d8ad47045956722873959d7c3583bfd9793d44e2dd7f9cc7dcb9926daa7b5e9888dc5646aee72fa304b937a3 SHA512 6079d681effc6f56514d40d79be09c28edf24562e8348467182a06ae06649a3df11303f7832a02de59736993ec173ff9635aa3a7c966facdcaf53d8dbb270aa1
+EBUILD qsynth-0.9.7.ebuild 1413 BLAKE2B 94f3b565fe4092f371bcb9e668ce11403dd384ce2932846956d80fab08b7fb18d00892b4f1e0cdf40f17d002897e4076f701119b965dd7dbdf28bb564ecddff4 SHA512 d46ea096cdab2d24bd73e42f55c5056ac408baa42a0ba5d215683342605c04cfa4c6f404dfaa0e2d6a9c5fc1ec9954835c8af88e5e0a51fc60fa15817b5e7733
+EBUILD qsynth-9999.ebuild 1347 BLAKE2B 219e5066d51c2aa4216f883b2a8e59de6f081caa033cd9810a4037ed7aea15225937e2c9c38cbd6d970c9ed1678f2d95d3b0a8cee3f6994243f77029a13ccfec SHA512 e423e026864f91ac8da553c616be407843ce250c504c96a7616bdae9821483675e338374474d0555a62859aa9b10478e2b1504cc2985b39dea534ea74e0a0932
 MISC metadata.xml 756 BLAKE2B 41cdb1c211eca3b2ff4218987850219ccbf3b0cbc6d76ea1841044811b52dba32bf2ce48be9b10bb40f7778188e5ebd4df29e0e865fb3b0017acfc1a6965efe4 SHA512 3f1b3281eb2bd0bc7a4f3ab87354ef636c1e8acdd79d7392d1d54c49be7c6715ad6e054dd6c1c6f9bd1186c2dd8aa40662008bfd79f72816c8de6e9fe62dd626
diff --git a/media-sound/qsynth/qsynth-0.9.7.ebuild b/media-sound/qsynth/qsynth-0.9.7.ebuild
new file mode 100644
index 000000000000..802d146a7511
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.1-cmake-no-git-version.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index 764b1b7b1cea..76fd6013eca5 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake desktop xdg
 
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index fb60ebf96b2f..e2333582d720 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,3 +1,5 @@
 DIST quodlibet-4.4.0.tar.gz 5126584 BLAKE2B b0d69ccacd009709148580619bdbafafb0c76acef791ab0025eda687cab4886b90f2d44fb6c37de80481e976ef4af466d209f7a7c6c53fc6794c26baa25d7bc0 SHA512 3a3c88c9283c3e14ee8b3504a9be9616a7773ce6819e832a76e1f926f9a1f86bbc68ae2dd98a2cf292ebc48216aca6e8a29e32f10d26b176effb62377183d13e
+DIST quodlibet-4.5.0.tar.gz 5585193 BLAKE2B e0b5ac89cc9fc8cab9beec3e32fe781b70d2704ae1f0304d0dd0250fb0d43ec0601a84c3940d143363e7294e68c5b5aa1bcf483ee0cd196fe0d61deb5da52b5a SHA512 4adc96b036bead26e8a0039bc0ecfa5e0a7a660647dd757afcb68887922fbb8c79f4ba3ae70f6870c17efc43da91a57f2050c15f7181317a1bfa1f841ddb91fe
 EBUILD quodlibet-4.4.0.ebuild 1526 BLAKE2B 36997e9d350253bb1dcd968d65f3638f1d572803954a9b4cf69e656b61a094637e460507d738a40e4b34d30489dec1fd16ce7a2e20ce14028efa7d24bf9634fe SHA512 542c25920c985a31d34ad7408db33c14fa6318361666ff186b17df4e4c2e872e46e70658214259612341f31e600bbbc3f5848f4acee720b8388c7ec4e7c06982
-MISC metadata.xml 1019 BLAKE2B d258af9e2e1bd3db516b4808a016610e0dc64f118a4a990297d66a444b62b8c0ea1f1183542556655d2e90a9d166583236d2968e584bef5a67de426d63bde3dd SHA512 e2c2161c3116a0387f0603be6ea8b992147679a2b9bd2a16d56a1f7cad4311d2ed1531b998b15cc61dde86ab0fb8d227e297cb802fa721abb4cfb00addb46490
+EBUILD quodlibet-4.5.0.ebuild 1510 BLAKE2B 0d69677e6b2cabab1d7775cd7a58ede527d52b26c6371df1be33e3842afd34c4a4f0d8b291faac6c44dfe1dcbbd9443c1a81635822b75c032df111f09b125472 SHA512 88111fb7281347f2c25825aff6756abcf90cf169899591450080c41dc41352b89f7e7d03c2f7e26aa1f488a40981fc91c97155a9c6ef1043953154e5c0383706
+MISC metadata.xml 907 BLAKE2B 079086ba811d0c9051e0593684b0b99cf434bb29c9f47a98cb5e158861757fc012238c741274acb06115a53459fa9f321c854e434fe1e8f920309825030b188e SHA512 b4e243593854233160621d731447cfac3d2e4c1e732f975cdc45ff1c44cffeef648abaefe8b5b7c34b68af4aed4fced0d77c3d5a5d468620aa223d61977c2122
diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
index 095e0d8ee974..56f548197440 100644
--- a/media-sound/quodlibet/metadata.xml
+++ b/media-sound/quodlibet/metadata.xml
@@ -5,10 +5,6 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>klausman@gentoo.org</email>
-		<name>Tobias Klausmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
diff --git a/media-sound/quodlibet/quodlibet-4.5.0.ebuild b/media-sound/quodlibet/quodlibet-4.5.0.ebuild
new file mode 100644
index 000000000000..ec3742406186
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-4.5.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 xdg
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="https://quodlibet.readthedocs.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+dbus gstreamer +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
+	net-libs/libsoup[introspection]
+	x11-libs/gtk+[introspection]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	udev? ( virtual/udev )"
+DEPEND="dev-util/intltool"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	local qlconfig=quodlibet/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc README.rst
+
+	# fix location of desktop file
+	mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die "Failed to fix desktop file location"
+}
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 7410109479d9..c74fc82addd6 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -1,11 +1,7 @@
-AUX snapcast-0.20.0-gcc-11.patch 261 BLAKE2B d41a0a47549e2f40bef887b5672a4ab1903c540503149055a0bdc25f4f4bd94a6bf323981dc1d6401e0882e7b41fadfec98833b30288af9f54177870c6f0d8dd SHA512 0917f69616376ec0c3c44a1cf4f6fdf2dff8f9e74e77e8ec1fa1c2f931139949757490fe49452b979bcb9bcb46fcdaac4dc04b148ba0ee88bcb5c0271f1c7e95
-AUX snapcast-0.25.0-cxx17.patch 819 BLAKE2B 67065e1747a49cfdbf52077890ee8a9b7b1afdae7b6edb9df541b8cc462361ca3cbcac0f441c036ba99bdbc3174e0841a9f32601a0005def6a162d7e60e7a6b0 SHA512 6308a22f055c7bf3180f1519e6186145c7bf75d1c6eac2382d0a2119203b909cfe1574a525a9a911c8896e206ce9235c585e4a54c55782ea6b89b32886def2be
 AUX snapclient.confd 641 BLAKE2B 74bae4c2c11fb7c1a7d4f2bd0f199c92a5ee11f68efb71da00026816f9dd7ba3555cc96c1e68be04dce26ea190a8e353c71817b5655ad2d9b43e3e510345c97b SHA512 f0adfca9354a4f5acb2def99585409e39229053e2b9be36309a67ac0b6935b1aeb061380a9e8a61d70bd902930536ec3afa98a6a708b08008eea1eb080fd1a5c
 AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd987fa51e9885f4968b0144106883a1a48e502c3e3558ca408babd38c46663b13ee56215caa108c3be SHA512 f429dfef7abd5705a8afc38f68125a7a6e5a812cd68733c8f47a65c7fb6aa22fc665c91e557726b8f35edbaced7b2e72ffad0ba123a6ed33bf8a6d333e8c1bae
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
-DIST snapcast-0.25.0.tar.gz 1412827 BLAKE2B 54d0c7b4fd20ec7d7ea414ed9915da9458c0875e5ca0277ba9c4d1415d50b0ef5940530ede3a09fe7d6bb94c7b17c7d0c6194105aa88a9719506f7494e79c723 SHA512 bc5e0540574f96a73971bae4b185a96f8ce0ca6619a51d9418368cf19f1e5b5248052a3a1e8922a15ba6b54dc8c3234c2f800fa2951fa5e97b9dd5610f78419d
 DIST snapcast-0.26.0.tar.gz 1537036 BLAKE2B f6ef4393f3601c749140a9505f57515582147aacf25072d9114491aafb108c202c3631142171858d2b8f914be8105bbd9c66054c6d36d0b4a443e5b9a642cf51 SHA512 fc7885e42a11794e33314544083251ffbb91a0cf160c6d4b854c56f57ffe9f38f75c7594478c9edabfe9076959938cd8de891dd456e66202692de664a75cde71
-EBUILD snapcast-0.25.0-r2.ebuild 1644 BLAKE2B 064b1fa8101911973d6e2ca077982e5dcff7ffc3c7af92b8bd6fd8b1df435e458b7ff46e9a31fa27fb4a1556b0831980845d04644d5fe60e993e2107f5729671 SHA512 403c1b3347f50a49f87b205ecca22f048963b586752adb8eec6e7f0b3ae3d87772e641b681d25e578463f538afabe35480dff03779f052935b2264659120631d
 EBUILD snapcast-0.26.0.ebuild 1570 BLAKE2B 4a2a6854bef2c3cf300cdd5c0d5d65fa01a3aa65dcc90d4021fd7628d344411328da96d8e429cdcafc9ef72470e73d0f22092858a24248f6df9691dca2e8bc3e SHA512 865ce1604a3737eda0d1286bb06650a5f1abd8016f7c41d7ff3a7109aee5b8f9e7e50ebeb4ddc893b417c06c448d3748200fd9babf7717698d1758b4c5aad8a5
 MISC metadata.xml 1040 BLAKE2B 5a5296b35eeae6e07b8b8c3dc3d63b58fb2d1aff7c0977f87690b9228183624c9d21fb2699aa82fef1d6027ff2cd89cb7a282cfa2c2ea0683f9da5a728fff17c SHA512 ac97766f2fe178adf1d6f642c60fab45be05e9b0509f34a270cb970ab16b3596ea90fc16b25d94b6457ff7c3543d4b88e5d291c62079ecc6b9d9e730fedc6250
diff --git a/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch b/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch
deleted file mode 100644
index 7ae562aaef05..000000000000
--- a/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/786303
---- a/common/message/message.hpp
-+++ b/common/message/message.hpp
-@@ -29,6 +29,7 @@
- #include <sys/time.h>
- #endif
- #include <vector>
-+#include <memory>
- 
- /*
- template<typename CharT, typename TraitsT = std::char_traits<CharT> >
diff --git a/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch b/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch
deleted file mode 100644
index f6797a62f85f..000000000000
--- a/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://gitlab.exherbo.org/exherbo/media/-/blob/master/packages/net-apps/snapcast/files/snapcast-Set-CMAKE_CXX_STANDARD-to-17.patch
-
-From 9858c60109c5d4aa09c26d1cb44be5c056849a36 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 15 Oct 2021 23:55:39 +0200
-Subject: [PATCH] Set CMAKE_CXX_STANDARD to 17
-
-Fixes the build with boost[>=1.77.0] and we shouldn't have compilers
-which don't support it.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4381a71c..5373f658 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,7 +127,7 @@ if(NOT ANDROID)
- endif()
- 
- # Configure compiler options
--set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD 17)
- 
- # Get arch
- include(${CMAKE_SOURCE_DIR}/cmake/TargetArch.cmake)
-
diff --git a/media-sound/snapcast/snapcast-0.25.0-r2.ebuild b/media-sound/snapcast/snapcast-0.25.0-r2.ebuild
deleted file mode 100644
index a8fa31c33a12..000000000000
--- a/media-sound/snapcast/snapcast-0.25.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Synchronous multi-room audio player"
-HOMEPAGE="https://github.com/badaix/snapcast"
-SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +expat +flac +opus +server tremor +vorbis +zeroconf"
-REQUIRED_USE="|| ( server client )"
-
-RDEPEND="
-	dev-libs/boost:=
-	media-libs/alsa-lib
-	client? ( acct-user/snapclient )
-	expat? ( dev-libs/expat )
-	flac? ( media-libs/flac )
-	opus? ( media-libs/opus )
-	server? (
-		acct-group/snapserver
-		acct-user/snapserver
-	)
-	tremor? ( media-libs/tremor )
-	vorbis? ( media-libs/libvorbis )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-cpp/aixlog-1.2.1
-	>=dev-cpp/asio-1.12.1
-	>=dev-cpp/popl-1.2.0
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-gcc-11.patch
-	"${FILESDIR}"/${P}-cxx17.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_WITH_EXPAT=$(usex expat)
-		-DBUILD_WITH_FLAC=$(usex flac)
-		-DBUILD_WITH_OPUS=$(usex opus)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_STATIC_LIBS=no
-		-DBUILD_TESTS=no
-		-DBUILD_WITH_TREMOR=$(usex tremor)
-		-DBUILD_WITH_VORBIS=$(usex vorbis)
-		-DBUILD_WITH_AVAHI=$(usex zeroconf)
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	for bin in server client ; do
-		if use ${bin} ; then
-			doman "${bin}/snap${bin}.1"
-
-			newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}"
-			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
-		fi
-	done
-}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 7cd842e2606c..1d0ca3e75b74 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,4 +1,6 @@
 AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
 DIST sonic-visualiser-4.4.tar.gz 6475000 BLAKE2B 37797b5fdcc397530a8b36bb1727bc56be703738505a117c853616eace41344b9526f98602ec872f4baa157cb1e92044bf7e3ef9079fa24b456453542bcf5763 SHA512 a76a6e5fc2381a3e7c89762687176fa60a8b731951438094af0ecd50103f73104a4366eacf731015573f8d5e5f436cf497a3e0e041363d5158d4f546bdd1f7b0
-EBUILD sonic-visualiser-4.4.ebuild 1853 BLAKE2B d7bb586f099e0ddf8fad350328d5b5db8d6324c62accc1650fe88a45e13e5c552d0f5f7d4363792c7333fbbe56f502c1b703d34866f35ae45ad964b28b6eec90 SHA512 5a9fcad978c8e50522623ee76c78a31ca5a89833fa30030654bcdbaa094f5795abc2e058b4d9700b566cd039be9337fc4b8ce95975a2e84017e14cc585f3f320
+DIST sonic-visualiser-4.5.tar.gz 6652200 BLAKE2B a5e39a755e991663390370c06ce5d54b2ff9422081f8b9046097645f1f747972d270233a0d4fe05d4e6adde5239ca6d2d0210a8a67d9ef6ede60089471ce6452 SHA512 eca7f7b2a56a4c70f38c8fafdd20d5c0e773dc1a99a75189998dd1f50ae777df4999e1a4b3431f9202edfb8ce2686d05cf6448493c263c52ab5f068169a7385d
+EBUILD sonic-visualiser-4.4.ebuild 1858 BLAKE2B 79a21af36977fcc72f8b0f5761b17db71844e3aaa4b5b9279d066fffc874cc388a0cf9f220e6af848b7ddaec26424c2210f2574404c85212ed8f617442466989 SHA512 9a8570133673edda48e0a9b809e941f5876f5bbea5413e862e46995d6999f3a2ac1726898795768acba6e6ab036792e47696826f29650248f577963b82bab14b
+EBUILD sonic-visualiser-4.5.ebuild 1658 BLAKE2B f2b870d2d9f2a7c9e159614a207b5d9790fb6d6ac164e16f685e5338b8e967a6a331faf712e68748e9a6bb3df39747286dd13271ea4d2411769202e1721e4554 SHA512 5d6b620b2c16d3dd28734edbc0cb677080f162f3bd5a2525436c46a6fcda34624df76f22aadfd888b96673041d00a3f1e3a44ebdf60bd27fce6e8e9ead726b37
 MISC metadata.xml 457 BLAKE2B fee1474516a395ba251de868c533ab4f88ac346a169a71e1513593f0ffa99f3365f0a7d87c24c31e73cf4f06d500b8bafe83f02230e6f24ebf8c0a23b43cd662 SHA512 58c25ca412527ef47411204f5ce579c3731c5b19922c43c13f069dae0c498e63879cc209e1f93e3487a2c32972df8ac45af690b4d470bfea9e497a3b9699c3a7
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
index cb1466d782e5..db3e3d1354a7 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.4.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=7
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-libs/sord
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild
new file mode 100644
index 000000000000..36f6a1943011
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2820/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
+
+BDEPEND="
+	dev-qt/qttest:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/capnproto:=
+	dev-libs/serd
+	dev-libs/sord
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib
+	media-libs/dssi
+	media-libs/ladspa-sdk
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/rubberband
+	media-libs/speex
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	mad? ( media-libs/libmad )
+	ogg? (
+		media-libs/libfishsound
+		media-libs/liboggz
+	)
+	opus? ( media-libs/opusfile )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+
+# tests fail without mp3 support
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( jack pulseaudio portaudio )
+	test? ( id3tag mad )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3-meson.build.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use id3tag)
+		$(meson_use jack)
+		$(meson_use mad)
+		$(meson_use ogg)
+		$(meson_use opus)
+		$(meson_use osc)
+		$(meson_use portaudio)
+		$(meson_use pulseaudio)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index dc5d61eb10fa..713eef69139b 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
-DIST strawberry-1.0.1.tar.xz 11191132 BLAKE2B e182ec5db26b22b60e9393b3a418cf44c01b647ab268bafe6d3f098d879817563d68faf7962f0670017f70b7f9f64f3a680056002e7041a2dc956fdc1dceeb95 SHA512 6a668ba6dbdcd5c60e78190c2cc8c04ad4ed920102c7555fdd42f6bf47c5b4004f9580c0f009cade642b404f6884b2b5dac386d326bf6f234403e4ba7612a2bb
 DIST strawberry-1.0.2.tar.xz 11202768 BLAKE2B 555c9492a6c10e9df579d4e9b1c718c722531f21784f68a436d8bd313a6950f0cfc58ded85f9a144de12a73ab07a0cc4d0e028223122dd4fde6604eb92145bd8 SHA512 196be23dde8fee531b2996bc7dacaf5b00dcd3f1aaaeb6630ed2a2fdeb777abb66d6c19928fc157dde7d5bceffdc646ff615a6d52bc0e6ee5ddcc14de6ee7a59
-EBUILD strawberry-1.0.1-r1.ebuild 3068 BLAKE2B ab5f45dc7358f0a6390154c35d241059c3620a47cc0060487f7777c87503d13b8cebafdf7739736844415deffb738ec7797e3ddfa8a471908380075ab07813f2 SHA512 e019a4ce8f3cb9aea5f281d6a07caf24c25e653ece187e8b86b4bd9442b66da7d20dfeaded540298ab7546346e4ee67b7707100ae1ff2e349acad2afe6ec5a28
-EBUILD strawberry-1.0.2.ebuild 3069 BLAKE2B 37799426ea976b6d26c43f253c14004c7e0f7e666b3f926277b749c231c767eca42514b1eb9dada51f9671aecd0a7c26fca6e7d85e012fc755d280ccb462546f SHA512 1962135b5e8ed7f02b5d1824e84f8c5ed5db9de24f03cf76160c15926d8ea81a70e09766da52be86fe9c1a848c885658c65448789446f87720d4bd4b35f21ecd
+DIST strawberry-1.0.3.tar.xz 11197224 BLAKE2B de47d07133506e21e5e5cc6a9460482f364cca4eb1ff9a3433b09a75db4cbde339b6ed7949d788c87d465b6dac488e598b4840a3b24d6439f28cbe59185b01e3 SHA512 a61c0824ac75d29048c31ce7d8b7ae5ccc700f21700951b53ab87f30b15a2ce49368c7a366037565d3b5c556cf20dad8c93d1db936108eda7429518d7700d6dc
+EBUILD strawberry-1.0.2.ebuild 3068 BLAKE2B ab5f45dc7358f0a6390154c35d241059c3620a47cc0060487f7777c87503d13b8cebafdf7739736844415deffb738ec7797e3ddfa8a471908380075ab07813f2 SHA512 e019a4ce8f3cb9aea5f281d6a07caf24c25e653ece187e8b86b4bd9442b66da7d20dfeaded540298ab7546346e4ee67b7707100ae1ff2e349acad2afe6ec5a28
+EBUILD strawberry-1.0.3.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
 EBUILD strawberry-9999.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
 MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa
diff --git a/media-sound/strawberry/strawberry-1.0.2.ebuild b/media-sound/strawberry/strawberry-1.0.2.ebuild
index ca2abcebaa8c..721ef2158d3d 100644
--- a/media-sound/strawberry/strawberry-1.0.2.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/strawberry/strawberry-1.0.1-r1.ebuild b/media-sound/strawberry/strawberry-1.0.3.ebuild
index 721ef2158d3d..af868219fe69 100644
--- a/media-sound/strawberry/strawberry-1.0.1-r1.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 3b5328dc4859..980199304d81 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,3 +1,5 @@
 DIST vmpk-0.8.6.tar.bz2 483376 BLAKE2B a2145394a9ad90f567e292e23bd9b7f62e26160b6375a48cea2a84818139865a65fdde172f6a8b6e42015e0ce14127c1f97558e00b56ebc288fa1e3d3bd11eab SHA512 0b77aabf1dda99c9149a5353fc9d0363469de2678e6089fc7dc13dc349587fd1b1630cf511c4d9ef384a7523b8f023e451d6c543a805dcda0bf5cf9d7a4b4277
+DIST vmpk-0.8.7.tar.bz2 483742 BLAKE2B 788c70034fcfb53edfb4c6b0faf80c06e2ae096c06819bc727359d4597cb217ca60efc9ebbbb19b223dc0d7106ddd9083abbce881f175b98203f3b6acc9b44e2 SHA512 83867aed8be8e620e18070d5eba9f5e4026b1f39ff9d7fe55e342d4a040c96e2353844296191c0efb46483254b1d2d30824894077562a165f7474d02a882cfc6
 EBUILD vmpk-0.8.6.ebuild 900 BLAKE2B c03d41aca3f7e1f0d4cc9ebab0c8bb6c8f4b4fac7ae9fe44e71f6edc020729f92ca6d175f7fa80cb896bf55fe4f8809b47fd382d52e3e05106c6bcfb0e288ee7 SHA512 3d015e48a8155bf03a0806c3c957f852e51f7ad75d17bbef4543823aca86231ae27e6066b64249321787c8664f5a897c9fd560e141a0ac8da4277bf71474d89a
+EBUILD vmpk-0.8.7.ebuild 910 BLAKE2B 4815d2b0d277ab50e1ef04a38648de9a836f6ff6d418200b196c69c1f969e82dbbb9d72618e34ee40819710ce271f1a5756a704f4c5d88bd91044ece912bf044 SHA512 df45d1291e8200b2b0339ff02aa4176d1bb5809fc583903aab0cf193b848bf529c0ec19400f8796462c226e45ed2ee34b04bc790a6943065b9929d59b2653163
 MISC metadata.xml 857 BLAKE2B 6d6600a0209d9d251f21c2e9f48ce1a9feffd2680a4e97c29f69f7a19f251607f7a2724e3a170b916dd3f3cad16f59ac8034621ab599f2de74171eedacea68ed SHA512 8d053c4c85a7ae69d87ea01058e0496f1a89994e7ff482e290e97afc4de2714eec397ed05129b98e9a1dbc5932a6067eb97bf17c6e05d13c6d2d1ba3747fd8b3
diff --git a/media-sound/vmpk/vmpk-0.8.7.ebuild b/media-sound/vmpk/vmpk-0.8.7.ebuild
new file mode 100644
index 000000000000..11fb028cd522
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.8.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Virtual MIDI Piano Keyboard"
+HOMEPAGE="https://vmpk.sourceforge.io/"
+SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=media-sound/drumstick-2.6.0
+	x11-libs/libxcb
+	dbus? ( dev-qt/qtdbus:5 )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodir /usr/share/doc/${PF}/html
+	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
+}
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index 46ff65f2ef18..aa952c6dc4f3 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1,6 +1,8 @@
 AUX wavbreaker-0.13-QA-desktop-file.patch 323 BLAKE2B 7a4414df32591399f7fe99a2f15e2a8d78a4da6ac435e69943cfa4b50bad5f41842a386f2de6ab048bdc9bd1cac0f26fa68b95923530cb140cb2a58e4fd7019f SHA512 a167b438504b7b88bc538ca45fd700ee5072e671c20830a72749f0bb07d1ac1430a438c17c5e7f1e3cc3ff6fee208c976e273d8600d528540742ecb7197b09bc
 DIST wavbreaker-0.13.tar.gz 366998 BLAKE2B 4f863699d6e0c5573d4af615a0ae8cd1d4d1b2fc74cc060ab8d0fb298e57812a8675b641bc69a45ae1015b3e6c0731a228aee773caaeaed75cafedf065dbbff0 SHA512 3585bdc6eb937d02ff8287c370a2f480dbdedfc6304505ee45943ed34e4302af480bdea511f7d4fb6778b9f5b25a435b533392eedac9869c650202645a64c574
 DIST wavbreaker-0.14.tar.gz 368275 BLAKE2B 0e09f1c82f0a790042a35eb44cebde3b06655d9c2a9f46fe1b426e2ca14a87178cf5cae3b4011448d98c82a4998110cf34f6c4f0eb5e028ee791b12d75789a00 SHA512 131833d40db34e3dd98b71cc68662f7852cc7f184e033fbefac03e34f2a3ed8c838d95bea9afab55c6453f837ac97c9be54088db2ba7e3b918e1801fdfe1d912
+DIST wavbreaker-0.15.tar.gz 380764 BLAKE2B e58645725ee831da8d9c231ba8a9715f5dc217f8a49737453430119d1920c53efea3dc0db0faf66d047e10ce3cdd9dc5918bd890f690d0c15ba4763cdfde1a0a SHA512 adc056b2d4117fcc95267033e21a015f7f7c900080c60f34a459f127badf79c3100a971059c0cd87210a68a5d08e38b03922bbfc505ec056e042209fc6523d7b
 EBUILD wavbreaker-0.13.ebuild 645 BLAKE2B 72c73afc027d5465fbc67619e499694d53ba8b6d87d262519b614ca9b8f398ad576f2713200e3ba43d6236d00c663f3a87e2292cc0dcd826c891f8cfaa5f0dc6 SHA512 61939436c0305cdf02acbdcf2820a92a64a352c0fce22088d4d6558525485fafe072448bf2176e035a57b471dcf8f1ed534015429224090d963e59ed22e844d5
 EBUILD wavbreaker-0.14.ebuild 657 BLAKE2B f6f11e82d132746b20bfe2c22482ad7e32525dd6ae08b430a4f55c72c16401ed4c0d17bb4f1333784936a40419a85dcb71b848c3a30f7a493908f3ce00b812d5 SHA512 9c80ce6c1f45b716ae497eefa76a72a7aba86965d81238ff5e375d40af9ea69b9bda8fe110d143b89e3ad9da48296639b4f5bd2b91c10f7b983b478662d9ac53
+EBUILD wavbreaker-0.15.ebuild 657 BLAKE2B f6f11e82d132746b20bfe2c22482ad7e32525dd6ae08b430a4f55c72c16401ed4c0d17bb4f1333784936a40419a85dcb71b848c3a30f7a493908f3ce00b812d5 SHA512 9c80ce6c1f45b716ae497eefa76a72a7aba86965d81238ff5e375d40af9ea69b9bda8fe110d143b89e3ad9da48296639b4f5bd2b91c10f7b983b478662d9ac53
 MISC metadata.xml 388 BLAKE2B 2b0d9ce6ec06d516b3ecb70ad7ba91860ba9b17dce5788873ed2fb00ed547a9443cba4d7b428b49c1da0dc1abfc687f29540ced700066b573ed4dae399a77fe8 SHA512 04f2b747b93768a48a1987b1c2453fda99fbd6dd2a8f6f88bd51e4019cea4030d866a3f287bb1202234f163e1cd6f9e56bcc6d25414520915e6659ad4728d652
diff --git a/media-sound/wavbreaker/wavbreaker-0.15.ebuild b/media-sound/wavbreaker/wavbreaker-0.15.ebuild
new file mode 100644
index 000000000000..3a540a0f0871
--- /dev/null
+++ b/media-sound/wavbreaker/wavbreaker-0.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
+HOMEPAGE="https://wavbreaker.sourceforge.io/ https://github.com/thp/wavbreaker"
+SRC_URI="https://github.com/thp/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mp3"
+
+RDEPEND="
+	dev-libs/glib
+	media-libs/libao
+	x11-libs/gtk+:3
+	mp3? ( media-sound/mpg123 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use mp3)
+	)
+
+	meson_src_configure
+}