gentoo resync : 17.08.2021

58 files changed, 770 insertions, 871 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 0b59e3b4848a..65456590aee8 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index d20c83b8bee1..43d0c7b9cdd3 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,3 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
-EBUILD alsaplayer-0.99.81-r1.ebuild 2008 BLAKE2B 1677ed078faf8dc56bb3a5b7892efae59c320e1d496c137ae45fe4a6d9e1627e7463d33056dab92a15b8b25f8dc1d1d0dba9dec4b455193a664dec97a04ee74d SHA512 278b39e47784db1b3dfd6bab3de0a7ca69a4d4ada4f05009096c350db5a1a38df8404cc9af545e8f8a64681d3b7b183047eb0ed64a9a481a10004ecccd7fb73c
+EBUILD alsaplayer-0.99.81-r2.ebuild 2012 BLAKE2B dbdff76d6d6913f16b747fb01138278fb4c650260ad7287b3c98f74a3bc57862fcff514c418caa7820824c201420f691f5e99160bdc0feab36c20c4f43f0aca7 SHA512 c29b3d7d516ecc75a58b08b9a474b368031d3850e167e9599a1d78d1da27c886e0a39cbee4fc92c37b2db7e0ec702be7153e56fb5e2cd03c523450d2b4c0250e
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
index 374beb56d611..b25a79761980 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
@@ -18,10 +18,10 @@ RDEPEND="
 	media-libs/libsndfile:=
 	sys-libs/zlib:=
 	alsa? ( media-libs/alsa-lib )
-	audiofile? ( media-libs/audiofile )
+	audiofile? ( media-libs/audiofile:= )
 	flac? ( media-libs/flac )
 	gtk? ( >=x11-libs/gtk+-2.10:2 )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod:0 )
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 23ef70220c62..73063c40212a 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -3,5 +3,5 @@ DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cd
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
 EBUILD ardour-6.8-r1.ebuild 4826 BLAKE2B 51df9831d221a6d0452e851a4668f576b9c4953ce4a963ab93ef19742c2fdc5a3c79920b790ef6f2d1535ebfdbc5980a17125a8257b551116947ff0150a66c39 SHA512 be04f3db61ac1a0f15c2c202ca0a87c522280c798b1c7140284d028c36a3be80ee1802cd3a46b12b6333ce23697a7661084e44bf72adca0bbaf0f02394d55ab3
 EBUILD ardour-6.9.ebuild 4833 BLAKE2B 31b4b2bc2270be509b0c1430490001284e3fbe8b584120120927522f386407b70c7e2a039292d435467d289641ce53dd2e94c64f506a7721b55db74b38c0475d SHA512 26daaed2414da80dd52fb7f238a48ed1ba82557e8e6cb270af1e6f9a4eda3d5db287a85596da7214f49cd92ac3ddcb3c066d8ed58506bf379e48535220f94af8
-EBUILD ardour-9999.ebuild 4833 BLAKE2B 31b4b2bc2270be509b0c1430490001284e3fbe8b584120120927522f386407b70c7e2a039292d435467d289641ce53dd2e94c64f506a7721b55db74b38c0475d SHA512 26daaed2414da80dd52fb7f238a48ed1ba82557e8e6cb270af1e6f9a4eda3d5db287a85596da7214f49cd92ac3ddcb3c066d8ed58506bf379e48535220f94af8
+EBUILD ardour-9999.ebuild 4996 BLAKE2B f2bb5c3a8440dd0b663917f340ea3189b6a21e202bb0be0b794db9212b0d0a180004c1c051f9792b4eb77a514337091e484340d1120fbf630d5e490bbd8c4ce3 SHA512 a5b90a1ba7bbe9faa129a489e8b19815dc6ccb9bb5eca32d2616be8ea2f0cbe0831711bf54c2718ba104df0e26316f2dffdcee595a683c925afa3b0534331231
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 41b264273ca0..b6fc5f46d356 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="6"
+SLOT="7"
 IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
@@ -164,6 +164,9 @@ src_install() {
 		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
 	done
 
+	# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
+	find "${D}/usr/share/icons/" -name ardour6.png -delete
+
 	sed -i \
 		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
 		-e 's/;AudioEditing;/;X-AudioEditing;/' \
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index dc43bb0482b6..2548ecabdd2a 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -6,5 +6,5 @@ AUX audacity-2.4.2-fix-metainfo.patch 468 BLAKE2B 87133634ca1be0ce0392b044d60a16
 AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39ca64b72449853bc396389c2760767d916301298951aaa7b82cc1379c2b7d9860b4579a964dedc6806c85120cd3f4f1aa2b726ae5846bae1df2 SHA512 dc7c2cb3ae1e47e00f473b0943994e352275dc41d41255b2b1ba2e042d9bd6ab046f2088cda81dbc22f2ffeb13a97d28073ce078e35bb29e868f6fa2e8b9e0df
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-EBUILD audacity-2.4.2-r1.ebuild 3951 BLAKE2B 0c4a89c17417e84e9934f62b360afad1ab812122109650a7769f96e09bec2b3ce94e8833787522b78ce61d09bbf6e096087e29301a5b20d236b489f62812e459 SHA512 4b7c7a277d22c42b949605c263ee099eed93b1f68e036c887985d3e3516c1355dec6f3940ba92dc8eafa1b4a95f3e16f4c10ab81f9d7de119c76d914d1740d9d
+EBUILD audacity-2.4.2-r2.ebuild 3955 BLAKE2B f4183c6a0075c0cb44c05c9345093c18502e70dc4201863f39038b2811f8e6084b88bb049cfc230f83858336928b87d1d085667e0c3e72cb36fd7897416de8db SHA512 9c8ef46c73966b333cbe9fdaa40b7fe49a20a7dc3c4929d28a7d2eb6dec66378b4863f23cb3f94fab51bf4b1aabe3845d7c449d6f72b20a34e85e228a2a4783e
 MISC metadata.xml 1202 BLAKE2B 2d3da00c349554901026197a6c383b16138b4295c113affdcd6d83cc370fc3d5f3c5010971dc7feda71942d998a0043e3a216e646b6a72c2eb6f61bb06ccc178 SHA512 999f3fa992af333d1b64fb558c44e43ac6978f779975bc929a3c615c43c831e5db4c83b4e39240ac1dade66a2d2afade7b8e5828b88cd75de8ddb0a2284121ad
diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r2.ebuild
index 4c5130a8044f..31ae2a91f847 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RESTRICT="test"
 
 RDEPEND="dev-libs/expat
 	media-libs/libsndfile
-	media-libs/libsoundtouch
+	media-libs/libsoundtouch:=
 	media-libs/portaudio[alsa?]
 	media-libs/soxr
 	>=media-sound/lame-3.100-r3
@@ -33,7 +33,7 @@ RDEPEND="dev-libs/expat
 	alsa? ( media-libs/alsa-lib )
 	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac[cxx] )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	lv2? (
 		dev-libs/serd
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index e6b423de7316..3abf5b76450f 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,5 +1,6 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
+AUX cantata-2.4.2-main-musl.patch 1196 BLAKE2B 13272e8b73aa97d4bac7b81de362dc9b58fc79e576f94fd8f314249072d3d32e83113f8cf7c1126d4af02f27c0cc025217a33665d36f4a75bc6e5dc664a7dcaf SHA512 23d22e126ea39739c67331b3db3a17d61bb4d0a462273c6bd7e652c8ca421fe3d15e264e3f752c6b0b6a7349753bd4396e061e5280fce2e7a26b2058453e4dcd
 AUX cantata-2.4.2-solid-musl.patch 1035 BLAKE2B 43b0f3312e93f8fe92b56dd488a70c815f448b6907ae1db3418f65aaef394f06ffb82279c483185cc4cde74081b28a0bba3b92c8c5a29f2fff2d3ff5ab510d67 SHA512 eb34e0939500b9176829347329ed508f0ba08e92cf450b949661a103782385cfd9175551cd8f0832799ebcf116c89cca98fad4eaa236729c38c1724b5b981221
 DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
-EBUILD cantata-2.4.2.ebuild 3074 BLAKE2B 9b296e832b7436de60c1a7966cdf8e81190eef8558b611e5ca0ef26c16445ab3143cb88d93e25a5f2974aed623911b6ef5f094bff610d8f029fd484db38e7364 SHA512 8f70c086d37c4d708d8013819df44a468efe62e35c017dc5ee381ac7724161528d4d0764ec6d8416553838056012e317448cb8acf1d91ba18166e5d98de3219c
+EBUILD cantata-2.4.2.ebuild 3122 BLAKE2B 5b63451d54fc89b3bf5d73248cf52f907b144899fbe807811d790d2e1c3ff715cb858938be19203bef55eed785f867ffb8466a3130ab90f93bf6215d04f9e595 SHA512 eab98c659bd6cf62ca4e2399336c0daf91b4a64f53289d9069c8d016a41c21ce80e3cf626cfbcfa5a3517352978b07594b59af63e9325fb57b6886a53cc67f9e
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild
index 19e2a7c4abd3..0b6da7338566 100644
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -23,10 +23,9 @@ REQUIRED_USE="
 	musicbrainz? ( || ( cdio cdda ) taglib )
 	replaygain? ( taglib )
 "
+# cantata has no tests
+RESTRICT="test"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -62,13 +61,14 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qtconcurrent:5
 "
-
-# cantata has no tests
-RESTRICT="test"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-headers.patch"
 	"${FILESDIR}/${P}-solid-musl.patch" # bug 792555
+	"${FILESDIR}/${P}-main-musl.patch" # bug 807763
 )
 
 src_prepare() {
diff --git a/media-sound/cantata/files/cantata-2.4.2-main-musl.patch b/media-sound/cantata/files/cantata-2.4.2-main-musl.patch
new file mode 100644
index 000000000000..492dc815854a
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.4.2-main-musl.patch
@@ -0,0 +1,34 @@
+From d837de8669a2c0eee835d81d9105e21172c8efc0 Mon Sep 17 00:00:00 2001
+From: Helmut Pozimski <helmut@pozimski.eu>
+Date: Sat, 16 Jun 2018 10:01:19 +0200
+Subject: [PATCH] Fix gui/main.cpp build with musl
+
+Picked from VoidLinux:
+
+https://github.com/void-linux/void-packages/commit/188bc4852af59e20f60b186e7acaaaa4b8ce51ab#diff-413d61b1a38989fbf79759fb57901b99d629706587f21aa4b1b19fb8ef23fd4b
+---
+ gui/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gui/main.cpp b/gui/main.cpp
+index 3424e94f7..f3851a0ef 100644
+--- a/gui/main.cpp
++++ b/gui/main.cpp
+@@ -266,7 +266,7 @@ static void installDebugMessageHandler(const QString &cmdLine)
+     qInstallMessageHandler(cantataQtMsgHandler);
+ }
+ 
+-#if defined Q_OS_LINUX && defined __GNUC__
++#if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
+ #include <execinfo.h>
+ #include <unistd.h>
+ #include <signal.h>
+@@ -346,7 +346,7 @@ static void sigHandler(int i)
+ 
+ int main(int argc, char *argv[])
+ {
+-    #if defined Q_OS_LINUX && defined __GNUC__
++    #if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
+     signal(SIGSEGV, sigHandler);
+     #endif
+     QThread::currentThread()->setObjectName("GUI");
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 818dd5e9d299..22fe53b9df11 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r1.ebuild 1785 BLAKE2B 9eee6ad75c26f5a9c558f8aba79b8dfa90b38cea53e1ca39d0037a034128bf95b6dba3d7df79cc56991ffd6167526f3aa4ae7cb1d8dd036e1d7187100bf61004 SHA512 ded435b01fdfe250ec59de8b5856b92618cc100b27d3bfadb3a9203ce3cc09733c2f51043c775930c56d057d38f3fbf01feacbeca4d4899021bc7aeefc7506de
+EBUILD easytag-2.4.3-r2.ebuild 1787 BLAKE2B 979c11819e68541c9f9c3b97ecd8863324104854679378e29be82ba2f973a5f25f4ac5c740fe59d1dbba038e37af2b65232940a7cb80c9bc32c8639fb61134c3 SHA512 9b0a902c7fbc2c069eca6f4c2930a931fd88fb3220a46b0ca41112903351d1ef325c77b559c802f5aad76cc8940f67babc743cd0ecda7ccbfdbdb4eaab552b14
 MISC metadata.xml 514 BLAKE2B b5fdb67baedcef2a155492cf00b63b35ae13c7fe214ba657722043bf824e607dfdf3d50deeb24c4ebb2cc704b7deb41d66c8ea8aa2f3b5911a72cb833b9e05a4 SHA512 eb53f395ef50eb4a86865629809332930907f459cd3b7b2d052727e4c25a27fd9e1acd9660fc354eb16ce7f6ff41e323689548e8b8a671e0878344cc0eb9ddc9
diff --git a/media-sound/easytag/easytag-2.4.3-r1.ebuild b/media-sound/easytag/easytag-2.4.3-r2.ebuild
index 67e1b072a47b..04dd96afa0ac 100644
--- a/media-sound/easytag/easytag-2.4.3-r1.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	flac? ( >=media-libs/flac-1.3 )
 	mp3? (
 		>=media-libs/id3lib-3.8.3-r8
-		>=media-libs/libid3tag-0.15.1b-r4
+		>=media-libs/libid3tag-0.15.1b-r4:=
 	)
 	mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] )
 	nautilus? ( gnome-base/nautilus )
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 8ab1201398fd..e559bd1d0530 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -3,5 +3,5 @@ DIST fluidsynth-2.2.1.tar.gz 1594153 BLAKE2B 9a297859ae90e3dba21a3923059c081596d
 DIST fluidsynth-2.2.2.tar.gz 1741567 BLAKE2B 78fe02ae37db70e7aa92071aa609ff6f3dc6217827f89091ded1a8e2d30e84f3d7a095e101fcccfe720e9c3445f58e15da588cfcd7063388ab642649536b8fa0 SHA512 208956e367725de4b1faeba7d4125a6a85bb4191ef0354a7087809e93d93b8986cdc30b78c135a743104851d15f3bb09776855fa02a686de0810dd14c97851c3
 EBUILD fluidsynth-2.2.0-r1.ebuild 3314 BLAKE2B 1170bc2979a36dcbe5b84ca2ef8e4c34256c9da3514833bd23d1e0edd7753f876a943be534630a8ec0637024ca0a4a34ec06bcf83a42ee4f3f0948cd716cf29b SHA512 6de4ee1f429768af858bc9bedf365e4977ef8f2d04a815ba0fb6c5649b2989c56bb56951cd1647e3c6f3a1a93d1daf99783532aa4e32512db4273df4091b235f
 EBUILD fluidsynth-2.2.1.ebuild 3356 BLAKE2B db78921d090a791457306485639b42d424d8c4695b8b55c2a00a66c1aa706fa65d14289072127ad96a49edbc1f437efb40dde003e44861f6b8a80b1d01a2f7d1 SHA512 c78089e8fe83cbd8f922814b3d797fe0a618feedd15c0cef0708c32f0cc24ee0b969b1f756d3f13b6637a0ee312bb09ae695e4a497a982ac76df234aa75497a2
-EBUILD fluidsynth-2.2.2.ebuild 3360 BLAKE2B 2f0caa610b00d7ac09122ab8dfae6390864240cff2272232f1ebd582f5d3e30d4460ab0ce0a33ba3fb14694a119017aafb96defabe36acb34b58db35709a4b1d SHA512 1f35e5811cb12736c6ee7790a507298bf2a78aa2c0263c4f510381cbe1ecc52a5b2e3d12b723978b25909cdd2288d3a90cb3ffc3ff9dd4708da8370f02c63245
+EBUILD fluidsynth-2.2.2.ebuild 3354 BLAKE2B 9814c616a04aeae0cd946917c91ccb2950205853bb44737064b48d0109effc34fcf33ed7a48d3dafe3234ecb5d7e7aa305d981bfcc0f740d33479afd635082ce SHA512 3044dc82d37dbac8565c52d2ff2366571e00c4b00a73de880db9e9c4d76d1d78d74906c757bd2f7acacc43e4503f14972fa185544a9ee4df43e90744426d51a8
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
index aca45d6ed7a1..627193808977 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc ~x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/gmtp/Manifest b/media-sound/gmtp/Manifest
index 4e2688e59f4c..3a91c04471b2 100644
--- a/media-sound/gmtp/Manifest
+++ b/media-sound/gmtp/Manifest
@@ -1,4 +1,4 @@
 AUX gmtp-1.3.11-fno-common.patch 11945 BLAKE2B 7a8f75b3780f9e8f4dfd0e9c5be29f21f261b4baf95a9a543db9c73d3bebdff485734eb009e4a4edd1079e4f6410051d0b3f651d9996b788a108f44257e4b915 SHA512 0350366fe1abf48f0929351c12b2d891fcf874df29d327f8b8926538efd8263b402371f11ecc77c4a23d6cf12bf6ce7a3bfecdb518115fe48304028d30fe4870
 DIST gmtp-1.3.11.tar.gz 498198 BLAKE2B 870f27712425328febcda0899b821bc5c8324c07bca50d7bf9f2bd78849e1f73968da4f5c2860e154d19c16ea184cd6a1715f198347356734dd815d7d2aca780 SHA512 af6e56136c227818aab19f9eb0a0ad9f1356b24e8a8aa44d600326d632bfcb0dc2794a7c28809f2de2016a52045c1cc5c2bdae0391a0a970ea04e947f920bc95
-EBUILD gmtp-1.3.11-r1.ebuild 815 BLAKE2B dc882ef24006b4326dc513f24b7b07612566118368bc2d53f0b62ef1fcb445e9aadd6b8b719abf8bcbb6dc14bfaa368604f788ef68b7895370cdc5fc94799985 SHA512 a3290045ac52af088d6d1adabfcb635b7511c115102acd473592b1076b403a326fe90ecd589a018cb6d96486e1602cd8eeacc831a4a055305ced3b456b40c556
+EBUILD gmtp-1.3.11-r2.ebuild 819 BLAKE2B 0670245e6803781b83b5d642634a35f51cd7d12123b5129a264d54ee4818a19f3a5d8f6b189d12639354d1467675efed89191c82bc11e68c4cd6c70a2b0ceb4a SHA512 a4c79f083dca9c451982eeaaa776a1838d478fc8fa14b4e2d67751716b5fc2bcbfb25cd2715ae65d01513377ff7b8b1b85fce51fd8fc5cbe9e3ddbdc70414e8f
 MISC metadata.xml 506 BLAKE2B 84107fa98c343254e61b433946b77be39abb9975736672bad91c9b61831f073aa3402046b946fa56dcab49413d4937480f36586ddcd9dfe8ecae23c09a0ae306 SHA512 ad86ce322da7b9459e597a94d03de3e3ec81d072646bf9fa98a4ad31e904f584c6a70cb82aaf7ec00feeca503818452109fc80cb9eebdff781b701ada830dac5
diff --git a/media-sound/gmtp/gmtp-1.3.11-r1.ebuild b/media-sound/gmtp/gmtp-1.3.11-r2.ebuild
index 9dc541fb70fd..e92eaf0a8e95 100644
--- a/media-sound/gmtp/gmtp-1.3.11-r1.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-libs/glib:2
 	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libmtp
+	media-libs/libid3tag:=
+	media-libs/libmtp:=
 	media-libs/libvorbis
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
index 20cc15cc2ebe..26b52bbd5b52 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,4 +1,4 @@
 AUX gnomad-2.9.6-fno-common.patch 1621 BLAKE2B 7e5cffd644026bca5fe84090930535e2129be9135c1e5e97e5e4f92132026cc210321da7e0e300655c14906559888e15e4a1a13598b32831cfeeb262c199706c SHA512 97d9e3d08808a81c206ffa39bc914bc152fde781ede811ecdde3ab2257442466f4f5f792dfec6d65b9e78ed66cb07574bb036ece8895f68097e7f518b5060288
 DIST gnomad2-2.9.6.tar.gz 318431 BLAKE2B 756345c1b27da5f41d46aaf2862d94a2a94cc91fece77eb5cd8428581773867a85e120e09e83337ddbf8d77a91bd7db09d50584190d9929be45bb3d94393b9eb SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1
-EBUILD gnomad-2.9.6.ebuild 846 BLAKE2B 6ee008f483276fde5f999f4e9bce88e8bc2435ad5c57012ef4498ffc979fc8d452babd2a5afb573f75694fee102bb21ec72ee5718f84ebfdb737afa0ac92a5fc SHA512 6d0afd0213c2e3bfc14bf0a73c69a8be6ae5440daed934716a738a9e60e8ce8954f5350ac3c69c70d2a3b55606999f3c96f0f587ecb12c18e3e5b911ffac39c8
+EBUILD gnomad-2.9.6-r1.ebuild 850 BLAKE2B c0a72f1fbf0cc000618c914cf41d4991cace7eddc22cb55781c5935d71a83792addc5fbb2f32766dc2ef933e16eadd391f20a9f42c65f708c96f9b4c4e97aa09 SHA512 89836ee056302fa6b371c249f85c8539c58fe27377c506f15b020a16ab3663250ae3125474ddd45318471b0091487de5c5b43167e211b6e9837462e7d38ea647
 MISC metadata.xml 330 BLAKE2B da9e23c768fba646f72a220e5d3d24a78d8e021660f7310bc657df6fc2ef56a6b4419149b0d2463b9ea51ae5c70795d79c23a54ef4c8fac25b1a0d41212120f4 SHA512 c039363dc7f06ccc5d9652d41923ea06819f199758fa843adad78a11dc00d230b49ebe5141c16f0aa6bf92909021a859e5be187d918eaa0f93fe7f2be7725386
diff --git a/media-sound/gnomad/gnomad-2.9.6.ebuild b/media-sound/gnomad/gnomad-2.9.6-r1.ebuild
index 5c0417d87c23..e9213c0f3878 100644
--- a/media-sound/gnomad/gnomad-2.9.6.ebuild
+++ b/media-sound/gnomad/gnomad-2.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,8 @@ IUSE="nls"
 
 RDEPEND="
 	dev-libs/libgudev:=
-	media-libs/libid3tag
-	media-libs/libmtp
+	media-libs/libid3tag:=
+	media-libs/libmtp:=
 	media-libs/libnjb
 	media-libs/taglib
 	>=x11-libs/gtk+-2.24:2"
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index df374da07dbb..8a10c140058f 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -2,5 +2,5 @@ AUX herrie-2.2-fix-buildsystem.patch 1132 BLAKE2B af945efc12c6ab5604fada1e7d123d
 AUX herrie-2.2-libxspf.patch 3025 BLAKE2B 22deefb9b02e26b184e5801ac9543a66e4cf4e140368ec34bfa2bee36c99d72899abfac7c62489f3b2efeb121ec478734952054e9626fbe11644050c37ff30e2 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192
 AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0efbf03a3eae4010c2a3ff1e3d62107e001bdb012a166ae84fe9cb9ab3f08b59d3c737e2bca03e3e2d9a53d5e2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150
 DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213
-EBUILD herrie-2.2-r2.ebuild 1847 BLAKE2B 4f77a546bfd6214af935016f83747387fcdfc998d8c725aac5cd78a27524d33c7327cf048d2920d599730aa02ec8d7ba598e5f62ff2277bbfdd6570898b12067 SHA512 3c1423ebad9fc096daccda8cd5101fa88bc51a76426581659308a22d7985b2ea8956257b99cf1e73074840153c848b5c03d83ec48f8ac95fbb8119619adb1591
+EBUILD herrie-2.2-r2.ebuild 1851 BLAKE2B 744cd158ffba9492e6eded64d224d04bfb062429fc8a6cfe13b9a51955942e0d4e5f625ac20368846ff0a550032356be35d089663dcfb47320992f633de0e9cd SHA512 f46672b9536acabc695a1747a730109fa97dd3e65846d192f48ca018da360899f309696f0595eb2dcc5e89089d3565892e72dd7882afa0dad1b709867d8c54c6
 MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3
diff --git a/media-sound/herrie/herrie-2.2-r2.ebuild b/media-sound/herrie/herrie-2.2-r2.ebuild
index 3ae36bc01359..cb67e755fdf6 100644
--- a/media-sound/herrie/herrie-2.2-r2.ebuild
+++ b/media-sound/herrie/herrie-2.2-r2.ebuild
@@ -17,12 +17,12 @@ REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
 
 RDEPEND="sys-libs/ncurses:=[unicode(+)?]
 	>=dev-libs/glib-2:2
-	ao? ( media-libs/libao )
+	ao? ( media-libs/libao:= )
 	alsa? ( media-libs/alsa-lib )
 	http? ( net-misc/curl )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-libs/libmad
-		media-libs/libid3tag )
+		media-libs/libid3tag:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	sndfile? ( media-libs/libsndfile )
 	vorbis? ( media-libs/libvorbis )
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 2cfc677cb51d..278b8d2523a9 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -2,6 +2,6 @@ AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef87
 DIST jack2-1.9.18.tar.gz 987166 BLAKE2B e1684d50c26ce45b36133b5e9632e916cd5bdf2a2ffba9257d7d6018d9fab8ade87f2de4c837d3cc3cb37bdda296fbcd8c2da6468676a3a4c74563fb42397879 SHA512 7b9116b8002db88d9df746acf99e523cf9103c1a7955e8174912c8538b2c53bc8e7c34a64d0df4dc1f212e35035392814fdfcfe78597e26bd08ec028876bcb98
 DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
 EBUILD jack2-1.9.18.ebuild 2444 BLAKE2B 0428836a0c60aac26ec8196765fab80a69e80f1051c23204249dee7101b58eeafa89d9ad73930aa1421fa959a59669bee2263b975c3ec015258c301578091ce8 SHA512 22f7c1128b06286f167c2f13b17dcda6d58239d11e80d3e22d14e95f96bd66d470b266d0db7f5124fbc9df20a4598c6e138822d5c07e3867598db0d216fde6a2
-EBUILD jack2-1.9.19.ebuild 2398 BLAKE2B e474d77d45005fc09f9de936d66d6d4fc4884e2514461cea31a2d1bbca955bc59b6eff61ef4360b69e3749a171dbbe044580ca9b7099fcaeeee582ff843e3e89 SHA512 673c1458aa4afaeed280d2cd4d7f66c8006e5737401c02389924531fc0153cd24250ecf8072e2e7894a4f644e3222dd40a2e3bb74c04f312f1397d5af7321fbb
+EBUILD jack2-1.9.19.ebuild 2396 BLAKE2B 58d1024bc5cc11605a02c4536104782ead38cff7103d31d5b189577a265106aaa137867144a1c079c11106c1be74cf39e59e852151bcdc0cc694bfc73f5acca6 SHA512 38c06810f46bc99a6760e288a0e488491a4f7832d4dad0051d53ab8c6f769e90103a6524044375ee5746aaa575754734f868cc0515f9712e606d42b1c468016e
 EBUILD jack2-9999.ebuild 2395 BLAKE2B f663eee6c44cb65f76a12d5b599a887cb0d56be0644dedbfb8e06368510a7ae18522c80bd9c0ef290ceb1af3e1f06eb60b3e4fb18b0c229df83929b155647cec SHA512 bfcfa9479713d773706964daacb266168d7c019da1af2528ee6aa2d1c327443718086536cd28b2fb71cee9da1a66dcb768f798164c0cb551f4e1cd9d829f6aed
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
index dcce141a31b3..2b158be89b93 100644
--- a/media-sound/jack2/jack2-1.9.19.ebuild
+++ b/media-sound/jack2/jack2-1.9.19.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/loudness-scanner/Manifest b/media-sound/loudness-scanner/Manifest
deleted file mode 100644
index e2191988f708..000000000000
--- a/media-sound/loudness-scanner/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST loudness-scanner-0.5.1_p20190709.tar.xz 65360 BLAKE2B 122a14b1700e0b971d423bb3c6395eddd49663d8980ecc57dec85cbf45b67ef72b68203b15ac21b040af824b71641635bd72c67b40b0ba757ed536e121c7e3ae SHA512 2160a1dcba92efeb308f65e2dbd32405ad6c9b72355a4161f12579d767757e709c0ffe17df988105210cbb8f05f727f6b143cbe0540edeb8c7c6585b14998fe1
-EBUILD loudness-scanner-0.5.1_p20190709.ebuild 1832 BLAKE2B 1ce330feeb0b33bea49443a147ee53a5211e23063c1592d6897bd7721e084573ab9fb5cea19a3043f4471b8983d52fe1985de28cf72f694a7815fc61dcce00f7 SHA512 94344bb6ec4eb2ba400bc850249480ec010d3e3f8282926986e8d6e98d2ccd105fe6b1c2768cd65acd235161b0228cd55aadb819bcbc1499729bd15f80ed9d18
-EBUILD loudness-scanner-9999.ebuild 1806 BLAKE2B 93c728e56472390121a4c6e7cd6bdafe22e58ad32c12ddad411df929f613166b6a1cea49c1839b50c5571e99961915f95758414b681c3e13b91924d18e431ec2 SHA512 c7a9c460654e1103d2f98c2dbc67e84eca5b6e0ae2f308462b68de0179e483712d0e3898a76386ead57432b2acd04b4d52833f204469c14e4f2236fff8ce602c
-MISC metadata.xml 1007 BLAKE2B 4093b4a33413e8c996860ea387454b9ac3c91d2bad0b6ac2a4240d73de5496b8321c2d9ac08c119d1842d08ab3686ae30d9ce2587bee7f1408e637653650a4b9 SHA512 16ca135b96ce7b636f3cc9d39fa52d2f8d9d18449f27e0583a3fcc835941f7806901b2e898ddc17ea53c8217981ef3706125c9cef138ea0f284d0cbee2c602d7
diff --git a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
deleted file mode 100644
index d3c803e98dcf..000000000000
--- a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Scans your music files and tags them with loudness information"
-HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
-SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ffmpeg gtk mpg123 musepack qt5 sndfile"
-REQUIRED_USE="|| ( sndfile ffmpeg mpg123 musepack )"
-
-DEPEND="
-	dev-libs/glib
-	media-libs/libebur128
-	media-libs/taglib
-	ffmpeg? ( media-video/ffmpeg )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	sndfile? ( media-libs/libsndfile )
-	gtk? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-		x11-libs/gtk+:2
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
-		"${S}"/scanner/inputaudio/input.c
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_SHARED_LIBS:BOOL=OFF # use static internal libraries
-		-DDISABLE_FFMPEG:BOOL=$(usex ffmpeg no yes)
-		-DDISABLE_GSTREAMER:BOOL=ON # depends on obsolete gstreamer-0.10
-		-DDISABLE_GTK2:BOOL=$(usex gtk no yes)
-		-DDISABLE_MPCDEC:BOOL=$(usex musepack no yes)
-		-DDISABLE_MPG123:BOOL=$(usex mpg123 no yes)
-		-DDISABLE_QT4:BOOL=ON
-		-DDISABLE_QT5:BOOL=$(usex qt5 no yes)
-		-DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
-		-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/loudness
-	use gtk && dobin "${BUILD_DIR}"/loudness-drop-gtk
-	use qt5 && dobin "${BUILD_DIR}"/loudness-drop-qt5
-
-	insinto /usr/$(get_libdir)/loudness-scanner
-	doins "${BUILD_DIR}"/libinput_*.so
-
-	einstalldocs
-}
diff --git a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
deleted file mode 100644
index f7320da421be..000000000000
--- a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="Scans your music files and tags them with loudness information"
-HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
-EGIT_REPO_URI="https://github.com/jiixyj/loudness-scanner.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="+ffmpeg gtk mpg123 musepack qt5 sndfile"
-REQUIRED_USE="|| ( sndfile ffmpeg mpg123 musepack )"
-
-DEPEND="
-	dev-libs/glib
-	media-libs/libebur128
-	media-libs/taglib
-	ffmpeg? ( media-video/ffmpeg )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	sndfile? ( media-libs/libsndfile )
-	gtk? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-		x11-libs/gtk+:2
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
-		"${S}"/scanner/inputaudio/input.c
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_SHARED_LIBS:BOOL=OFF # use static internal libraries
-		-DDISABLE_FFMPEG:BOOL=$(usex ffmpeg no yes)
-		-DDISABLE_GSTREAMER:BOOL=ON # depends on obsolete gstreamer-0.10
-		-DDISABLE_GTK2:BOOL=$(usex gtk no yes)
-		-DDISABLE_MPCDEC:BOOL=$(usex musepack no yes)
-		-DDISABLE_MPG123:BOOL=$(usex mpg123 no yes)
-		-DDISABLE_QT4:BOOL=ON
-		-DDISABLE_QT5:BOOL=$(usex qt5 no yes)
-		-DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
-		-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/loudness
-	use gtk && dobin "${BUILD_DIR}"/loudness-drop-gtk
-	use qt5 && dobin "${BUILD_DIR}"/loudness-drop-qt5
-
-	insinto /usr/$(get_libdir)/loudness-scanner
-	doins "${BUILD_DIR}"/libinput_*.so
-
-	einstalldocs
-}
diff --git a/media-sound/loudness-scanner/metadata.xml b/media-sound/loudness-scanner/metadata.xml
deleted file mode 100644
index 85416081988f..000000000000
--- a/media-sound/loudness-scanner/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<name>Stefan Briesenick</name>
-		<email>gentoo@sbriesen.de</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		loudness-scanner is a tool that scans your music files according
-		to the EBU R128 standard for loudness normalisation. It optionally
-		adds ReplayGain compatible tags to the files.
-	</longdescription>
-	<use>
-		<flag name="mpg123">build the mpg123 plugin</flag>
-		<flag name="musepack">build the musepack plugin</flag>
-		<flag name="sndfile">build the sndfile plugin</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jiixyj/loudness-scanner</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index 0b851df5e0c6..a14249e2e8b4 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,5 +1,5 @@
 AUX madplay-0.15.2b-fix-autoconf.patch 3680 BLAKE2B 43f6c7ea82daf816bd6df38f51c808efff962b62edafe8af59cf643632de8ed075ccde4c109368de75df0afa80eec5dd803f36d9ce36d99a519118c4fa0bf48e SHA512 232758235370d5280bd8ca8980edc503d92d0a18edceffff06a2683152b12b9a8fce3a8656284e6d58a91b251978b7a5f88d368452cdf4e9c2bcbbc73514e265
 AUX madplay-macos.patch 593 BLAKE2B 306d4013251f9abf1791c8115f1ccdaf06c706ebae4ec073ff1a6f8f09086c80fc5b3a64d923f9818967f01f2793916ea301b7a078fac5bb879b8d0627180ae4 SHA512 d8989ed522212e984f0173dbb346ed624a2e8664a4c06d2186238018baf20c1f67d4109baa866ccb13cec6695db751be9ab6ac81466e3c786b13a89de4e066a0
 DIST madplay-0.15.2b.tar.gz 590929 BLAKE2B 93a62d04a36247ae8e1f4a63fe183735a2b5a7cd75fcde1ff2261222fad08ec96069b3fe5b7f06ad78a37d5060cff1d233d8139d7d0ff02c5231d2c384fb1a22 SHA512 0e79cdf0c32f48599083ec7a0716d816e3f03254705b7225b1ea9008d53eefd48342dd687b0507f0ff15942218fc07ad1e38c4172508c27755f3e9a0e5412f34
-EBUILD madplay-0.15.2b-r1.ebuild 768 BLAKE2B 3427de788425caf4c53b83868714b9eeb685384c341b9ecd43c0d46464ebe5be21ca819ac56be6914f9c1ba7258736971f3c34733abbaab176db7afbb9620546 SHA512 8d2913d788a6cdba4930a3f5450cade3caf5d9aef467156e377c568e9d446e5f3a153e39c26c3e1029f10acf7f0879e36cecef29a7a09fa4487261c622571190
+EBUILD madplay-0.15.2b-r2.ebuild 764 BLAKE2B 6dc855f505f99d45d3ba1b55d870f4ad8c0a36c1974c27d80f76b3cd889727c4de32b79cbc16e25a23459d191b4a59c4a87cee91906145a406a25f986507518f SHA512 a69ce2ceb7b8d3d4216a1a8eb0d70100e681745514a08e56ae35959d0f71a68c2621ec2b6c9b6f2a0967702b43dfc465adef9f6366e4f3e0bc10a1b8668888e1
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r2.ebuild
index 444be063a6b9..e365a62bc206 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r2.ebuild
@@ -16,8 +16,8 @@ IUSE="alsa nls"
 
 RDEPEND="
 	media-libs/libid3tag:=
-	media-libs/libmad:=
-	alsa? ( media-libs/alsa-lib:= )"
+	media-libs/libmad
+	alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index bddbccc25df5..0bf5e6e18de6 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -4,7 +4,7 @@ AUX mixxx-2.2.4-fix-scons-compat.patch 744 BLAKE2B ffadce18947d538a8f614bc3c53f7
 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
-EBUILD mixxx-2.2.4.ebuild 3227 BLAKE2B 6525da69abed8dcb6d0ace3aebd4660041c9fb15b2c1a6054ebd8dcde0fce2a65d3f09de3eeeb641afd9d289229ad4328a37ff8d3c7870217fc5ecab2ee7ec52 SHA512 cce7d885c7d2fd712961d5827bfce26aa0329b96aab0094baf264a19b8007f5df4088d88023ffc3366ea86fba4820c8740b664db87ddbb2c629a3b4f53fe64c8
-EBUILD mixxx-2.3.9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
-EBUILD mixxx-9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
+EBUILD mixxx-2.2.4-r1.ebuild 3229 BLAKE2B da761449e1cae6b3f15bad1ce27aca814072fd51de74262effb69515e5e729153cc3a1ece682fdfbd3b2056b2da75323ab98bc92a9637ce23c96502284ea891e SHA512 165a0c7fb737a51df060731e9fb904bc6233d21cc9f0aef6e5f8882b2026360e76c8457fd95d49e1df07b8fd36f835113acc81924d261ccbf689b5941aa028a1
+EBUILD mixxx-2.3.9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
+EBUILD mixxx-9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
 MISC metadata.xml 849 BLAKE2B 68fcb8b3e3353ad0c99ff9532c5b098738addbe5f3965bc931d5555f0110ee3b4a39514ae471881d8a4b0270d4257e502bd82d9010b235394ae3d0daf2ba4089 SHA512 eb222405a3de8c013d44b2fb114d42f32d54651309ec66176433ad055937a45d4dc7cc2cf3075a413ba508348100f74bd4c06ac77fc7960fbcf915d86bb02336
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
index 12f5c4bf11dd..06e567d08097 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9})
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
@@ -43,7 +43,7 @@ RDEPEND="
 	dev-qt/qtxml:5
 	media-libs/chromaprint
 	media-libs/flac
-	media-libs/libid3tag
+	media-libs/libid3tag:=
 	media-libs/libogg
 	media-libs/libsndfile
 	>=media-libs/libsoundtouch-1.5
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 437d4ca2e35d..8b5963df7ac6 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	media-libs/chromaprint
 	media-libs/flac
 	media-libs/libebur128
-	media-libs/libid3tag
+	media-libs/libid3tag:=
 	media-libs/libogg
 	media-libs/libsndfile
 	media-libs/libsoundtouch
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 437d4ca2e35d..8b5963df7ac6 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	media-libs/chromaprint
 	media-libs/flac
 	media-libs/libebur128
-	media-libs/libid3tag
+	media-libs/libid3tag:=
 	media-libs/libogg
 	media-libs/libsndfile
 	media-libs/libsoundtouch
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 038221ff9112..36029692bf5e 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,6 +2,6 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 AUX moc-2.6_alpha3-stdint_uint_types.patch 1179 BLAKE2B 73dcba135553cd9630cf44e42a4651785d6b9d1cacb554be166a7772c56fbfdc1b4165c6951c810e962a6b4dc24fe714eb739244490b9a975e79b1d67e82dec6 SHA512 642be986fb147aa81251ce9c3f86761ff9f24c61e84fd447e243da34b1e9058a94f27ef632144f01e3c989bc321346bdc543130fd090520fb3064668a8017110
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
-EBUILD moc-2.5.2-r2.ebuild 2111 BLAKE2B 1313e13157bcc9d222d9809d80596996a77358866cb7e114153b83833f688482c971cc8e8f32b237f553df1d4cd90bcef82cd4b66812818c913eb65d2a7ed722 SHA512 ab5560f47571e66ee6736915292152ea721fd3d0b541b174653673d1a12c807321b73d4df7d9689a172ff3a4af41499e922565a395c570c0e13473a00e227e48
-EBUILD moc-2.6_alpha3-r4.ebuild 2440 BLAKE2B 7c3b03c5c4e35090af1db15ecef82b8b746f9c2fee53316ce03a77a83414c2205ade1fcab97b4c5de4899ff6b4ee1d1947b62c73ddd51a526e79839b98fd40ef SHA512 b900f9a2fe1838b9973f71d9f6fb99b83d7ad1ff7b7074aa129c96fcc0446d2d56fb121b318dbb50bbc7dd27da0f6afe6fdfec07b460e9bac5734e1d3641aa67
+EBUILD moc-2.5.2-r3.ebuild 2113 BLAKE2B 7b015775dc97b5338b4c10d2880bd57a6336c88b13323f09fa51144c7a912b48c46a47f27fa38fd49f73a7ba4fd0736a64681735486825e11c14f3b0626a43b2 SHA512 b316c0fa8a983b2bdb69e0e787f1f65aab014d71661b38c1b9a8745b53456a512957b73ec76604391cf945bbaa10bef573a92f8258458a0ae003d63c2f49d729
+EBUILD moc-2.6_alpha3-r5.ebuild 2442 BLAKE2B b9d45c55de5104a6683a5c26e814091151efae3450e2a35a148af5b0f5ab4869aba0fbafda5f71943002c69354364a40293f71c51c100c3119a3e18830449db9 SHA512 140d77e6a802e83ba616a5dd3f8e4969f34c82ed92692c07604fc974a4f68b886ccc3a686840002a59ea6cb38c3fbd48796b8a3b3cc5a9d4a6985ad359c2db59
 MISC metadata.xml 620 BLAKE2B f4b43ba546218153ab2e3c980ca4b09e4b82a35dc17755be3904beb7131f22f71b756edc913f0dce4285e779a1b4a75c474577c81095d341c50d45b03f407497 SHA512 fd676e1ee0aba80032597c106ae94a451e9e2762fffe0b7a33119d2701eea37ac400d25849bd668654bcf7ed8d12af91c0bcab4e6006d5cd3bf0f35af098baa2
diff --git a/media-sound/moc/moc-2.5.2-r2.ebuild b/media-sound/moc/moc-2.5.2-r3.ebuild
index 107d1a0337ad..bab0a7dd9865 100644
--- a/media-sound/moc/moc-2.5.2-r2.ebuild
+++ b/media-sound/moc/moc-2.5.2-r3.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/libltdl-2:0
 	flac? ( media-libs/flac )
 	jack? ( media-sound/jack-audio-connection-kit )
 	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag:= )
 	magic? ( sys-apps/file )
 	modplug? ( media-libs/libmodplug )
 	musepack? ( media-sound/musepack-tools media-libs/taglib )
diff --git a/media-sound/moc/moc-2.6_alpha3-r4.ebuild b/media-sound/moc/moc-2.6_alpha3-r5.ebuild
index 82c189dc290c..7df9af78e4f3 100644
--- a/media-sound/moc/moc-2.6_alpha3-r4.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r5.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	mad? (
 		media-libs/libmad
 		sys-libs/zlib
-		media-libs/libid3tag
+		media-libs/libid3tag:=
 	)
 	magic? ( sys-apps/file )
 	modplug? ( >=media-libs/libmodplug-0.7 )
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 9a938babb9d7..113d0faa6697 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -9,12 +9,12 @@ DIST mpd-0.22.5.tar.xz 730308 BLAKE2B 2c7375af25c1b5d6dd8cf79f71e67842f75dcdb38b
 DIST mpd-0.22.6.tar.xz 730524 BLAKE2B 675b876415a343ba387e26ad800b2e562b40a5e3aaacdff31e0ec9d6ad09f0117406f82e519a08ba3187020b482dcd0434267f9e84dd13e9e1bf8565d1967c2c SHA512 5e417204e24d11fa609740ae92bc1d796aad2d63537655f655074d829cd79cadaf1ca025171dcf5486c1e557cc946152c21e299286b1cb74cc342da2b1f41343
 DIST mpd-0.22.8.tar.xz 737368 BLAKE2B 96866fdbcf124534d99db1bde89039d515c64afd7c65d341e6772be796feebf2fa20714f90856f82036dc322087ec2f85d8a4d85efad523a5f275f3d89d64920 SHA512 54b381e6d4e6113cd170ca7afbb671bef4ababb4de80a80504fe951f53aaf66269c123b7923112ab40291e069fa27457936227204cc84b42cf44aac1721c0d0d
 DIST mpd-0.22.9.tar.xz 738432 BLAKE2B c0c3a87ea83941e7ab85b4338db40daeff0c7fe665d4e0b27eebdf7cb06302d2b7a7573724d06d06d45a62583304f095ec4f67a21467748de665067e10a2514c SHA512 744e20e9a2b5df0f0c01b33809aa87cb159385b69868df5418302b091e6c5265dd70de13f383efcd71f76ae059c73969667212e55ee96e13d89ca0da5c2d4ae2
-EBUILD mpd-0.21.26.ebuild 8065 BLAKE2B bd01f82bd58a5026a179ed246a5b280b48c1f55fdbe80f41481f36a1e25827cbecd1a9904de791bd8a81e249b187aa0d94eff31c09e58f01032ea85196ef8338 SHA512 96879862ea3f10d67e420968703a476d02b4fc0c288fa1118170d225ce853303507de4a5265913f6afaa6690cde7b7995a7cf190ad8073df4c34914fd73af44c
-EBUILD mpd-0.22.10.ebuild 8514 BLAKE2B 2724c46d1ee527aea93d3767cd89cb72ec416cf3e733e5a085cf023a265002f3bffe4e3faffd63151b8be0c259a8d065472f9e023b01327836f4a72fe3c3841c SHA512 52a61a59ec75fb83e6c04bbe59dd2e7d3f0a420d5f6a5f1b76016ecb2acaa40be2c4c2785621c3b2811c99e12e8392e8886395955a64ff8ab2b900e38bd1fec9
-EBUILD mpd-0.22.3.ebuild 8122 BLAKE2B 79a904effc8fb09208f648dee611ba9795f2b25676399e9972aa0b4708c1084368a5c691dbbbe9336b8825439029a7f2b1b090bd0d58263569c104a2080b239a SHA512 23ef558178b9a67bbf39ade963e6cea591ee18157403ff0612c28640a8820d4d328b4dcddd465127658277222d8683a3f0ae8e02dfa8dd1ca32904abb5e83584
-EBUILD mpd-0.22.4-r1.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
-EBUILD mpd-0.22.5.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
-EBUILD mpd-0.22.6.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
-EBUILD mpd-0.22.8.ebuild 8514 BLAKE2B 2724c46d1ee527aea93d3767cd89cb72ec416cf3e733e5a085cf023a265002f3bffe4e3faffd63151b8be0c259a8d065472f9e023b01327836f4a72fe3c3841c SHA512 52a61a59ec75fb83e6c04bbe59dd2e7d3f0a420d5f6a5f1b76016ecb2acaa40be2c4c2785621c3b2811c99e12e8392e8886395955a64ff8ab2b900e38bd1fec9
-EBUILD mpd-0.22.9.ebuild 8514 BLAKE2B 2724c46d1ee527aea93d3767cd89cb72ec416cf3e733e5a085cf023a265002f3bffe4e3faffd63151b8be0c259a8d065472f9e023b01327836f4a72fe3c3841c SHA512 52a61a59ec75fb83e6c04bbe59dd2e7d3f0a420d5f6a5f1b76016ecb2acaa40be2c4c2785621c3b2811c99e12e8392e8886395955a64ff8ab2b900e38bd1fec9
+EBUILD mpd-0.21.26-r1.ebuild 8071 BLAKE2B 91df71b928168d00d63eabb823621f4e22d5e6d0d81075098607adb594ecf8f13f7842c2af370c19c1fc6b168eac15215d999706094978025653d61ecd80e2b7 SHA512 933751f86d9a7e24717bbd3ded3ddc13c15b5268fc6c6ac287d646704acb0e1a7cf5635a862e7de471a68000129c2f7232ae9956ae22f3b645356d0f512864ef
+EBUILD mpd-0.22.10-r1.ebuild 8520 BLAKE2B 23f1d52663adb310138b4b0749d9c5c9f16d24344f522055ce5fae93f531894073047d57e7c4509618c11c73ff0919b1b4bbf9e6ed7c6a0c4e9d85d3606d3a95 SHA512 ae900911cf01c13bb86ae12372b2fc1e40b09e938de61d52f50cb8572858cedec580baf80ddfc309a6c35052189155e64e1dc81e178fc1f84e595d5d117a0b93
+EBUILD mpd-0.22.3-r1.ebuild 8128 BLAKE2B f30f8d3b609102c7f9b8df1b7ea5eee6e5e1f449c4a8ef0e8e69d1025fd288025715fedaaa2d79a0589f085a1de8bd7ad499a17ecd8acbe27919b7bbf4dcaf9b SHA512 0e591e6e5b4955697a93307814ddb56de27545ceb21b3aea4dbac7b34fba47ee3412d7f8a5505c5877a807b4efc7c5a58e5296774298dd0b9702e372732dc0f9
+EBUILD mpd-0.22.4-r2.ebuild 8520 BLAKE2B 97b075b83e64feb64837cdf5c57efd7c4f7b7740cbf9d710d35d81cc76fb29ffb71bcc5058dcd80e5abf97e9b6d3bc7ef98e7fa04cb49b046d6704441b16360d SHA512 125c848346f5d1ed3b3ae66f83fb6191d8d9f1f312603aeb2964379962940bae3d926383e3a258dd6197391da0e659287a958141073b275b68adfbc4f6c9ed7f
+EBUILD mpd-0.22.5-r1.ebuild 8520 BLAKE2B 97b075b83e64feb64837cdf5c57efd7c4f7b7740cbf9d710d35d81cc76fb29ffb71bcc5058dcd80e5abf97e9b6d3bc7ef98e7fa04cb49b046d6704441b16360d SHA512 125c848346f5d1ed3b3ae66f83fb6191d8d9f1f312603aeb2964379962940bae3d926383e3a258dd6197391da0e659287a958141073b275b68adfbc4f6c9ed7f
+EBUILD mpd-0.22.6-r1.ebuild 8520 BLAKE2B 97b075b83e64feb64837cdf5c57efd7c4f7b7740cbf9d710d35d81cc76fb29ffb71bcc5058dcd80e5abf97e9b6d3bc7ef98e7fa04cb49b046d6704441b16360d SHA512 125c848346f5d1ed3b3ae66f83fb6191d8d9f1f312603aeb2964379962940bae3d926383e3a258dd6197391da0e659287a958141073b275b68adfbc4f6c9ed7f
+EBUILD mpd-0.22.8-r1.ebuild 8520 BLAKE2B 23f1d52663adb310138b4b0749d9c5c9f16d24344f522055ce5fae93f531894073047d57e7c4509618c11c73ff0919b1b4bbf9e6ed7c6a0c4e9d85d3606d3a95 SHA512 ae900911cf01c13bb86ae12372b2fc1e40b09e938de61d52f50cb8572858cedec580baf80ddfc309a6c35052189155e64e1dc81e178fc1f84e595d5d117a0b93
+EBUILD mpd-0.22.9-r1.ebuild 8520 BLAKE2B 23f1d52663adb310138b4b0749d9c5c9f16d24344f522055ce5fae93f531894073047d57e7c4509618c11c73ff0919b1b4bbf9e6ed7c6a0c4e9d85d3606d3a95 SHA512 ae900911cf01c13bb86ae12372b2fc1e40b09e938de61d52f50cb8572858cedec580baf80ddfc309a6c35052189155e64e1dc81e178fc1f84e595d5d117a0b93
 MISC metadata.xml 2563 BLAKE2B a974514d9226d8ddb4ac85adaaccb4beb5104fc28d68248ac4afe87ab5358e2e7a4214444444419c20c22533ffeb1649308f805958273bce8f603f6f47551884 SHA512 642ecc4d91cfd82db6e4afa9e35f1dd01dd7c4be23576303cc29e266e629463b73491c61d0c0ff5b7dba753ea6c60ec89ccf1f5a895968e9127852b445151a39
diff --git a/media-sound/mpd/mpd-0.21.26.ebuild b/media-sound/mpd/mpd-0.21.26-r1.ebuild
index e4821554af5d..0152f6fddf5c 100644
--- a/media-sound/mpd/mpd-0.21.26.ebuild
+++ b/media-sound/mpd/mpd-0.21.26-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 		media-sound/alsa-utils
 	)
 
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile:= )
 
 	cdio? (
@@ -61,7 +61,7 @@ RDEPEND="
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
 	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	lame? ( network? ( media-sound/lame ) )
 	libmpdclient? ( media-libs/libmpdclient )
@@ -99,7 +99,7 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	wildmidi? ( media-sound/wildmidi )
 	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
+	zip? ( dev-libs/zziplib:= )
 	zlib? ( sys-libs/zlib:= )"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/mpd/mpd-0.22.5.ebuild b/media-sound/mpd/mpd-0.22.10-r1.ebuild
index 0578b8f6aabd..7e5eda24cd46 100644
--- a/media-sound/mpd/mpd-0.22.5.ebuild
+++ b/media-sound/mpd/mpd-0.22.10-r1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 		media-sound/alsa-utils
 	)
 
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile:= )
 
 	cdio? (
@@ -63,7 +63,7 @@ RDEPEND="
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
 	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	lame? ( network? ( media-sound/lame ) )
 	libmpdclient? ( media-libs/libmpdclient )
@@ -101,7 +101,7 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	wildmidi? ( media-sound/wildmidi )
 	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
+	zip? ( dev-libs/zziplib:= )
 	zlib? ( sys-libs/zlib:= )"
 
 DEPEND="${RDEPEND}
@@ -284,10 +284,10 @@ src_install() {
 	keepdir /var/lib/mpd/music
 	keepdir /var/lib/mpd/playlists
 
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
 	fowners mpd:audio -R /var/lib/mpd
 
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.22.3.ebuild b/media-sound/mpd/mpd-0.22.3-r1.ebuild
index 5ba4a5f6cde5..5f5a7ec2ebe9 100644
--- a/media-sound/mpd/mpd-0.22.3.ebuild
+++ b/media-sound/mpd/mpd-0.22.3-r1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 		media-sound/alsa-utils
 	)
 
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile:= )
 
 	cdio? (
@@ -63,7 +63,7 @@ RDEPEND="
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
 	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	lame? ( network? ( media-sound/lame ) )
 	libmpdclient? ( media-libs/libmpdclient )
@@ -101,7 +101,7 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	wildmidi? ( media-sound/wildmidi )
 	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
+	zip? ( dev-libs/zziplib:= )
 	zlib? ( sys-libs/zlib:= )"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/mpd/mpd-0.22.10.ebuild b/media-sound/mpd/mpd-0.22.4-r2.ebuild
index cb6f9fbd098d..04cae8dac405 100644
--- a/media-sound/mpd/mpd-0.22.10.ebuild
+++ b/media-sound/mpd/mpd-0.22.4-r2.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 		media-sound/alsa-utils
 	)
 
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile:= )
 
 	cdio? (
@@ -63,7 +63,7 @@ RDEPEND="
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
 	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	lame? ( network? ( media-sound/lame ) )
 	libmpdclient? ( media-libs/libmpdclient )
@@ -101,7 +101,7 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	wildmidi? ( media-sound/wildmidi )
 	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
+	zip? ( dev-libs/zziplib:= )
 	zlib? ( sys-libs/zlib:= )"
 
 DEPEND="${RDEPEND}
@@ -284,10 +284,10 @@ src_install() {
 	keepdir /var/lib/mpd/music
 	keepdir /var/lib/mpd/playlists
 
-	fowners mpd:audio -R /var/lib/mpd
-
 	rm -r "${ED}"/usr/share/doc/mpd || die
 
+	fowners mpd:audio -R /var/lib/mpd
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.22.6.ebuild b/media-sound/mpd/mpd-0.22.5-r1.ebuild
index 0578b8f6aabd..04cae8dac405 100644
--- a/media-sound/mpd/mpd-0.22.6.ebuild
+++ b/media-sound/mpd/mpd-0.22.5-r1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 		media-sound/alsa-utils
 	)
 
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile:= )
 
 	cdio? (
@@ -63,7 +63,7 @@ RDEPEND="
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
 	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	lame? ( network? ( media-sound/lame ) )
 	libmpdclient? ( media-libs/libmpdclient )
@@ -101,7 +101,7 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	wildmidi? ( media-sound/wildmidi )
 	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
+	zip? ( dev-libs/zziplib:= )
 	zlib? ( sys-libs/zlib:= )"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/mpd/mpd-0.22.4-r1.ebuild b/media-sound/mpd/mpd-0.22.6-r1.ebuild
index 0578b8f6aabd..04cae8dac405 100644
--- a/media-sound/mpd/mpd-0.22.4-r1.ebuild
+++ b/media-sound/mpd/mpd-0.22.6-r1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 		media-sound/alsa-utils
 	)
 
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile:= )
 
 	cdio? (
@@ -63,7 +63,7 @@ RDEPEND="
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
 	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	lame? ( network? ( media-sound/lame ) )
 	libmpdclient? ( media-libs/libmpdclient )
@@ -101,7 +101,7 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	wildmidi? ( media-sound/wildmidi )
 	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
+	zip? ( dev-libs/zziplib:= )
 	zlib? ( sys-libs/zlib:= )"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/mpd/mpd-0.22.8-r1.ebuild b/media-sound/mpd/mpd-0.22.8-r1.ebuild
new file mode 100644
index 000000000000..7e5eda24cd46
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.8-r1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
+	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	fowners mpd:audio -R /var/lib/mpd
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/mpd/mpd-0.22.8.ebuild b/media-sound/mpd/mpd-0.22.8.ebuild
deleted file mode 100644
index cb6f9fbd098d..000000000000
--- a/media-sound/mpd/mpd-0.22.8.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
-	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	doc? ( dev-python/sphinx )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	sndio? ( media-sound/sndio )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-		-e 's:^#user.*$:user "mpd":' \
-		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
-		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
-		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
-		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
-		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
-		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
-		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
-		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
-		doc/mpdconf.example || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-		-Dsndio=$(usex sndio enabled disabled)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dio_uring=enabled
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	fowners mpd:audio -R /var/lib/mpd
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.22.9-r1.ebuild b/media-sound/mpd/mpd-0.22.9-r1.ebuild
new file mode 100644
index 000000000000..7e5eda24cd46
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.9-r1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
+	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	fowners mpd:audio -R /var/lib/mpd
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/mpd/mpd-0.22.9.ebuild b/media-sound/mpd/mpd-0.22.9.ebuild
deleted file mode 100644
index cb6f9fbd098d..000000000000
--- a/media-sound/mpd/mpd-0.22.9.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
-	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	doc? ( dev-python/sphinx )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	sndio? ( media-sound/sndio )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-		-e 's:^#user.*$:user "mpd":' \
-		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
-		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
-		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
-		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
-		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
-		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
-		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
-		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
-		doc/mpdconf.example || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-		-Dsndio=$(usex sndio enabled disabled)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dio_uring=enabled
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	fowners mpd:audio -R /var/lib/mpd
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest
index 7e2395f99db5..83fc428b2dd6 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -3,5 +3,5 @@ AUX mpg321-0.3.2-CVE-2019-14247.patch 931 BLAKE2B 5ef376d165a61771241389a9c165be
 AUX mpg321-0.3.2-format-security.patch 1154 BLAKE2B be54674f59b5f98118573828b73942fc7f312e02058e358b3c853318021e30cd5062721c568e83317504770c9f44c052289c32007822a7d99a30df7cef20afc3 SHA512 4184e415f7338d35e2169d663ef24d2d4c0acfc7fac9dc40e184538aaf1c6aaaddd3adce6f54755043dc94b0ee90f74fe287abf6c010f677639dd58b814a4fd1
 AUX mpg321-0.3.2-gcc10.patch 2218 BLAKE2B b78e85d6ec04b6b76471bfe48df31ebd312d97c938f30b823f364dffcfa9101ac2033c4710173902fb42767d664f1bc89e0401b725084a062a35d89a01d14cbd SHA512 079cec28a4ce9aa54a7952e548d24804c266e397b2109eb7cbc42396b88a7f6e4ba5112219d645972d293e90ba12e5f696d606c803cff9225888cac1ba0cea79
 DIST mpg321-0.3.2.tar.gz 151139 BLAKE2B d1b043316aca07e61ab61698f1d9e56fd221c4024e69b5262906b280dcb4f67bd32f3ff72b1758ba26cc0fa7d1c5c4052fc6fc87ae9ceec9d0bf77b1d35a868f SHA512 f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234
-EBUILD mpg321-0.3.2.ebuild 1246 BLAKE2B db6df4d455150a7265c58f432332711c65231a851424694b6fa3aff09c1bcc6d27cc3209137ae6db0f98dc52097794901b0f86821455353ca0832628e6888672 SHA512 ed3a3fc84e59ac86c06e5fbf673906765868a60aab2f87d0a9b0440a068dfda6ef6cbb492e7dee95866cfc9def27922df0d11edae1ade24ca14e91a9256018dd
+EBUILD mpg321-0.3.2.ebuild 1250 BLAKE2B 1d2903fd6bf19d3c2aaaa275b34b27e0fdb8f59b2d8c4d4b5f5805b5a547aa1d42b64f8d6cfef9789817b8a957a36c9c978f48343b0a258dcc8c53b4dcb7786a SHA512 0534e6164f42a7acddf61d6e1112457e32516709426f3ad64a23742ae156978f29223b3b0407091aa22ee32685c7770fd1b752336b3999fc6d8b5906af0cec10
 MISC metadata.xml 329 BLAKE2B d54fd85110b067a080ba1be242f8ee2e5c76b503e7fd6852fba8b1af20873244666fe5d46a1cbdce2a555c44dd057e99801f7974ceac78076c0189976c125960 SHA512 7f66ba87cde258577f41f82b9056b613d1da1741a3dbefe2185562549cf53050d5073b24f07f2b7de25f06b55cdde55653cb8de03d97806a2c47224b8e100764
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2.ebuild
index 9d050bcc5dc0..4ce38f653315 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~
 IUSE="alsa ipv6"
 
 RDEPEND="app-eselect/eselect-mpg123
-	>=media-libs/libao-1
-	media-libs/libid3tag
+	>=media-libs/libao-1:=
+	media-libs/libid3tag:=
 	media-libs/libmad
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )"
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index 7d682f393d2c..9c5a776993fb 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -5,5 +5,5 @@ AUX mt-daapd-0.2.4.2-maintainer-mode.patch 332 BLAKE2B 94083b6a8847b0f6a1f8c0608
 AUX mt-daapd-0.2.4.2-oggvorbis.patch 590 BLAKE2B be372f1dc4aa4541b35782064c0dfccc40d62e704d2ac3041fda8d719af52f5692dd8a0ba351c8fed3b5ef35be0ca604242e2a9cc588c890862ff710c4762c96 SHA512 51785b2e89fe20d71a3bfaaf75ccbf6b8369af8e5b76f2c8fb63b76fbb0a3249b9119be7c63256b507ce4f39cdfd08982ccf9e398d3d3fd13b24628b2c8f2280
 AUX mt-daapd.init.2 1220 BLAKE2B 483f41aeab5ab3de0ab6c268f8263317a26b6c647e5e02c52c1636bfd4f4b2efb3cf9f8745e4da90b8f19d809509fcebe721fe94fef8140fb65da3152bd26549 SHA512 32a24aa6c027df24a959f908bfac5be24638975fd98a7470dd0e5e9e4590c9918810f646eb9a4497405563c1dfdd139a974cc6db8b7066684af8d9701c703b42
 DIST mt-daapd-0.2.4.2.tar.gz 436513 BLAKE2B bca01805bbdc96d3aed1499a1295c48761d83f2ab876e15ea546d30b164bd86eab9e8278db39bedad356b4c018bec96f2086a98113562dfa09a496c6c0ce60de SHA512 1a944f31cc63355d33c7fd821d4509b8b69805ae29aa23f1307bf7602f6a62beba1f5ab5f4005387177f17c5fdf8db91b338f010b4be4ab0cd783dc72c6df60f
-EBUILD mt-daapd-0.2.4.2.ebuild 1849 BLAKE2B 9de14a699f83d501b7ea328dc7cfa91df1d0634a3bdebe08432c4aebc2ae20f042e20dfa157ac6b7720b5020da9a6cf4212f95cb7a275b26b873ec06b9864c9c SHA512 8fa7b66a447a75fc6a67ae5d1bcc924b63c9d619484b20b5ac2be389e2e547a0a3d918f189da6c8b308a2e5e09d88c70dfbc4530d4d3566ec702ae55d7c83c7e
+EBUILD mt-daapd-0.2.4.2-r1.ebuild 1852 BLAKE2B 41cea2876622e6d60029fb99eeb5108e6b25980d3760c369e55f9300730c18e892ad18188f70867257fe1b7ce40289a3d752b1e218d5dcfb981d189629051164 SHA512 15e71db10db1dd3204f4133f261f1a0d1494d1c3a421a70fbc1f82123f2379e7cdb65dca44fc7d0578732a698c8627bcfcc2f907dc47e3058c7ebdccc3cffed3
 MISC metadata.xml 331 BLAKE2B f7842e1c5183217f3496de60b60bad916ff47ff7419dc9e6c72116a030ca36d9508a8b2d01c3350374be8e2513b982e7c59d18325934f9814eb1ceb09e8d3ff0 SHA512 75a2feebcc5b6226a059c79d8519bbf79de8ff4025c43389a39cb287ff220176e99f2fa2abdcdb371ebf9d988cc8bea4ca018ed347c98e9aedfc4ef7cbead941
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r1.ebuild
index bb376b2c40ab..7400ed7efafd 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,15 +16,15 @@ IUSE="vorbis"
 
 RDEPEND="
 	media-libs/libid3tag:=
-	net-dns/avahi:=[dbus]
+	net-dns/avahi[dbus]
 	sys-libs/gdbm:=
 	sys-libs/zlib:=
 	vorbis? (
-		media-libs/libvorbis:=
-		media-libs/libogg:=
+		media-libs/libvorbis
+		media-libs/libogg
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.3-sparc.patch
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index d997931eba44..ee46cf2fa05d 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,4 +1,4 @@
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
-EBUILD mumble-1.3.4.ebuild 3757 BLAKE2B 38b1bd1778be0290bf1a887fb615a7b8b247e324cfc4df02a816923962e3fe4bc58b7e298d7a4b50ee41b304a5c1f8d3574c675a33adc9af1331bb76028dd957 SHA512 0a450d16a7102a5b6b7c337999fa649d585cecd6ebf9bcddd7352a1806aa3e6ff580fc5b1687a4bd40ac1b1726cb461861a2f24ef84b7e403afcea6078ca197a
+EBUILD mumble-1.3.4.ebuild 3775 BLAKE2B dcf342af9e2a3ad6e19ac795931fd6df8bf8b1f9932dd12c78d58db453604da80e1c59cde9b87055777ab463ccec0b1e18da2fd8b025125d13ae88bc6b687f12 SHA512 157d75a84cdc693f34533aced498f57c28e19d00ca1b49d5f1a13736cc5d8fddb6e06bfafa5e48e154d3ae3e11ab8a10dd40a86501264ca148a5776438bb127e
 EBUILD mumble-9999.ebuild 3032 BLAKE2B f5dbfab60d82ea467f4b387fab941555ecd05a82ac80d67cc6dff962d049f3dd91ad9e59ed3a15dfdbe5c0c1981f6116decdf503526cad3aa2a37a5da6fe1f28 SHA512 6ff0537b360e770b73dd081aab902603f6583a268702d4aedc8d75619f9aa4dd9bb058d5cf70e4f0769fd037fd8564a041dcf7746831061d1c65db175d3fb5a0
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.4.ebuild b/media-sound/mumble/mumble-1.3.4.ebuild
index aacdc0c4ab45..5c1fc367dd3e 100644
--- a/media-sound/mumble/mumble-1.3.4.ebuild
+++ b/media-sound/mumble/mumble-1.3.4.ebuild
@@ -87,7 +87,7 @@ src_configure() {
 		$(myuse oss)
 		$(myuse portaudio)
 		$(myuse pulseaudio)
-		$(myuse rnnoise)
+		$(usex rnnoise bundled-rnnoise '')
 		$(usex speech '' no-speechd)
 		$(usex zeroconf '' no-bonjour)
 	)
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index aa71b2861b79..7e5e05b6fb0d 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,3 +1,5 @@
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
+DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-4.0.ebuild 858 BLAKE2B e613591d317859e84c8330efa3adaa311b005153044e4e588c9131ded0fac49a0e7ed6212d77a214cc8e9b5419e9ac96359ead9cbf61bde86c7c8c96ef656107 SHA512 3edc52431b727d80603cfc51704d57f4cec1e12fdbeeaa56729d64cdaf0bf2edce65028f9c0d929f7c0cfa64541fd5a706fb97fcc65cdc286835bffad2bdf956
+EBUILD pavucontrol-5.0-r1.ebuild 829 BLAKE2B 25f09546b23c8847dc832d18bf202fa466ddd75d45cbf6c31c406f41bfb2b2671967a8cc344dd570e51d9fc37f1d4e9b54a369b15954dca5d7105fffb4d6ae34 SHA512 ed8fab2e2d3eb88051e20f5b86f4325837fdbbc1aabd5db69cd261bac038f0e25465c51fd5f99b98c05106c44b588b14deedddda5791c1a6b137b6cbf60f51c7
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
new file mode 100644
index 000000000000..e0559cf0d304
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-libs/json-glib
+	>=dev-cpp/gtkmm-3.22:3.0[X]
+	>=dev-libs/libsigc++-2.2:2
+	>=media-libs/libcanberra-0.16[gtk3]
+	>=media-sound/pulseaudio-15.0[glib]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-lynx
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 8d85d64b595e..c7f7a22bff52 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,4 +1,4 @@
 AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
 DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
-EBUILD sonic-visualiser-4.3.ebuild 1636 BLAKE2B cc13d00d1562777d328eba6166a73fd8ff13390985140f16ae2e2f1555338198cb76740767fcab2fe9b1065ecf83ae39553bb2219c2135311a13762f33a1a82b SHA512 47067ede6d807f1de837b0312575feed6063d9d2a4077b0f6a5bac7a42ed2777ee5444905dc39e61bdc1389ef840865fb003abcda2b2816fd148306dd187d1a4
+EBUILD sonic-visualiser-4.3-r1.ebuild 1638 BLAKE2B 24fd029abfaa5de80f6975679db06cd0e3f6b8de17ab7b209bf964f4f2eebee5627bfb44768c0fd676fbd4d8d5009167c2f7fddeabc63c4aca6a98e08a30f263 SHA512 e7ae7fae399d1ad994ae92cd38a6dbaf7e628e6c12a466e448c8536f68902239844bdd6d4313f1028e31feef01abba4021610fc5c2153d83f5541d782e854a42
 MISC metadata.xml 456 BLAKE2B ea6749af7e2c0905dfa753fdc2c5e9342727599b4550c282db4dd01c564019ba7e02c5116cd256abb99476087b78b085742ff649df7844f82b3efe88c74ea8ad SHA512 95e15aaade8230e877d46a7f7625d7ffaadf1273129e36255f43ca578ee3b878ab78fe39837ba7090f248830cd7bfa47de144ec13ed31f9677f7b65d270a66b0
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3-r1.ebuild
index e1d71cfe2f6c..5592a828181e 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.3-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	media-libs/speex
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	jack? ( virtual/jack )
 	mad? ( media-libs/libmad )
 	ogg? (
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index a2866f04f191..4f964e956a70 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,3 +1,3 @@
 DIST sox-14.4.2_p20200803.zip 1089835 BLAKE2B fa53d8c9f14620675bf534090bf6c69ec256bb977aa1b3c01b2d95ba8e685eb4f9d479872f303b2954aa1b063c095bf3b90e5b746fd8d7d66e35476e5218fa6b SHA512 8c485a53b9ecce9ecf759d7bbf8d95e568a89505bec7d1258afded4c7ad0f28c624b637a188ab87b64dee720db59b8de20c347805910f0401f00550832e16392
-EBUILD sox-14.4.2_p20200803-r1.ebuild 2829 BLAKE2B 6cd443934dbfc17f4d48156dbc93138b7c3bfd5bef43985d6b7589f8f04becf485ff6faff8792cade2911cbab1770cbf496e26214d62a0d14151d68d15656163 SHA512 cf1808544a84e8500e559ea2526c52c5f1bd3a40bf896db5bb77cfc94516cf101ee54d4b33ca3aced0b2bec8e838ec2d25950072f1dd51d3c227e10a436dddf0
+EBUILD sox-14.4.2_p20200803-r2.ebuild 2833 BLAKE2B 321acd4a7c6587b310c85ebcaaffa3ea60aed488e4b3ef95fc082275e91e2170212d762a7f9de55c6e3d9050e18c4c56af3b560385f5decea16dafb75c79f58e SHA512 59e0d8bf59301124f02c2dc859c8debc4e50c62bb7055826380bdb6f2c57df51142e18af43bcf27bc07583370c4e50a75b82f3b1bdd51423c564a47ea631638d
 MISC metadata.xml 653 BLAKE2B 73d6e024f7b8cf87cc0640a749af4bf3d45604e9e28cd9ff1f68fea9b7f4c05ff2e1ee676efd07d1221070492a3575c1f4397cfe7008df00403232353f22afcd SHA512 578f6db7fbe2ae3dc3a732a2cbfb8627bfcce1801b4834071040df1b9e3bf20ca9dd6e7a8d7df221d38f4e8fff22cefa6ad57fd19dc145ab4a247f688c497c71
diff --git a/media-sound/sox/sox-14.4.2_p20200803-r1.ebuild b/media-sound/sox/sox-14.4.2_p20200803-r2.ebuild
index 4c431212e18c..c8ec11bac503 100644
--- a/media-sound/sox/sox-14.4.2_p20200803-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20200803-r2.ebuild
@@ -32,10 +32,10 @@ RDEPEND="
 	sys-apps/file
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
-	ao? ( media-libs/libao )
+	ao? ( media-libs/libao:= )
 	encode? ( >=media-sound/lame-3.98.4 )
 	flac? ( >=media-libs/flac-1.1.3 )
-	id3tag? ( media-libs/libid3tag )
+	id3tag? ( media-libs/libid3tag:= )
 	ladspa? ( media-libs/ladspa-sdk )
 	mad? ( media-libs/libmad )
 	ogg? (