gentoo resync : 13.11.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
commit: e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree: 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /media-sound
parent: fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)
40 files changed, 107 insertions, 2620 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9dc2a052aef9..ffb7be0509d0 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index b2ed075b3b97..bbdc11ed4651 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,7 +1,5 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
-AUX alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch 1663 BLAKE2B 15f3778401410039d30aa93c12f17a7b9581474a7b1f2cf9cad743992b3b7ae9df65810af842d5a00f36d62e53cde51cf2c6ba8d41e1aab7e0a089a4396fe841 SHA512 2b6f0e6c6e68adff98911547d6b5372493d313ba1f7ff16f845ebf58d584a83916b213c3aeaef1198f09808851b01dd533b2d85fc7b72032843319ab60a707e2
-AUX alsa-utils-1.2.5-fix-the-nested-iteration.patch 989 BLAKE2B 5f5956c72a0e9605011b953f98ae29803f50e0c427c794331d1b99e7c1a4dc81379a074a1403ba71737cf8de03c0d749e4544a22a8e2f39984ed9dd6482b40dd SHA512 0cdc8c41b70be714515f355a630fc28b68b95cb7b5a5cbb58c1b288ee0edf3128eb8f80bb874844cf11268c89bb04e82f1fe8c4c1ebb7cd7334d28f2896d5a85
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
deleted file mode 100644
index f06756a8af96..000000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001
-From: Chao Song <chao.song@linux.intel.com>
-Date: Mon, 31 May 2021 10:29:57 +0800
-Subject: [PATCH] topology: fix potential null pointer from strchr
-
-This patch adds check to the return pointer from strchr,
-because it may be null and cause segment fault, if component
-is not properly constructed.
-
-Fixes: https://github.com/alsa-project/alsa-utils/pull/91
-Signed-off-by: Chao Song <chao.song@linux.intel.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- topology/pre-process-dapm.c   | 5 +++++
- topology/pre-process-object.c | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/topology/pre-process-dapm.c b/topology/pre-process-dapm.c
-index 450ca717..dbaf2f11 100644
---- a/topology/pre-process-dapm.c
-+++ b/topology/pre-process-dapm.c
-@@ -146,6 +146,11 @@ static int tplg_pp_get_widget_name(struct tplg_pre_processor *tplg_pp,
-
- 	/* get class name */
- 	args = strchr(string, '.');
-+	if (!args) {
-+		SNDERR("Error getting class name for %s\n", string);
-+		return -EINVAL;
-+	}
-+
- 	class_name = calloc(1, strlen(string) - strlen(args) + 1);
- 	if (!class_name)
- 		return -ENOMEM;
-diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c
-index 09aa3758..ac8caeca 100644
---- a/topology/pre-process-object.c
-+++ b/topology/pre-process-object.c
-@@ -492,6 +492,11 @@ static int tplg_pp_add_object_tuple_section(struct tplg_pre_processor *tplg_pp,
- 	}
-
- 	type = strchr(token_ref, '.');
-+	if(!type) {
-+		SNDERR("Error getting type for %s\n", token_ref);
-+		return -EINVAL;
-+	}
-+
- 	token = calloc(1, strlen(token_ref) - strlen(type) + 1);
- 	if (!token)
- 		return -ENOMEM;
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
deleted file mode 100644
index e175287a5598..000000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 1 Jun 2021 17:47:42 +0200
-Subject: [PATCH] alsactl: fix the nested iteration
-
-There may be nested iterations for hw: card names.
-Handle this card name in snd_card_iterator_sinit().
-
-BugLink: https://github.com/alsa-project/alsa-lib/issues/142
-Fixes: eefc2c6 ("alsactl: use card iterator functions for all card loops")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- alsactl/utils.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/alsactl/utils.c b/alsactl/utils.c
-index c79fd951..881b5053 100644
---- a/alsactl/utils.c
-+++ b/alsactl/utils.c
-@@ -247,6 +247,8 @@ int snd_card_iterator_sinit(struct snd_card_iterator *iter, const char *cardname
- 	int cardno = -1;
- 
- 	if (cardname) {
-+		if (strncmp(cardname, "hw:", 3) == 0)
-+			cardname += 3;
- 		cardno = snd_card_get_index(cardname);
- 		if (cardno < 0) {
- 			error("Cannot find soundcard '%s'...", cardname);
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 22fca96ae9a9..3df13bb27690 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,5 +1,5 @@
 AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f2303764ae2c3959fc3a4b271e109d56151f3ddf08a21904fbd6aa4e397c96eea88c7735a02004e600d0c07b3a58dd9e1 SHA512 ea35b8ae9d11525b314cd4c89385e24b98c22dec34a042b694a707e9a3bdf8741497c6ede792d9837976cf939795f7e645be23174cddcc5df9b3fb228ef56198
 AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10
 DIST amsynth-1.12.2.tar.gz 1607129 BLAKE2B 8308a8a595dfe7b2c9924ff183134fdd5ad20ac2c957b1f52e474a8cb297cd73ee9f8b9938212deb21701e11ccbf776ea22cab763fb71940bf1df5c169e309db SHA512 a1eef3d5a0d0f0ec1edb93d89b3e456ea133a8445a9be73ba338771ae651a2008aea8dd077a9bcf0cd50e6bcc97ad98ab4c44a9baefd9f3381287afdf3325e8f
-EBUILD amsynth-1.12.2.ebuild 1116 BLAKE2B 68403a52299b3e64ea670b60a81810d323f4219ade428b549ac0a0c1caa9356ef8de3c280e10a345c9a7faf52b6b46f7891eb9c2bda92c97203278a8055e2cc3 SHA512 ae74bf746296f8739aaa49df3dbbef852e58156ac65edca94ddee2701ce203712338280bc70bfe83386786bb198b5d6ffa8f92b11385592bf4d4c91dc7596726
+EBUILD amsynth-1.12.2.ebuild 1135 BLAKE2B d1642af920eee3a3f40cdcca6802996ae7c44a2f070288b4639493dd2587c7a0c4b3c2271374d89ff186ff75d2de7a6fc175db10a10182854e35c550333a47ae SHA512 072dd5c9a8f8766db10f61ae69d4c98b4e9df33f2779d966bc8ef999c357b27fcd64bdf0b72e38aac8e2cbcd0a366be6d4c5662a69ba8dd996a35f9b7a2c0368
 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965
diff --git a/media-sound/amsynth/amsynth-1.12.2.ebuild b/media-sound/amsynth/amsynth-1.12.2.ebuild
index 43b44f1114be..892e1eb063c9 100644
--- a/media-sound/amsynth/amsynth-1.12.2.ebuild
+++ b/media-sound/amsynth/amsynth-1.12.2.ebuild
@@ -17,6 +17,7 @@ IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
 REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
 
 BDEPEND="
+	dev-util/intltool
 	virtual/pkgconfig
 "
 RDEPEND="
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 43d1583d95fc..eb7b08913be1 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,7 +1,4 @@
-AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d29bf9a7792a4b212124985367c8cf1c6ae5d71682e4474a3ebe1c8c9602565ba4b908156d4bdd4db2b2745c627903034a5f7f74cdecfad4b106b4685e8bddef SHA512 6fc4ece49940d0f4beaecd0c2f218516e0bac14979fbce1ad25454b5075fc5eb29873c93ff3930c7e6214643a47bbe55408ad258859f973a0b5717b67456340f
-AUX denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch 2103 BLAKE2B ebb91ff4df71ec412ff881cc2443c7a071ef105ba180ec72dcf61cdd5d5fb97070deb9b9a73e49a133e746a9c159a6ff8c93640784047a5792a97ceae674aed1 SHA512 74f02aa8801ded5bf1c33f7bfeb38db258ba924241e72be05c5e7784538f0eb4d72a88e0b810b5b8b1c96e95d27b135b6fcf3fea8f7a9ebcd9ee0652e3b6560f
-DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
 DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e
-EBUILD denemo-2.3.0-r1.ebuild 2977 BLAKE2B 636fe2171f0047f4377ea349059e5222b47da692e18b10aab44ffa7f8c37218136f0b4654304284cb2e8f2de3d6234ba7a4ee626cc7afe277fb0b22880d209a3 SHA512 ba1f78313cf50f77cab4923dd11b160aae49d15de9295db7c185d2bab070a20e26ab48b6379aaaf6d121339d165edba9a7cb5c17d2032b43737e2c614221e4f6
+EBUILD denemo-2.5.0-r1.ebuild 3015 BLAKE2B ff38cc0a9fb149936c7291ed7cd6175acca20a5a0ddff1ad4a80b0b8074ad3a33eb87b3886dd333d230692c685848b68f2ebd7579d549482708bfe208f8e8bc2 SHA512 a4dcd5608ccc2ab5459bc9f6cb0c2f9b2e9362735de26a064ad0b0ab3daa4ddd403f3bc7a0374cf1c533fc18502576ea4835d22faf2f56043bc8a54eb265f7ee
 EBUILD denemo-2.5.0.ebuild 2876 BLAKE2B 00d1a90e577ba541e15a9a71b5f5c377ab065fefabec6e5d6078b7449e6c3ed39f4bdfaf61f1cdfdb4939717b61e8332327130cb0212f50a45411976fb28d731 SHA512 7bf2b042085591775e8accce5522827bfbd714ce776a27a6f94760a10bcf56fefba770e4f04d5bdde758d1f989e3d02c77c58aa3fac496d8f12ac84a58c6e2a8
 MISC metadata.xml 1305 BLAKE2B b6e58a60c832879cfe3fa5d8fe3af73fdcc698b43b139e1063f20170d051023a00c076d7b618fbc04eb88b4ea113cab5ab97d68df39d6a56a2d81b5490ddfdcd SHA512 301c335b2abd0abadfec0c9ca4904fd3e56ab71b1abb84b632e81591485ad9cabf8c5abcb68f4e106ee4e9f2769737f0d1ab67d7fe0331e83f96897c08f840bd
diff --git a/media-sound/denemo/denemo-2.3.0-r1.ebuild b/media-sound/denemo/denemo-2.5.0-r1.ebuild
index 8c30d94ce54e..11db5633d214 100644
--- a/media-sound/denemo/denemo-2.3.0-r1.ebuild
+++ b/media-sound/denemo/denemo-2.5.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools xdg
+inherit autotools font xdg
 
 DESCRIPTION="A music notation editor"
 HOMEPAGE="http://www.denemo.org/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # configure options currently not used:
 # --enable-mem(no) memory debugging: needs Electric fence (efence), which
@@ -30,7 +30,7 @@ RDEPEND="
 	media-libs/fontconfig:1.0
 	>=media-libs/libsmf-1.3
 	>=media-libs/libsndfile-1.0.28-r1
-	>=media-sound/lilypond-2.19.54[guile2(+)]
+	>=media-sound/lilypond-2.19.54
 	x11-libs/gtk+:3
 	x11-libs/gtksourceview:3.0=
 	alsa? ( >=media-libs/alsa-lib-1.1.2 )
@@ -44,9 +44,7 @@ RDEPEND="
 	portmidi? ( >=media-libs/portmidi-217-r1 )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
 "
-
 DEPEND="${RDEPEND}"
-
 BDEPEND="
 	>=dev-util/gtk-doc-am-1.25-r1
 	>=dev-util/intltool-0.51.0-r1
@@ -59,11 +57,6 @@ BDEPEND="
 
 DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
 
-PATCHES=(
-	"${FILESDIR}/${P}-0001-configure.ac-patch-to-find-guile-2.2.patch"
-	"${FILESDIR}/${P}-0002-Fix-issues-with-gcc10-fno-common-flag.patch"
-)
-
 src_prepare() {
 	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die
 	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
@@ -85,6 +78,7 @@ src_configure() {
 		--enable-x11
 		$(use_enable alsa)
 		$(use_enable aubio)
+		$(use_enable debug)
 		# --enable-doc does nothing for itself
 		# basic html documentation is always being installed in the
 		# /usr/share/denemo/manual directory
@@ -97,6 +91,7 @@ src_configure() {
 		$(use_enable portaudio)
 		$(use_enable portmidi)
 		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -116,3 +111,13 @@ src_install() {
 		dosym ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
 	done
 }
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
deleted file mode 100644
index 982ccfade868..000000000000
--- a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 9a515060df9024ef64bce2055fd3f2ceada5efa8 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 14 Aug 2019 13:51:32 +0200
-Subject: [PATCH] configure.ac: patch to find guile-2.2
-
-The patch uses the GUILE_PKG command to find any installed
-version of guile instead of explicitly checking for guile-1.8
-and guile-2.0 but missing guile-2.2.
-This patch was already provided to upstream with denemo-2.2, but
-didn't yet get accepted due to not being able to compile the
-Windows version with this patch (cf. http://savannah.gnu.org/bugs/?54821)
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- configure.ac | 41 +++--------------------------------------
- 1 file changed, 3 insertions(+), 38 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f85b74e..1fc0af0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,10 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_YACC
- AM_PROG_LEX
-+GUILE_PKG
- GUILE_FLAGS
-+CFLAGS="$CFLAGS $GUILE_CFLAGS"
-+LIBS="$LIBS $GUILE_LIBS"
- 
- AC_PROG_LIBTOOL
- 
-@@ -63,44 +66,6 @@ AS_COMPILER_FLAG([-fdiagnostics-color=auto],
- 
- AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"])
- 
--AC_ARG_ENABLE(
--  guile_1_8,
--  AS_HELP_STRING([--enable-guile_1_8], [use GUILE_1_8 @<:@default=no@:>@]),
--  [
--    if test "x$enableval" != "xno"; then
--      useguile_1_8=yes
--      PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
--      LIBS="$LIBS $GUILE_1_8_LIBS"
--      CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
--    fi
--  ], [ useguile_1_8=no ])
--
--AC_ARG_ENABLE(
--  guile_2_0,
--  AS_HELP_STRING([--enable-guile_2_0], [use GUILE_2_0 @<:@default=no@:>@]),
--  [
--    if test "x$enableval" != "xno"; then
--      useguile_2_0=yes
--      PKG_CHECK_MODULES(GUILE_2, guile-2.0 >= 2.0)
--      LIBS="$LIBS $GUILE_2_LIBS"
--      CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
--    fi
--  ], [ useguile_2_0=no ])
--
--if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"]; then
--  PKG_CHECK_MODULES([GUILE_2], [guile-2.0], useguile_2_0=yes, useguile_2_0=no)
--  LIBS="$LIBS $GUILE_2_LIBS"
--  CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
--  if test "x$useguile_2_0" = "xno"; then
--    PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
--    LIBS="$LIBS $GUILE_1_8_LIBS"
--    CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
--    useguile_1_8=yes
--  else
--    useguile_2_0=yes
--  fi
--fi
--
- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30])
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
--- 
-2.22.0
-
diff --git a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch b/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
deleted file mode 100644
index 425662e042c9..000000000000
--- a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 54075086a5b7acceef6dff41e19148778e285475 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 20 Mar 2020 21:03:02 +0100
-Subject: [PATCH] Fix issues with gcc10 -fno-common flag
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- include/denemo/denemo_types.h | 7 ++++---
- src/export/print.h            | 6 +++---
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/include/denemo/denemo_types.h b/include/denemo/denemo_types.h
-index 1d67827..936892b 100644
---- a/include/denemo/denemo_types.h
-+++ b/include/denemo/denemo_types.h
-@@ -430,7 +430,7 @@ typedef enum{
- } SCRIPT_TYPE;
- 
- //index of columns in the keymap command list store FIXME if you add columns you must add them in allocate_keymap !!!!
--enum
-+typedef enum
- {
-   COL_TYPE = 0,
-   COL_NAME,
-@@ -1167,7 +1167,7 @@ struct cs_callback
-  * The (singleton) root object for the program
-  *
-  */
--struct DenemoRoot
-+typedef struct DenemoRoot
- {
-   gboolean non_interactive; /* if TRUE denemo should not display project, receive or send sounds etc*/
-   gchar *scheme_file;/* filename for scheme code to run on startup */
-@@ -1258,6 +1258,7 @@ struct DenemoRoot
-   gboolean *silent; /** Don't log any message */
-   gboolean *verbose; /** Display every messages */
-   guint pending_layout_id;//Non zero when the current layout being created will be renamed to have this id 
--}  Denemo; /**< The root object. */
-+};
-+extern struct DenemoRoot Denemo; /**< The root object. */
- 
- #endif
-diff --git a/src/export/print.h b/src/export/print.h
-index db0c8f1..64a3a8d 100644
---- a/src/export/print.h
-+++ b/src/export/print.h
-@@ -108,9 +108,9 @@ typedef struct WysiwygInfo
-   GtkWidget *dialog;            //an info dialog to tell the user what to do next...
- } WysiwygInfo;
- 
--gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
--GError *lily_err;
--GPid previewerpid;
-+extern gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
-+extern GError *lily_err;
-+extern GPid previewerpid;
- 
- WysiwygInfo* get_wysiwyg_info();
- void initialize_print_status (void);
--- 
-2.25.1
-
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 84cb81411fc1..a257b8f392bb 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,8 +1,8 @@
 AUX easyeffects-5.0.4-meson_no_automagic.patch 1520 BLAKE2B e7eb71a9aacdb80cf45b7314acc80a42c48549047e754f8154fdfd901d0b25ec16e25ca64715d26335b9f2c6f8bd5bec2803b09e62f7e8c618435aff5f97e748 SHA512 db116e3727c497774b702c6537c6cef152c5898034ebd0260df4365d65b1e8465181aefb7b5ff28eab2eb5794ce331326b1cd0f313124f3a33c61f073af15b4c
 DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
-DIST easyeffects-6.1.2.tar.gz 1924029 BLAKE2B 74b5cbf2c7ae93ce12ee8ff6a6931f258b7e56b4af91a6b9873cb795309dbfb690fcda51584edd35adf05e85788070f698cbb6e4a914be0b7c5630bb0815b041 SHA512 2700dbf335a2414b3a294b66eeda8c12eef0df8a6f62b53fee9b6f0d5877f13d5791b24fca3d8560e84ae3d3bdbbb11d95f50934668f250f6052d3ba08711e10
 DIST easyeffects-6.1.3.tar.gz 1922869 BLAKE2B c92546ec8e1b67b09c9c46a21296fc77cb76617a581141ed6c01f57a00beb0f1428a70725918a627dcf1136b118daece89215084588d428a7673d6f2270f588a SHA512 ff3724abd821eb076d36b9f2543386bd899371d4401697b620292e9504a90f01a40c5a824e5517613747c2a3a872b3e72c8d798655069bb36742417523a968b3
+DIST easyeffects-6.1.4.tar.gz 1959269 BLAKE2B b3a4b7f2e1816353bfda4d232f380483e33316c166d8b6e7e704cb86ac07e99fac14bac68e7748a3731ee76d07317d62cb4cae90c39cdbd77d794ef8151de71b SHA512 104e1efaf2790d052bcc0d7512a86e86fe12041ea9020cb0c3664c723bcfb79a96e071ad3cb5b36cf2d77acc5deecea0adcd36c409410e20aaeac908923e9e9b
 EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
-EBUILD easyeffects-6.1.2.ebuild 1992 BLAKE2B 94f5e3065ac7a8cc3e29ca4c4659b3657af5e4ad5e537d3ce26022e12403bb17850109f99f69039f96cd0efb6224d36cf328ee0d0f035c17e0cf9caf231f6899 SHA512 47d913562ff73adec27786aa2247ae11faea4cb8ca939197db6418dd3a2809567c6aa27f03fdbfbb13e4104ad57f768973fa125d098d333f791f26ee87b9197c
 EBUILD easyeffects-6.1.3.ebuild 1992 BLAKE2B 94f5e3065ac7a8cc3e29ca4c4659b3657af5e4ad5e537d3ce26022e12403bb17850109f99f69039f96cd0efb6224d36cf328ee0d0f035c17e0cf9caf231f6899 SHA512 47d913562ff73adec27786aa2247ae11faea4cb8ca939197db6418dd3a2809567c6aa27f03fdbfbb13e4104ad57f768973fa125d098d333f791f26ee87b9197c
+EBUILD easyeffects-6.1.4.ebuild 1997 BLAKE2B ac38c18dd06f16486a7d4595025b64e607fd28f75bae3de7ff12da36f421b2f003c0b79d15e5faf952e01260540229d3cf3ee3c63f3c363ae54f42911861ade9 SHA512 e58bcb7303515868a68e8553a2c8c0028cd8266514ac662d66786af1e4c34e89d02be8e7637e17d1e0b8bd70d23707931b9ef51eebbaf96df6b3eda351e0c66e
 MISC metadata.xml 1285 BLAKE2B 2f08a86e1d8dc764ab015461101f7983cbad6c4856239ba2dcf332e23f3cbdeecb9e93bd464315b86125b708e8dba80008f1536dc4cc8fe240137e3cfdf461e5 SHA512 6bd4a58517ba2124ec04cb7dcbc36fc8f029729041abe623e1e4de8671439bba2471bb6d03febd780b820a2bd9b37384dc3c289c87f6eaa39d2005b544f16cf6
diff --git a/media-sound/easyeffects/easyeffects-6.1.2.ebuild b/media-sound/easyeffects/easyeffects-6.1.4.ebuild
index 92750db2b8fc..e99c0e46a097 100644
--- a/media-sound/easyeffects/easyeffects-6.1.2.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index e7ade41143bc..72751b2a414b 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-21.04.3.tar.xz 1725896 BLAKE2B 4937403cb1e58c23979ec5525232f227a92f4cfded11127af2cbf62b1f0a72163f39f1a02bec5e9d5acb9c78659f66bb3519a7ab322aaf3a5be7f855975cf365 SHA512 12a83267332f3d36d4906cd9dbc6c46558cd5a3efbf67ccdcfc53156e4e6b3cf334cd05033bc299105ce72df3625852ba8b9dc1438c0b50b7e29798796699ecc
-DIST elisa-21.08.2.tar.xz 1738284 BLAKE2B a1c8d2d8265d297dcda014f458fc0a620fa529e21571bf3053eaad1cf5e128b7525e69550b11f1a2b31fb895643e43728105a5a387ce4caa320b75fabeb8bba3 SHA512 a24fdd08c7ae42d7364c32d9ed58fa7d2bbd56e143c96eec60e2b7f4bceb883c0c681678a96afe206a8cf56aa216d5bde44182ff38fa21eba647bd95f15a4572
+DIST elisa-21.08.3.tar.xz 1739368 BLAKE2B ba802dd260e2061bcb652511c732b4c6c9431ca4c3af30f71980f06637bf9942b94874b56312eaa24a3b764132db290d73165bae0c6b967f84293ca07c656196 SHA512 839a35d3bd69b6c57eff85b583d78d8a630536f7911283e407776ada8c69625d2c3e06a0ac1591cf91420eb05ff1cd9bfbfe6eb8dccbbb26a31845a3ab9f2018
 EBUILD elisa-21.04.3.ebuild 1647 BLAKE2B 732a7150c9aaf95f42078b20069a39321445623cbe46aa1527acb3178a10a7a16e78e55274c77b860a26cc31eb8cd468083bf0949824ca34b462d0b0e9194814 SHA512 514bf14e4839faba7ab708dc8506503ca2d1157d21b9caf95e6712ee593d0ee4863a29cd887d011fc96c5c50956992e561abf2423fc3c43d2549e1ebd82515b4
-EBUILD elisa-21.08.2.ebuild 1648 BLAKE2B 96e61bdada10abf44a1543f090e09ce0004a5934b5c6f24764c8c4de67fd1e688a0c2f15a198b7929d5f5ee3be6786e1f5e33674559b62228ad8255e43485fe2 SHA512 e43a44653f0a85834f799827259692dccd2e38fc690bf40fcb7a878c26adb14d6a256a9462ad9ebdd69ce58c1cfe0bdda4cdd2593c537b70b32925209578b560
+EBUILD elisa-21.08.3.ebuild 1648 BLAKE2B 96e61bdada10abf44a1543f090e09ce0004a5934b5c6f24764c8c4de67fd1e688a0c2f15a198b7929d5f5ee3be6786e1f5e33674559b62228ad8255e43485fe2 SHA512 e43a44653f0a85834f799827259692dccd2e38fc690bf40fcb7a878c26adb14d6a256a9462ad9ebdd69ce58c1cfe0bdda4cdd2593c537b70b32925209578b560
 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751
diff --git a/media-sound/elisa/elisa-21.08.2.ebuild b/media-sound/elisa/elisa-21.08.3.ebuild
index 4e9fd54d5b2f..4e9fd54d5b2f 100644
--- a/media-sound/elisa/elisa-21.08.2.ebuild
+++ b/media-sound/elisa/elisa-21.08.3.ebuild
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 41df4f3450f0..b7434ef174bd 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,22 +1,8 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
-DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a
-DIST mpd-0.22.10.tar.xz 736456 BLAKE2B eb95efff44425f7aa261c937d3cf185eec17e3ade212c8b4873f4bb5cb5b775cbab621b851e972bba20fe3a56a3e7465aa0c26cc2fad60f50499925046cfb443 SHA512 e29deec7473a25236d17609ae898d7154e716f29a137c658492952cae162d59fbe9992be2b50971b8dbe03e9b11a894b6c5e9b4767c265d178f6da3ff49e3820
 DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43
 DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
-DIST mpd-0.22.4.tar.xz 729264 BLAKE2B d8060a205f94fa369ad8aee7a3e12f1389e7587aac7843eeec6ab3e6b39c2e063cfd5413bc7c9738ce6c68c56d3befefd48112c1c93f725a6940ff1889d882e6 SHA512 e169d6656b378d52798e822ffd47f554bd7c076ca8bc5a1119e3b2fad36bee79335dc392aa8d78d854689af62168625698c1777440e08a67075099898ee5fe34
-DIST mpd-0.22.5.tar.xz 730308 BLAKE2B 2c7375af25c1b5d6dd8cf79f71e67842f75dcdb38b1ca90c8dda2661a5bd6d110ad0ebbefc53e0a38cfa6434ee4d2ad99688982588ee6d8d6895b24e15e3f927 SHA512 589516b7ee5820cbeee99042017b411a46857d39547302bce0bedb9c265da2c8465224a6817a1b7e65105f344398bee5fb2a3674064e42507157cdac01416295
-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-r1.ebuild 8071 BLAKE2B 91df71b928168d00d63eabb823621f4e22d5e6d0d81075098607adb594ecf8f13f7842c2af370c19c1fc6b168eac15215d999706094978025653d61ecd80e2b7 SHA512 933751f86d9a7e24717bbd3ded3ddc13c15b5268fc6c6ac287d646704acb0e1a7cf5635a862e7de471a68000129c2f7232ae9956ae22f3b645356d0f512864ef
-EBUILD mpd-0.22.10-r1.ebuild 8520 BLAKE2B 23f1d52663adb310138b4b0749d9c5c9f16d24344f522055ce5fae93f531894073047d57e7c4509618c11c73ff0919b1b4bbf9e6ed7c6a0c4e9d85d3606d3a95 SHA512 ae900911cf01c13bb86ae12372b2fc1e40b09e938de61d52f50cb8572858cedec580baf80ddfc309a6c35052189155e64e1dc81e178fc1f84e595d5d117a0b93
-EBUILD mpd-0.22.11.ebuild 8527 BLAKE2B e9fdc64ff02fa7c9fbd2c0878cad5dda204735c714204f750649103a569671366bb90a781c214cef7874fb7076d01d21663d8b6301d41ba0902adef26f088769 SHA512 5e06f9750c639d2cb72dbd3203ff69e74c604d5f7cbed9298d49b3faf2544f6528e6db2bc43568592c77ce6da614bff2af46cd195bace487c45e4a16f742cc94
+EBUILD mpd-0.22.11.ebuild 8438 BLAKE2B fa57430a830cfaa6cbeba62b0ee9467465eaea4981aa7e4a3a5232f4edfa7fe9666a604a7511d38a7b846cfd071d117e4d3a8f8ee84cc8e3b45b166888a56fa0 SHA512 ad734efd651240eacc1402c3f97be74d3f0f5d8c8181a2586ea7445adb7cc23c72a749525e334c2fd39c8eb89be25bfd73a6db89ce1d425e9dc3c117cb3adc72
 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 2564 BLAKE2B 6187917fb80c7483d2e349c2b63c79707203f1187a453ec5423c2ce0d6c651f702852c94bed3fb54dcc85597ead6b740712082212c6f6b6bc5d5164669369edb SHA512 f6e1acd0a592beb00dbbe025eaf109a3da022ee24ad8ed9d525c0e90b9490520bb96b09896acfdfccaa31c533d6e2b6e2d0209adc0416acac05a31f68bc64fdd
diff --git a/media-sound/mpd/mpd-0.21.26-r1.ebuild b/media-sound/mpd/mpd-0.21.26-r1.ebuild
deleted file mode 100644
index 0152f6fddf5c..000000000000
--- a/media-sound/mpd/mpd-0.21.26-r1.ebuild
+++ /dev/null
@@ -1,296 +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 +dbus debug
-	+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 unicode 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
-	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 )
-	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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-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() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	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)
-		-Ddebug=$(usex debug true false)
-		-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=false
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-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.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.22.10-r1.ebuild b/media-sound/mpd/mpd-0.22.10-r1.ebuild
deleted file mode 100644
index 7e5eda24cd46..000000000000
--- a/media-sound/mpd/mpd-0.22.10-r1.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.11.ebuild b/media-sound/mpd/mpd-0.22.11.ebuild
index 5ed8afa7afd2..c33e3db9b9d8 100644
--- a/media-sound/mpd/mpd-0.22.11.ebuild
+++ b/media-sound/mpd/mpd-0.22.11.ebuild
@@ -17,7 +17,7 @@ IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+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
+	test twolame udisks vorbis wavpack webdav wildmidi upnp
 	zeroconf zip zlib"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
@@ -92,8 +92,6 @@ RDEPEND="
 	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 )
@@ -243,7 +241,6 @@ src_configure() {
 	emesonargs+=(
 		-Dqobuz=$(usex qobuz enabled disabled)
 		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
 	)
 
 	emesonargs+=(
diff --git a/media-sound/mpd/mpd-0.22.4-r2.ebuild b/media-sound/mpd/mpd-0.22.4-r2.ebuild
deleted file mode 100644
index 04cae8dac405..000000000000
--- a/media-sound/mpd/mpd-0.22.4-r2.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
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.22.5-r1.ebuild b/media-sound/mpd/mpd-0.22.5-r1.ebuild
deleted file mode 100644
index 04cae8dac405..000000000000
--- a/media-sound/mpd/mpd-0.22.5-r1.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
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.22.6-r1.ebuild b/media-sound/mpd/mpd-0.22.6-r1.ebuild
deleted file mode 100644
index 04cae8dac405..000000000000
--- a/media-sound/mpd/mpd-0.22.6-r1.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
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.22.8-r1.ebuild b/media-sound/mpd/mpd-0.22.8-r1.ebuild
deleted file mode 100644
index 7e5eda24cd46..000000000000
--- a/media-sound/mpd/mpd-0.22.8-r1.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
deleted file mode 100644
index 7e5eda24cd46..000000000000
--- a/media-sound/mpd/mpd-0.22.9-r1.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/pasystray/Manifest b/media-sound/pasystray/Manifest
index 7d9cf6b1578e..edb95dd9ffc5 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,3 +1,5 @@
 DIST pasystray-0.7.1.tar.gz 56041 BLAKE2B 5f7cae7a55580bf3dfe294e95bbda372c3a679bec000d222964b4027ced2462dfb4a8446d0683f8910e96ab98e1541b3fa9fafc36da530c92d2285f00a1beb65 SHA512 2af5176e6a5bf6d74baf0a0b52b731b7a3b54f787c4e89d945357aab4e186a35e0f77288d69d66743bf4e21f758e0d961cc1f9b339ce513eb4eb2bcab0d754bb
+DIST pasystray-0.8.0.tar.gz 58770 BLAKE2B dff11dec46986d3b086acdff43aa7eda97e8edcdef0ef85a246087a3a0da9407cb4475ab4b579a370f90c23327d065ae704685124915b27e03f0be1a44e50a58 SHA512 104c68e41659306ca1e750d0d580d6ffcf4411da2da51a4f2780f551e12da9e104eb66ea841234292769f05a15f8f14ceaefc55893cf551a47124d086b1fb291
 EBUILD pasystray-0.7.1.ebuild 999 BLAKE2B 311f499a2c1eb72326a348893098836166330425c323a9cd6ed117f0619eb7a8179d1c883344143d0d858f7037193451c5b3c0486f47dec52bb192aad557e5c0 SHA512 74b5e0e8fc57f0bcc6c6285dffb7c60a1a9cb32f9d96d05b64a429a6f79bf0c638434529cf36323387fff1338cc5f6bbffe3362efe1d6a0179f4e093d7bc635f
+EBUILD pasystray-0.8.0.ebuild 762 BLAKE2B 163b8827d4ea18137cca66f6ca4733407f79e15b9065e6db672e301b59f4578834440a95bd221514b6be223e437ed433017516abf653aa8d2ac5e91f8eafe2e4 SHA512 57427a09ce1757a4ae69a4e803e0dbc2a68185e013c4ab1861ed16d699803302c35dd9b46c1892999e85e77d5be7c1c7116d4830eb14e2aa1d19387f304e05e3
 MISC metadata.xml 666 BLAKE2B 6729f9a6e3bbfeaa9f8319c53770972326a0ffe851c02b5238d0e928c02d222d93bf569d00a9b6c1f33602fc13b764f9750d4473f67b1fc5d36da06e52fe96c0 SHA512 11a383b58d521ce5ca4bdcf3505e45b8dbd3053cf3e075c39c8dc4b83c94e3e7654141ffc8048cacdf8b4cc0c4d6565fe0d9609a3e14bf14bc248578978cf39d
diff --git a/media-sound/pasystray/pasystray-0.8.0.ebuild b/media-sound/pasystray/pasystray-0.8.0.ebuild
new file mode 100644
index 000000000000..3bbcec540569
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libnotify zeroconf"
+
+RDEPEND="
+	dev-libs/glib
+	media-sound/pulseaudio[glib,zeroconf?]
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	zeroconf? ( net-dns/avahi )
+	libnotify? ( x11-libs/libnotify )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notify) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 3a5f43de1339..eab6ecf95ff3 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,7 +1,5 @@
 AUX picard-2.6.3-fix-py3.10.patch 2720 BLAKE2B b5644f587d4ffcddeeb9594b33e75ac2b6da6c1ef613dd05183568fe8899220a021f5c2b0a58351c9670a2fdda25423da501c321cd47e5dfe88012f718bb8cba SHA512 431bb2c37322c27d04c1187828cd7b758954b83cc0078602551e3408c2f471bd6d17b1f0e1c7a2a97fd66bd6a631336615fc4ba8147b547d5ca3bce6ff58d5ac
-DIST picard-2.6.3.tar.gz 4320046 BLAKE2B ce308440ed4c6297128a5470b7bdced50fb22e62995c26670339ff71c70d610fc0c4ea8433f9dbacb197b710b8100de171817df604d76986596391d029b3c20f SHA512 71bdeb4777a0d996ac0093edefc448a348aa72e657ec639331e67257c47c389993d2715ccebf715458c3b606051154586d63b22b3cebd541d8b2da5e96a833b5
 DIST picard-2.6.4.tar.gz 4319362 BLAKE2B 78768b4a8a22c51c118ba03a9e97ba6c4bec9180e5739867b5756170083930a942a0a1ceaeb74bbe724af3ca392b92139cbc4acdde9556e9031be16a968a0240 SHA512 5f44f91f9f44cb17ecd27e204b75c83b776a2c55e2a6e42f96018c83f4073d92f028ef74006d6acbe42b1ed374543a65e177f34c561bfdf13ded1085515bf353
-EBUILD picard-2.6.3.ebuild 1511 BLAKE2B b1171f075b1be925db317d34edf8dbc5e2c1e8b635f8c3872ab4087b9fef18d29b611dd28ddb8d0fd1ddee2312c259cd0890664c6a4c7a553c117730e888820e SHA512 defd6e9e132bee27d0e9cd904c11cd57c3a3a16c255693957e7174dd81206bab3f7eff196b5b52870b5c2c23781643970e8e66de438255a0ee428671faa8c9d4
-EBUILD picard-2.6.4.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
+EBUILD picard-2.6.4.ebuild 1373 BLAKE2B 0e4d19baada49a91a0f5e9e2023c910343417d45b7e9dbaeb445069ed992338d3dc335b1985d26122e6b15309600da15ff568dc91334b9224ea4d391a4e6b416 SHA512 3f0056bf9addd5973b1cb9fdbc39288bbcb745157d6505f462e4be06b4f3f360c8df98e1a1fd26e29b1cb5b0fc4a20c3ce2c317f866fa26b8191ffdccc6c144f
 EBUILD picard-9999.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.6.3.ebuild b/media-sound/picard/picard-2.6.3.ebuild
deleted file mode 100644
index ea73dd432539..000000000000
--- a/media-sound/picard/picard-2.6.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/metabrainz/picard"
-	inherit git-r3
-else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
-fi
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="discid fingerprints nls"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
-	')
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/metabrainz/picard/commit/452bba954c30d5a642f03c02411529f511bda786
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
diff --git a/media-sound/picard/picard-2.6.4.ebuild b/media-sound/picard/picard-2.6.4.ebuild
index 3b869df3541b..d89a10588735 100644
--- a/media-sound/picard/picard-2.6.4.ebuild
+++ b/media-sound/picard/picard-2.6.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 5ac935f2d3f1..d89cdb0285f5 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,7 +1,5 @@
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
-DIST qjackctl-0.9.4.tar.gz 1094914 BLAKE2B 61025ecd6695df877802180a95763e5e9d557bc1d36966454cae2638fc5b5439c1ce64b65cd0193e40fd461575a3223b5ef5132905b7d211b75292dbfd5b7299 SHA512 ce808242d8bacadf4e267bdf75c20b53601f54c8a4eb0b5116653afa7bcdd17e99ac4f878d4ec78844194e13623a804850cf8ea7e12430806caad4fe986115c7
 DIST qjackctl-0.9.5.tar.gz 1336079 BLAKE2B 3446b0cb5cd34541d5761f3f6e2361dcfb50656997c723b5972aa60466a1eb1a720fb5d97684079832705b084d8d1ca082f652145d51ff89aedfab71a90d5c5e SHA512 2edceefd30a57b3b2277db271dd95c2b47b4a85106762eb3149dff94328265c096c5a26d301bd0edcd8f5d948dfc24ff2d3da532ac297121e4fee6982fb6ba56
-EBUILD qjackctl-0.9.4.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
-EBUILD qjackctl-0.9.5.ebuild 978 BLAKE2B 3e2107aef51bac45a53f2a5701a08f32c385626e93ac22b7f5b5657e2a62305b4eea241ae8a8afda524f7b5a339929924da74d79a5f2b6f5cb0a079126f63832 SHA512 e9c90266c949e5edd0b37ce436ae870cbc193aafd96b55658b44084c404243a8e5e7f782bf74900d48e225e1a6af6745a75651e98cd0ab4cd844d854a04d9e3c
+EBUILD qjackctl-0.9.5.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-0.9.4.ebuild b/media-sound/qjackctl/qjackctl-0.9.4.ebuild
deleted file mode 100644
index 200a042d00bc..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.1-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qjackctl/qjackctl-0.9.5.ebuild b/media-sound/qjackctl/qjackctl-0.9.5.ebuild
index 15137741a070..200a042d00bc 100644
--- a/media-sound/qjackctl/qjackctl-0.9.5.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 5a82c72ced77..ad51cf099cc7 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -1,8 +1,9 @@
 AUX snapcast-0.20.0-gcc-11.patch 261 BLAKE2B d41a0a47549e2f40bef887b5672a4ab1903c540503149055a0bdc25f4f4bd94a6bf323981dc1d6401e0882e7b41fadfec98833b30288af9f54177870c6f0d8dd SHA512 0917f69616376ec0c3c44a1cf4f6fdf2dff8f9e74e77e8ec1fa1c2f931139949757490fe49452b979bcb9bcb46fcdaac4dc04b148ba0ee88bcb5c0271f1c7e95
+AUX snapcast-0.25.0-cxx17.patch 819 BLAKE2B 67065e1747a49cfdbf52077890ee8a9b7b1afdae7b6edb9df541b8cc462361ca3cbcac0f441c036ba99bdbc3174e0841a9f32601a0005def6a162d7e60e7a6b0 SHA512 6308a22f055c7bf3180f1519e6186145c7bf75d1c6eac2382d0a2119203b909cfe1574a525a9a911c8896e206ce9235c585e4a54c55782ea6b89b32886def2be
 AUX snapclient.confd 641 BLAKE2B 74bae4c2c11fb7c1a7d4f2bd0f199c92a5ee11f68efb71da00026816f9dd7ba3555cc96c1e68be04dce26ea190a8e353c71817b5655ad2d9b43e3e510345c97b SHA512 f0adfca9354a4f5acb2def99585409e39229053e2b9be36309a67ac0b6935b1aeb061380a9e8a61d70bd902930536ec3afa98a6a708b08008eea1eb080fd1a5c
 AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd987fa51e9885f4968b0144106883a1a48e502c3e3558ca408babd38c46663b13ee56215caa108c3be SHA512 f429dfef7abd5705a8afc38f68125a7a6e5a812cd68733c8f47a65c7fb6aa22fc665c91e557726b8f35edbaced7b2e72ffad0ba123a6ed33bf8a6d333e8c1bae
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
 DIST snapcast-0.25.0.tar.gz 1412827 BLAKE2B 54d0c7b4fd20ec7d7ea414ed9915da9458c0875e5ca0277ba9c4d1415d50b0ef5940530ede3a09fe7d6bb94c7b17c7d0c6194105aa88a9719506f7494e79c723 SHA512 bc5e0540574f96a73971bae4b185a96f8ce0ca6619a51d9418368cf19f1e5b5248052a3a1e8922a15ba6b54dc8c3234c2f800fa2951fa5e97b9dd5610f78419d
-EBUILD snapcast-0.25.0-r1.ebuild 1615 BLAKE2B 353a5da75f77cd596d6a7de6f52052e71b30a107a3bf80d96f0b5357db09620c71003d355c50febf71a121817d2a494112c4256f18d131c106f1e3a729578bfe SHA512 4d4ac542e367d2c460f80e8e6c26124865385bb6640172ffa318137508e745b32beec7635c4954df27c94a2df3e9dffe8fbf5972f64e61dc9b71ab8e5416c651
+EBUILD snapcast-0.25.0-r1.ebuild 1648 BLAKE2B 8c6e492c866c6fc8b14f5e0ca0f839e2a7c5e10f0ce91ffc993ccb7052b5e61f01d9b2fd5bdcc1355c45ad0ed90f9d119fff2ea8af13f8abe1fb9aa5da1f8fe4 SHA512 afc9b48ae173fba2c8bf68eb3ecbed2827a4dc2acaf7df271cd7bc613fa4b4a04f2780036cf784746db96d6eab6b7e09f66ae2d1ff2e8aac4ebf1d9c3aedf637
 MISC metadata.xml 1040 BLAKE2B 5a5296b35eeae6e07b8b8c3dc3d63b58fb2d1aff7c0977f87690b9228183624c9d21fb2699aa82fef1d6027ff2cd89cb7a282cfa2c2ea0683f9da5a728fff17c SHA512 ac97766f2fe178adf1d6f642c60fab45be05e9b0509f34a270cb970ab16b3596ea90fc16b25d94b6457ff7c3543d4b88e5d291c62079ecc6b9d9e730fedc6250
diff --git a/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch b/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch
new file mode 100644
index 000000000000..f6797a62f85f
--- /dev/null
+++ b/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch
@@ -0,0 +1,27 @@
+https://gitlab.exherbo.org/exherbo/media/-/blob/master/packages/net-apps/snapcast/files/snapcast-Set-CMAKE_CXX_STANDARD-to-17.patch
+
+From 9858c60109c5d4aa09c26d1cb44be5c056849a36 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 15 Oct 2021 23:55:39 +0200
+Subject: [PATCH] Set CMAKE_CXX_STANDARD to 17
+
+Fixes the build with boost[>=1.77.0] and we shouldn't have compilers
+which don't support it.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4381a71c..5373f658 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,7 +127,7 @@ if(NOT ANDROID)
+ endif()
+ 
+ # Configure compiler options
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+ 
+ # Get arch
+ include(${CMAKE_SOURCE_DIR}/cmake/TargetArch.cmake)
+
diff --git a/media-sound/snapcast/snapcast-0.25.0-r1.ebuild b/media-sound/snapcast/snapcast-0.25.0-r1.ebuild
index 093e6dafcf79..c969b0dbde45 100644
--- a/media-sound/snapcast/snapcast-0.25.0-r1.ebuild
+++ b/media-sound/snapcast/snapcast-0.25.0-r1.ebuild
@@ -39,7 +39,10 @@ DEPEND="
 	>=dev-cpp/popl-1.2.0
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.20.0-gcc-11.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-gcc-11.patch
+	"${FILESDIR}"/${P}-cxx17.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 68d95bc13fb2..7cd842e2606c 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,6 +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
 DIST sonic-visualiser-4.4.tar.gz 6475000 BLAKE2B 37797b5fdcc397530a8b36bb1727bc56be703738505a117c853616eace41344b9526f98602ec872f4baa157cb1e92044bf7e3ef9079fa24b456453542bcf5763 SHA512 a76a6e5fc2381a3e7c89762687176fa60a8b731951438094af0ecd50103f73104a4366eacf731015573f8d5e5f436cf497a3e0e041363d5158d4f546bdd1f7b0
-EBUILD sonic-visualiser-4.3-r1.ebuild 1638 BLAKE2B 24fd029abfaa5de80f6975679db06cd0e3f6b8de17ab7b209bf964f4f2eebee5627bfb44768c0fd676fbd4d8d5009167c2f7fddeabc63c4aca6a98e08a30f263 SHA512 e7ae7fae399d1ad994ae92cd38a6dbaf7e628e6c12a466e448c8536f68902239844bdd6d4313f1028e31feef01abba4021610fc5c2153d83f5541d782e854a42
-EBUILD sonic-visualiser-4.4.ebuild 1854 BLAKE2B 93d4d82f16b81db8e5ed833f2356ef4036f346356d4af41a912c5d8a827efb1e3a7568c855df263129961c1d265bcee4ce1b8071b7f60efd7532fa0b5d636ae0 SHA512 043bba4edf2a8b88cbcff696fe8e3309e5beffe317eedd5cb53c757342404cbfec1b3f8012f33bf96adb2508c4291e82747069a07d87184706a0e7e98f443d88
+EBUILD sonic-visualiser-4.4.ebuild 1853 BLAKE2B d7bb586f099e0ddf8fad350328d5b5db8d6324c62accc1650fe88a45e13e5c552d0f5f7d4363792c7333fbbe56f502c1b703d34866f35ae45ad964b28b6eec90 SHA512 5a9fcad978c8e50522623ee76c78a31ca5a89833fa30030654bcdbaa094f5795abc2e058b4d9700b566cd039be9337fc4b8ce95975a2e84017e14cc585f3f320
 MISC metadata.xml 457 BLAKE2B fee1474516a395ba251de868c533ab4f88ac346a169a71e1513593f0ffa99f3365f0a7d87c24c31e73cf4f06d500b8bafe83f02230e6f24ebf8c0a23b43cd662 SHA512 58c25ca412527ef47411204f5ce579c3731c5b19922c43c13f069dae0c498e63879cc209e1f93e3487a2c32972df8ac45af690b4d470bfea9e497a3b9699c3a7
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.3-r1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3-r1.ebuild
deleted file mode 100644
index 5592a828181e..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson desktop xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser"
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
-
-BDEPEND="
-	dev-qt/qttest:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/capnproto:=
-	dev-libs/serd
-	dev-libs/sord
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib
-	media-libs/dssi
-	media-libs/ladspa-sdk
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/rubberband
-	media-libs/speex
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	id3tag? ( media-libs/libid3tag:= )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libfishsound
-		media-libs/liboggz
-	)
-	opus? ( media-libs/opusfile )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-# tests fail without mp3 support
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( jack pulseaudio portaudio )
-	test? ( id3tag mad )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-meson.build.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use id3tag)
-		$(meson_use jack)
-		$(meson_use mad)
-		$(meson_use ogg)
-		$(meson_use opus)
-		$(meson_use osc)
-		$(meson_use portaudio)
-		$(meson_use pulseaudio)
-	)
-	meson_src_configure
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
index cd16b31dbb51..cb1466d782e5 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
 
 BDEPEND="
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 23d51c545413..e8a5d348e1ee 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,3 @@
-DIST yoshimi-2.1.0.tar.gz 7471945 BLAKE2B f95fb49ec901e5a513960bfc4c1d27ce1979f3cd664d7ca7ddb723ad41fb06153749db0560a32f41c44c7fb433fde09ee49e898cb8bf55e232536b163d616992 SHA512 d90666ca2599d057d5c22abfc5e64f9a31eb323d13c50f771b92c5f94f7da9049b79dc8a478b3832142a97f8c2f5ea384a26e1543fdd6c063930989e34b146eb
 DIST yoshimi-2.1.1.1.tar.gz 7479260 BLAKE2B eec292d489c01054ff3e7b4402a359d5abc29157048b475df8482630dccaae9fdff6cc697d95614778e34d363215633b0dc8beaeb1c832c02f98f0f21384b42e SHA512 4feaf7b779d450e4d8f9612a141fdcd2858117c738c56bb43fa12a19f9806d6c990e560dfc62755c7d39e23608f516fb017b0c4063440996c5c17286a58bf946
-EBUILD yoshimi-2.1.0-r1.ebuild 1193 BLAKE2B d29685b96b0e40949d055036cb266e7eae25d4b0e0f7c135f75fbb796eb0a6148e3c19b3a57c3aaede3ac84f4d679aa9a5402003b52d4689d8ab295d213280f2 SHA512 f8d6b1642c5540e67352af2ccf278ade542d1cf18fb8bc3772017bc94f1ac9568b52b80c0bb287945ed1fdf0a35a94493688b54bc8fb674a6feca9ed0b4579b4
-EBUILD yoshimi-2.1.1.1.ebuild 1195 BLAKE2B 0d5c2293fd43c238fb68bbbb0cd21f5554d16dccd9ca10de130136ff7813c450cc1ede150b8b278ac2b9e9d8502332cf9032ff433ccab94f9bdbc882af85e295 SHA512 1837120f7c243549b618bb261b46ed0ad6ac3846c3b89a6126b5a73b203a8d9a2b250ae441c6253bbcff61cfd36b2945bf1faaaaf79d2735d16a35c8db930a42
+EBUILD yoshimi-2.1.1.1.ebuild 1193 BLAKE2B d29685b96b0e40949d055036cb266e7eae25d4b0e0f7c135f75fbb796eb0a6148e3c19b3a57c3aaede3ac84f4d679aa9a5402003b52d4689d8ab295d213280f2 SHA512 f8d6b1642c5540e67352af2ccf278ade542d1cf18fb8bc3772017bc94f1ac9568b52b80c0bb287945ed1fdf0a35a94493688b54bc8fb674a6feca9ed0b4579b4
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild b/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
deleted file mode 100644
index e4052c27b49d..000000000000
--- a/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/mxml
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-DOCS=( ../Changelog ../README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# unpack Histories.tar.bz2 to avoid QA issues
-	pushd "${ED}/usr/share/doc/${PF}" || die
-	tar xvf Histories.tar.bz2 || die
-	rm Histories.tar.bz2
-	popd
-}
diff --git a/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild b/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild
index 23dfc649dc2c..e4052c27b49d 100644
--- a/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
author	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
commit	e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree	1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /media-sound
parent	fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)