gentoo resync : 16.01.2021

author: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
commit: 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree: 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /media-sound
parent: c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
55 files changed, 891 insertions, 367 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index e5dbc46f2ab4..3934a0149341 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index aad7c81840ad..49d3cdd0f627 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,5 @@
-DIST abcMIDI-2021.11.25.zip 607419 BLAKE2B bac5f8f31497a5cbc2133e70c7cfc1a925e22f8ffad67393a59fb1b976cab057f255bee9eaf4d8b48c597763c70e403aa9daf99a4ca82947d138493caed6d390 SHA512 d019c1445f75d91a7b2be5636aacadaeee29dcfbc195e2851ecf5dcf5ff0c45b459338dc625aed9cdcfcfaef1f1e120594126ded3ae044c3e3bae45ee6df38ab
 DIST abcMIDI-2021.12.12.zip 607868 BLAKE2B 89b978b3a8a635617e44a870a6d1f36c1053fafdee189fce5c1d419c51cea94f77b1ca1a8ecb6a7bd0cc0c4d92309a8f4d590ccba8d581f9793ae94fc8e4abb3 SHA512 909c25cbef04b9aada3914bbed1a13bc1ca47414a104601fdea733adc37bc7c7fd19be09c1dbdeac76e10df778a0d9481469d5df4d2b6a94622e157531d866e1
-EBUILD abcmidi-2021.11.25.ebuild 676 BLAKE2B da71fd66f245bdac7a72f8016e7c1c9324561e6f4b1cc0f1e943672edd93ae174913af401a8b0aa07a48926a9f508676d8008402f357a914a9e41252ca8e2589 SHA512 4505cce6306e087e8a8c038105ff4f3a40933de133a75159d735f7b08f41a3801bab2b03d32e52c29ba699814f96c654909bbb0d7088f952503963fcb3608b4f
-EBUILD abcmidi-2021.12.12.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
+DIST abcMIDI-2022.01.13.zip 608407 BLAKE2B a61a0b536b268082a60638d05ac40bf40453b44751f36647515e31511600f2530037e53dea931e212321a8cdab40571dbbe97c63a7b88ac79823cf4cbf4c5871 SHA512 eaaee84e269cb7bc5a171906ada72d65be3f44e6fc5f1426333e03962c032bc709becfce9bf5aee66cfd18e6200afe855e1f703436f2cc61e3b64facd13837cb
+EBUILD abcmidi-2021.12.12.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
+EBUILD abcmidi-2022.01.13.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2021.12.12.ebuild b/media-sound/abcmidi/abcmidi-2021.12.12.ebuild
index a0a2a9de38ec..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2021.12.12.ebuild
+++ b/media-sound/abcmidi/abcmidi-2021.12.12.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
@@ -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/abcmidi/abcmidi-2021.11.25.ebuild b/media-sound/abcmidi/abcmidi-2022.01.13.ebuild
index ae7e456f10f3..11f547f4cb8e 100644
--- a/media-sound/abcmidi/abcmidi-2021.11.25.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.01.13.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
@@ -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/amsynth/Manifest b/media-sound/amsynth/Manifest
index 6bb10bc2fb59..97ab375217f3 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -2,6 +2,8 @@ AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f23
 AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10
 DIST amsynth-1.12.2.tar.gz 1607129 BLAKE2B 8308a8a595dfe7b2c9924ff183134fdd5ad20ac2c957b1f52e474a8cb297cd73ee9f8b9938212deb21701e11ccbf776ea22cab763fb71940bf1df5c169e309db SHA512 a1eef3d5a0d0f0ec1edb93d89b3e456ea133a8445a9be73ba338771ae651a2008aea8dd077a9bcf0cd50e6bcc97ad98ab4c44a9baefd9f3381287afdf3325e8f
 DIST amsynth-1.12.3.tar.gz 1624332 BLAKE2B a78317a08c4b02c14578f68fb0fbd7de9380f439c8bc737321c253df5effcd23219ff02d50520768ed5c698b4f284a87435640e965ee4f1cd6023ae770dfd10a SHA512 ac4f32b2a35ebe15c0c63ded213c2ab73bb3a105ce9c857811f095807a1c032dfd518eea5709ea58594c54324bca194236d5fe4606fac274772c9012be2b1110
+DIST amsynth-1.12.4.tar.gz 1624416 BLAKE2B 1dcd2454d94200b76097d4215ed419123a3b8427064c8f674a1e7cb27620fb5b2977470ea7feb8114c429ed904511ec73c73461b7f38e1388e4cfeabc4e68ec3 SHA512 502fdd1d6c4e54a57482d266977d78008efa26717c173be0bf98e907a111366fd80b65d667b9448e751085901dc5f2a61ac0bf5b1d02e35c695ecd99c9d1df00
 EBUILD amsynth-1.12.2.ebuild 1135 BLAKE2B d1642af920eee3a3f40cdcca6802996ae7c44a2f070288b4639493dd2587c7a0c4b3c2271374d89ff186ff75d2de7a6fc175db10a10182854e35c550333a47ae SHA512 072dd5c9a8f8766db10f61ae69d4c98b4e9df33f2779d966bc8ef999c357b27fcd64bdf0b72e38aac8e2cbcd0a366be6d4c5662a69ba8dd996a35f9b7a2c0368
 EBUILD amsynth-1.12.3.ebuild 1153 BLAKE2B 9801e8b2e0b620b5360625977556e3f053f4da5d409a7d3d23a59fab201db06df1328415cccbe46e4eecdb065869130265532e652ed301ad557d7d1bb08e3afd SHA512 a78417056fdabe0a6ca6282024b22c70492de41715079018c7b70681546752228df29645dbce199d7e74f3cdcf4aa99e653dc56386cc476872c98e20cb519dd8
+EBUILD amsynth-1.12.4.ebuild 1153 BLAKE2B 9801e8b2e0b620b5360625977556e3f053f4da5d409a7d3d23a59fab201db06df1328415cccbe46e4eecdb065869130265532e652ed301ad557d7d1bb08e3afd SHA512 a78417056fdabe0a6ca6282024b22c70492de41715079018c7b70681546752228df29645dbce199d7e74f3cdcf4aa99e653dc56386cc476872c98e20cb519dd8
 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965
diff --git a/media-sound/amsynth/amsynth-1.12.4.ebuild b/media-sound/amsynth/amsynth-1.12.4.ebuild
new file mode 100644
index 000000000000..e42fb11b9d12
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.12.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
+
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+RDEPEND="
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+	)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12.2-metadata.patch"
+)
+
+src_prepare() {
+	default
+	! use gtk && eapply "${FILESDIR}/${PN}-1.12.2-x11.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with dssi) \
+		$(use_with gtk gui) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with lv2) \
+		$(use_with nsm) \
+		$(use_with oss) \
+		$(use_with vst)
+}
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index b2c89077c96b..783f4ad2d361 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,8 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
-AUX din-51.1.1-makefile.patch 1906 BLAKE2B e620aa00b69c460a694de60a4e16539f6b6f123e38a282e59db6b2e2b623cbec3bd793df2f1e7d935d955314023f90dd4b2dd12f155bb0c261328456af46a1d9 SHA512 02f3080beeadb90d725e4f94d4e39bc944aa22287b2af3b78b8094c4200ad58ffd02ad0359c4b677c89a426874394e134b526347b53ea3efa76fe950b007eafb
 AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
-DIST din-51.1.1.tar.gz 3700797 BLAKE2B 559a4476188ac6d9da596be011bdaa8b379bb336220b3f94edf04e3eeb9ca0100fbaaa0fc10f9a9f37d3efa436acddac5c06435c6b3ebb4d21afdbd7c65b2dc8 SHA512 ea5e1ab79cbc24abb80a9fd25d8304f36ab2345505ee98132196685cda73b31dd7db3f62cb1821cbdc9694703d3454bd58d733833710d492ecebffee23732a0f
 DIST din-52.tar.gz 3706694 BLAKE2B 054d3857bed1b4f4affbeffa0fc5c27ef356f200a60f9d6c5145327311accc5f0b1c8deaf425b745ea4cd2c1accee1195b2e840e9125d105edf67e09062b8574 SHA512 c2ec779746d07ad6579aeebadff45e218fd29715ac446f00840b513d3f9c8d1ef79f556a1f5c7d931adb3451b547f58fb58d6da699170755ae62f25d70b95158
-EBUILD din-51.1.1.ebuild 1083 BLAKE2B 474d674d77d7350c744a50d61863b12cba148e73afd6d56d52f30d293b7a89659d658a3ede854dd0de281ade1d26e399aca940b90565a9980537acce5737b780 SHA512 d9bc8d1038e6f30e3fb6c1cc608b6760135e4df33fc8da7525df75b4fadd22d4676083e6c3abb05300cc562444fa7a1503c49209a90b5765130ac8ef6b166736
-EBUILD din-52.ebuild 1085 BLAKE2B e7a1c6e4c4e4efaa825733da31a56d19b50d71842ed3343fc8d3a9b9c2050af7f2c7aac993095799e77460404661cc74d7370a9d299497789eb6efa05f516273 SHA512 e0184a6602de34393f51e1cb42597ced4ca5a0c2acf7a0a87a0f1a486ce13e9661eac05de895a342aaa253956f562da596670bdb19076378f1e80428c5a6eb0a
+EBUILD din-52.ebuild 1083 BLAKE2B 005a89e65bbcb9dfadd2cb706847700f3408741b72b19417d54d6c77876af4594994999d3a67be207231fac9362d1e68bc6d3f98a04a2325549bce3af81f6aa0 SHA512 ce85c7e29d1fa3d0d3d3fbd7e4410601faea27f7902fbe63abaf0c6983a7c1cae82b3514b17d91541d8d450a1894bbff377c9e9a3e48ecd41056d1bc504c6ca6
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-51.1.1.ebuild b/media-sound/din/din-51.1.1.ebuild
deleted file mode 100644
index 43999113438b..000000000000
--- a/media-sound/din/din-51.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix xdg
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="https://dinisnoise.org/"
-SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	media-libs/libsdl:=
-	virtual/glu
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa jack )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
-)
-
-src_prepare() {
-	default
-
-	edos2unix pixmaps/${PN}.desktop
-
-	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
-
-	eautoreconf
-}
-
-src_configure() {
-	# Jack takes over alsa.
-	local sound_engine
-
-	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
-
-	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
-}
diff --git a/media-sound/din/din-52.ebuild b/media-sound/din/din-52.ebuild
index 69a4da0ac755..13c24db52183 100644
--- a/media-sound/din/din-52.ebuild
+++ b/media-sound/din/din-52.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 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/din/files/din-51.1.1-makefile.patch b/media-sound/din/files/din-51.1.1-makefile.patch
deleted file mode 100644
index 9909080a9b54..000000000000
--- a/media-sound/din/files/din-51.1.1-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 377dc4c..b086c0c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
- #dinincludedir = $(pkgsrcdir)
- 
--AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
--LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- bin_PROGRAMS = din
- din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index e013381811f4..af1656d39645 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,3 @@
-DIST drumstick-2.4.1.tar.gz 2014026 BLAKE2B 4e2765430438505c910919d5a5069b13a63e72083c4a40bd8b406e3463842ccd5ab024f4a0fccbceafe808e3926b3be03e98338afcac4520de978b0f5c950ee8 SHA512 5063201b643cd3e58db4c77521444e7816febb39ceb739309ac63b164b2fc67b6bdec16a98945141d7b41add41d82b2bd2ddf99890f12edb2f86b73e643ac6d6
 DIST drumstick-2.5.0.tar.gz 1914679 BLAKE2B 1b9c12304156577230f22dee5bde068ecdc2a3c0dc7406db4d9d8588788a29e1115330d0f9bab8376e1adb72cbf0ff23f4b72ac66c90e1ee83c8322510cf2a2a SHA512 d2e4438d66307dc8259b1da8455c4f2c9954bc3605836b993ec004fb0ca326189d3c8a706ea86bf4836701b80b24d51e756d46c86f04301d5c1601687d1fa6fc
-EBUILD drumstick-2.4.1.ebuild 1280 BLAKE2B 84f086bcf5bfa81e6f700d1ee82a871daa32929d353db06d91cb572dc18c50dfc25fad9da53a058863281c888bf8fdb2013dcb92baac52ccb1e9b9463c5917b9 SHA512 85a2dc9eff1690c4b441a8b44a3d0bf84240c97fe5a8feb518ffe27b4ac289c46ba78f5709733d6a48a96519f0523cb05700b7be7bfd6db579fef3b2e0225804
-EBUILD drumstick-2.5.0.ebuild 1282 BLAKE2B 019bce62e329ed8f99d946684005d3e9c57d45ef48a9bdc5fe4ac81c6d9f01a8adab66f01bda027d29b6e42ccfc8dd40c24a9a34a40593703a3e25a0ed602cb0 SHA512 497b08f55faf4f3b4f7485936ff1d15515314db60d9366719116e2de469e6880fcb69027066b7f8fa370a667cb969875b589d163256e706849df393e6d03d27a
+EBUILD drumstick-2.5.0.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.4.1.ebuild b/media-sound/drumstick/drumstick-2.4.1.ebuild
deleted file mode 100644
index d5cce38803f9..000000000000
--- a/media-sound/drumstick/drumstick-2.4.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 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/drumstick/drumstick-2.5.0.ebuild b/media-sound/drumstick/drumstick-2.5.0.ebuild
index 70bc8c734398..29329502f5d2 100644
--- a/media-sound/drumstick/drumstick-2.5.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.5.0.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 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth network pulseaudio"
 
 RESTRICT="test"
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 966ded1e7a42..25a4619f24a4 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,3 +1,5 @@
 DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6
+DIST easyeffects-6.2.1.tar.gz 1729150 BLAKE2B 660bfbd21c04bf0afcfd2918278f6fcf6f21a7c44ca5ff69b3782ec9de8a93c65d240bca52a0a6009a8a4c00d7970ff8fe740b1e969bed99e6f24eaa4b0789bd SHA512 0539c2cadf38796b7bb0f82b260829f5794b1ab8e20185b855335b080a107e6858b1d80fbaa3b7b59cdfb50d67e3ad90fecab464fc0901af49e76171f5bc0014
 EBUILD easyeffects-6.1.5.ebuild 2023 BLAKE2B 2f097197e93d3e4c62c05a3998c81129291f65c143a36c864eaceb3c941061eb54fd1cc93bda6ecf456dc22b546151e84cac23caeba4b467a8c08eb7e463d115 SHA512 542d72440be49b6229d2ce451fb3484775e1be14169d1570e8b68781c0808dc51f6ec521ff40df8153f084a90b5b279ae79c1856be88017b75355c46dd5107f5
+EBUILD easyeffects-6.2.1.ebuild 1985 BLAKE2B 51fe43f5d79ead323d03fc51c2955785757fae7e11a01c7290d514d3bd86490fddb3af5438dd3144282e1275609efe3f9ef96d6b0bf313d887e7f8dbade45451 SHA512 4b143e8d7baba5f2f068b2fd52b1699dec04b5657b4cee5b2efaf68a1a67659491ef4e336933415d31e8f8100a959524c5494849e40ba30e28432944de677a4b
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.2.1.ebuild b/media-sound/easyeffects/easyeffects-6.2.1.ebuild
new file mode 100644
index 000000000000..d5850143500c
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-6.2.1.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
+
+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"
+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/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.31
+	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
+	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 d9acc88ace31..9a7c7ca4c33a 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083 SHA512 3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
-EBUILD gnome-music-40.1.1.ebuild 1924 BLAKE2B 96d423604481ff621250708dc425c8c31e0e205b5a0b9bfb6d4070e34c2932ca1f98023efbed3053e30026a424b99b59365a1f92659c2b5bb792dcb91905d993 SHA512 572c936a5250e986f72aaba67d2b9d8010218729b32c667849a4dc6d55b2aa724d49a0f019eef0c8f1c790ae0c3333b1770c6c77c81b224fd60a2f9ed879e779
+EBUILD gnome-music-40.1.1.ebuild 1922 BLAKE2B c04d24a55391de91bcabc80c0e091a5eccf82bed86c31dfd842d329fe243abaa2576a14397b8d93ad0a6f07e924cbac28e68907a0c1d66dbddb858ccbadd103c SHA512 aa38a8403b3be4da9cdea0e91b2467afc37fd49d022e8dbd5eb2704a88b93557cd627cbf3e7fc379d0d94e9a58d787ac28e92369d892ba1eaf6e7b9b081bc52f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
index 65ea2646249a..261d35742d1c 100644
--- a/media-sound/gnome-music/gnome-music-40.1.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -53,15 +53,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
+
 pkg_setup() {
 	python_setup
 }
 
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
 src_install() {
 	meson_src_install
 	python_fix_shebang "${D}"/usr/bin/gnome-music
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index aad02298fa9c..44f7c7b27512 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,10 +1,8 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
 AUX hydrogen-1.1.0-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
-DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19 SHA512 116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8
 DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089 SHA512 c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37
 EBUILD hydrogen-1.0.2.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
-EBUILD hydrogen-1.1.0.ebuild 2079 BLAKE2B 32f5db272650f71d573264c5466cf963c01d25108a6a930378480106d30c53c99b7367992564720c3a02dbcf147f594807904e3af6460605acdc773dab7f5f84 SHA512 00f0756680c74df3ddad342b08832ab1aef12fa87b2fb8b2ba3b90a56371746d73632be70445f086910362e9210c7384084e9a71eec7f056ab08eb874b05ab22
 EBUILD hydrogen-1.1.1.ebuild 2086 BLAKE2B 41eb6d5b0064e0f3553ead000cbcffc917795e4776af202c7d52853b944225f9e45779584abfb96134c775bb6ee3d767960f0e91da9f560b4815fa1fbacf2e06 SHA512 bcad8cb18fe0ebff4a111ad234c4ebd66c73767430c50f793cbce6236fb7dbbfc8cb9f9e29cefb51937c20aa9ff0c898ce499ed00a603f49c20f84448ab93bd6
 EBUILD hydrogen-9999.ebuild 2090 BLAKE2B 194dad4a7e4ed8efe043e4d53175dbe42805153670eadfe4e2fb51ae3c7ec80531798cd96904e89a859105b2084114c88991b0cef0bef32affa8e5fbb5b47d53 SHA512 00d1a1367617ead9ce2c2853efc58c081c37ec9aada417b47beab567ef143c5ae6561aa8c3fc0bfc2b677bb2346c3ea3f693adfff41851e106591e8add5a2a95
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
deleted file mode 100644
index 99394f5d5f81..000000000000
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-fi
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	doc? ( dev-texlive/texlive-fontutils )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 933f64d644b8..ea326b1955a6 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,8 +3,8 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba
 AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
 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.4.tar.xz 768768 BLAKE2B 34ea3f0065edcb26e57350a9cdfc79e8705674a4811b06ff4dfa0a93a1c92bcfae7c9e6ae208210289a1f11fac079aa53ad34a3b317fd5dbe4c6d522883b6623 SHA512 fb476b108a7be842663683fe6ca6737cffad73c0f09874f9d052121d188d16f69b144e993d1691f2edfac713db24aa3c28302b399f4720b29c09c909860c0938
+DIST mpd-0.23.5.tar.xz 770700 BLAKE2B 91f0d37bca0632a414083f6ecf8838ba5dc4ef4965692b14e56587d3d145140f61bcc120fe4b2bf83eb41f2a7e085da4d999efc19ca9717d2552d92fc6359c65 SHA512 3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34
 EBUILD mpd-0.22.11.ebuild 8443 BLAKE2B feec210b7c18ee035be6ae785d80a93cec9d76af775146655834933a05e6962025b2ad2a119f45bb55bf5a187aa541689bbadc0ab9d9ff639fbd70d5923a42b1 SHA512 e4abf4bac79a66e3f8ac058d7be22761a904501adae91d38485e1ab3cf984cd9269e696530b7fd08b1e6386e6b5e0487451e49e7eabb2ba918ca85b1c6f1f3f4
 EBUILD mpd-0.22.3-r1.ebuild 8133 BLAKE2B a627f1a5641ce7a3253aaf140bdc3afbf917ba43a3ba5e6a0271559ae144e13f55ad3abd7d280c39ba9486f4f48c50b06c1465560496f82949ce8c455b4aaec7 SHA512 c688ccf84623fe0e1a3f350587ba34c79cb3bf0ed6cc5f9f61369ceabcf92279fc7c31838148db9d7b43ece61090e498c3e045869d00e27e3f3065e65eff2c1c
-EBUILD mpd-0.23.4.ebuild 9019 BLAKE2B 28f8a0e26fae127b6e46e58c9f1bd08e29a757e5f4758d6aa3c54009fe58ab603710f4f29ddd13641a9b6958095f28670a2f31f02bf3433470bda2ed01d97083 SHA512 3508d6ce920873930266533d7dfd90061680ede9710dc58d1014734a06626ce04f1d28ba03191ed6838e0a47c64ba0e27cb85d582f2ee07f7bfca866849499ff
+EBUILD mpd-0.23.5.ebuild 9025 BLAKE2B 9246b8d06bce451acdafc464b75f7f33ecbb48fbca9a5b2e545e202b40dc9d2c422043b838002d66b619f2379c64df3d9e8b9154347018e225bbb6b2fc8fe6ba SHA512 07c149302a865fb269540b4ae886bbd1b3c59747838ebf3f23cc25fca944314c7162d25c66dd9e17b762003e64be89d68b1f89c11e92d75ba25cfc84dea6e953
 MISC metadata.xml 2724 BLAKE2B 08bb2402db4224ccced73cb40aa2e3d7e9a9d699277c999e08f12bb0cb1bbd1406c6fb20b9b80cfe3a41eae05e28f4be30d5e59482132723a82d4ef6de81219f SHA512 112a969c9150a17bc99e18949bc32ef15fb2d06903c0ac5ab455d29ca0cae0f2150b90f0e94cd3a4755c5f545b23c0bd5ec2de93bd154df1d70f224a0f8011c0
diff --git a/media-sound/mpd/mpd-0.23.4.ebuild b/media-sound/mpd/mpd-0.23.5.ebuild
index 217a56903cae..6fa4a901619c 100644
--- a/media-sound/mpd/mpd-0.23.4.ebuild
+++ b/media-sound/mpd/mpd-0.23.5.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 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 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/mpg123/Manifest b/media-sound/mpg123/Manifest
index db68fd76caf9..26d2ca9957ca 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,5 @@
 DIST mpg123-1.29.2.tar.bz2 1069976 BLAKE2B 2580f1a4ce3a9ba7016c61289da08e0185eed363d51e4477bab34f1e4ac296b9ab4912a565afcffd29c16f5287c320d8a3d4f92872a0b8a7e2a32c147d87b7c9 SHA512 ffb82ffbebedeb12783338b5159bf055afd25cb77e1b705bef29f04fa50bcb2ceaf2a6418d0e111fab1151ea956fe48ba3576d978e6b0c8f4ca72c3883608ec0
 DIST mpg123-1.29.3.tar.bz2 1069979 BLAKE2B d01a8d77ffb6c344592d1b90026ee25ae12eb2e063446e88370e0aa508705a843b987f1a400351b5ed87d211251057b7b31a2e653401b800fe9871ac2a5756fc SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6
 EBUILD mpg123-1.29.2.ebuild 2992 BLAKE2B 4bb2cafa1ed3c1f69097a953697fe924c675b78d5117dc52d1abcd3b8a9e6fd6b694e791320c9ada6fd6852c478f3a93eb5e810323f59fdd719ec2ad829fba66 SHA512 804e99324bf8c5fbbf870307d8b243733eb09708b0c6a9a6068803f8886219169d7153789f43690e368a0c2fc2ed2ac47ebcf84a67fca035937c202abc5869a4
-EBUILD mpg123-1.29.3.ebuild 2999 BLAKE2B 49a074e953c393d80541c36a02e2ca1340937b4d844650177316b76662a2b4a47c775ff119f32ad0c65605f1daf554c6e46c985bbf83070961064479c9fea15e SHA512 359623d74681fd7401f131d63094219cb2a1e42fa2fa1a27692c48c432e1929809c5b10f9b9a6d3a97983de05ae4410f176368d39e9c269a10eac264d81447ee
+EBUILD mpg123-1.29.3.ebuild 2994 BLAKE2B 9cc72c5b3eb4365f906214022e4ce968817189313bb5a40e1ffef60b9e7baa9e85b8569c961bb51c19a3ca6c15161a226d41b6905264a16b1217deec32e5c98e SHA512 ece567dfe97b106c89215936b2adb2eee6566c8f9e06d7ff12966e46aa8111636e03f2169e6eecbed93771f3fc736de6337da4a065e8078eba0f7c9e39df31f6
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.29.3.ebuild b/media-sound/mpg123/mpg123-1.29.3.ebuild
index 29a2b1f3de75..20ac2ef9c320 100644
--- a/media-sound/mpg123/mpg123-1.29.3.ebuild
+++ b/media-sound/mpg123/mpg123-1.29.3.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 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index d6b7a8f3ecaa..7087689789c3 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,8 +1,10 @@
 DIST picard-2.6.4.tar.gz 4319362 BLAKE2B 78768b4a8a22c51c118ba03a9e97ba6c4bec9180e5739867b5756170083930a942a0a1ceaeb74bbe724af3ca392b92139cbc4acdde9556e9031be16a968a0240 SHA512 5f44f91f9f44cb17ecd27e204b75c83b776a2c55e2a6e42f96018c83f4073d92f028ef74006d6acbe42b1ed374543a65e177f34c561bfdf13ded1085515bf353
 DIST picard-2.7.1.tar.gz 4884448 BLAKE2B b9f5ac2b6205aadbb707dcaee2dc6c89c333568d8fc6ca85da3fe8f9d308d0a54076d17b3f14be52e0154767c4f24ee2fd89d9df909ce1c74b9fc57c970ff0b1 SHA512 e3cffc538bdb7bf851e378b5ce7d4155fd6a2c13e77c42eb4c10a6cd129d45bb0c52d295bc209694fd89eadd60b0f04eb2d7c9eedbcec0a03ab00b7ee1f4e0be
+DIST picard-2.7.3.tar.gz 4887533 BLAKE2B 65a10be3dafcdd99e20d6c193d1238b0edfa66425a28c705bd6df0f57f75ddcf874f3bf09cef3c331e583a35f49ec780a63d2960081188081c8f0687f6a0b4d1 SHA512 33cd37ce19e261d14882b4400054c289bf921d3c74313db634f3876bc7f51ecca184aa29a9cb1d673fe799c53eda81de45d23c83caaf2f71b74fe341c258d2f7
 DIST picard-2.7.tar.gz 4868049 BLAKE2B 87f04056843623f81165bdae181699125d5aa8e41e5da47d645026bb1b3ee4a70edeeef0399f3230584026caf8f014cfe27b5d9f3f2e6b71a8e2de48a832655a SHA512 b88d2cc24a9b6a01e6bb1a54f93bb8ec62c901fe9ff352641ea402b5e091d71241665b067fd12bbf77cf219b951db9a570400adda82fa9da9406f9cfa6aee4e5
 EBUILD picard-2.6.4-r1.ebuild 1411 BLAKE2B 25a245abce95b21718ee395eb86b0866ec46ea6a3b8acf2ed747a2b370ba8743f76c862eaa0bba8114b170d6cd346995e4cdf378daf0c15acbc58ba45dda69f5 SHA512 0c1e20ad7072859da7115334755821b2c868dd85442cc5a1a619b2df214cb034328e9b782884ca9606be4a2eed968a0ffc99f4673118e5ea168257eae31b7a83
 EBUILD picard-2.7-r1.ebuild 1413 BLAKE2B e4c2e7e17203d3ea53580b91ca547dd1fb8a600fb736a9004c73a3759189796c6813fa500e715dfac2c0070b7b0cdc10eecb529a690dfb55e47876cef65cd2ad SHA512 fd01f4fee1be7998f084b2c2371076c5f54e003003f092cb72e264fe1ac0e927f7e8d03a78dd0cd9936f08a3b6a0d14793ced3593f2b9794bde6de4f0e9ef9a9
 EBUILD picard-2.7.1-r1.ebuild 1413 BLAKE2B e4c2e7e17203d3ea53580b91ca547dd1fb8a600fb736a9004c73a3759189796c6813fa500e715dfac2c0070b7b0cdc10eecb529a690dfb55e47876cef65cd2ad SHA512 fd01f4fee1be7998f084b2c2371076c5f54e003003f092cb72e264fe1ac0e927f7e8d03a78dd0cd9936f08a3b6a0d14793ced3593f2b9794bde6de4f0e9ef9a9
+EBUILD picard-2.7.3.ebuild 1413 BLAKE2B ef1c81a19e42fedffb65c47278e340c0b7ca27b0f2da934c3f4d232db314f05efd7499c1a818c842a0a94f18afdf18b01e16ab8f8a75ee3d1a03026a2002e8c4 SHA512 d464908123fc47a3770b920ac36d649913a08322d1dfedf4f748fc91bffe2e4eb0ef0a411326411d561aaf312faaf1de890619dacf8c7e5cacd0f51d62ac0786
 EBUILD picard-9999.ebuild 1413 BLAKE2B e4c2e7e17203d3ea53580b91ca547dd1fb8a600fb736a9004c73a3759189796c6813fa500e715dfac2c0070b7b0cdc10eecb529a690dfb55e47876cef65cd2ad SHA512 fd01f4fee1be7998f084b2c2371076c5f54e003003f092cb72e264fe1ac0e927f7e8d03a78dd0cd9936f08a3b6a0d14793ced3593f2b9794bde6de4f0e9ef9a9
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.7.3.ebuild b/media-sound/picard/picard-2.7.3.ebuild
new file mode 100644
index 000000000000..accbc2910dfb
--- /dev/null
+++ b/media-sound/picard/picard-2.7.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="discid fingerprints nls"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
+	')
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index d89cdb0285f5..4d09adf16153 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.5.tar.gz 1336079 BLAKE2B 3446b0cb5cd34541d5761f3f6e2361dcfb50656997c723b5972aa60466a1eb1a720fb5d97684079832705b084d8d1ca082f652145d51ff89aedfab71a90d5c5e SHA512 2edceefd30a57b3b2277db271dd95c2b47b4a85106762eb3149dff94328265c096c5a26d301bd0edcd8f5d948dfc24ff2d3da532ac297121e4fee6982fb6ba56
+DIST qjackctl-0.9.6.tar.gz 1271177 BLAKE2B 8d4d6a5ddb712c7ea8c7494a0392250e8128b4284addce797031294c19059e05f7db43ca2b421d7ebaf0abe8db95e2cf098dec3fb2b520a3ff282383fe169455 SHA512 0af54ffc9a4afa3672e5996273f2ba20c7b0aec2d64831944a3aed16b7d33a48eca7d71dd799f197e450c44010065ea9e8ca9d5cc307af926697a2f95a4fa023
 EBUILD qjackctl-0.9.5.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
+EBUILD qjackctl-0.9.6.ebuild 978 BLAKE2B 1cd97fba1596268e1b574e7712d53a4632c05f3e8dff249baf579ececaebb2e72fa03b3e7a24f6dd8843241ab13e6a5e0d19ab43607102955b4b074b609e5f30 SHA512 e14fba2be8e4de5a4781ea3806a8f60ff3ab430fb9f57860ed502efd83d5efb6d53cf983a34c3b3bcec218d39cf21b585561fdcf952d2dcb88cb84e760118339
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-0.9.6.ebuild b/media-sound/qjackctl/qjackctl-0.9.6.ebuild
new file mode 100644
index 000000000000..127871210489
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.6.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/qsampler/Manifest b/media-sound/qsampler/Manifest
index 2212f6fe9e7e..8b0b3657487f 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.4.tar.gz 284055 BLAKE2B 83f0eb7102d6dbba994d2efeee59ebc46ce2b07d40b9dcfe97ed3059fefd449fa90167718ef65ef41f04709ef9c985c86e2b35a0572b47a948172cf5b1a5dc23 SHA512 0e43a335c503bd76d41bfe88967b199bcd8c34a44a65293c1460daa342ca1e35f236984af74e30404637e9f6c8428b4cc52fc27501af7d52e1c9e30f1a80d35e
+DIST qsampler-0.9.5.tar.gz 222375 BLAKE2B 0051fc3bee7b3c544336b68ae36acbab265eb5dfd7750d525402d5ffea6ed69481fcccd77ba54df37c4eb2305ad25a6a56181aa4fa12d6a3afa86e012be5cb84 SHA512 2f79e4928ccb2cecafe63fc0b35349ed2ad4b26fe4436bdea0446f1d54a61478dbd5df87445bdd77c5ffd6c5e93e478c90b1576f4c1105276abe34a99b6a30e3
 EBUILD qsampler-0.9.4.ebuild 1137 BLAKE2B 840ed40ce55f34e831abc36184174e7efbfb9cbd811042df77fd2ae7e8691d73f0a05b47ff1fb121634d2e389e05fc888cbd8eb1fc2d4ae534e4e923e31d02fe SHA512 ffe1374211b4aabda05bd4d4fb8b829806759f7ea3873bc8714e71fee7e82d8cf0df200860a50a23e38ca98e702e8474b7c7118b86a07db3a75b085391561614
+EBUILD qsampler-0.9.5.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.5.ebuild b/media-sound/qsampler/qsampler-0.9.5.ebuild
new file mode 100644
index 000000000000..f286d8199e11
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.5.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 96d3b1225868..7b16925ef630 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.4.tar.gz 395550 BLAKE2B e25195755c52c63912b03a416878d248712b78ba0014414bc8b1d31cbd5bb75562640de4a0255d2727a40274a6ff3a84b201d39c93674140ff31ccc581bfd254 SHA512 764a90fd86451cd3a12c71f061f4a603cdce54ae80e6543d05fa66a97ea0b7c50bac0350f01f597ec93ed445a5433a9dea6d9c5a43ce385c231aaea8e13675d4
-EBUILD qsynth-0.9.4.ebuild 1411 BLAKE2B 224fb67d8c438ea03f47bdd1b11fd0f17992969582f46cabc67e36da7ec965d70f64b7ea926a29795ed7bf9cf2bf4e2cf40585761eeddf9fd2aceb1aa27a45c8 SHA512 ab5a4cdf1f9c2cd4aae7c6a5f81fc0824a25d8009a95d5495afcb43282a9916333d25c45bc5f8e97e8477d5d6ae2a344a76bc37b64b693cb8f2b19ebe80aa6ab
-EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
+DIST qsynth-0.9.5.tar.gz 331213 BLAKE2B 3973c2ea0599b8bf9f12c3ce1bb7eff00b5d20b4f051ebcb578f556dbfce714cbe0bf77038b553289f27cfedc521bd7e179af652c721375e6bedc4d22ce061d5 SHA512 157e49e8ebfcf550754379c4f2bae221354cffbfe47dcaea747749c00520339f59de5fe7f17e105674ecc6099a98af5f2326d2d258fe359c0c7522366f4267d4
+EBUILD qsynth-0.9.4.ebuild 1399 BLAKE2B 594db33af2cff57be2c05950bdadeae487ac4f931f213d4e528479972d594fdb842353e7248246e178310dd571869ded4587bdbb53cce8ed3cdc14753db01304 SHA512 7d1211bb2c892a6641dc5454be2accc3103be8bd0eefab1186d4aa62f218aee7c810d6f31b2da1458fe0dd56f2193a7641edbc5a170cd58840c6b51e533b6fdc
+EBUILD qsynth-0.9.5.ebuild 1413 BLAKE2B 94f3b565fe4092f371bcb9e668ce11403dd384ce2932846956d80fab08b7fb18d00892b4f1e0cdf40f17d002897e4076f701119b965dd7dbdf28bb564ecddff4 SHA512 d46ea096cdab2d24bd73e42f55c5056ac408baa42a0ba5d215683342605c04cfa4c6f404dfaa0e2d6a9c5fc1ec9954835c8af88e5e0a51fc60fa15817b5e7733
+EBUILD qsynth-9999.ebuild 1347 BLAKE2B f1e4103cd0ba4bbdb8e8b5e263d00027002501f0d8ad47045956722873959d7c3583bfd9793d44e2dd7f9cc7dcb9926daa7b5e9888dc5646aee72fa304b937a3 SHA512 6079d681effc6f56514d40d79be09c28edf24562e8348467182a06ae06649a3df11303f7832a02de59736993ec173ff9635aa3a7c966facdcaf53d8dbb270aa1
 MISC metadata.xml 756 BLAKE2B 41cdb1c211eca3b2ff4218987850219ccbf3b0cbc6d76ea1841044811b52dba32bf2ce48be9b10bb40f7778188e5ebd4df29e0e865fb3b0017acfc1a6965efe4 SHA512 3f1b3281eb2bd0bc7a4f3ab87354ef636c1e8acdd79d7392d1d54c49be7c6715ad6e054dd6c1c6f9bd1186c2dd8aa40662008bfd79f72816c8de6e9fe62dd626
diff --git a/media-sound/qsynth/qsynth-0.9.4.ebuild b/media-sound/qsynth/qsynth-0.9.4.ebuild
index a9c46977ac25..42c724b0c2e2 100644
--- a/media-sound/qsynth/qsynth-0.9.4.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
diff --git a/media-sound/qsynth/qsynth-0.9.5.ebuild b/media-sound/qsynth/qsynth-0.9.5.ebuild
new file mode 100644
index 000000000000..802d146a7511
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.5.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 f2e790dc5a2b..764b1b7b1cea 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
@@ -52,7 +52,7 @@ src_install() {
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
+	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
 
 	local cmd
 	if use jack; then
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 0a1f30236c2c..31ed69a4f88a 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,5 @@
 DIST qtractor-0.9.24.tar.gz 1960092 BLAKE2B a94822b20544aa0675a4b1208b7f1dcb726973c3ffb4705ef10ef284e21433c2b92747eca189667e2e8d8cec4569421e8492ea330d7b51cb80a6157dffdd8e41 SHA512 b65dc90566023e06edc08a437e3a9f1e8a6e524cb1c9cf78afe90cdc1437ce345b7bb4907619ced7886966923facb7dbe8f22ac23076531e95e149a71286187b
+DIST qtractor-0.9.25.tar.gz 1874329 BLAKE2B 94e653724582ebb6be417574e4bc357b58fe79deca686745607dcdf75f14b813cfccdb1d976dc98f89a19c23450ff52ef6060417ce986882374ba36c8f724a7f SHA512 057add530356bd81c4afc9e5527fbf2f6ec21b2f0455f0f8739efb82730ea834a5d2397683e3622071fa75dde31e9d0a1f36d9381618d4a2604100f1b8dd5aa4
 EBUILD qtractor-0.9.24.ebuild 2443 BLAKE2B f0969d8e2d78258f02d0b1a2292ae49725034e2b12585c1a0e9a4e6fdc15a9888755c719bc028f65761ccc2e6a8a684bdc7ec6f28ed66c8609bdc407b0af0016 SHA512 2b94252e99cc4d48ed123665e609f7ff8cfccbdd0b5a6ac36e05ec5ca277fbf14140fbba0b2dd086b16eeb5e42b9049663edf51f59466adfe9ebe651470dca4d
+EBUILD qtractor-0.9.25.ebuild 2445 BLAKE2B 7508a7aea3d74dc68d3a8fffa85f733bf1772d5f87dd545d6dc3ab6ea2e75d8aa96b0320014236f855a667fabac9e14fb603859140c1f5ba733b0ecc4faf8abd SHA512 acddfa87c474e4876081bc1ad5b7607fde4ac785ab10d0ed5e97711b32f4de0c8e827833d2a3a91222ed5409e2913ea3eefdae5e13bc66634ecff0a168edafff
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.25.ebuild b/media-sound/qtractor/qtractor-0.9.25.ebuild
new file mode 100644
index 000000000000..f9f6cb16552b
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.25.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/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 068e9b0a4271..81bf1293c529 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
-EBUILD rhythmbox-3.4.4.ebuild 3330 BLAKE2B 2d3af8777c8bba6b6259c8e40b9d8b77f8234e47df79283319ac1d96d9bef90557221f3b97de9d2c3db3c102ae063bd12d8cde504c2ae3c7c51b38e466ee998d SHA512 8892f5fdc1041781b8163c8e71cac08afd42025ec2dfe9d4375db3b45c9e32f6bcfcc7175cf1c15dfce8e5d74c2a9e79e2f2de8352ff6986b7dcf87da8396080
+EBUILD rhythmbox-3.4.4.ebuild 3337 BLAKE2B 75495811cd8c559c630d14d33340c7d67b8d7c9acf0d50ad699fc6b4657fa389c9b39ae131a461f74e7eddce69c2b15117e7aa1bbcc077e653386a33bc312ae6 SHA512 2a489d4f822bed89869886dd41cc0852d5e7aefc017e03a7a31c67ca55663a4eb518d83b3ff4785fdf768cffd4c083b849b923defd9f9a5a37f18881c70cd318
 MISC metadata.xml 546 BLAKE2B 3f273ab651f53329ae8c493be78977713b4bcf31b35a65d66b523f5b27e11b456b26cddf78ce4ec7b08478fff2fceb875b7e976e9491cb63007744ea93f518ed SHA512 bb4c662bc4728e72ff31d32101da0b67e77e254e3511de9b7cf5bf98bc224f21d6b31e07f3c687c41d66f7abe15109d353402d6db5405086edea1f5518f2436d
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
index 49b5d725a857..32ae7e137c3a 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.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=6
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index da24891ec16b..9985be1bb01f 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,5 +1,3 @@
-DIST rosegarden-21.06.1.tar.bz2 6479487 BLAKE2B c18e1b6d14c2caac1ac7a2ddba2d40fb5a19d8a6468b81c696267ac984875db58943ec0fd46afe4b5d511afa1f5cb1ada93205b6088effcaf75adf234beaa516 SHA512 a0214d95c26e01c5c0ce671bf23f4ebe7f63e54cecf6471226768aae5b4ce8dcf9f03a1970c26317d734a16a0d741d83ce684a53f115db656538522b373ef7a6
 DIST rosegarden-21.12.tar.bz2 6490931 BLAKE2B d1f3bbd173e1d082c5380be2fe0bd9818a741498add5edc9b24c47b9e37e24b928869c00734bf84dd9c2cb9a79fed15275de35a8e7cd4cbbd8ff6cdcb739c09d SHA512 d11756f57e4f364993af67e4aa10c25ef6a7f5fd4baddd127df50c84c29d31aa1e4a42485c8503e9fca31a8cf8e50c3c5b3bad2a08ac945a3fc8cd1a5874d4be
-EBUILD rosegarden-21.06.1.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
-EBUILD rosegarden-21.12.ebuild 1135 BLAKE2B 0043a742125f952ac76ffc12179df22dd24e34398c4df87007a5a3255fe7f8d273637382c5b0ebcd243cbb750d1ed7e9ebb2556957b8d94b774b873fd540f531 SHA512 f6f2595054121d9765f794187be730cc976bf3e47af9d22a8a7896fe3020638206f5a10a1c27fce38134563ed52dcc20f052e265b99620edfc8cb30832bbba90
+EBUILD rosegarden-21.12.ebuild 1133 BLAKE2B a622a2944862fa2075296aadcdf4bcf28f60de9b2d69abb9c56d78d757a74a1e31f526eb2551b08bcd9b740ca33a1193c3ebb39610cfb1a3dc2a5f3e27061e59 SHA512 4663edcf437147fe646031dd7791a49eaec8fc5e1eaaa5d841561d317fb63106af4d8cddff8c5d83bc9377976c4083cf022ce89af2c956d5ed8240139bbaef29
 MISC metadata.xml 350 BLAKE2B a98ce813216f0135bf3db7e71b401be679ac05012731d4380820df75d91cc919db2923c867f1593aff8939c5202b03d3b3c1cdf1a7884ec12f83952a66845a38 SHA512 9287817aa2c7a4d7d7767f3a44561920dc06a40fa376e3f9d04e6998e3995e93ff74170f772baedbd94c4519bd62c2c7b1b619e9a69c4a7c707ece518b6ce7a4
diff --git a/media-sound/rosegarden/rosegarden-21.06.1.ebuild b/media-sound/rosegarden/rosegarden-21.06.1.ebuild
deleted file mode 100644
index 8df3e4a0dfb1..000000000000
--- a/media-sound/rosegarden/rosegarden-21.06.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg virtualx
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_LIRC=$(usex !lirc)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# bug 701682, tries to open network socket and fails.
-	local myctestargs=(
-		-E "(test_notationview_selection)"
-	)
-	virtx cmake_src_test
-}
diff --git a/media-sound/rosegarden/rosegarden-21.12.ebuild b/media-sound/rosegarden/rosegarden-21.12.ebuild
index 7c555572ab0a..be07439fa3cb 100644
--- a/media-sound/rosegarden/rosegarden-21.12.ebuild
+++ b/media-sound/rosegarden/rosegarden-21.12.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 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-sound/scream/Manifest b/media-sound/scream/Manifest
index 0e427c91a41f..7f50537487df 100644
--- a/media-sound/scream/Manifest
+++ b/media-sound/scream/Manifest
@@ -1,4 +1,4 @@
-DIST scream-3.8.tar.gz 1114613 BLAKE2B 7c178477bbe2e1079394319657ff5bef2cacddb7ebbac0c527ff676ebd1fb66c4f00cff6578202deda96baa78d1d3a95a994e658d2bc893f10a3f3f13cf3d2eb SHA512 0ec3e68177a5852528b8dc0eed35088c7b399a59762063c5f08e06581340884123d37aebcedc0534acfb0ab0702c2d6dfc033cfcbf6d7e80faf8963ab0827983
-EBUILD scream-3.8.ebuild 961 BLAKE2B 9dbdaf8d6c05640087461816aee80101e710eeb1fa17819aea81f4302e500208337e01bb87162de5c840d28d33eb32e02b611f48f5b950737b7a1396b67e97c6 SHA512 cacfb33b2dd2fd3228e3990bf0e4ccda0b015134ef1e31e8a623af0112b340b8bac3182346ed7aa91f8d51076b4968de0772c396248f8351f74b3099c09dc8eb
-EBUILD scream-9999.ebuild 961 BLAKE2B 9dbdaf8d6c05640087461816aee80101e710eeb1fa17819aea81f4302e500208337e01bb87162de5c840d28d33eb32e02b611f48f5b950737b7a1396b67e97c6 SHA512 cacfb33b2dd2fd3228e3990bf0e4ccda0b015134ef1e31e8a623af0112b340b8bac3182346ed7aa91f8d51076b4968de0772c396248f8351f74b3099c09dc8eb
+DIST scream-3.9.tar.gz 1114518 BLAKE2B f7ae8ca69bc786fdb8055b2d1d5cd8fb9350c147465e1d75936defba8ea630351b4a559e508ef3b1f3bbd24d9b2bf96b6450577c7e5e334aacfd54f71efc5928 SHA512 83cb5b9daca82395b955fc8e01be4a466c6ebcc3839179c47912a78294ca98abed3833b6c636632a37e9d944750f56680a2a55975376756d183c9ed9b1d3dede
+EBUILD scream-3.9.ebuild 961 BLAKE2B 328f3a19a941a7bb422ed0b98809226aeb94cf011de2e633058eb0bfb2a2d64f4ec13c3d210c9e1ff083c0d0acb0d8b87cd96982f3a9d3ee35bb22efe558f319 SHA512 cffc3d8fe442b3784b8d586dcec01dc706418d7b9433eb44586919c581ce3cd376730b7456b3601bb8e48df720acab8149d5ee3c365f51a033bea23bee9ca695
+EBUILD scream-9999.ebuild 961 BLAKE2B 328f3a19a941a7bb422ed0b98809226aeb94cf011de2e633058eb0bfb2a2d64f4ec13c3d210c9e1ff083c0d0acb0d8b87cd96982f3a9d3ee35bb22efe558f319 SHA512 cffc3d8fe442b3784b8d586dcec01dc706418d7b9433eb44586919c581ce3cd376730b7456b3601bb8e48df720acab8149d5ee3c365f51a033bea23bee9ca695
 MISC metadata.xml 601 BLAKE2B 73fbecd357911596fd856784adfbbcaffc0129b0c559abed51323cc45fd55743ae86642a0ecc030949c02ea5ead0cae3738f61ac1d48148b1f4c2d00dbf23ce9 SHA512 70011204f2f601b5846c3a16409bb9b4894bf082594575da10cc857634b8d3e90dafbb38cc813696fdff7a6942bcaac3100c59df15bb9adc990c5ff361c0d799
diff --git a/media-sound/scream/scream-3.8.ebuild b/media-sound/scream/scream-3.9.ebuild
index 82133a82fe29..8c7ed7611cf1 100644
--- a/media-sound/scream/scream-3.8.ebuild
+++ b/media-sound/scream/scream-3.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
diff --git a/media-sound/scream/scream-9999.ebuild b/media-sound/scream/scream-9999.ebuild
index 82133a82fe29..8c7ed7611cf1 100644
--- a/media-sound/scream/scream-9999.ebuild
+++ b/media-sound/scream/scream-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index ad51cf099cc7..4e70fb0a3460 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -5,5 +5,7 @@ AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd
 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
-EBUILD snapcast-0.25.0-r1.ebuild 1648 BLAKE2B 8c6e492c866c6fc8b14f5e0ca0f839e2a7c5e10f0ce91ffc993ccb7052b5e61f01d9b2fd5bdcc1355c45ad0ed90f9d119fff2ea8af13f8abe1fb9aa5da1f8fe4 SHA512 afc9b48ae173fba2c8bf68eb3ecbed2827a4dc2acaf7df271cd7bc613fa4b4a04f2780036cf784746db96d6eab6b7e09f66ae2d1ff2e8aac4ebf1d9c3aedf637
+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 1558 BLAKE2B 50b29ff2f253789447eb288e250f9f3db874c3a2e9def0bcd72c289b92fc449277e8db8ad5d41ed9c87ed0b14b6b1f3113eb6290e8bc9a538a96eab1aa899a22 SHA512 71cbd7c0f144cef6bc502f21c73151e54c40fe3b8b6bfee2d26a5f046b103b9f38149218cbc905468a3c1a62884a5333005620791c94d628aacced26322ea4a5
 MISC metadata.xml 1040 BLAKE2B 5a5296b35eeae6e07b8b8c3dc3d63b58fb2d1aff7c0977f87690b9228183624c9d21fb2699aa82fef1d6027ff2cd89cb7a282cfa2c2ea0683f9da5a728fff17c SHA512 ac97766f2fe178adf1d6f642c60fab45be05e9b0509f34a270cb970ab16b3596ea90fc16b25d94b6457ff7c3543d4b88e5d291c62079ecc6b9d9e730fedc6250
diff --git a/media-sound/snapcast/snapcast-0.25.0-r1.ebuild b/media-sound/snapcast/snapcast-0.25.0-r2.ebuild
index c969b0dbde45..a8fa31c33a12 100644
--- a/media-sound/snapcast/snapcast-0.25.0-r1.ebuild
+++ b/media-sound/snapcast/snapcast-0.25.0-r2.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
@@ -17,10 +17,8 @@ REQUIRED_USE="|| ( server client )"
 
 RDEPEND="
 	dev-libs/boost:=
-	client? (
-		acct-user/snapclient
-		media-libs/alsa-lib
-	)
+	media-libs/alsa-lib
+	client? ( acct-user/snapclient )
 	expat? ( dev-libs/expat )
 	flac? ( media-libs/flac )
 	opus? ( media-libs/opus )
diff --git a/media-sound/snapcast/snapcast-0.26.0.ebuild b/media-sound/snapcast/snapcast-0.26.0.ebuild
new file mode 100644
index 000000000000..5303188d8416
--- /dev/null
+++ b/media-sound/snapcast/snapcast-0.26.0.ebuild
@@ -0,0 +1,69 @@
+# 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
+"
+
+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/sndio/Manifest b/media-sound/sndio/Manifest
index f7cb9ab53067..77049d0f4903 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,5 +1,5 @@
 AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e844e5b1cce7be92c6198ebf57e733e40261f767921d9678957b633a903c2bd659266c4d SHA512 80f2fc6eb775889ac9ba6257651a18bf030668d577727a8f78dc864717e90251757eb779a6ac97ae5468629da59a399c9df013d470744b6d480c1aa09a602323
 DIST sndio-1.8.0.tar.gz 156249 BLAKE2B 46d279c0a9ab40253d9f4abf5892d6c2cbbbeeeeb5ff72f45287b16adce122550025ee2d50b45de5e6952dfac1f25041e520692b0afc31ce9cfa5e122d8799fa SHA512 c3225e59e50c3dee41df7df1d87d32ed616117ea6883d9c643a57091b2239b03988c00230882c32f68331952852781dccb8bdc5a6c92780d97a294a1bd9d8ef8
-EBUILD sndio-1.8.0.ebuild 1056 BLAKE2B 622f2503a9f3180924dcb1531b3c421f93e0e9cc0281e5ca4d0897ea82e659fdd161e1ac10f0565129fb883c65fd42da271680424a39f1fbd39069b4b1c37455 SHA512 883e1b5b899c5633dcf2f3fd2f167bdbbb33d1434f7309779c6e3cc0fe71d7ff582209ca01f9a228e170506ca22df4d0eb5541468241b1e089d19800b1b41d47
+EBUILD sndio-1.8.0.ebuild 1062 BLAKE2B b2ad8c433260bc1c81afa7c384dc2d4c25bfcec944b8d31ae7b84d83705540a0f6ec8bd4caf4830adf31cd1d4a9f0b3a0e684ecdb07dac13110fd2d47b4afe51 SHA512 3d290983c6e3a69e862ae503db7dc00c8eaa77a0bd050a16add83ca8399b63a74bf8622ce1841421cd118b29ea4ff3488f9d571a6ef6f214e029b65da3becffa
 EBUILD sndio-9999.ebuild 1049 BLAKE2B 55f1786cacbae3e9e3706cb9d23ff2879d224a6a5929cc0bc3f9ba9dec6728c81017023e6c2b859f3816af09663b1d87a43a789afb0d26f98965dfc16d6f1d4b SHA512 afbfa868aaaddffad8c066e3840cd85b9ba272894c3f31b56608c1953659e4c3fea7eef59d5ba2f70e2fd63f4bb4490b5062f6cf940bc784a581f42d315e713e
 MISC metadata.xml 410 BLAKE2B 75c853b9665a82c30c29f3aa0e9171fe2665ed2f7e4c1a7ccdd04258a07e4ef753ad01066934adccc3434aa52332b7007148c818b568335a2429bd8afc61d974 SHA512 b26adba8415ba084c079fabf29b966886bda8736165fbd9f0db13fe4da80e9be373ea7ed2d59e3b8c2b9a04eb84d8327f432c091c3ee936a82650a7983a7a483
diff --git a/media-sound/sndio/sndio-1.8.0.ebuild b/media-sound/sndio/sndio-1.8.0.ebuild
index ca228a614849..2ddabfba5be4 100644
--- a/media-sound/sndio/sndio-1.8.0.ebuild
+++ b/media-sound/sndio/sndio-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_MIN_CLONE_TYPE="single+tags"
 else
 	SRC_URI="http://www.sndio.org/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="ISC"
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 2bc6762ad27c..16ccb00c61d2 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.38.0.tar.xz 1775916 BLAKE2B d811f91256197cb6575f491e3c692a60ccfaa78ae28d5a489c27e835dec07a16c19b5bae6cae774e6efe3bc7ae10cffc3c03f652f9e60263325167cb1b348743 SHA512 d76d38839c1f5a997a900d0ba4f43d59e38d9a1d547f51bdf15d1aa9ee0a2b24210a876bfccb7b221feb1adab5882ac1d884da6131a0f259dd985326222eff9f
-EBUILD sound-juicer-3.38.0.ebuild 1262 BLAKE2B 93c85c6d629ff49db561dd43adf2e937f951478193eb57815e588cf1a30bb02227154a58a3a4d62d2348fa1c48e1cd7de4898839c18c1208647675ff4149658f SHA512 708b707ed8360b1267265e3c00192363da61c02bd73c34d04773cb2165222e23a523b93c703830137a532480cab41d2ed6dadffef5659c6a2eb07a2a75b11751
+EBUILD sound-juicer-3.38.0.ebuild 1364 BLAKE2B c048c8bec57b7878a586f655ae3d086d4294a6f64981dfc36c575c4252c7f4cdf4c61f4efd0e8d7ee1ded51b3dbb086148e0a983e6189a4c5041706fc9cf22cc SHA512 2764efb286b7eb3c5fffb103fd872d5967fa648b954fd57d2e9457608854a68e832c2bfee4e4cdca84c797bea3d00af0ebc892282519f512bd95faaf50a841ca
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
index de08dd174e7d..3516bda7b7e5 100644
--- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome2 meson
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 gnome2 meson
 
 DESCRIPTION="CD ripper for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
@@ -10,8 +11,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="flac test vorbis"
-RESTRICT="!test? ( test )"
+IUSE="flac vorbis"
+RESTRICT="test" # only does appdata validation, which fails with network-sandbox
 
 DEPEND="
 	>=dev-libs/glib-2.49.5:2[dbus]
@@ -38,11 +39,12 @@ RDEPEND="${DEPEND}
 	media-plugins/gst-plugins-meta:1.0
 "
 BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.3
 	dev-libs/appstream-glib
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.3 )
 "
 
 src_prepare() {
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 85626ee9ea35..acb67a1f2324 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,6 +1,8 @@
+AUX spotify-wrapper 647 BLAKE2B 6bb43ce4667ff954d301a99fbbd862a5c814c140a3ab56b16dd7adf520e9ebb51f6527ce07796bac058afc3a7c4cc97a85f9e996c6e3ffee8b2b29b731b4d718 SHA512 1202e39f6d3a47cac353ec9519695a424aaf51afe24d8ca6f3ec0ec79ec19020bbc7c6e43352121684b2b7789e2c7be32d4942ad4883d3076b19ad9eee4ab1c1
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.1.72.439.gc253025e_amd64.deb 117803268 BLAKE2B 4ca2ca2df9ef5626483d4eca9c5a6f32fba63efdcd9e930379e83a2f8d40c112ab95ac4ade79fec365ae18b3e4aff089b5f07b6af02a5d080f64f14995099ea7 SHA512 65cec95448d936b7be93b0d16f29927a298b5b56aa2bc4834a5d357e341c78486fa69e61b3b6cf9fbe7da88c8d3b6ce3bccb5e963ed1b5a23320c0c808ccb385
 EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
 EBUILD spotify-1.1.72-r1.ebuild 4187 BLAKE2B ea2a85532926be54d20a1974dd726a8f34da51935cb2a64dc0a49a0daebe480d169b462a06c24370a4186c6bef33dfd7c05aa0a15bb05a0f2d71c06fafc9f705 SHA512 cdc5d3dcb5e1f0998b8d61a6076e99db9c5aaa58e5a8a62b6118e2df963c030cca9d0bce0132be7e89b98ad3dcfbde7aed00871d33db006083d3a58bce632991
+EBUILD spotify-1.1.72-r2.ebuild 3471 BLAKE2B e811845414f94846031d111a983755f4fc0eb340a8593def1ba9323bfe627c13de0c69381015e9bcc0586bd6c126e039240de5a099b43802bf772e22ac56b5c5 SHA512 6aa4511ed47f4a17646ff831edb217acafab6fad30cebe25cf605f36b2578c109b1c02c51ac1a8c30bc5ffc0e4a5b4ec3306a6ab749656b450c849f3d6dd2767
 EBUILD spotify-1.1.72.ebuild 3441 BLAKE2B 90000daf87d9578758f37ed1bca2da1a185ff6887cca06525e72c2e3c5e2d4fb2a8e6a68d79b015d0bad45468eeda20b0a5597158ec00f76671f1497b1693932 SHA512 f63014c8d4852c1c76d2f9d6dc0d55fedc333f6d3c0969bf280ae6bba21f672cca564c8cff66297caa31d3bff61dff9089441aac63bab94ade5d8068fb9289f1
 MISC metadata.xml 633 BLAKE2B acdcc4b02017e86b02be5f5e7fb56a292c5c0be9bceebf2a6d2caa4512ef240f5c1dc9d1ee6f48b1d8391556dccd81e94cda1e7233af5cd666536f5c6cb35a1e SHA512 c7b74768267009ac22c3ed90da61a60ea3ef6bb6a35c859f58ab2707af310f5201f35a526182402d669639b470ca47cd59f5a7b820b170122c4989b15f960fcc
diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper
new file mode 100644
index 000000000000..db8f8b948780
--- /dev/null
+++ b/media-sound/spotify/files/spotify-wrapper
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse"
+
+if command -v spotify-dbus.py > /dev/null; then
+	echo "Launching spotify with Gnome systray integration."
+	spotify-dbus.py "$@"
+elif command -v spotify-tray > /dev/null; then
+	echo "Launching spotify with generic systray integration."
+	minimized=
+	for arg; do
+		if [ "$arg" = --minimized ]; then
+			minimized=$arg
+			break
+		fi
+	done
+	spotify-tray \
+		--client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- "$@"
+else
+	echo "Neither gnome-integration-spotify nor spotify-tray are installed."
+	echo "Launching spotify without systray integration."
+	exec "$SPOTIFY_HOME/spotify" "$@"
+fi
diff --git a/media-sound/spotify/spotify-1.1.72-r2.ebuild b/media-sound/spotify/spotify-1.1.72-r2.ebuild
new file mode 100644
index 000000000000..d3f98c51dd26
--- /dev/null
+++ b/media-sound/spotify/spotify-1.1.72-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature pax-utils unpacker xdg
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/download/linux/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="439.gc253025e"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify local-playback pax-kernel pulseaudio"
+RESTRICT="mirror strip"
+
+BDEPEND="
+	>=dev-util/patchelf-0.10
+	sys-devel/gettext
+"
+RDEPEND="
+	dev-libs/nss
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/openssl:0=
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	media-libs/mesa[X(+)]
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-sound/apulse )
+	local-playback? ( media-video/ffmpeg:0/56.58.58 )
+	x11-libs/gtk+:3
+	app-accessibility/at-spi2-atk
+	x11-libs/libxkbcommon
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libSM
+	x11-libs/libICE
+"
+	#sys-libs/glibc
+
+S="${WORKDIR}/"
+
+QA_PREBUILT="
+	opt/spotify/spotify-client/spotify
+	opt/spotify/spotify-client/libEGL.so
+	opt/spotify/spotify-client/libGLESv2.so
+	opt/spotify/spotify-client/libcef.so
+	opt/spotify/spotify-client/libvk_swiftshader.so
+	opt/spotify/spotify-client/libvulkan.so.1
+	opt/spotify/spotify-client/swiftshader/libEGL.so
+	opt/spotify/spotify-client/swiftshader/libGLESv2.so
+"
+
+src_prepare() {
+	default
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \
+		envsubst '$SPOTIFY_HOME $LIBDIR' \
+		< "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax-kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+
+	optfeature "Gnome specific systray integration" gnome-extra/gnome-integration-spotify
+	optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray
+}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index d7507b6a3a27..c688f5a3faf1 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,6 @@
 DIST strawberry-1.0.0.tar.xz 11149316 BLAKE2B db500acb75c1e206c7eb2b5b668fc850444da8383ea98926e05d3eaee46a477f9b7c24017c75a1ea8d0ac8d89287a137aa65ef9098527b0449e3b5b14e37fa9e SHA512 e7f03eb068bd2de22b83b0bdd493dabbbe054bb0f7d3f4d237ff38955e382a13d7c42f60c9a257c906ded46567b6f4ca9139920291df8a7688fb4025cdfec488
+DIST strawberry-1.0.1.tar.xz 11191132 BLAKE2B e182ec5db26b22b60e9393b3a418cf44c01b647ab268bafe6d3f098d879817563d68faf7962f0670017f70b7f9f64f3a680056002e7041a2dc956fdc1dceeb95 SHA512 6a668ba6dbdcd5c60e78190c2cc8c04ad4ed920102c7555fdd42f6bf47c5b4004f9580c0f009cade642b404f6884b2b5dac386d326bf6f234403e4ba7612a2bb
 EBUILD strawberry-1.0.0-r3.ebuild 3050 BLAKE2B cc7af3d47d128f8bf0ec448100c413f2a8575e1e777967fd1fbab801393ae22fa984a326215c3d0f7effda78a247e194fc7d1f805524fb6a9dbd79e9a80b8c68 SHA512 05985dafb6975a6a2a94cc91d3a5c19fbd2d883ad79483adb1f9428aced426a37dc1520899f7588edd8717e483a8e804317af2f2587c62e38a1eb10bfb153405
+EBUILD strawberry-1.0.1.ebuild 3052 BLAKE2B 9a491efa29dae00d1bbb920fd3f54344db71cbf9e2b55286ccecdac0715c16a66b3a1d2ee56cfc6e2e749576c45b134024364f5534824985034623dda9ea485b SHA512 cabc602ece8c7e895a741d6158c031a9e74922b6e1c0b9ebc826af22b065eb9076f495f67d27f6d72bf0535dbfff876afd5d3a92f3188ffc95735e6742f51cc9
 EBUILD strawberry-9999.ebuild 3052 BLAKE2B 9a491efa29dae00d1bbb920fd3f54344db71cbf9e2b55286ccecdac0715c16a66b3a1d2ee56cfc6e2e749576c45b134024364f5534824985034623dda9ea485b SHA512 cabc602ece8c7e895a741d6158c031a9e74922b6e1c0b9ebc826af22b065eb9076f495f67d27f6d72bf0535dbfff876afd5d3a92f3188ffc95735e6742f51cc9
 MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa
diff --git a/media-sound/strawberry/strawberry-1.0.1.ebuild b/media-sound/strawberry/strawberry-1.0.1.ebuild
new file mode 100644
index 000000000000..3649ac2be758
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale xdg
+
+PLOCALES="ca cs de es fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	>=media-libs/taglib-1.11.1_p20181028
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		>=media-libs/chromaprint-1.4:=
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qttest:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	cdda? ( gstreamer )
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		# Disable until we have qt6 in the tree
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
commit	2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree	4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /media-sound
parent	c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)