gentoo resync : 16.04.2022

26 files changed, 251 insertions, 148 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1ac134f9ee34..5a48fd2e1eb1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 80bf582ea52a..19af43531de7 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,7 @@
-DIST abcMIDI-2022.02.21.zip 609368 BLAKE2B 0608d9539d0a66f739a820693c5a9884d1b39b68e4bcd3d21ce020ef240de6e19eacb52bc35ed7a9d4c4fde47e6265c415cf4d80711853904ccdc1ffd752cefe SHA512 515c6ebef75a5b0592578dab6f5d940ed5e25811dd66f15f85ebb1e6fdd7bcbcffdd4d361e0f16a78144323fac14a0cbd1a7ed6b14c7039e2d48986d40765171
 DIST abcMIDI-2022.03.08.zip 609510 BLAKE2B 231eb517a2d47993ed39e509d377d14ec2311fe49128bf559799ea1fabd3ba79c69307f2d7b9d44fec2279e42d0575141088463ca96aa0f9dda5bbecc305a92b SHA512 3267bcecad586e0aadc5fbc2801c0c992ba765094fdf5d3b71a8634f4433a950c64b0c863bec496bd21f8a630c0e768cbc39d50d58e6cf9d2769a66bf265a8c7
 DIST abcMIDI-2022.03.20.zip 609912 BLAKE2B 8972f6944897d49c1281be9d9b1368278d62fcbfc909651d1fb1347d3efef4ab145f049bac05e11f09118548e9c3c3a753f9367c9e90d933af96e74b71bd6b19 SHA512 138480f0d2a36b573e63a9214d7e2e2109a3e6b55e94999376a333da1978fea0addb5359b0d469d801924d6e039b0eb164a28a9cfad02d73cba1069a29dbfc9b
-EBUILD abcmidi-2022.02.21.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
-EBUILD abcmidi-2022.03.08.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+DIST abcMIDI-2022.04.06.zip 609956 BLAKE2B c140bcacc94d8e6193ba6220c1747861a11d79e5b394ff5826edfdb3029e57b3a6d9443a557baf6279d4a7c9e6488dcb2c8d0e6a05858046be53fc52be2640bd SHA512 06d4ddfc4f7bbc1906604629e3b2ca7ebf8d2f89edb478d2068b2ba4efab6ff1d96aeebd6344ea2ebc7a92c23cf49d08b40bc97c47458e526d505313fb52a527
+EBUILD abcmidi-2022.03.08.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.03.20.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.04.06.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.03.08.ebuild b/media-sound/abcmidi/abcmidi-2022.03.08.ebuild
index 11f547f4cb8e..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2022.03.08.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.03.08.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/abcmidi/abcmidi-2022.02.21.ebuild b/media-sound/abcmidi/abcmidi-2022.04.06.ebuild
index 3b11050a4f44..11f547f4cb8e 100644
--- a/media-sound/abcmidi/abcmidi-2022.02.21.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.04.06.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/deinvert/Manifest b/media-sound/deinvert/Manifest
deleted file mode 100644
index e0bd0daebbbf..000000000000
--- a/media-sound/deinvert/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD deinvert-9999.ebuild 577 BLAKE2B 73d11db67d8e80b4505d7c5e30d16aa94d0980dc8c029399c1970cb7ce3dbc1df5269323afc192ca2d5199a5c9c71ac7713506ff86e7601480a10d9649b96a50 SHA512 43c85e567aedac7f8d8184d70a87403c4a1385536e60fabb23632c13789a177588fd4a525062da4111a9602f0e01e61ac78d173438ffb4137b5a1d3b95018dd0
-MISC metadata.xml 424 BLAKE2B 2614e40d104e5af87718cd3dbbb4075b16897d128ea6cd9b733d60390eea25056c65b9a72f542a49c2cb48493aabb3147ee96cbe8660d11f776ccefa346872eb SHA512 46fffedc09b45ebf8316a854586f10d23315181515ef036bb53ea3631a6ae46e5ea073ee42a9c4730d15dac9fbe841c3f84e15ddeea8c5b94a6c78e9a238cb7f
diff --git a/media-sound/deinvert/deinvert-9999.ebuild b/media-sound/deinvert/deinvert-9999.ebuild
deleted file mode 100644
index 8f9dfb0b0b80..000000000000
--- a/media-sound/deinvert/deinvert-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit git-r3 autotools
-
-DESCRIPTION="A voice inversion descrambler"
-HOMEPAGE="https://github.com/windytan/deinvert"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/windytan/deinvert.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="+liquid +wav"
-
-DEPEND="liquid? ( net-libs/liquid-dsp )
-		wav? ( media-libs/libsndfile )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with liquid) \
-		$(use_with wav sndfile)
-}
diff --git a/media-sound/deinvert/metadata.xml b/media-sound/deinvert/metadata.xml
deleted file mode 100644
index 617359842772..000000000000
--- a/media-sound/deinvert/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="liquid">improve sound quality using <pkg>net-libs/liquid-dsp</pkg></flag>
-		<flag name="wav">wav file support using <pkg>media-libs/libsndfile</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 9f55c57f9a6c..2cc31f0bdb53 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-21.08.3.tar.xz 1739368 BLAKE2B ba802dd260e2061bcb652511c732b4c6c9431ca4c3af30f71980f06637bf9942b94874b56312eaa24a3b764132db290d73165bae0c6b967f84293ca07c656196 SHA512 839a35d3bd69b6c57eff85b583d78d8a630536f7911283e407776ada8c69625d2c3e06a0ac1591cf91420eb05ff1cd9bfbfe6eb8dccbbb26a31845a3ab9f2018
 DIST elisa-21.12.3.tar.xz 1748236 BLAKE2B 5e3ea6a5cd1f7bb9aa7a99e33ddfe97f7f239f3594d8e7684639861966b16e812ba9f46cbc5a6c9ceb5c19acd75c3bb56567875dacb01ebade88a59ec81cb865 SHA512 f2ef0c2669d171e42e55460d464f019751a4fdea174cf8224c90bf6002d7d181e101cac46c8fb3e8e13bfac0b0f79bd16fae3b55f02808a4172ba994f8ac667b
 EBUILD elisa-21.08.3.ebuild 1645 BLAKE2B 1eeb11af3bba9667ac966d084e44138c73b18f8d24b5e54f8f951c03edeee36580de42dc4de8c8d4d15e2067db5962116e3900ff28d9db0a5625f993a706815a SHA512 105c60d1091c90941af584ce31f46c9cb131a1a1c31c57cd42569e0566898a57f9a4edd505ffa071d6d737ea6afe27acee6d6ef9abffd68570ae28075d7ab1c8
-EBUILD elisa-21.12.3.ebuild 1648 BLAKE2B e7309aadf1779490bcdf79f53a57076ddd3c0e4f2d4e209eaef25e963ae46b0df33a26669d62b58a431c57f6b18994c8909eb0181e71b4396189f07b8fbb71e2 SHA512 0306ef949803a105263bb7d840a80336594b4e4d232cd8a42844ba75565b244f13f5cd0bd5365bcaa3e7a9cdff6737b4584b2a08f518197cf25bb4f114577d1f
+EBUILD elisa-21.12.3.ebuild 1646 BLAKE2B d8b3c5c634f5bb8d954a5554c6ed25cb30b53be73379c8d7904ca048e9efe6a95f03da3d5f74664184374d8f6d874898baf3a986009dc8c76f2cde53f4650fbe SHA512 101a9d258134698d1994247b1ce73bae1c4300c0842b85e458694b2511defcced8b4e72693a76d76d93695566fd758cfdb7b5012f8a187deea00ad1f4d72c174
 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751
diff --git a/media-sound/elisa/elisa-21.12.3.ebuild b/media-sound/elisa/elisa-21.12.3.ebuild
index 593d43270229..01c5eb6c69fe 100644
--- a/media-sound/elisa/elisa-21.12.3.ebuild
+++ b/media-sound/elisa/elisa-21.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/elisa/"
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="mpris semantic-desktop +vlc"
 
 RESTRICT="test"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 8eac742aa967..b54198ec8d61 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -8,5 +8,5 @@ DIST mpd-0.23.6.tar.xz 770812 BLAKE2B 5ccb4a7c06c4317e3285846a261438bdcc10db5eaf
 EBUILD mpd-0.22.11.ebuild 8432 BLAKE2B 8f392818d046de9043ab4687b974e04bef7bd862250eeb9f54781b4379f399685a1c5e494e45737df426de23865b4b7ceda01cef76c3b9a2bf4938ed426b04f6 SHA512 9804fbcd13f02f6476f926502c926b008cbe9d765dabb17a15516cc7ec7d0cb1412274227c8c19564dfe47e6a2f2f397ea3a94b0bab3d812bb19ffd1ef421d11
 EBUILD mpd-0.22.3-r1.ebuild 8126 BLAKE2B 818d798cd6bc84639490e60456023bad57ba0b5e08533b903744e03fff1627811dde55f3b67f7600af10e00b17c6b490acf7fa3a616e3574001ffc5494f95aae SHA512 30f4ce07449598a93429ca88307fd5e9ee9471ce742f350ee0521ea68a6a9b4c7144c2c6ee8c93116a797dd36170189ef907d9cae77cc46b77a58df6be79ad1c
 EBUILD mpd-0.23.5.ebuild 8888 BLAKE2B 720e6e27f453b0a45f758674e15227953ad025a20b2d44e7c7e176a5f8a17126b1dea267b34ada121e39286fd8b90875750e7e75f9129d20a10562a84d331fb0 SHA512 76f547fee10a657ece1d41cbe9b0f4479525973ef616f6b1a5848096322326bd99d47d7f70c55bf48cbc83608c84f18ec60ab296c535a3ea870a2ad04625cb83
-EBUILD mpd-0.23.6.ebuild 7776 BLAKE2B 464cc6ba1c6a135a731033025546c8778835dfeaf07c21407542fc3c396934f15ab862ac4df8acaa8e3eda46cec4470309f74264c6f784d192d554480aff39b8 SHA512 4af6f0e9bc4b7556cad0bc503ccff135a95a8e46eeb951dd3deac5dfeccded855147dda4edbec8dca7376a640b1b938b1bf7fbbe2ae756e25d09220c0d41507e
+EBUILD mpd-0.23.6-r1.ebuild 7840 BLAKE2B 6419899c6bbed1fc9afe98fbfa14eb9e3c444e714899f63099e3b7e58cd91ab76a4a2b80b38c8d6c6384b6d6dd774e3d51980a812045d37b8c8800330bbb0921 SHA512 70f93d68014bdae3e6535aabab0a831c1e11c3f12dee15806c37a3e74000ab3d119b4422cbe90ede4944689af6e4b33939c90fa4629d0d5f9310a728e5f0bd26
 MISC metadata.xml 2724 BLAKE2B 08bb2402db4224ccced73cb40aa2e3d7e9a9d699277c999e08f12bb0cb1bbd1406c6fb20b9b80cfe3a41eae05e28f4be30d5e59482132723a82d4ef6de81219f SHA512 112a969c9150a17bc99e18949bc32ef15fb2d06903c0ac5ab455d29ca0cae0f2150b90f0e94cd3a4755c5f545b23c0bd5ec2de93bd154df1d70f224a0f8011c0
diff --git a/media-sound/mpd/mpd-0.23.6.ebuild b/media-sound/mpd/mpd-0.23.6-r1.ebuild
index cd26cda82402..0acdab319108 100644
--- a/media-sound/mpd/mpd-0.23.6.ebuild
+++ b/media-sound/mpd/mpd-0.23.6-r1.ebuild
@@ -41,20 +41,21 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
+	dev-libs/libfmt:=
+	dev-libs/libpcre2
+	media-libs/libogg
 	sys-libs/liburing:=
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
 	)
-
 	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile:= )
-
+	bzip2? ( app-arch/bzip2 )
 	cdio? (
 		dev-libs/libcdio:=
 		dev-libs/libcdio-paranoia
 	)
-
 	chromaprint? ( media-libs/chromaprint )
 	curl? ( net-misc/curl )
 	dbus? ( sys-apps/dbus )
@@ -97,7 +98,7 @@ RDEPEND="
 	sndio? ( media-sound/sndio )
 	soundcloud? ( >=dev-libs/yajl-2:= )
 	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
+	systemd? ( sys-apps/systemd:= )
 	twolame? ( media-sound/twolame )
 	udisks? ( sys-fs/udisks:2 )
 	upnp? ( net-libs/libupnp:0 )
@@ -110,7 +111,6 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.68:=
-	dev-libs/libfmt:=
 	test? ( dev-cpp/gtest )"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 3532498626cb..cc97cb1491f0 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-qt-0.17.0.tar.xz 104120 BLAKE2B 13cfd361d134a8fb79eb6bf20ab2e2755b998e4c46105efb0e7d29a171262d795b6f77629c4b066b0d786cf1bd60784d0d7155c4b77d23ff2a0a148f3f7764a5 SHA512 b6c77fc78c62051c8c0484edb09d1e2a347fc30ae8b65f1e4b3d279499abd47aeaf19c2cb3037871ef8885a5bc787f3d0307d7c0aa0699deaba3129501fb9a3a
 DIST pavucontrol-qt-1.0.0.tar.xz 110092 BLAKE2B 82d95fb649422d5d9921b8d1b7759367689d884e7bf134c47a7254f2bdf9c0eaf31fc4f96cbc105112b52c5619f31f13a1816545b7d619f4b358fc185c4d1652 SHA512 10e03572287a468b2c8062098edab1e5783a6b02ec3629ff0d65f87a8dbe2e490752d9edfdba1f0886165302ec9da615467344ae6b7fa97afde63491e193df89
 EBUILD pavucontrol-qt-0.17.0.ebuild 671 BLAKE2B 85a5d3d4810e3580d35e16143d9a901f51d0c9f8f0f3bbba205e1430f0e3df908113b24b583ad07458a3cb9bab622ee66ef27e031e0de8c100d436db3a1618aa SHA512 56b254b486e007b0c663b2bbcc49f710e4226e4ddbf71261c9e0b2ccc16131836a460e4d264c4d0f0c98e3de5f2f944f12ed60dbd80ad37056b4f5172dbfcf2b
-EBUILD pavucontrol-qt-1.0.0.ebuild 720 BLAKE2B 730392287c43a21c2bb2de2f433d329a854394f13256480f84d2d23d8fef4dcad479af75d4dfec9efd2de67678df72d78f293edd33507a8486c0999c61e3217b SHA512 e4c501e6820323f57a3536575ac437ff91f9dc310a92953fa38d2a46826818bd70e62af4cd22de4e1478b90a9bb0f1e89d6dcdf6759c7ee8e4f90df4272dd622
+EBUILD pavucontrol-qt-1.0.0.ebuild 717 BLAKE2B 873a4bda98e30d8562c03c9b56b4b752fad11f6f0e51a7fdffe0c1e583448ae488551b2d676d519d9d417cf00d496b835f55acd05e0f6993ca7129bda98c92ad SHA512 803c980efc57a07024a08cd6fac091d3fc0cdd5f13c03d8545dae1b24abd442884db669d7faee362bfe264268484c92c5a072c8b535c3637236c6e854fe58ad6
 MISC metadata.xml 321 BLAKE2B b7f545670cc272a1ae2adc3042c6e3aadd1c290cd0c5ae53e7b9a07dace88a7ae388c8aab67547272f9196fb25a36dcbf27e33004d39a56923c288bee9cea327 SHA512 97d8ab3268bbd28ad78fd4e1667a4e5e5920b611adc9b175c45f670afeb99d7a88101ce53aa5594436ad67e32b94501f90b97ba29c312b6f3e90c14af1035a6e
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
index 7331d3993129..c56a6aecc9f9 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-1.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index ebbdcd5185be..4914e923cfa5 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,3 +1,3 @@
 DIST potamus-17.tar.gz 146822 BLAKE2B 9fa7beabcd4e0ce8a3a6adda4fa425d0a6789c85cc1852bcf528c709574097f5fc34127cb8404d2d8b01c0f961026439786f58a0afd3bd022ed9efe22790bcf9 SHA512 655ac7c99e252c200bb012b1076850ae8c4307ac57dd8d6cb86fc0da0a0ea3b3193c617a365889485a4cab87cb113e40f1d828585e5bdf20c5f2b1b0a2c51099
-EBUILD potamus-17.ebuild 1133 BLAKE2B a5c02e6418299c784836bc3bd5813e6836853c75ba262c1584eee0d6d90d54fc69ae3ee6835460197c49343df7e612eee767ba52c76036cdddcf01a95580ca3d SHA512 f34d8c7a53acf48e2aa84fedf70608e62730579eaeb6a376b5ebe3d030366b759aff340cd8329608b3fc55cd28d75d79be1fd0e95d96c3b3e9833a104e634cd6
+EBUILD potamus-17.ebuild 1110 BLAKE2B 6d7d9d16e4c1ccb467e1473b965b4763ba709c4ef8356d8f270c459407f257a81f4592a53a0a3bab06e2acc990f2ce75307bf739ed7ba9c934427da09fd2fd03 SHA512 9f841da8c86c199f875399fa456a23b1c1dfdddb2c31f0821e6471468dfa165f28456512b64f651f74513179ffe19c4b823c37373174d0444209a7ed95dc9e44
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/potamus/potamus-17.ebuild b/media-sound/potamus/potamus-17.ebuild
index 1579d146b648..f6d79f9163a6 100644
--- a/media-sound/potamus/potamus-17.ebuild
+++ b/media-sound/potamus/potamus-17.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit xdg
 
-DESCRIPTION="A lightweight audio player with a simple interface and an emphasis on high audio quality"
+DESCRIPTION="A lightweight audio player with an emphasis on high audio quality"
 HOMEPAGE="http://offog.org/code/potamus/"
 SRC_URI="http://offog.org/files/${P}.tar.gz"
 
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
index 2356c4720793..96c813e4b63b 100644
--- a/media-sound/puddletag/Manifest
+++ b/media-sound/puddletag/Manifest
@@ -1,7 +1,3 @@
-DIST puddletag-2.0.1.tar.gz 1227152 BLAKE2B 804e9ca9629a9d78114d6f4b6afbe9032cb414678ea6325679c21ac18867bafed8f1b16aae5fbea18995ecc800d35594c478a5164b377f3b4e5dd75148fd3246 SHA512 d84ba360a6cd8c3ddb6628e30276df58d059d9e8cbb2d1255320ca273436c69f05584059c2e768a15871d3f56dc08d7ac96fef9a9c7c077811bb9fdfde444610
-DIST puddletag-2.1.0.tar.gz 14628824 BLAKE2B 52ac6291682710eed81aa6176b1a53eb15aec8885a8421361d3da8850e8b1719d0d1c9b2f131ad826febc328244ec890cf6283f1945275458d75b1f923890dd2 SHA512 638c12be894d157d0456f336972f0064c4f4087d1c689f58b7b01f0e88cd773319b9c447e6f2b606f6e482b6d1e2328f5bc2aca556bab427b764d6525b8c2d5e
 DIST puddletag-2.1.1.tar.gz 14628014 BLAKE2B 14343cc5731bd060dc836b14707948ef103c3e4c968974e7c578ac975a12d6d2b9d3dfa9750e6d0ac94e8a8466c85b82f409b93cc787a32d8950f5de1b60dd3e SHA512 b05ab8a09d5ad4d21f8384fa85beebe039b8ee7e775630a23981bfe88ac389fc34a6ac6eac6660a99f38e34157e6bd841ba12237f45e290fe96ded3ab6d44d77
-EBUILD puddletag-2.0.1-r1.ebuild 1103 BLAKE2B 4ae7c9475756de655d0bcd372c437a8b5ff2402686feb252b127a307184e2c15d30aac9634257491d1e311692ad72e309f19e28fa4cc5722959a5fdb15648ff2 SHA512 344971ce17a67d5173c33deac101395f86492229660d58b1647de50714801c27624084bb737806f9917442d167bc4e404f530cacab5cb0e9bab161ac8ed251cf
-EBUILD puddletag-2.1.0.ebuild 1148 BLAKE2B f9e8e2c778d08d158516e4aef6b2fb1f30f14aebd16a37dbede2e65b6738cd49a6cea802a201544f80342d1ed630bcb0f3aa330c7ccc677a6282ad6742fc109d SHA512 e4ac798f89666f6da5b8cf32f620dbc855bc579a885d8569c4ee6328f8ed81e471e74d900ddb086429007f62099919f8fe18c9b3845015c2438714197ebae5b9
 EBUILD puddletag-2.1.1.ebuild 892 BLAKE2B cf6ce1fca7b383ffd303b08a4f69078134c933014b6565eefa7b7cd76c20e4c4f039040f9175db8c3b8837e44696ec9419b7ec2c8ab106a0a095879b49315d84 SHA512 7903edf2912017094b6abf1a18b748135dbd3c29b6aa812689d02f069e1e294079c53860b9a2927088e99471c40bcb2146a36a31c62c0260fe7bab610c4e8168
 MISC metadata.xml 625 BLAKE2B 53148d8c908987d7bae7246c123e72638270848c8458a18f1839a8046995eb156d25c75b0312d0dfd5b1949d16062362b7c4af09f74843fb3dbf81015f706de5 SHA512 b49b68c45205f4f465263983d94bbb5289412ab7567e210f98b98587bd3103db426a375fecf7c2e99929df623d1bbd603330561fffccdc4bf70170f2312d2769
diff --git a/media-sound/puddletag/puddletag-2.0.1-r1.ebuild b/media-sound/puddletag/puddletag-2.0.1-r1.ebuild
deleted file mode 100644
index c2b9e387903e..000000000000
--- a/media-sound/puddletag/puddletag-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="Audio tag editor"
-HOMEPAGE="http://docs.puddletag.net/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid quodlibet"
-
-DEPEND=""
-RDEPEND="
-	>=dev-python/configobj-5.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.15.2[${PYTHON_USEDEP},svg]
-	>=media-libs/mutagen-1.45.1[${PYTHON_USEDEP}]
-	acoustid? ( >=media-libs/chromaprint-1.4.3 )
-	quodlibet? ( >=media-sound/quodlibet-4.4.0[${PYTHON_USEDEP}] )
-	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
-"
-# docs
-#	>=dev-python/wheel-0.35.1[${PYTHON_USEDEP}]
-#	>=dev-python/markdown-3.1.1[${PYTHON_USEDEP}]
-#	>=dev-python/sphinx-1.4.8[${PYTHON_USEDEP}]
-#	>=dev-python/sphinx-bootstrap-theme-0.4.13[${PYTHON_USEDEP}]
-#	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-
-DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-sound/puddletag/puddletag-2.1.0.ebuild b/media-sound/puddletag/puddletag-2.1.0.ebuild
deleted file mode 100644
index 2e182ebcb057..000000000000
--- a/media-sound/puddletag/puddletag-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="Audio tag editor"
-HOMEPAGE="http://docs.puddletag.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid quodlibet"
-
-DEPEND=""
-RDEPEND="
-	>=dev-python/configobj-5.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.15.2[${PYTHON_USEDEP},svg]
-	>=media-libs/mutagen-1.45.1[${PYTHON_USEDEP}]
-	acoustid? ( >=media-libs/chromaprint-1.4.3 )
-	quodlibet? ( >=media-sound/quodlibet-4.4.0[${PYTHON_USEDEP}] )
-	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
-"
-# docs
-#	>=dev-python/wheel-0.35.1[${PYTHON_USEDEP}]
-#	>=dev-python/markdown-3.1.1[${PYTHON_USEDEP}]
-#	>=dev-python/sphinx-1.4.8[${PYTHON_USEDEP}]
-#	>=dev-python/sphinx-bootstrap-theme-0.4.13[${PYTHON_USEDEP}]
-#	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-
-DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 1e3fe5ce7cfe..e76224b6805a 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,5 @@
 DIST qtractor-0.9.25.tar.gz 1874329 BLAKE2B 94e653724582ebb6be417574e4bc357b58fe79deca686745607dcdf75f14b813cfccdb1d976dc98f89a19c23450ff52ef6060417ce986882374ba36c8f724a7f SHA512 057add530356bd81c4afc9e5527fbf2f6ec21b2f0455f0f8739efb82730ea834a5d2397683e3622071fa75dde31e9d0a1f36d9381618d4a2604100f1b8dd5aa4
+DIST qtractor-0.9.26.tar.gz 1868666 BLAKE2B 3e0febf185ad5818bec00c3b66cfdcf8e2ff89909f3934facf3e371283b840847111b3eb175bcc7f5e0a073f06b01554aa5f61a0add1c21588124858849a3cfa SHA512 ca1a1cfcd7083bae83d26b0710cb7b884658176c060858f5f9fbc40a885a498731a544390be2a61f4f986d113ca112271eaf5c6218f6e3051b152dcae836b8d0
 EBUILD qtractor-0.9.25.ebuild 2443 BLAKE2B 55b7a06d8840c4b0303511e5a2b790a80672f95d5e270b3bccc9232562902a1ca6eea92de9586fb598976de0b54190139f34342024358569d823d121ec313a5a SHA512 f71d82260c8ad9ff055ca1c881a70924338b86b2360d56b5cec580296ac8d99863ec27cdf9d84ba85883165eb454b1fbfccfd51fc4e5e8eaa0f9d29505e6f18c
+EBUILD qtractor-0.9.26.ebuild 2445 BLAKE2B 7508a7aea3d74dc68d3a8fffa85f733bf1772d5f87dd545d6dc3ab6ea2e75d8aa96b0320014236f855a667fabac9e14fb603859140c1f5ba733b0ecc4faf8abd SHA512 acddfa87c474e4876081bc1ad5b7607fde4ac785ab10d0ed5e97711b32f4de0c8e827833d2a3a91222ed5409e2913ea3eefdae5e13bc66634ecff0a168edafff
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.26.ebuild b/media-sound/qtractor/qtractor-0.9.26.ebuild
new file mode 100644
index 000000000000..f9f6cb16552b
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.26.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/strawberry/Manifest b/media-sound/strawberry/Manifest
index 713eef69139b..6bf6eb80af5b 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,8 @@
 DIST strawberry-1.0.2.tar.xz 11202768 BLAKE2B 555c9492a6c10e9df579d4e9b1c718c722531f21784f68a436d8bd313a6950f0cfc58ded85f9a144de12a73ab07a0cc4d0e028223122dd4fde6604eb92145bd8 SHA512 196be23dde8fee531b2996bc7dacaf5b00dcd3f1aaaeb6630ed2a2fdeb777abb66d6c19928fc157dde7d5bceffdc646ff615a6d52bc0e6ee5ddcc14de6ee7a59
 DIST strawberry-1.0.3.tar.xz 11197224 BLAKE2B de47d07133506e21e5e5cc6a9460482f364cca4eb1ff9a3433b09a75db4cbde339b6ed7949d788c87d465b6dac488e598b4840a3b24d6439f28cbe59185b01e3 SHA512 a61c0824ac75d29048c31ce7d8b7ae5ccc700f21700951b53ab87f30b15a2ce49368c7a366037565d3b5c556cf20dad8c93d1db936108eda7429518d7700d6dc
+DIST strawberry-1.0.4.tar.xz 11208992 BLAKE2B f7a8b000672b55fb667fa4e0f32052adb138b4dbdf2149beec308555ed00417aac0734fe7ede1767bf648d5a10ab527b69f004ffe0b1f8834e65d6dbaf2c52a9 SHA512 e2a90911acd47735715266cb3745910a6e04a2ef4e98b0c9734230a5e2b382cf7d3681fc2e368a361e7a7c53bc0627a88a36e6df6c4f6941d54f65e2424d29ee
 EBUILD strawberry-1.0.2.ebuild 3068 BLAKE2B ab5f45dc7358f0a6390154c35d241059c3620a47cc0060487f7777c87503d13b8cebafdf7739736844415deffb738ec7797e3ddfa8a471908380075ab07813f2 SHA512 e019a4ce8f3cb9aea5f281d6a07caf24c25e653ece187e8b86b4bd9442b66da7d20dfeaded540298ab7546346e4ee67b7707100ae1ff2e349acad2afe6ec5a28
 EBUILD strawberry-1.0.3.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
+EBUILD strawberry-1.0.4.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
 EBUILD strawberry-9999.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
 MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa
diff --git a/media-sound/strawberry/strawberry-1.0.4.ebuild b/media-sound/strawberry/strawberry-1.0.4.ebuild
new file mode 100644
index 000000000000..af868219fe69
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.4.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 es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~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
+}
diff --git a/media-sound/substract_wave/Manifest b/media-sound/substract_wave/Manifest
index 691eb1ae1cc5..3743e83177bc 100644
--- a/media-sound/substract_wave/Manifest
+++ b/media-sound/substract_wave/Manifest
@@ -1,5 +1,5 @@
 AUX substract_wave-0.3-Makefile.patch 1112 BLAKE2B 9a4e57525dd3fcfcd110cb645c6d2c2fc38aff77fff3456a65b5beb005ea7cf51fb53dd3618d426d9fe390e39f21615e49725d549dad3f8220b7033cd8a831fc SHA512 050562b55d1a45dbcba694df9f989be9ef7671b08c6bc9f9bf76f7650c5e3fecba0ddbcf9b77af07505e5504a2d0cba84a4fdc029d04ac83659930382ab8b429
 AUX substract_wave-0.3-overflow.patch 884 BLAKE2B 85fe358477be29831817d2785afe627421183e82a809b7bebd98157583a4871283e78b480cbc5ec99c65be2b9d671c911d16a8810098bcc8a82deebff3a901d0 SHA512 384054cdfc029885dd4d3f7ada6d9838736c5cd375a936bbb785233b124157028c2690f7036afa940f6ff536e14105eeb02ec6b1581db9c9cea64279d50586bc
 DIST substract_wave-0.3.tgz 14793 BLAKE2B 7e22fa8f46b1eb2de889034867a3c0c0d1594ae639abc970bafc6c27858ed2d78170c4f0de18368bf6fd5a83b878624e0e1c35e35831fcfb546996e5de92ed51 SHA512 f62c6c36e5cc69b4cc6afb28500b89284dc48e12b42643e9dca836dc48506a97444d6df032fb593329952d70e41e2a88963291bbb2c5a5d54db3a577ea7bb5fb
-EBUILD substract_wave-0.3-r1.ebuild 558 BLAKE2B ce2ee684277f841c475ba6bf61b73b07e3fa87a0ecc6e7df5aa706279cec7ef17d64eb8a797c008c321a68d1dea5ccb037629d0abe06c4fe37285753e847e6f2 SHA512 660ccbfab26c3a4d6f7d1b4bd7778a9aad80131fb7e87e3724a2c26b580f5adb68125b8646a202f57ca40c7fad4c9553837f5a312afb7351d9efa7759f41d197
+EBUILD substract_wave-0.3-r1.ebuild 535 BLAKE2B ecf0fe69079ee1b7c06ed975253d477ffded7c2895b918c0b4138cfb3aa5b2cdaa7af49290f9618e6e091cadc1681e4837d94549b0374abb467bc83f57bd5a74 SHA512 c11c9617f543e2ac05441f85f790b682f8420cd8891b67edc11e9e6d17337969ddff14bc219048ca6c1419c03bbe77cb9798a5441fb1b8af8f6579e55eeb8016
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/substract_wave/substract_wave-0.3-r1.ebuild b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
index bef6d1ddfaa8..775a29a2bd93 100644
--- a/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
+++ b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
-DESCRIPTION="substracts 2 mono wave files from each other by a factor specified on the command line"
+DESCRIPTION="Substracts 2 mono wave files from each other by a factor specified"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
 SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index ed2f527b0f37..4f095edb3832 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -7,5 +7,5 @@ DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196
 DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
 DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
 EBUILD xmms2-0.8_p20201016-r1.ebuild 5876 BLAKE2B c200ded0045be9be4ce10c1434f6f1bc104344f893e62187159bc77f23cc745c30b3f45ed828e7e2814b70ed7b6a482bcbdb00d22f963aa283c40970747c3954 SHA512 0ad122574b7fcb2ad60c5ee0a898612a0beef3d661c7267336d52a589dab269dccfcdeb00c2cfd153113f72455aa1d8f9dddd6d9f7e3ccff13b40768d60ea4cd
-EBUILD xmms2-0.8_p20201016-r2.ebuild 5913 BLAKE2B eff55cef1c431aa8ca7ae3ebd6f7638a8485cd05b2fef7ecc6fda38d6282908b8edec47d7269ff15ae1d85870480298713bde097eef5655c77f72c721d3d8232 SHA512 fb84b90330d0aac147b6c68d2a1fbd86e56128f503a28ed47c18e717f6f6b514d79e035568fd623751c64953157891f6c44f0cac771b8e450d50eb44e6547f0d
+EBUILD xmms2-0.8_p20201016-r2.ebuild 5910 BLAKE2B 857f8877eed08b63640483f312fa99d9a626f2f32988f525c156d5416d1b3812740c63086a59cb0aadef6aaf51f4685706ff4ad1fadb30aadb063f8c0b3bd09e SHA512 4837be50ebf0560e263aa54bd98d462140e63a86456942f42efeb4869897274b5f5b5a643a80df67482ee755ed8230406d102db15cfa7d16b18526b52bd3b24d
 MISC metadata.xml 1529 BLAKE2B 0f5c762b0325e767ba28410bd6838960e84df8a8f30ceda76833809b21b4e109f01caa2c4c5e234aacd4697f9a0a43d8fc1012f62261b8a1e9e458e2530b9dfe SHA512 be88d429da72efc944841bbb11c85dd6e746201eae90c20cc588bb5c42958315fc23bb9388396e971f0bc2069d4eb6dd9189b9c8f4c7cf4f343ca491f9d744be
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
index 7d7a6a230952..0edb6f31cd7f 100644
--- a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86"
 
 # IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
 # flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`