gentoo resync : 03.03.2021

74 files changed, 1395 insertions, 924 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bbb684ebfc3e..bf6c1127f09b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 01539fcf018e..6eada05f5839 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,4 +1,6 @@
 DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
+DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
 EBUILD ardour-6.5-r2.ebuild 4776 BLAKE2B 957265c747d35808bca1f4bb55e8aea7228bb5f4f2cc36d2516a990114924f2fb48160af3343125ad241d4d7796aabe0ae22e1da12933ee35d7362330d3dc331 SHA512 f8d58d2858d18860cfd129f617dc730ffa64491a3f4c3eafced05015e15720602b362c7e100c29d7514b0c47cf3d1419bee87ddd14fb5ab224a530c6dc3b6a04
-EBUILD ardour-9999.ebuild 4778 BLAKE2B 5c90551cb095d55ac3853dc718893e10b1b554aa8341b5aa482e13ec6efc8b06229d9a44f6b02c83f22dbc0b0e114256fcc2f9e3004ef33ac2be55bcd6084ef5 SHA512 e625d9899ed2e852abd2fc3f0de8cd95967bca076eaa9a21e737e6f864d6f8d98e3126f02753f68bf096cbfa21e0b22898190b16a5800ff1c0125738848bb95e
+EBUILD ardour-6.6.ebuild 4786 BLAKE2B 01ecb43a3cb8ebe2cdcc25af1e880b118f7d64d5884bbb3397514816f33076c20d15e4b798a6fc8d8781900f8775154056930b87b5a13d588dde261f5a383af1 SHA512 81ab09a2043ca58cb8c01d7d6d07df49e9c7adfed9107a669e437c8555f69e39171aab389fb1dbe78dbc3ccf09e80602158f9473675836288e18039d762bc4c8
+EBUILD ardour-9999.ebuild 4786 BLAKE2B 01ecb43a3cb8ebe2cdcc25af1e880b118f7d64d5884bbb3397514816f33076c20d15e4b798a6fc8d8781900f8775154056930b87b5a13d588dde261f5a383af1 SHA512 81ab09a2043ca58cb8c01d7d6d07df49e9c7adfed9107a669e437c8555f69e39171aab389fb1dbe78dbc3ccf09e80602158f9473675836288e18039d762bc4c8
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.6.ebuild b/media-sound/ardour/ardour-6.6.ebuild
new file mode 100644
index 000000000000..ceeb6768060f
--- /dev/null
+++ b/media-sound/ardour/ardour-6.6.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils desktop xdg
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="https://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="6"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/raptor:2
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:1
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	media-libs/suil
+	media-libs/lv2"
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_src_prepare
+
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+	my_lcmsg() {
+		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+	}
+	l10n_for_each_disabled_locale_do my_lcmsg
+}
+
+src_configure() {
+	local backends="alsa"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
+	tc-export CC CXX
+	mkdir -p "${D}"
+	local myconf=(
+		--configdir=/etc
+		--freedesktop
+		--noconfirm
+		--optimize
+		--with-backends=${backends}
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls "--nls" "--no-nls")
+		$(usex phonehome "--phone-home" "--no-phone-home")
+		# not possible right now  --use-external-libs
+	)
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	waf-utils_src_compile
+	use nls && waf-utils_src_compile i18n
+}
+
+src_install() {
+	local s
+
+	waf-utils_src_install
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
+	doman ${PN}${SLOT}.1
+
+	for s in 16 22 32 48 256 512; do
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
+	done
+
+	sed -i \
+		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
+		-e 's/;AudioEditing;/;X-AudioEditing;/' \
+		build/gtk2_ardour/ardour${SLOT}.desktop || die
+	domenu build/gtk2_ardour/ardour${SLOT}.desktop
+
+	insinto /usr/share/mime/packages
+	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
+
+	insinto /usr/share/metainfo
+	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 9d4f2f8cc5ae..ceeb6768060f 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils xdg
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 27daa109b4dc..609e15f95dcc 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -2,6 +2,6 @@ AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fc
 AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cdf2b790dfa63e03c039cd507b7e6d254a8109bcfda9d82dc3b9d0b42b404c375f73431d701c1ae380 SHA512 b268dea4662dcd8488a7c787d5e14a6bdb2208fa3db573ae6c71ff96906be4d1b43f98c8a7fd0f8bbe2b95b9493cf1306aac48e675c0635ce03c267c2abd63c1
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
 DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
-EBUILD bluez-alsa-3.0.0.ebuild 2406 BLAKE2B 68c8643f6084d40405f7888f84b56914c9a1c0e4310168bf373755b07898ca70bed4dc8231a22bd60560b3918ebc34d8bc5b1e6eb8e301d000786686f206a232 SHA512 8ac1d87dcc0c33646529363256cbcac8abdc1a3d29e1204044182eba99ea3c1db682ef719b73b5e349277e0d3a41b62becd6b31cf211b9292c1e4b7bf25034ee
+EBUILD bluez-alsa-3.0.0.ebuild 2413 BLAKE2B 1b79b12eaafb4edbc0ce2a1f90099f1f7ebf30e062d7d12b2a351d24a9681b56e8b17ef6e774d7121501f99374d678d1f0d33e971bf038a9a0f5ebecbb3f843d SHA512 76ce2586414a1fc995993600522fdc0183252e3f234bad6bf876ca94a772a622e3b8d32dde205322cb97aa063180c90d54344e3bbd2dcc6e8127468345470283
 EBUILD bluez-alsa-9999.ebuild 2406 BLAKE2B 68c8643f6084d40405f7888f84b56914c9a1c0e4310168bf373755b07898ca70bed4dc8231a22bd60560b3918ebc34d8bc5b1e6eb8e301d000786686f206a232 SHA512 8ac1d87dcc0c33646529363256cbcac8abdc1a3d29e1204044182eba99ea3c1db682ef719b73b5e349277e0d3a41b62becd6b31cf211b9292c1e4b7bf25034ee
-MISC metadata.xml 780 BLAKE2B ac2e3d17efbdf9a80db3e6b58b47438931483a3ea4de163d171ee03157bb1d940d4b720b63d645011bb5cdfd89ef05574593501f79402cf5d64e1d19138231f6 SHA512 e6a7a33cf5da26f96d49bad352a26ae08665ade39ac1b676c1a4dcbd815116ce65fa5f9d788ec668e393a4c1fe3a4d6092a3d9a8c8404eed6017dfaa3afbfd29
+MISC metadata.xml 687 BLAKE2B 5d06c77f99064183f873c61f33f550f344b841d87b20d77ca20d08cf4331aa791b6ae0ac40b9d82aaa320ba9804513ea69bb6b181c6f044bbbdbf621bca578a1 SHA512 e03836baea8aeee48b9a45db2d34dab4ff587971112ef5182117d7128e536b0a72eda9d34631ea6dbf2ee5a83eced76a462a439967a019b2125f0ed01956b232
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
index c8620648df98..e7b9c1c647a3 100644
--- a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
 else
 	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index cf14e256b358..55feec0ee5bc 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -11,7 +11,6 @@
   <use>
     <flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
     <flag name="ldac">Enable support for AOSP <pkg>media-libs/libldac</pkg> dispatcher</flag>
-    <flag name="man">Generate (and install) man pages with <pkg>app-text/pandoc</pkg></flag>
     <flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
     <flag name="ofono">Enable ofono elephony support</flag>
   </use>
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index f99d3b22073f..f0a2f3c47bfd 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,5 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
-DIST jack2-1.9.16.tar.gz 974652 BLAKE2B ff20d57f544bd636d93e77c2c6dec3af3afbafe4a217ba480c66247ddb6d8ca60755fa55599240fdd75e8ce2c1f7d8fb4f1bf68de8a212268588245f35731ead SHA512 8e4717cad097806a436e3a7b7977faa65987ca0fe59fd285014d6207899c62f9abbb79474170d0e5a6e82d0dbfe998c1310b13c4de8cd68cea0a6935ba579fd1
 DIST jack2-1.9.17.tar.gz 975827 BLAKE2B 7841f2714dd2fe72d7f5d72fd93a24a63b75143d81bed5166d8b2b29af4acc487157f78b26290aacb45fb2a2c82c18156d8fb45f49bda8780cb6938ae72ffedb SHA512 dff611273e23cea6fe258114c65e193f01dfa0366ddd4e6a026a3d676a32002ee744bc70085fb8568cb85395399072beec2c7f7eed8d9ec912332a2a56623521
-EBUILD jack2-1.9.16.ebuild 2462 BLAKE2B e42b0d1111653d51a3cde0aa1c559b474c92210949704f882ec40aa08bf237bc40d8d961629e53d9c8045727d2aaec05c81ba6bb9e05f3acbfa972ba46351a66 SHA512 352a9ca63a557d7492a36e31f585c065efee11cbc673868e9546f8920958c4c75c8f5dba1e22d1d8dbf81818840dd79aed11e38fc293cc586a06479d05c3e7f5
-EBUILD jack2-1.9.17.ebuild 2458 BLAKE2B 64ffbe6a0a75249ecd490a6b2c7725a47b5f7cf6e3899f79f8d53e2150071ff843e1c7fc3948f85e6dd2cd71727875f49bb7395c935eb60ada95c549a3920ec9 SHA512 a229b00cfea8ef17c46a7871cff59624cbe96a3516ef1bb7dbb958a3a42ed2ebead98629cc67392d2e7bbeec5264d8587f8c00359ed07e980463fa7e4ea0c889
+EBUILD jack2-1.9.17.ebuild 2452 BLAKE2B 63f95828a08f855d195c9923a71e2cd5a292b24c791f9a6681bfc3794cb4ffdfa80cbfc7e1ef3d05afc845a2ba06cf63d0fa3f699e4f5ad6b5d5f8213246db49 SHA512 0e2241fa26abb4ab1f0bd163bea7e445d71c33adf3c79537a553534ed80e55b65a1a9c6baebdef597fe4a6793ab15e2fc46d9665df95ed1ec8c88d5f2efd43d2
 EBUILD jack2-9999.ebuild 2458 BLAKE2B 64ffbe6a0a75249ecd490a6b2c7725a47b5f7cf6e3899f79f8d53e2150071ff843e1c7fc3948f85e6dd2cd71727875f49bb7395c935eb60ada95c549a3920ec9 SHA512 a229b00cfea8ef17c46a7871cff59624cbe96a3516ef1bb7dbb958a3a42ed2ebead98629cc67392d2e7bbeec5264d8587f8c00359ed07e980463fa7e4ea0c889
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.16.ebuild b/media-sound/jack2/jack2-1.9.16.ebuild
deleted file mode 100644
index e3c71aed2a9c..000000000000
--- a/media-sound/jack2/jack2-1.9.16.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.14-fix-doc.patch"
-)
-
-src_prepare() {
-	default
-	python_fix_shebang waf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.17.ebuild b/media-sound/jack2/jack2-1.9.17.ebuild
index 3001f60267b3..0e31dae3a2bf 100644
--- a/media-sound/jack2/jack2-1.9.17.ebuild
+++ b/media-sound/jack2/jack2-1.9.17.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
index 196e448f7af3..2195f832c63e 100644
--- a/media-sound/marrie/Manifest
+++ b/media-sound/marrie/Manifest
@@ -1,4 +1,4 @@
 DIST marrie-0.4.tar.gz 7775 BLAKE2B 7b68fbdfe35c7e72fe111b44bbabf4e60eb9f6211867184d1f3f7bc7b1c067f99223eea2dd3c7809f041d0a7b5ac80be360d3c14808605f3145b8d39a0a9c7fd SHA512 9ed8677729e7575519f130c1866923e7223dabf07c9c24b9e3f6a70cd5e1e56da2a5d1a34011b73d65c8d8fa4c962f65709883b9444d078d6439769d4afb644b
-EBUILD marrie-0.4.ebuild 880 BLAKE2B 4791ea7a320c067abae8dcae04cf46f4e5b4d59a279a099528d177cd0b34e55c38d712a8b095d19c1d904a741aa434bf07857c01ee261740aeaf6da1985ee1c5 SHA512 e56680d489ef2bcef3044b4ff7c189183d90626091d44851ce7a4d76bc451309267781d467e47736556f0f0096d660b21d07897fc7e0f0e91a3956e4fac45103
-EBUILD marrie-9999.ebuild 880 BLAKE2B 4791ea7a320c067abae8dcae04cf46f4e5b4d59a279a099528d177cd0b34e55c38d712a8b095d19c1d904a741aa434bf07857c01ee261740aeaf6da1985ee1c5 SHA512 e56680d489ef2bcef3044b4ff7c189183d90626091d44851ce7a4d76bc451309267781d467e47736556f0f0096d660b21d07897fc7e0f0e91a3956e4fac45103
+EBUILD marrie-0.4.ebuild 751 BLAKE2B 9e9fbb3e5de75847d714a0afa059ac5752e7dca7208c6d769ac665343d42dbc9bfd8b79456462310876151b5066568346f328373fa5506714af90172c91c9c46 SHA512 5531fd1469c0c05b5710aa403094b8011fe8df57e71c99dfa78cf80d6746bb49af2c534dbed0d165d60ac44e757ce029ff75b353b3e2a5460962dab309dd6809
+EBUILD marrie-9999.ebuild 751 BLAKE2B 9e9fbb3e5de75847d714a0afa059ac5752e7dca7208c6d769ac665343d42dbc9bfd8b79456462310876151b5066568346f328373fa5506714af90172c91c9c46 SHA512 5531fd1469c0c05b5710aa403094b8011fe8df57e71c99dfa78cf80d6746bb49af2c534dbed0d165d60ac44e757ce029ff75b353b3e2a5460962dab309dd6809
 MISC metadata.xml 479 BLAKE2B 0ddc1860004de05f492636bd0a7b57e683ee07be026a4b5509d4e2c959e4a9d6b3114fec0dc5ffdc958f8b4359fcb9ad09156f2b20a23f5613a308949746827d SHA512 e4df2008d83fe62532c1a1b03d4058aa7d4f7b67024aaf34d5c5d76aaf32baf01f56d90c5864fb4b3787f3828addbd75fba79b4dfb63149bd4eb3e046ad0ce87
diff --git a/media-sound/marrie/marrie-0.4.ebuild b/media-sound/marrie/marrie-0.4.ebuild
index 5e26f9cf5c9b..a1e727f450c9 100644
--- a/media-sound/marrie/marrie-0.4.ebuild
+++ b/media-sound/marrie/marrie-0.4.ebuild
@@ -4,35 +4,26 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
 
-GIT_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit distutils-r1 ${GIT_ECLASS}
-
 DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
 HOMEPAGE="https://github.com/rafaelmartins/marrie"
 
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
 
 pkg_postinst() {
-	distutils-r1_pkg_postinst
 	elog
 	elog "You'll need a media player and a file downloader."
 	elog "Recommended packages: net-misc/wget and media-video/mpv"
diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild
index 5e26f9cf5c9b..a1e727f450c9 100644
--- a/media-sound/marrie/marrie-9999.ebuild
+++ b/media-sound/marrie/marrie-9999.ebuild
@@ -4,35 +4,26 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
 
-GIT_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit distutils-r1 ${GIT_ECLASS}
-
 DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
 HOMEPAGE="https://github.com/rafaelmartins/marrie"
 
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
 
 pkg_postinst() {
-	distutils-r1_pkg_postinst
 	elog
 	elog "You'll need a media player and a file downloader."
 	elog "Recommended packages: net-misc/wget and media-video/mpv"
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index be646476fa98..166b0759083d 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -3,4 +3,5 @@ DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2-r1.ebuild 2109 BLAKE2B a24ab48ca76fe6a1d062bd2d7e875daad0b833e73687a6c328d21c89f4857fc270f0fb57f79e6554253b6d2ce2ce8ada2d8970f3a325840a5681f89276be9dd4 SHA512 d7b1a37f2a5b162c8637af93a5da4a39e7080904054eb7d6cc3433521a43447b2d670137af09b74d19fa98b8cd647f83045a21bdad5692f81adb898523d0a667
 EBUILD moc-2.6_alpha3-r2.ebuild 2248 BLAKE2B e74e11a9a71a95399bb7e4c802d14b3992a63a8a1c9a5386fe857fa2cc48b61c1851d41aae5c438cf7c65d8a54e2213c243953849220a61607b304580db50eba SHA512 bf4131162002fc37857ea0022f7304ef7d6f7bda45cd8ed96a1fd3d204ddbe0b1f4b3cb6a544a9661fe915d6144c07586812e9cc8926747c85148b97505b48b9
-MISC metadata.xml 532 BLAKE2B 79a7280e9bb412be2a57f13259d34ff2d2501bd3a34bc74c6fe5ce2529842dae5f199a674224b0b13883af8536fea947e98c6054c3039141a60dbc436ad4a5e2 SHA512 62746eb7250465ef0099c8b9c8e906e932d1bb5c9ac41b1a0192ee3cd4fa79698342b6fac2e7646d65197ebc9f7a504ab733eb2b889b7e84d1a8a9fadfc2ac57
+EBUILD moc-2.6_alpha3-r3.ebuild 2309 BLAKE2B d64957278960b177987a702701a5519b30439da37c2b254f97b0fcbaa402159a5eb669d9bab35d4d2aa71dc636eba405905a4a40e9202e2a1e0d19058aa4dd43 SHA512 3299e36a66c407ea53df6d4e6a8cce0ee1493b4e07e585b9c6e0bdcdbfe49e4c2dd953b6d81e6faf0489346cb0a808e1ada04a3eeb07fcc325d8367da3812a74
+MISC metadata.xml 620 BLAKE2B f4b43ba546218153ab2e3c980ca4b09e4b82a35dc17755be3904beb7131f22f71b756edc913f0dce4285e779a1b4a75c474577c81095d341c50d45b03f407497 SHA512 fd676e1ee0aba80032597c106ae94a451e9e2762fffe0b7a33119d2701eea37ac400d25849bd668654bcf7ed8d12af91c0bcab4e6006d5cd3bf0f35af098baa2
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
index 5d50f496122e..7a91a7907864 100644
--- a/media-sound/moc/metadata.xml
+++ b/media-sound/moc/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="cache">Enable tags caching support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 		<flag name="tremor">Build vorbis support using an integer implementation
 			of the vorbis library (<pkg>media-libs/tremor</pkg>)</flag>
 	</use>
diff --git a/media-sound/moc/moc-2.6_alpha3-r3.ebuild b/media-sound/moc/moc-2.6_alpha3-r3.ebuild
new file mode 100644
index 000000000000..76ce43971282
--- /dev/null
+++ b/media-sound/moc/moc-2.6_alpha3-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="https://moc.daper.net"
+SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
+	oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack"
+
+RDEPEND="
+	>=dev-libs/libltdl-2:0
+	dev-libs/popt
+	sys-libs/ncurses:0=[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	cache? ( >=sys-libs/db-4.1:= )
+	curl? ( >=net-misc/curl-7.15.1 )
+	ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 )
+	flac? ( >=media-libs/flac-1.1.3 )
+	jack? ( virtual/jack )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
+	mad? (
+		media-libs/libmad
+		sys-libs/zlib
+		media-libs/libid3tag
+	)
+	magic? ( sys-apps/file )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	musepack? (
+		media-sound/musepack-tools
+		>=media-libs/taglib-1.5
+	)
+	sid? ( >=media-libs/libsidplay-2.1.1 )
+	sndfile? ( >=media-libs/libsndfile-1.0.0 )
+	sndio? ( media-sound/sndio )
+	speex? ( >=media-libs/speex-1.0.0 )
+	timidity? (
+		>=media-libs/libtimidity-0.1.0
+		media-sound/timidity++
+	)
+	vorbis? (
+		>=media-libs/libogg-1.0
+		tremor? ( media-libs/tremor )
+		!tremor? ( >=media-libs/libvorbis-1.0 )
+	)
+	wavpack? ( >=media-sound/wavpack-4.31 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
+
+src_configure() {
+	local myconf=(
+		--without-rcc
+		$(use_enable debug)
+		$(use_enable cache)
+		$(use_with oss)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with sndio)
+		$(use_with magic)
+		$(use_with unicode ncursesw)
+		$(use_with libsamplerate samplerate)
+		$(use_with aac)
+		$(use_with ffmpeg)
+		$(use_with flac)
+		$(use_with modplug)
+		$(use_with mad mp3)
+		$(use_with musepack)
+		$(use_with sid sidplay2)
+		$(use_with sndfile)
+		$(use_with speex)
+		$(use_with timidity)
+		$(use_with vorbis vorbis $(usex tremor tremor ""))
+		$(use_with wavpack)
+		$(use_with curl)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/mp3_check/Manifest b/media-sound/mp3_check/Manifest
deleted file mode 100644
index b508e7b49ffa..000000000000
--- a/media-sound/mp3_check/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mp3_check-1.98-makefile.patch 605 BLAKE2B 8245fac6221ff1770dcf0e898adf207d123e9590ab1e97db6c2f257d9fc4a09f5f46784ddab7b846d02987b18576cee41b7a5b2352eb7bea8c333cffba5689b0 SHA512 53b1541b6644f32a03fb13c412badc2ecda775d605a3cb6aba6f97ca0d3dfe2fba80fc9e64f544a53ef55382afcc38eeb33dca837a997f3802155f38bdd0a447
-DIST mp3_check-1.98.tar.gz 83098 BLAKE2B 49f6a368ae0326aa426818e737964aa8019e09e8ed90316b333bee7aad973fdbd5ab9872ae1dcf41f8d9eed911b25c0b3b07f6dd5ba4557c6ed804c764186f87 SHA512 65eac5498ea3d4a63e0ab23c769a0baa233ddc863c907e934b691b1e8eb2a68da8a3bd7c6bd1b53d30d06330ab84d615c397753bb30257b0aac404e4b18ea4a3
-EBUILD mp3_check-1.98-r1.ebuild 657 BLAKE2B 6ddfa700adf7a3425f9d2c7f3a8df4352f209cfd7a6d05b75d305af446f86830856e1ea71f21582356da178ed6f569a0549ebc4a9e1ad35df05622616978b3fd SHA512 7a7ff5f12eecd723be02d25410f3ce81c18080967d9b5650624baf930f717ca177afd6b59eb0437cde4fa4769b98f8026a8b7ac91a9919d2809f22d78c65748f
-MISC metadata.xml 393 BLAKE2B d4df38beb932debf1e099affcd85edf27cd78aa872ae91ef365f6037337892aa470011702e3df0efa7d602b0696dcf84e62637726932cfe5c83a3d293c55bf7e SHA512 1d249854ee7bae0e2b8f6c8de7539cb7a4593c76c35e4e938b578f0b866d8d9ef712fbf0f113a0d5370dfa28dfc760b668769a50f17333cf58bd38d4d66a8b22
diff --git a/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch b/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch
deleted file mode 100644
index 906ad468f0fa..000000000000
--- a/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: mp3_check-1.98/Makefile
-===================================================================
---- mp3_check-1.98.orig/Makefile
-+++ mp3_check-1.98/Makefile
-@@ -2,7 +2,7 @@
- 
- CC ?= gcc
- LOCALBASE ?= /usr/local
--CFLAGS += -Wall -Werror
-+#CFLAGS += -Wall -Werror
- OPT_FLAGS = -L${LOCALBASE}/lib 
- OBJS = 	mp3_check.o \
- 	mp3_check_misc.o
-@@ -16,8 +16,7 @@ norm: 	$(OBJS) 
- 	$(CC) -g $(CFLAGS) $(OBJS) -o mp3_check
- 
- trim: 	$(OBJS)
--	$(CC) $(CFLAGS) $(OPT_FLAGS) $(OBJS) -o mp3_check
--	strip mp3_check
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OPT_FLAGS) $(OBJS) -o mp3_check
- 	cat MILESTONE.INTRO
- 
- install: all
diff --git a/media-sound/mp3_check/metadata.xml b/media-sound/mp3_check/metadata.xml
deleted file mode 100644
index dcd2c2b8c0a9..000000000000
--- a/media-sound/mp3_check/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://sourceforge.net/p/mp3check/bugs/</bugs-to>
-		<remote-id type="sourceforge">mp3check</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
deleted file mode 100644
index 6eaa72e075c5..000000000000
--- a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="MP3 consistency checker"
-HOMEPAGE="https://sourceforge.net/projects/mp3check/"
-SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-DOCS=(
-	"README"
-	"TODO"
-	"MILESTONE"
-	"MILESTONE.INTRO"
-	"GOALS"
-	"FOR_TESTING"
-	"THANKYOU"
-	"NOTES"
-	"MY_NOTES"
-	"WISHLIST"
-)
-
-src_install() {
-	# Use dobin because Makefile doesn't support DESTDIR
-	# https://sourceforge.net/p/mp3check/bugs/8/
-	dobin mp3_check
-	einstalldocs
-}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 10f44650618f..dd8543bd7337 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,7 +4,11 @@ AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b
 DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a
 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
 EBUILD mpd-0.21.26.ebuild 7986 BLAKE2B 24b791d8b86389dd6d4eb123e05c1bdc8ded128edf559e6a203220fcbbe043013cb44bbd185458755e5f1a8f225909b90f8a5b0c2ddb53a04b6f5e487dcac795 SHA512 1f385dbe89c5a91960426734f4a23827495afefe71817a09ef170877d546087e87df69e2e58257b1ce670a1d58c835cb0536dd5412d581ea303922e903a5c74c
 EBUILD mpd-0.22.3.ebuild 8043 BLAKE2B 7ad05f2cb5ac56d326c8f5ceee7772346ccfed4650cd4c94df5b572d4963cbf0f0955ed894dacac64c70736285c6bfe83b1eaf2017e1263282ef19c4ce0a3108 SHA512 4aa7fd6aba159d16bc2cbc6a4c2f88b04175e871da2ef48c0ea9cda004102e10308ea7dfba4ca53339c609038ef4f2b40791445d22c8879d07117fcd0212e768
 EBUILD mpd-0.22.4-r1.ebuild 8435 BLAKE2B c57089b82c7f78f9f870d22caa412586289cd2de9f51bf0e435fd695383af578eab9a4d226bafbc198c486047bd36b002f8cd7e19ffe2e2b1a2757bb3a944ec4 SHA512 cad3ae48000a0945c7388a16104ce6e3b5dd2222d0bf9f39e9da18c4a31e3dfd2b56f2caa7b89c68f3ca288efd9cca17801dbfab808e1fe805b6a4fbbb3d170b
+EBUILD mpd-0.22.5.ebuild 8435 BLAKE2B c57089b82c7f78f9f870d22caa412586289cd2de9f51bf0e435fd695383af578eab9a4d226bafbc198c486047bd36b002f8cd7e19ffe2e2b1a2757bb3a944ec4 SHA512 cad3ae48000a0945c7388a16104ce6e3b5dd2222d0bf9f39e9da18c4a31e3dfd2b56f2caa7b89c68f3ca288efd9cca17801dbfab808e1fe805b6a4fbbb3d170b
+EBUILD mpd-0.22.6.ebuild 8435 BLAKE2B c57089b82c7f78f9f870d22caa412586289cd2de9f51bf0e435fd695383af578eab9a4d226bafbc198c486047bd36b002f8cd7e19ffe2e2b1a2757bb3a944ec4 SHA512 cad3ae48000a0945c7388a16104ce6e3b5dd2222d0bf9f39e9da18c4a31e3dfd2b56f2caa7b89c68f3ca288efd9cca17801dbfab808e1fe805b6a4fbbb3d170b
 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/mpd-0.22.5.ebuild b/media-sound/mpd/mpd-0.22.5.ebuild
new file mode 100644
index 000000000000..2b67f0ccd3dd
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.5.ebuild
@@ -0,0 +1,296 @@
+# 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 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 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 )
+	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)
+	)
+
+	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)
+		-Dsndio=disabled #not yet in the tree
+		-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
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/mpd/mpd-0.22.6.ebuild b/media-sound/mpd/mpd-0.22.6.ebuild
new file mode 100644
index 000000000000..2b67f0ccd3dd
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.6.ebuild
@@ -0,0 +1,296 @@
+# 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 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 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 )
+	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)
+	)
+
+	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)
+		-Dsndio=disabled #not yet in the tree
+		-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
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 9370afcd8536..8d0b0db8b03e 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,4 @@
-DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
-EBUILD mumble-1.3.3.ebuild 3814 BLAKE2B f59c05d68a56cee5f840d6991718bf10cee2fe10bd70d78eeea5a87aea4ddf545c96807ccc52bb1c01615348695cdc166d94ebc6dd651042c0945337621f37a3 SHA512 7d7d42d1ce7b90b4f25522f4ea71696218b2b8c4addfc8f8c927ecfabf1493ab08d811136b24bfaeb708928d3b6e733e0f40c65103cc11ed87071e04bec12577
 EBUILD mumble-1.3.4.ebuild 3814 BLAKE2B 56c5fc62d9117dd41d82de5b027f1e5250ff117813dbb745f84e4f4d4327d9ee4c6d1bc0f377f16e9939750de877c3ab11ec19b3f55797efa025e04da8a12ca8 SHA512 2019d8ccaa70a7d9a3979d52b794e7ab6b8a9dc14a8efc88e4a79b1bd1fb14e0458efd3a7dcf5a8d1b6c13b2e5770304c70d120c5e413f0782612b234c127c61
 EBUILD mumble-9999.ebuild 3043 BLAKE2B f6e699e41a172ce1b816cde9b30e021b0ea15579a29bed4037d272c65d0859dce1dfa4a2e14275c85a47cc6e2b11e39d62302df993bb48d85983fc20205c98b0 SHA512 5a643584e6202916ed620a899d77fb59088026ef96a0420e4bde721a68ee68174827b29dd776ea35274a89af6bb0645e9792fa1e8a39acf5efb3363f7bced9b6
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.3.ebuild b/media-sound/mumble/mumble-1.3.3.ebuild
deleted file mode 100644
index 0da26f648ad4..000000000000
--- a/media-sound/mumble/mumble-1.3.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib-build qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	insinto /usr/$(get_libdir)/${PN}
-	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index b5c01de62e44..f01054c21bac 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,12 +1,9 @@
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
-AUX musescore-3.5-lambda-capture-this.patch 562 BLAKE2B 4443f04bc90e01dbca81cac5d73a1683ecdcb1103e1ab72796a53a56f6a1b15347875374a73853d5dde62e5b6e145ca2f8c8d61c30667f9397a2baba99b4f0d7 SHA512 3ee07a796f605e03fd1c8dda6dcf2d28f3f0344a77764f032195e3f17fb366c5aefa464b49858e5a07065ca74b9444aaf2222255c7eafdb7d6536d6dd51952b0
-AUX musescore-3.5-remove-duplicite-declaration.patch 245 BLAKE2B 5d42790b4c1147a34bc75bdd46f3b3832007734702d1be5f81dc41537347574e5f0955a141f9d412ce00f95370717bcb31d272b0625e7462ce3f640e69d71ac6 SHA512 7f3cc05a05c208dedd18094639534131ffbde748da653e309c21fcc414d005ad744de82186cd7484a46cb230d08e643f52555d6fe371c237686b58a559947cda
+AUX musescore-3.6.1-rename-audioitem.patch 491 BLAKE2B 9ecdccb1e3aec15c7233baaeb07d1b962b487dfa1c88cbb1c79616e92d36fc8e0d46635b9bda851550145086bfef2bba56a53ed033325b6bd98378a9f6928bb3 SHA512 55cb0187dfe4e590ec47c772d3c820f64324d748a2b95d0529b516cd048f2862477117dd711c335fd7abf8e3693e9e0b8b60cc270aab5a5960a173fa8bd7ad85
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb SHA512 4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
 DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad SHA512 8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-EBUILD musescore-3.5.2.ebuild 3030 BLAKE2B 4b8499c5ad5672c7994173558fffff771dd8885314e76970d8f5519aa103507984ebcd0606a335861ea636351b22d60291a45cb2fd7eae0575cd5f24adf8c9ed SHA512 273facf45e3e610cf52c0792c79e69deb5ef2ea6db549f4e026d3e64817cdbd20a23988998a3739ceeb2f3a7091abd928c2b477bda2973f71e9d1a527d22bcab
-EBUILD musescore-3.6.1.ebuild 2940 BLAKE2B c758a38461d735aba0974360717bd9ae94fbe86fb38ebf65e2ec9ec1f99c53fda25f2aef5221d4204e145cd5df48c995158f1e4710d8ae56d4273c05bf5dcfce SHA512 f9e7f1664134ea10c2fa9a10e3f8df2c01c1a8b21f14d4f79003cc5d5283660906a54943e80aa48100ad37e5211950e04f17a2632c7e34beea34265197ac57a9
-EBUILD musescore-3.6.2.ebuild 2940 BLAKE2B c758a38461d735aba0974360717bd9ae94fbe86fb38ebf65e2ec9ec1f99c53fda25f2aef5221d4204e145cd5df48c995158f1e4710d8ae56d4273c05bf5dcfce SHA512 f9e7f1664134ea10c2fa9a10e3f8df2c01c1a8b21f14d4f79003cc5d5283660906a54943e80aa48100ad37e5211950e04f17a2632c7e34beea34265197ac57a9
+EBUILD musescore-3.6.1.ebuild 2981 BLAKE2B 6533c18a0eef953a7541a087c185eec2d069095bb60bbf8d96c528d4a788dd33d3d0677eaeb99c27a4f0a2a3fecfcdc214b2a3fdfb4bf3a42607a6c99b1e9c28 SHA512 75b5603767cd6631b247545c07c008cbf99555c13c528af34b63776946b1c48492f5bd3fb25e80c96d2d1d84f00932d85100efbbe70e6adbe94492033b0aa322
+EBUILD musescore-3.6.2.ebuild 2990 BLAKE2B 869b5cc0232c59ca95d856d9db12d20d3683f76b676f5e74d7fc692d52062e7d6b524c427cbe93eb9b94e4e70e6d3ee5b703144862387c930fc6d091c06cb634 SHA512 7b25f1b5c0c2afad39927da7220283ad8dae2552dbafefecbaf0acb3b4276844ea627939272105935d3e67de55a83a49edb3a5f8d19b8f9d6979c51ffa47a91c
 EBUILD musescore-9999.ebuild 2884 BLAKE2B 733677224abc2be6cb04328339392069832574fa48e00fbeac1a0cec8f18add469d34cd9ba3cfd68bd83be88bd1fb8c6d82065d71d3378df4d71e6c89064b220 SHA512 829ed729aaedd2aff35466e4c286ac5274e39a46033ab173c2fff196a36e713a0a834cf01ea4d27d8839118f26fba0c4b8576451f0aa55cb963e189b251affe9
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
deleted file mode 100644
index 283ffdc92e21..000000000000
--- a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
-index 94b1aef..6a7b4e8 100644
---- a/mscore/scoreview.cpp
-+++ b/mscore/scoreview.cpp
-@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s)
-                   cv->updateGrips();
-                   }},
-       #ifdef OMR
--            {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
-+            {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
-                   if (cv->score()->masterScore()->omr())
-                         showOmr(!_score->masterScore()->showOmr());
-                   }},
diff --git a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
deleted file mode 100644
index b4e1ad0baf54..000000000000
--- a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/omr/pattern.h b/omr/pattern.h
-index b040497..1b8e0c4 100644
---- a/omr/pattern.h
-+++ b/omr/pattern.h
-@@ -24,7 +24,6 @@
- 
- namespace Ms {
- 
--enum class SymId;
- class Sym;
- 
- //---------------------------------------------------------
diff --git a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
new file mode 100644
index 000000000000..caf9ae67ec70
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
@@ -0,0 +1,12 @@
+Fix misnamed variable causing build failure with USE=-mp3
+https://bugs.gentoo.org/767760
+Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
+--- a/mscore/exportdialog.cpp
++++ b/mscore/exportdialog.cpp
+@@ -77,5 +77,5 @@
+       // Disable .mp3 option if unavailable
+       QStandardItem* mp3Item = fileTypeComboBoxModel->item(3);
+-      mp3Item->setFlags(audioItem->flags() & ~Qt::ItemIsEnabled);
++      mp3Item->setFlags(mp3Item->flags() & ~Qt::ItemIsEnabled);
+ # endif
+ # ifndef HAS_AUDIOFILE
diff --git a/media-sound/musescore/musescore-3.5.2.ebuild b/media-sound/musescore/musescore-3.5.2.ebuild
deleted file mode 100644
index b8137e72faf0..000000000000
--- a/media-sound/musescore/musescore-3.5.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-else
-	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${PN}-3.5-lambda-capture-this.patch"
-	"${FILESDIR}/${PN}-3.5-remove-duplicite-declaration.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.6.1.ebuild b/media-sound/musescore/musescore-3.6.1.ebuild
index bb23b9e040eb..db51b9d0df1d 100644
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 else
 	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
 
@@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+	"${FILESDIR}/${P}-rename-audioitem.patch"
 )
 
 src_unpack() {
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
index bb23b9e040eb..d5a19eb9bdc6 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+	"${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
 )
 
 src_unpack() {
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 19139b79cef1..22ac70d55a95 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -1,7 +1,9 @@
+AUX pamix-1.6-fix-ncurses-freezing.patch 628 BLAKE2B a1265bd6d77771d00700812c9da0b50a46705a735bc0bcf7be92b9082b4bbe7737347645691d6d707d74c7806a346505d2702755ca2c3a8bda5dd5ba1f4f6d3d SHA512 23a91d5161103facf023eddc072295dfa9aa268b3961cbc5daaa072176007af7eab2c000e69e5866dd7e69352f09927f639c8df1e546b39f88803cb19aac0f7b
+AUX pamix-1.6-fix-output-scrolling.patch 742 BLAKE2B 23d14840500c9f535a68e5f439165a75fcecd455c4a419297ca982ebeac8f97047dc4548f3838db188b14cac8bfccb9fc6e6d59d597aa30b6a9ae69ab01d746a SHA512 a89269b18d42257c4a5d2ee8cfbb56cf49191348c64d1d27f9d009af0d0b1ed41282171de759cca26ad122d7aa6ee466ab97ff71f3299c3de12560e20fef4b13
 AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd2509fc9236cfdc898084434c378c3b1b78db941f05e9634de3ab585322371af89c3d47f98942f8cab1a4f8a462a544ad0e3 SHA512 b910fb3cd2f5c82f50dedd06f076d93b78fc9008b884434bda6854e3340ac357144bd75207f5ba490d1752d5dd013a413d3510570e47f60fd667ff6a1bda4bb0
-DIST pamix-1.5.tar.gz 16902 BLAKE2B 4f7612cb870f84110b8cc31a061afecb7c2aeb8d073887cde671bbaf8702db83b8cfe4e7b06e9260c6925c4334c1cb46175612f87d4ed625181179f615b6e954 SHA512 51516664c5f5d8d0c70565c5cdd7a91e7d40c83a49d75ca76c38286d937a737da28f9070e9d0185545d8e74999894e3afa9f1d2f8c22658f83af5c1c161f7938
+AUX pamix-1.6-xdgconfigdir.patch 1390 BLAKE2B f64950f335b03aaeed20298ee66bc769d575cbe1fd4b17682742d6d87cf8f5ad06432dd23147ebdd3f0c35d815a296f9cbbc1ddac7a33a8706cb0074b8aea0ec SHA512 e90c2ea1b02b4b74fe231740d09a266c4e91128b67353ffbc92e66897c8b08a8b131d43e01b1462542f289b0f1e2633851681d6a5ec514f29e266d8868849281
 DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
-EBUILD pamix-1.5.ebuild 773 BLAKE2B 57ab9145fcb6998a9c03ae50109cb9a65dbdae0e2a7578dfdf8f3287deea336948774c37059bf4f6ae39cee5e71d66c1827eb0c09b6adf0c1377a9915be79865 SHA512 4041efab6a1ee3d34d39a8dfd2f4353516eec4dcb937d334c6e7113700a9ceb3cb82b8f29a834093732c9b97f37f92509313eefd38ecbe0cfbd779f9e90a963d
+EBUILD pamix-1.6-r1.ebuild 1117 BLAKE2B 7b6a3c08fc6ceee40ef1c30cb91764baba293724115aeeebf45be272b57962cc727b522f6fa684bf6e3547bff0f07394fdc55ec03124da2a8b8e08094922e4b3 SHA512 90e206ee4b2d5de6d908952d95a819b57d2cdb624fc35b0470807d1c33ce4416c98af42e1ef871920c3aec3345d4e49be232f39f4d798cab759ff58810476947
 EBUILD pamix-1.6.ebuild 845 BLAKE2B 177ff961b13d3008f5a45ad81aac87ed31e256e4114a07a3402e88034424c8c72295a41422ef8fd9d956a6f652a8466a785b4bed54dfec9dc6b1e6f442bbad42 SHA512 e063b58c9bd13b3640cd29aa2d5f3d9eed262a031aaf791b96aac88d9847836ad42509043fdf1489d9ae1348a98bd07ef06181d324636724e3bfa237bc5671b2
-EBUILD pamix-9999.ebuild 753 BLAKE2B f0a0fd50d60ae57dff4e7ef22a739ee62694dfb5e207c7af97c50e2a6b8ffcff837c7308b1084a5c26e406a4acb4577f13f7d63c07585eb58834d00fe815aa13 SHA512 655e7c7ff7131255837c6c5bdb6a4e2613d46a2c5038d2dede0af0d64bff3f0d6e589c707bd1285120f9033fece73c59f4a0452aa19a7ac9b0638105c6e94fee
+EBUILD pamix-9999.ebuild 927 BLAKE2B d8d49375ae2f78a08d47bb82656da43d2d7922bb3aaed738871142d26a15dee6149be0d1b21bb45c4bba145e38573ca0f9bd9cd765dfdb3372a811a119b2b1cf SHA512 f083f2a75297e6b9e7f344404f2d8b1d7233fe029dd89066568593343d5c73e403af732c03141ed1dea7c8ff952f47fbe44064c4723e3ccba48810e2bed939c5
 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch b/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch
new file mode 100644
index 000000000000..61c34f0a4202
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch
@@ -0,0 +1,23 @@
+From 1e45f226ef35b649cb2889e23ad90ad39d0db947 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sat, 14 Mar 2020 03:11:58 +0100
+Subject: [PATCH] Use 25ms as escdelay
+
+By default ncurses will use 1000ms, which will cause freezing.
+Fixes #44
+---
+ src/pamix.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pamix.cpp b/src/pamix.cpp
+index d5f7ead..368639d 100644
+--- a/src/pamix.cpp
++++ b/src/pamix.cpp
+@@ -206,6 +206,7 @@ int main(int argc, char **argv) {
+ 	initscr();
+ 	init_colors();
+ 	nodelay(stdscr, true);
++  set_escdelay(25);
+ 	curs_set(0);
+ 	keypad(stdscr, true);
+ 	meta(stdscr, true);
diff --git a/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch b/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch
new file mode 100644
index 000000000000..6e4b94d05669
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch
@@ -0,0 +1,23 @@
+From c15831c99bbef1a25710e5a34208809dc9160e86 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sun, 1 Dec 2019 16:23:12 +0100
+Subject: [PATCH] fix bug preventing entries from being scrolled.
+
+resolves #41
+---
+ src/pamix_ui.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pamix_ui.cpp b/src/pamix_ui.cpp
+index 16a2e34..c1acb2b 100644
+--- a/src/pamix_ui.cpp
++++ b/src/pamix_ui.cpp
+@@ -265,7 +265,7 @@ pamix_entry_iter_t pamix_ui::getSelectedEntryIterator() {
+ }
+ 
+ void pamix_ui::adjustDisplayedEntries() {
+-	if (!m_Entries->empty())
++	if (m_Entries->empty())
+ 		return;
+ 	if (m_SelectedEntry >= m_NumSkippedEntries && m_SelectedEntry < m_NumSkippedEntries + m_NumDrawnEntries)
+ 		return;
diff --git a/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch b/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch
new file mode 100644
index 000000000000..7de00460316d
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch
@@ -0,0 +1,45 @@
+From 72d8189b942f6e95d8c946fea2faaee9a74f4b35 Mon Sep 17 00:00:00 2001
+From: nilninull <nilninull@gmail.com>
+Date: Wed, 3 Jan 2018 16:32:27 +0900
+Subject: [PATCH] FIX: default XDG_CONFIG_DIRS directory
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38605f2..7677e43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ ELSE ()
+ ENDIF ()
+ 
+ add_executable(pamix ${pamix_SRC})
+-install(FILES pamix.conf DESTINATION /etc)
++install(FILES pamix.conf DESTINATION /etc/xdg)
+ install(TARGETS pamix DESTINATION bin)
+ install(FILES man/pamix.1 DESTINATION share/man/man1)
+ 
+From e3bf53d9a841c3559880863c8c29c2919ab5b425 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sat, 6 Jan 2018 07:05:23 +0100
+Subject: [PATCH] change default XDG_CONFIG_DIRS value when searching config
+ file
+
+---
+ src/pamix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pamix.cpp b/src/pamix.cpp
+index 3ea2730..d5f7ead 100644
+--- a/src/pamix.cpp
++++ b/src/pamix.cpp
+@@ -130,7 +130,7 @@ void loadConfiguration() {
+ 
+ 	char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
+ 
+-	path = xdg_config_dirs ? xdg_config_dirs : "/etc";
++	path = xdg_config_dirs ? xdg_config_dirs : "/etc/xdg";
+ 	path += "/pamix.conf";
+ 	size_t cpos = path.find(':');
+ 	while (cpos != std::string::npos) {
diff --git a/media-sound/pamix/pamix-1.5.ebuild b/media-sound/pamix/pamix-1.5.ebuild
deleted file mode 100644
index 261d33492f6d..000000000000
--- a/media-sound/pamix/pamix-1.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit autotools ${SCM}
-unset SCM
-
-DESCRIPTION="A PulseAudio NCurses mixer"
-HOMEPAGE="https://github.com/patroclos/PAmix"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+unicode"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-else
-	SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/PAmix-${PV}"
-fi
-
-RDEPEND="media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]"
-DEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable unicode)
-}
diff --git a/media-sound/pamix/pamix-1.6-r1.ebuild b/media-sound/pamix/pamix-1.6-r1.ebuild
new file mode 100644
index 000000000000..e3fa9ceb8f79
--- /dev/null
+++ b/media-sound/pamix/pamix-1.6-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/PAmix-${PV}"
+fi
+
+DESCRIPTION="A PulseAudio NCurses mixer"
+HOMEPAGE="https://github.com/patroclos/PAmix"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+unicode"
+
+RDEPEND="
+	media-sound/pulseaudio
+	sys-libs/ncurses:0=[unicode?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ncurses_pkgconfig.patch"
+	"${FILESDIR}/${P}-xdgconfigdir.patch"
+	"${FILESDIR}/${P}-fix-output-scrolling.patch"
+	"${FILESDIR}/${P}-fix-ncurses-freezing.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	if [[ ${PV} != 9999 ]] ; then
+		sed -e "/^include(CMakeGitDefines.cmake)/d" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_UNICODE="$(usex unicode)"
+	)
+	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_VERSION=${PV} )
+	cmake_src_configure
+}
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index 1e8fad344924..aac3dbb67cf9 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -1,38 +1,46 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake
 
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
 	inherit git-r3
+else
+	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/PAmix-${PV}"
 fi
 
 DESCRIPTION="A PulseAudio NCurses mixer"
 HOMEPAGE="https://github.com/patroclos/PAmix"
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="+unicode"
 
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-else
-	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/PAmix-${PV}"
-fi
-
-RDEPEND="media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]"
+RDEPEND="
+	media-sound/pulseaudio
+	sys-libs/ncurses:0=[unicode?]
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	cmake_src_prepare
+	if [[ ${PV} != 9999 ]] ; then
+		sed -e "/^include(CMakeGitDefines.cmake)/d" -i CMakeLists.txt || die
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_UNICODE="$(usex unicode)"
 	)
+	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_VERSION=${PV} )
 	cmake_src_configure
 }
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 651ea8772083..aa71b2861b79 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,3 +1,3 @@
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
-EBUILD pavucontrol-4.0.ebuild 854 BLAKE2B 98d893b52f48860f6cf73360750be57d4215cfc78b623d7ee9b1782dd56d0c14833b0169e55c241469f0ed7018e7ce213462ef9c572722935774dd4557828409 SHA512 1df30060cbab2c3ae4e9efad9a52f28ea6fe3f0205c120766d9acc8d25d2e199ba501b02520b22674b3ec12364fe2304089a2b2caff26723d61ea86d1805520f
+EBUILD pavucontrol-4.0.ebuild 858 BLAKE2B e613591d317859e84c8330efa3adaa311b005153044e4e588c9131ded0fac49a0e7ed6212d77a214cc8e9b5419e9ac96359ead9cbf61bde86c7c8c96ef656107 SHA512 3edc52431b727d80603cfc51704d57f4cec1e12fdbeeaa56729d64cdaf0bf2edce65028f9c0d929f7c0cfa64541fd5a706fb97fcc65cdc286835bffad2bdf956
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index 3a675042aecb..2826e6c159eb 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index 0e908e045e4d..21991dccc51b 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -1,4 +1,7 @@
+AUX pnmixer-0.7.2-fix-assert-if-volume-gt-100.patch 925 BLAKE2B 81012218ae38650ed01f53ed26846bb7f93ccf2e3ba9bc5b53e77dbf93a82fb16a5fe333f9ae0fa4af255c6c5dea00b3d078b83f97df0b789d28381495c05d3f SHA512 8f74969fd81d2e3bdb592abe77ff2f710b4a3a41acbfc5b050198c3a287049bc511259f1e94c6c1cb9f421b532ba016b4af4d0aee6a43c3e472e9e0904d344f1
+AUX pnmixer-0.7.2-fix-possible-garbage-value.patch 1173 BLAKE2B e4a874f9ffcaaa6d5586eac4f6ffb8d291703fd83f92546a2d06503060e6f2698470e67922487253c141796eb3baef70e10aaeee8b7457d72c05287b0386050b SHA512 bc5262610fdaca06c0c8fc4a767d2f2f6b50877f03699d30838ab60b018a061cc41853598d5b438dd5a343dda5e66b973a087e1773463757d550132cc62f9d2b
+AUX pnmixer-0.7.2-fix-possible-memleak.patch 620 BLAKE2B 1eb39431bdb5d7597575687c03175b8b0b41a4a64a2fd9fc704775154f048f6400ce7a38e7611484314d643caf2422660442bb0e38a631e8689c1816ba46900d SHA512 df1b824a5219d299ab69c83064156d425ee257594f49d632c745647be4497d70f071d3ba7ac5256749461d5f04a82d1a5faff32e9198e5e2246f35bf537f91f9
 DIST pnmixer-v0.7.2.tar.gz 237972 BLAKE2B 368d149d9e803b52c7b0edac9ba8996312da7122f10f536095cffcdf31d319159494fa3aab0005e6dedb4e7e0b46d58bc73dd89285c7bddca4750d29539fa489 SHA512 9f43a56d17f4c16465113d4355a546ba71ca4d208e384812cf84625a51bd9bb6fa0e93f3e40fd0a2d157c4ee2b27f64082a47bbd4135c168a95b3fcbeebf6186
+EBUILD pnmixer-0.7.2-r1.ebuild 1152 BLAKE2B 50469e88f8e4851b6f47c17eedd0620a2d0f9e91cd4fe0deea92d9ef18792d9dde160887b141dee78e81a75ae5eb92b33d5dc389048660c1981cdc789e423967 SHA512 b9dac5065a4c566c682dc6c082006bb5844a393b1889b76ccdef00dfcb15091e1ea87c47742f05365100b80c35feac571146b011b66d2c9dcf89ccdf9758ab0e
 EBUILD pnmixer-0.7.2.ebuild 1010 BLAKE2B 38e73b4665b30b1401f44b5f8257b2b37dc6ba39c401e45f26558f5943718574efb90f470c26a3fdd550b3d5246bf1cc986829e0c94c4360b9c5ca33ce3259a8 SHA512 762319ccacd5e8e08921603bfa85cd147c2455cd53c8739be709bbad966f580d41ae307f353b04ac8d8b37b9f7c5ddb0bc9b4d69c976331afb539c157cc7e34d
-EBUILD pnmixer-9999.ebuild 819 BLAKE2B f11e945d77d82fd0d22b3c8f62f67bc563f7d5672528c71c1ad04d778d35cef8516a372e5586387afa1b5caca2ffe0c70a97af176b058d87a871df4da80c86c6 SHA512 126ae9a4c6e539fc34dec05d9210ceffe01fd1279958e4e89df7295c8cc4e6dcb95c81cef9f8c0839190ed826b0b143f38538310190d0e8fa16372d0c7094189
 MISC metadata.xml 2311 BLAKE2B 15ea04569ba81121b6f5965c2214a3b165f0f82ad9410b91fdcdafa03477fb5429abe4dd8e2f93dd78acb0f4d725d62c7927b74b1112bcda5a7e1699675ee68f SHA512 e2b368365561ca414b44a7228dcdab0bb4cd31d26aaa9ea24ec87bce012edabe701c77e6930b7ffc11710e5372e817fb0f5a46accc2318218e10677f9a710a5e
diff --git a/media-sound/pnmixer/files/pnmixer-0.7.2-fix-assert-if-volume-gt-100.patch b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-assert-if-volume-gt-100.patch
new file mode 100644
index 000000000000..6fd28572f90e
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-assert-if-volume-gt-100.patch
@@ -0,0 +1,37 @@
+From 7eed10b2bd4650dadbc2c98f435d2bb10de7f75e Mon Sep 17 00:00:00 2001
+From: Arnaud Rebillout <elboulangero@gmail.com>
+Date: Mon, 19 Jun 2017 20:02:01 +0700
+Subject: [PATCH] Clip volume between 0 and 100 (thx to yunake) #162
+
+---
+ src/audio.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/audio.c b/src/audio.c
+index 750f20f..06b245c 100644
+--- a/src/audio.c
++++ b/src/audio.c
+@@ -437,11 +437,22 @@ gdouble
+ audio_get_volume(Audio *audio)
+ {
+ 	AlsaCard *soundcard = audio->soundcard;
++	gdouble volume;
+ 
+ 	if (!soundcard)
+ 		return 0;
+ 
+-	return alsa_card_get_volume(soundcard);
++	volume = alsa_card_get_volume(soundcard);
++
++	/* With PulseAudio, it is perfectly possible for the volume to go above 100%.
++	 * Since we don't really expect or handle that, let's clip it right now.
++	 */
++	if (volume < 0)
++		volume = 0;
++	if (volume > 100)
++		volume = 100;
++
++	return volume;
+ }
+ 
+ /**
diff --git a/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-garbage-value.patch b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-garbage-value.patch
new file mode 100644
index 000000000000..e85dcedd2337
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-garbage-value.patch
@@ -0,0 +1,38 @@
+From c8577027aa4597c8f194a84a73982aa0ce7f2dd0 Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Mon, 19 Feb 2018 20:06:26 +0100
+Subject: [PATCH] MEM: fix possible garbage value wrt #174
+
+Not sure if the clang static analyzer has trouble
+with g_memdup() or if there is something more serious
+going on. Good old g_malloc() works too though.
+---
+ src/ui-tray-icon.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/ui-tray-icon.c b/src/ui-tray-icon.c
+index 27b35f3..23ba947 100644
+--- a/src/ui-tray-icon.c
++++ b/src/ui-tray-icon.c
+@@ -166,9 +166,11 @@ pixbuf_array_free(GdkPixbuf **pixbufs)
+ static GdkPixbuf **
+ pixbuf_array_new(int size)
+ {
+-	GdkPixbuf *pixbufs[N_VOLUME_PIXBUFS];
++	GdkPixbuf **pixbufs;
+ 	gboolean system_theme;
+ 
++	pixbufs = g_new0(GdkPixbuf *, N_VOLUME_PIXBUFS);
++
+ 	DEBUG("Building pixbuf array (requesting size %d)", size);
+ 
+ 	system_theme = prefs_get_boolean("SystemTheme", FALSE);
+@@ -202,7 +204,7 @@ pixbuf_array_new(int size)
+ 		pixbufs[VOLUME_HIGH] = pixbuf_new_from_file("pnmixer-high.png");
+ 	}
+ 
+-	return g_memdup(pixbufs, sizeof pixbufs);
++	return pixbufs;
+ }
+ 
+ /* Tray icon volume meter */
diff --git a/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-memleak.patch b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-memleak.patch
new file mode 100644
index 000000000000..a88013b9d4b8
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.7.2-fix-possible-memleak.patch
@@ -0,0 +1,21 @@
+From 84c66c389cd7a8a47aa5f543726683a19dcca5ff Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Mon, 19 Feb 2018 20:06:45 +0100
+Subject: [PATCH] MEM: fix possible memory leak wrt #174
+
+---
+ src/alsa.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/alsa.c b/src/alsa.c
+index c46d4d8..d91c79f 100644
+--- a/src/alsa.c
++++ b/src/alsa.c
+@@ -336,6 +336,7 @@ mixer_get_poll_descriptors(const char *hctl, snd_mixer_t *mixer)
+ 	err = snd_mixer_poll_descriptors(mixer, fds, count);
+ 	if (err < 0) {
+ 		ALSA_CARD_ERR(hctl, err, "Couldn't get poll descriptors");
++		g_free(fds);
+ 		return NULL;
+ 	}
+ 
diff --git a/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild b/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..4930d96eb601
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+inherit cmake xdg-utils
+
+DESCRIPTION="Volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer"
+SRC_URI="https://github.com/nicklan/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc libnotify nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/alsa-lib
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	libnotify? ( x11-libs/libnotify )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-assert-if-volume-gt-100.patch"
+	"${FILESDIR}/${P}-fix-possible-garbage-value.patch"
+	"${FILESDIR}/${P}-fix-possible-memleak.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION="$(usex doc)"
+		-DWITH_LIBNOTIFY="$(usex libnotify)"
+		-DENABLE_NLS="$(usex nls)"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/pnmixer/pnmixer-9999.ebuild b/media-sound/pnmixer/pnmixer-9999.ebuild
deleted file mode 100644
index 69801bb9225a..000000000000
--- a/media-sound/pnmixer/pnmixer-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_LIBTOOL=none
-inherit cmake-utils gnome2-utils git-r3
-
-DESCRIPTION="Volume mixer for the system tray"
-HOMEPAGE="https://github.com/nicklan/pnmixer"
-EGIT_REPO_URI="git@github.com:nicklan/pnmixer.git
-	https://github.com/nicklan/pnmixer.git"
-EGIT_BRANCH="master"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="libnotify"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/alsa-lib
-	>=x11-libs/gtk+-3.12:3
-	x11-libs/libX11
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LIBNOTIFY="$(usex libnotify)"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
index 6b4b8b7fd2dc..84bc9fe0a19e 100644
--- a/media-sound/pulseaudio-ctl/Manifest
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -1,5 +1,7 @@
 DIST pulseaudio-ctl-1.67.tar.gz 6615 BLAKE2B fd760fc5475cdd9c6bbced9f4bbe0f62e793364d375f0bc24686986d42c9ddcfeddde501950c3572a4bf004cdfba36d3dc5aa1df3eed7a9730a437e74eb97b26 SHA512 5ea1cbfd87cf073de46b6fd9953a3c7b9c6969da46103dd5dfc56aa3f179b2ba36ade5db7ca47d204f0f60ac02020f1a4f2dd58bbaf010f9a99780702295418c
 DIST pulseaudio-ctl-1.68.tar.gz 6575 BLAKE2B a126730f53687b8456ed06f205e13d9380f7cadd4581430b4263dff65ebd33b22ad698cad4271402f873d9fa6c3499fd805ba02e9108723dcd60690016fcc196 SHA512 8ed4383d123d235bcde2e89a0a81fea96daa81dabb37cc9428eb3dd8e0c80fde3b9adf2b3ff911abaf6c4e5cb7cdbd74ce6817e080b3dba65d9206677ce10de5
+DIST pulseaudio-ctl-1.69.tar.gz 6577 BLAKE2B db55eec57e1204eef228ad331fd0b95bab2ee16625ca94fe4632ee713412b0686f1c1abc509f8c2ee0d1e6b08147f79ab961a4039fdadc351a88bcaedc13a9e0 SHA512 4cd80bb917b95ed96bee5005b54f50cbce6d3e341aee32c91daf301e3b4bc8fdd8b4c350b3a3951c6afa740df4565dfc5f0fdb7c858a3f2c7321c983f3fb36c2
 EBUILD pulseaudio-ctl-1.67.ebuild 688 BLAKE2B 3a49094e376b4b94d8dc000bb482c7e1f05dcf27efde4a79ad3b98cd1cc0b908dab4a9a4008f19371b8ba5834de35bfc7813cb8c60240c2983011d77332add43 SHA512 1dddd8e10477b99d15c64cff2f05401c36c6f09ecbae7216b44b1a8c8abbe977c00bd9c304d51f6521dce8a70ff87c624d6f539f9c1c1de78175b64f97b10295
 EBUILD pulseaudio-ctl-1.68.ebuild 615 BLAKE2B 7c751c3dd17cd4a51e142ec436dcea1620c5e24bd5bc87a03a4b81e8933dfa885a65bcd5275929afbac1cbfb41f28aa30ded77812b6ffc629f111c0fc715112b SHA512 66c38fb2cc349bd2ef934f6760a14669463d9985c575a7ff63a8250419d7a6e8609460dfc26e66f217f75a79535f6e66cc8bc4b2c88fea11cbc00b67e8b36b4a
+EBUILD pulseaudio-ctl-1.69.ebuild 615 BLAKE2B 5aca5a348d7b120ec3bf68b560fa9ed9d4e9e748312909c2c7dcf53cdb2273dba7753554221df1901fde969ce8849d1d42ef57566f05c2a01401abc9a6d38892 SHA512 5b7d59037fee4103d8498f3c71fce30035a8b3b5aea68486851efb816cc0adb7747722e3ecbebbc038476bcee476962a10590876f47c3224ca2f08e183daa873
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild
new file mode 100644
index 000000000000..64655c017f73
--- /dev/null
+++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="CLI utility to control PulseAudio volume"
+HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
+SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
+# in both cases they should be already present if DE supports them
+RDEPEND="media-sound/pulseaudio"
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
+}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index f760153e937a..9e90d6659543 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -2,8 +2,10 @@ AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d540
 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
 DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac706fc9eb535c78c06f32526d910dffb82bec36af4130490645c95b200562c51f59f19de8905c3c54bda5d8a4b68b5297a SHA512 4d68f5bd678c75f5b13519cddb2f46bd0a827516f1cc7431a8952204f51bd2691f701df869258092a93843bcdb4c61bac916291bade8c4428ed9a4d68b70c757
 DIST pulseeffects-5.0.0.tar.gz 2030440 BLAKE2B 3d68f48ea6beeee308cc82dd3aa10a242587d2c5fdacdb89cf2618ae6ea537966e33e0c9454fab0258c64d05fa71ad196d462097d2abeae1e57a1bf1e7d89ef4 SHA512 f43e1ad22d243689b94d840dd71046079ff806a42606184918e2a28bc6a287d40e709a43abc51e4ea5ea36e99963db43486206a122cc89fe533afe1f9ee54e2f
+DIST pulseeffects-5.0.1.tar.gz 2032470 BLAKE2B 8422d4a9dc3f0b6218921389824eda9aa0de902903edcd382bb1d2a4cbb0e539333ddc43c632b1653b410c68018a97cea18cb1a2e1f20ef72e9930fc28ae6442 SHA512 5cd8fe334766e3f939998c37651444da516e3eaf83841c34504d77dacee7f2e00653abb427e7ef7d909755b468689bc419697d97245ba906589df4b9d3cc5b83
 EBUILD pulseeffects-4.7.2-r2.ebuild 1905 BLAKE2B 61eaf56d327b9f99b1e337cbbb316e8c191ac6d316929a9ac4049985a421ecbdba229ccd61d773412be3f5eebdcb39fbe121f64e268a4aab0157ec61b9eaa669 SHA512 3fd3c448f9716f943e4c1f5a679f2a0b242e725ec2a8ee11efaa3d98e396d7e7d0bf9d0954eec0276d0df38f781230cafba3d7b34cd9272c6e0d0a67341c2a36
 EBUILD pulseeffects-4.8.4-r1.ebuild 1811 BLAKE2B 58e33cd0dfc818d9ec00fc9b9bb6a48b4eec41262a3904282d770a5d8ed4649a08d9103778e4ebfa6c90e890fe9159dacd0b44634d9024226bb807d63f990607 SHA512 9c7721f01c43a462d9a152423e247f76fe9fd0cffdbbabb4990cfb04436f62369fd490dcf5f41a7e0f2bea83015ebf01fda36303eae5caa8c43e8b2bb037e42d
 EBUILD pulseeffects-5.0.0-r1.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
+EBUILD pulseeffects-5.0.1.ebuild 2151 BLAKE2B 9b655d8fa40f30184513180043c3458f1698942060e0ba88467d9ce2348abe84c0347e00fb994880c5c702a2a1ed2d05db632d2cf7eda495bb17f9561f26a80e SHA512 bffa759bb8a224b8b4fd37498a879ddd5fb213b4458fd387732192a8e913f43c720791a88c94843a4e857427491b3eb9fffccf36011f03e266377acfc3e9f161
 EBUILD pulseeffects-9999.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild
new file mode 100644
index 000000000000..6d09c3207969
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+else
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41:=
+	>=dev-cpp/glibmm-2.56.0:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-video/pipewire[gstreamer]
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt "5.0.0"; then
+				if ver_test ${REPLACED_BY_VERSION} -ge "5.0.0"; then
+					elog "PulseEffects has switched to pipewire as it's audio backend"
+					elog "See https://wiki.gentoo.org/wiki/Pipewire for how to use the new backend"
+				fi
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/pulsemixer/Manifest b/media-sound/pulsemixer/Manifest
index ab2bb83d8778..4ddc1c1efb2d 100644
--- a/media-sound/pulsemixer/Manifest
+++ b/media-sound/pulsemixer/Manifest
@@ -1,4 +1,4 @@
 DIST pulsemixer-1.5.1.tar.gz 21789 BLAKE2B 4a20be7b6499501adc64f5ac33b30ad1ea9418190104fbf452e1ed2bd3585552033c042554948b78b41e6a48c22ac62a42f4117b0311300bda738f7556ef1dc3 SHA512 c07b5e5fffa71ca60ed41e4c28a0f4ae5c8b5df9f269ea7376ed835b35536300f34504da724899bab5277f0c39a4c345654b99930ec8bdf4b43374d9b6d331be
 EBUILD pulsemixer-1.5.1.ebuild 591 BLAKE2B 43bf974025e537601720be6a85830764a7895ae062ebd9464335aa5fc8387b975a1b4eac07f44c5b5c5886937f16cd6b61f8f19299474d81948be6e310558d3c SHA512 0ac1cf209a4bc5477fdc099a6eb198040e22c8a2e0ca55fd1e085a89dad89e4f9fd28c5a8c1f7924cbf1a01633f25ea552e24f2c07b8eb3bf28d77ebc5b9b2e2
 EBUILD pulsemixer-9999.ebuild 581 BLAKE2B df8247a32ee6ecacbd92903eebd21e340bb938d0ae21e9adac83c12b23eb6478e487f917d2d11a289f0b7e80f11214dbe3bfc7ec5af9eba22a58c769e7b2125f SHA512 11e696b5746211fa84708ae67f6a9cf3968170fb88bc0a015387c766cb4e51e9ddf7a0528b640da8ae7ebef94d6f9fe342d7bcbed6f6eeee8a00028369f310b9
-MISC metadata.xml 539 BLAKE2B a6a5b4a697f8009c2065d9df6ea91a43c34b5362fe0129560ecc52655391b9e9b15875189fa4d40e93b780041c44dca49546f85a32e5b4e9bfce787a6af2c9dd SHA512 a90de79e4b49b0a1ab8b3306962af79d3e7ea606d010edabd16986edafe770f0e5be12112c7eff6c01739b7168be4ec3952919ada251c40895212f299e3c755a
+MISC metadata.xml 416 BLAKE2B fb09b0f9a9341ce88d785a4d9db4435a1ce1c136fe4c4444acdcbe64bead0a650d318fee750867c83a8439a862a3d787c9fee7b1984028db6dcc25a360781967 SHA512 f985d40a7ca4d2b02fb61cf099e3ac990b2e2884ec41fbd15a714039809e2a534251568834cc9e57796381c305a79812ec112ba71bf0fed1ca4a5854631a64a0
diff --git a/media-sound/pulsemixer/metadata.xml b/media-sound/pulsemixer/metadata.xml
index 5cffdd8cf98c..4f1b4e8b06be 100644
--- a/media-sound/pulsemixer/metadata.xml
+++ b/media-sound/pulsemixer/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">GeorgeFilipkin/pulsemixer</remote-id>
 		<changelog>https://github.com/GeorgeFilipkin/pulsemixer/releases</changelog>
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index bd535716aa6c..df812f83eed3 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,4 +1,4 @@
-AUX sndiod 58 BLAKE2B 66ccfb1e14b145e34851bf6f06566e9c7cbeb6d5a0b4af3d1ee189133441697563b828af9fc96d6313fd7597c89821a79b0d5d67e9b15c5658891605fa54dcfc SHA512 7afae426a04482ca556c360fedfb08e92dbf54af108db3725dce5db74d5332d8fc46481f04804674bec56aa901ab679bae6fdfc21a065c91333dbc169dfdc434
+AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e844e5b1cce7be92c6198ebf57e733e40261f767921d9678957b633a903c2bd659266c4d SHA512 80f2fc6eb775889ac9ba6257651a18bf030668d577727a8f78dc864717e90251757eb779a6ac97ae5468629da59a399c9df013d470744b6d480c1aa09a602323
 DIST sndio-1.7.0.tar.gz 147989 BLAKE2B 20f5969cfd6d6a62d9c04e493eda7648f686ad394db18e43ae574db235f31a025705f40f9c6ea821e04449bc1cdbc35c23dbeff9575b71fccc92c24140341d7e SHA512 f9db7bad5f30e8790488c4d20198c8a5a51f04f94e4b1067eadd7fe0fcc6f6ced3250173a627439d661dcf6faabc7bc4786b30af013788a5c88d972f1c9dc1f8
-EBUILD sndio-1.7.0.ebuild 898 BLAKE2B ab94a572674d50612ea15e05c4ac42043a0b22db28fecc0e02196cac1a7a1ce1d06bbff1233a4b00ae055477521de33d99a4d55a87b6fb061fde8a81a529ad9c SHA512 0089f39fb6fc155bc37ba8e766bb142582c3d52d450f37366551c89d9c2d9eddf22547ab63baf66edf8fb8a63c3520266a5c2b41dd8d9123c6238c40de0b2aad
+EBUILD sndio-1.7.0-r1.ebuild 904 BLAKE2B 4dd22571d5ac249b4217c02db8d5651630b473dea1401416f36533d8412ced895dfc023462a3a48e1837cf82cbdb7bdc8ffb830f30832bda16441909b00d12e9 SHA512 642123ceb5d9c2688bf8aa3dd0c839fd168c03106400d33e63a4d53aa98e02644e753da9d8a2ec8d8888a3c723183af10aa42460ae74ff3218ae952395df4d45
 MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
diff --git a/media-sound/sndio/files/sndiod b/media-sound/sndio/files/sndiod
index ee38dcb97d94..ce4ebe523c16 100644
--- a/media-sound/sndio/files/sndiod
+++ b/media-sound/sndio/files/sndiod
@@ -1,3 +1,2 @@
 #!/sbin/openrc-run
 command="sndiod"
-command_user="sndiod"
diff --git a/media-sound/sndio/sndio-1.7.0.ebuild b/media-sound/sndio/sndio-1.7.0-r1.ebuild
index 18d25351250b..d68b89b4b8b7 100644
--- a/media-sound/sndio/sndio-1.7.0.ebuild
+++ b/media-sound/sndio/sndio-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.sndio.org/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/7.0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 1a72ba28a07d..b40844d8e4e6 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,3 +1,3 @@
 DIST sonata-1.7_beta1_p20200212.tar.gz 2259353 BLAKE2B 78befe6896d75033649e4f7333bc1487cc7462a66564860d93b4770cb7e86a6cc4656377b6e13defb07591b0a81cbd22653f01c5e9f20d75fcbf28a84551f7fb SHA512 bdff3ee3ec4d94a18604409efbca398f94633a510780f33d449921b69787521ad5d68285aa0fe7252191c1227435c42cf60bca0fe7764e1a8b3d887ff4be4ae6
-EBUILD sonata-1.7_beta1_p20200212.ebuild 993 BLAKE2B e0687db484ccc92056e907ad41966f215415fb6c837b155f50059e5072adca170311a3f52621a2a802345be5f2ba8ef69503c116858b95d522234986c9e564bd SHA512 9dea76744d1fd924967243f514b5f5a53a328ba1a89d5ef1470e0ff2ca67dcc3891a972a7e84c8872f59d05e6fb49baab92ecc7d894fb24a8ce987c77a805b5e
+EBUILD sonata-1.7_beta1_p20200212.ebuild 1031 BLAKE2B 8bd11ba89b430e07e3d4cba805cf6d6b17ddc68acbffcbdb570bb261a58a2ef3f614ea16fd81e93a90882f903c62f112d3560dc38457feb77ad6d46f5fe72a42 SHA512 2ca3fc5410eaff075649921b472d19e354d509f3d4c0594a857edf779f1e4fe84fd430fa2d925abfd9ed2ade3f3f0168e927c1a9932a19a64336ada4596f3c86
 MISC metadata.xml 478 BLAKE2B f93c58977de74be7b3fcbaa3d2ca22e2d8394b6899d6c07072270418380cc50ce99f426ce3668e5a663939769eb7e6a4871d1a7c96afb81c5c89d0aebc1c3ad2 SHA512 5c7dc2feb0594f52ebcf8e579a9292e157b673e358ea80cf8111cb72a62bb2551725d4f3f738daec430ae4f66ff80e48330b0d8aa23a3ac508a0c202f209170a
diff --git a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
index ac2bf45c1747..2c394b59693c 100644
--- a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
+++ b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 COMMIT=0c807e593f7571a654ad055cb126652d7f3a698d
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_SINGLE_IMPL="true"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 inherit desktop distutils-r1
@@ -19,8 +19,7 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus taglib"
 
 BDEPEND="
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
@@ -32,8 +31,10 @@ RDEPEND="
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
+distutils_enable_tests unittest
+
 src_install() {
 	distutils-r1_src_install
 	doicon -s 128 sonata/pixmaps/sonata.png
-	rm -r "${D}"/usr/share/sonata || die
+	rm -r "${ED}"/usr/share/sonata || die
 }
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index cc46e27951fc..12cb1843f417 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -4,5 +4,5 @@ AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c1
 DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
 DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
 EBUILD sonic-visualiser-4.2.ebuild 2857 BLAKE2B 480517d4a7be070af7e4b70727b66cb7fb6bccfd46fa532b9e1896685f092417b7ef4082019c414181ce551b8dcf7deff66af89acb1e2b27e17e5f2cf4967d4a SHA512 95e5d27ac10caac3752b45a01a75f07131cc0ad70d477b475c57382c1dd4493e7f7db433bf49ce84a30222c5a779f7a0c1f5099c72186561796193f42434750b
-EBUILD sonic-visualiser-4.3.ebuild 1601 BLAKE2B 2607a86ce68466b0f3a21b02ed591a252d4129d1d0a2925e9da82df21451e7d1b2acf41fd46f8966d9f62a384321c644f8afc350dac25e4d064c5af892155e4d SHA512 c2c741cf1cfb304665a4a91a96c387934eefe62e6fdbc769ad7562c04ba3372cab2be8510ba262d12bb6d79400b42e1bdfa5eac53cd7688bd33caab9720df5a0
-MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
+EBUILD sonic-visualiser-4.3.ebuild 1638 BLAKE2B 2df62c42fb0eff4e29d347442b55cbeb75b510383e97732f002acea69123f0f33db43a2e729a9faec3ccc0d91503cf106fc4840b72a589f20d870b62c23a3c9f SHA512 62c7f47e6fdce8db515d519ca91b86f7547870b09d9d1408259f0644bf797e2b30df8a20a51ad3ecb5a3397252f3ea2e4171e191d1b3bbcca2a427f2510d6816
+MISC metadata.xml 456 BLAKE2B ea6749af7e2c0905dfa753fdc2c5e9342727599b4550c282db4dd01c564019ba7e02c5116cd256abb99476087b78b085742ff649df7844f82b3efe88c74ea8ad SHA512 95e15aaade8230e877d46a7f7625d7ffaadf1273129e36255f43ca578ee3b878ab78fe39837ba7090f248830cd7bfa47de144ec13ed31f9677f7b65d270a66b0
diff --git a/media-sound/sonic-visualiser/metadata.xml b/media-sound/sonic-visualiser/metadata.xml
index 09c4d45f4670..13f905d13744 100644
--- a/media-sound/sonic-visualiser/metadata.xml
+++ b/media-sound/sonic-visualiser/metadata.xml
@@ -5,6 +5,9 @@
     <email>proaudio@gentoo.org</email>
     <name>Gentoo ProAudio Project</name>
   </maintainer>
+  <upstream>
+     <remote-id type="github">sonic-visualiser/sonic-visualiser</remote-id>
+  </upstream>
   <use>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
   </use>
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
index 79ea3cb16090..743413b051ab 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit meson desktop xdg
 
 DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${P}.tar.gz"
+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"
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 0caa3a0962c3..45c1f013b9f8 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,7 +1,7 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
 DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
-DIST teamspeak-client-5.0.0_beta40.tar.gz 116647752 BLAKE2B f0e5cf0aa2fe4c69bd7c621454918c13175d0708c3ad54b5dd0b18dfbbd0dc18af520d0f65e391f36d7d5cb3a8c2eaffec0619101f4b59262b8885cebf86629b SHA512 abeacf9d200f68ae4ac9a9adee146a52d81a7f34c7593cfa0ca363300f18ca1d85e582181d1c874accb5a84eb17bb1ed6bc79fb460708fbb2ebd937c40f28607
-EBUILD teamspeak-client-3.5.6-r2.ebuild 3045 BLAKE2B 33a81fe060e563a7357078ebf301b7400727a656a035987d8391c8c2dac1d5d5d4169a1c13fed0d5ed5e2a3f396705071bcea8a81b18cf76464b68a59026bcb1 SHA512 167a5140716b9a3f5b2c6925f1773e2c1be592668cb07d5d672f2de611486a11b05964061a860ab802dc784e6552f70d01a774e3468771590a8da34ba682cbd5
-EBUILD teamspeak-client-5.0.0_beta40.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
+DIST teamspeak-client-5.0.0_beta43.tar.gz 116647752 BLAKE2B f0e5cf0aa2fe4c69bd7c621454918c13175d0708c3ad54b5dd0b18dfbbd0dc18af520d0f65e391f36d7d5cb3a8c2eaffec0619101f4b59262b8885cebf86629b SHA512 abeacf9d200f68ae4ac9a9adee146a52d81a7f34c7593cfa0ca363300f18ca1d85e582181d1c874accb5a84eb17bb1ed6bc79fb460708fbb2ebd937c40f28607
+EBUILD teamspeak-client-3.5.6-r4.ebuild 3105 BLAKE2B 5be9bb40652e30ebf3975216fad766fc303200edad749fa087113d1aa16cf8b36812b7bb256b509c34528f8b1984d7ed2e4de99f4c25cae290bde5265cdc9e76 SHA512 8597838502d4792e2e2b6fa8281586aec7c763af9374f5ce928c8728d53a99dad3888229dc540e1df43678f81d6b78124c37176586b76e9f64202297210125da
+EBUILD teamspeak-client-5.0.0_beta43.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
 MISC metadata.xml 744 BLAKE2B e5a883b78a951de65c5a0ac3ef23674fc120339531a8e10225f5049a67d42f206fce5296f41bbb329105386b2138c83385c0b3293199409ac76b92c10dd17696 SHA512 6e8688c9c36c34625b8bf8b0e2870b88a8f7df4986f2a2579c089260058022cc5177e5108e8f4616cebfcfc1c132277eff74b9d45054b6d61f87c8966dff9156
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r2.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r4.ebuild
index 99cf08b2b88b..151c902c854a 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r2.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r4.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-inherit desktop toolchain-funcs unpacker xdg-utils
-
 MY_PV="${PV/_/-}"
+inherit desktop toolchain-funcs unpacker xdg-utils
 
 DESCRIPTION="A client software for quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
@@ -14,23 +13,21 @@ SRC_URI="
 	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )
 "
 
-KEYWORDS="-* amd64 x86"
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="3"
+KEYWORDS="-* amd64 x86"
 IUSE="+alsa pulseaudio system-libcxx"
+
 REQUIRED_USE="|| ( alsa pulseaudio )"
+RESTRICT="bindist mirror"
 
 BDEPEND=">=dev-util/patchelf-0.10"
-
 RDEPEND="
 	app-arch/snappy:0/1
 	dev-libs/openssl:0
-	dev-libs/quazip:0
+	dev-libs/quazip:0=
 	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[accessibility,dbus,X(-)]
-		dev-qt/qtgui:5[accessibility,dbus,xcb(-)]
-	)
+	dev-qt/qtgui:5[accessibility,dbus,X(-)]
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
@@ -46,8 +43,6 @@ RDEPEND="
 	system-libcxx? ( sys-libs/libcxx[libcxxabi] )
 "
 
-RESTRICT="bindist mirror"
-
 S="${WORKDIR}"
 
 QA_PREBUILT="
@@ -65,20 +60,24 @@ src_prepare() {
 	default
 
 	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
+		rm soundbackends/libalsa_linux_*.so || die
 	fi
 
 	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
+		rm soundbackends/libpulseaudio_linux_*.so || die
 	fi
 
 	mv ts3client_linux_* ts3client || die
 
 	# Fixes QA Notice: Unresolved soname dependencies.
 	# Since this is a binary only package, it must be patched.
+	local quazip_so="libquazip1-qt5.so.1.0.0"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so.1"
+	fi
 	local soname_files=( "error_report" "ts3client" )
 	for soname_file in ${soname_files[@]}; do
-		patchelf --replace-needed libquazip.so libquazip5.so.1 "${soname_file}" || die
+		patchelf --replace-needed libquazip.so "${quazip_so}" "${soname_file}" || die
 	done
 
 	tc-export CXX
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta40.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta43.ebuild
index c10184fe8264..c10184fe8264 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta40.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta43.ebuild
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index d830af1528b7..405c69580b37 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,11 +1,4 @@
-AUX vorbis-tools-1.4.0-CVE-2014-9638.patch 2579 BLAKE2B e568ba19d7905546672e31d3bf3e119df2cf7ba521e500bbd348e1c19e7498ddaaf8bb39b188b87d11adf2aee0c7a9f9bdeed671a4e1737550b7f8634a117655 SHA512 f7e05deb226e6f32088f55519cfc17849e0bf6ddfc27aa582f77b4e7fb9ba3962f509d86af895e1b867f29a50ec5550aeb8fda780f5875fd2e2564aa4b723f1e
-AUX vorbis-tools-1.4.0-CVE-2014-9640.patch 691 BLAKE2B bdf2e1f18ddddf90afb26e6814afbf67032509570d9671a7f90b6188897e7494f0832d888f4fe4c854de75151d6e4c4811ad6d0dee3da3d65446402b7aa9fa71 SHA512 f9dd54fa2d09f2ad1a45bbf576884aa00148334452c478914566713bd149572f9c4e05b301aa8bd2aeb299a095cbae5cde09dcb762eaa6c2e8bbd33c91fec2f0
-AUX vorbis-tools-1.4.0-docdir.patch 340 BLAKE2B 147fa0212acd6a7df359d3eeb120465ca962532263c8cfa8815a91c5f0a43c230d52b2693e9ff1167a17191edf4f70592778249857ff91641b99ca19f572ea87 SHA512 080e70054ef9583430c1675f5cba1cef1ad6cf76068fe1881b0771a08d9d3651cd2adfe92388ad8974fbbc64f2066b3aaeb8de790ba5bfaeae68b5618c733646
-AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743afe660ae1a741d8bb7b2790823936a089c4a8667a41160d6d1b79ec6027f4bf77dbbd8110bc65d2503bcd87c51f4f1e675566ff2dc6 SHA512 319451c4317e2224cb56c791528c8ba4722a142b5c85f63fd606e3a1acadc95904cfab3bee7ad4634fa982f59a92ebeb30d8698d8f697640d6579b6a80eadd93
-AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
 AUX vorbis-tools-1.4.2-docdir.patch 416 BLAKE2B 1ce521f429314e40b9fbde91103dc0fd4cb02a0801479da8c4d5cf17334e6586c23a892f12398b9cc62c86fd17394d5325bd580c5be1d03ffd11e5a21bf18443 SHA512 96f1ef85b92e25dd1d029cf19b4e81ca455cbf9da83b49bf50ce10bbbf02a0150975eaeb2ded262c8931d213d6d767013ced4d7334ab5a6fa1c06f55bf278c91
-DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
 DIST vorbis-tools-1.4.2.tar.gz 1389947 BLAKE2B 6cec240a2c069a74accfadd4d4a5a2a75bb4ad40c83aff86e190f7b19a87d4348d7a932e69a9ae9dd2efff636f47d3465b3d26d39393b4fec925cb7d1543f77e SHA512 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf
-EBUILD vorbis-tools-1.4.0-r5.ebuild 1187 BLAKE2B ff778c641c185df7262a9e7ff146d329c3a64eab774ad64f67b846e3e9c1ce35d618ce98d27b92e6ef390daa52168aacf63d0e3bd2eca1e0e5dde33fae4dc8d1 SHA512 8829796e494ab2e280b5d1cd028ce55b33c0f3c0bac84b5f4aecd005cd90bf036eaf1d4561ec9233f93be6dd0078936223dd46fc722b0e1314c26166decb03af
-EBUILD vorbis-tools-1.4.2.ebuild 951 BLAKE2B 3b819d545b3c9041522d51500168742ab3fe92b6ca2d3de7315bff32caa18b31941da68fdfc2531bd489a05e5242a7869c50e6c270ca30264793fc64894db362 SHA512 993af7575a3edb7f0f1f9af7bf8fcd9575d99f5a096a63477e5549b5adf863a17eaf0e2f77eecc2b602be0efdd80971b7564a47774ec9bb061a5669b9ce9ae2d
+EBUILD vorbis-tools-1.4.2.ebuild 945 BLAKE2B e89fedc5e2f1873a0dc6d68d68a7e0cd55f5d1deb58c5b0209240e51bebd99860be202d466d09e706ed2571a17811811f438fe843942191c3a3a9b2c2667b35e SHA512 504608faefc9c5cfaab1c802419533da15dd935e08e4c903937a775263b9277b4c738da17cf8b29254e2ffaa09c1a64a4045fe4a06f8a9060309756f8f4b9550
 MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
deleted file mode 100644
index a643f1cb82f6..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Patches taken as references: 
-https://github.com/mark4o/opus-tools/commit/8c412e619b83eb6dd32191909cf6672e93e5802e
-https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
-To fix bug report:
-http://www.openwall.com/lists/oss-security/2015/08/29/1
-    https://bugs.gentoo.org/show_bug.cgi?id=559170
-https://bugs.gentoo.org/show_bug.cgi?id=537422
---- a/oggenc/audio.h
-+++ b/oggenc/audio.h
-@@ -25,7 +25,7 @@
- 
- typedef struct {
-     short format;
--    short channels;
-+    unsigned short channels;
-     int samplerate;
-     int bytespersec;
-     short align;
-@@ -44,7 +44,7 @@
- } wavfile;
- 
- typedef struct {
--    short channels;
-+    unsigned short channels;
-     int totalframes;
-     short samplesize;
-     int rate;
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -245,8 +245,8 @@
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- {
-     int aifc; /* AIFC or AIFF? */
--    unsigned int len;
--    unsigned char *buffer;
-+    unsigned int len,readlen;
-+    unsigned char buffer[22];
-     unsigned char buf2[8];
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@
-         return 0; /* Weird common chunk */
-     }
-
--    buffer = alloca(len);
--
--    if(fread(buffer,1,len,in) < len)
-+    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
-+    if(fread(buffer,1,readlen,in) < readlen ||
-+        (len > readlen && !seek_forward(in, len-readlen)))
-     {
-         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
-         return 0;
-@@ -277,11 +277,18 @@
-         return 0;
-     }
- 
--    format.channels = READ_U16_BE(buffer);
-+    format.channels = (short)READ_U16_BE(buffer);
-     format.totalframes = READ_U32_BE(buffer+2);
-     format.samplesize = READ_U16_BE(buffer+6);
-     format.rate = (int)read_IEEE80(buffer+8);
- 
-+    if(format.channels <=0)
-+    {
-+    	fprintf(stderr, _("ERROR: Invalid channel count in AIFF header\n"));
-+	return 0;
-+
-+    }
-+
-     aiff->bigendian = 1;
- 
-     if(aifc)
-@@ -449,11 +449,17 @@
-     }
-
-     format.format =      READ_U16_LE(buf);
--    format.channels =    READ_U16_LE(buf+2);
-+    format.channels =    (short)READ_U16_LE(buf+2);
-     format.samplerate =  READ_U32_LE(buf+4);
-     format.bytespersec = READ_U32_LE(buf+8);
-     format.align =       READ_U16_LE(buf+12);
-     format.samplesize =  READ_U16_LE(buf+14);
-+
-+    if(format.channels == 0)
-+    {
-+      fprintf(stderr, _("ERROR: Zero channels in WAV header\n"));
-+      return 0;
-+    }
-
-     if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
-     {
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
deleted file mode 100644
index 51c23b062aff..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch taken from: 
-https://trac.xiph.org/changeset/19117
-To fix bug report:
-https://bugs.gentoo.org/show_bug.cgi?id=537422
---- vorbis-tools-1.4.0/oggenc/oggenc.c	
-+++ vorbis-tools-1.4.0/oggenc/oggenc.c
-@@ -97,6 +97,8 @@
-               .3,-1,
-               0,0,0.f,
-               0, 0, 0, 0, 0};
-+    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
-+        N_("RAW file reader")};
- 
-     int i;
- 
-@@ -239,8 +241,6 @@
- 
-         if(opt.rawmode)
-         {
--            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
--                N_("RAW file reader")};
- 
-             enc_opts.rate=opt.raw_samplerate;
-             enc_opts.channels=opt.raw_channels;
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
deleted file mode 100644
index d3fdde0e11d7..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Thanks-to: Chris Mayo
-https://bugs.gentoo.org/533774
-
---- a/ogg123/Makefile.am
-+++ b/ogg123/Makefile.am
-@@ -19,7 +19,7 @@
- localedir = $(datadir)/locale
- DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = @docdir@
- mandir = @MANDIR@
- 
- bin_PROGRAMS = ogg123
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch
deleted file mode 100644
index 501300ca6171..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vorbis-tools-1.4.0.orig/ogg123/status.c
-+++ vorbis-tools-1.4.0/ogg123/status.c
-@@ -148,7 +148,7 @@
- 
-     switch (stats->type) {
-     case stat_noarg:
--      len += sprintf(str+len, stats->formatstr);
-+      len += sprintf(str+len, "%s", stats->formatstr);
-       break;
-     case stat_intarg:
-       len += sprintf(str+len, stats->formatstr, stats->arg.intarg);
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
deleted file mode 100644
index 9aee38e0b19e..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://bugs.gentoo.org/513942
-
-Fix building with `./configure --enable-ogg123 --without-flac --without-speex --without-kate` and `make`:
-
-libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--hash-style=gnu -o oggenc oggenc.o audio.o encode.o platform.o resample.o skeleton.o  -Wl,--as-needed ../share/libutf8.a ../share/libgetopt.a -lvorbisenc -lvorbis -logg
-resample.o:resample.c:function res_init: error: undefined reference to 'sin'
-collect2: error: ld returned 1 exit status
-
-libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -o ogg123 audio.o buffer.o callbacks.o cfgfile_options.o cmdline_options.o file_transport.o format.o http_transport.o ogg123.o oggvorbis_format.o playlist.o status.o remote.o transport.o vorbis_comments.o vgfilter.o  ../share/libutf8.a ../share/libgetopt.a -lvorbisfile -lvorbis -logg -lao -lnsl -lcurl -lpthread
-vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
-vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
-vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
-vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
-collect2: error: ld returned 1 exit status
-
-This is using the new GNU gold linker:
-
-$ ld -v
-GNU gold (GNU Binutils 2.24) 1.11
-
-Happens because -lm gets appended to the libraries list only with, for example, --with-flac but vgfilter.c and resample.c are always
-using functions from the mathlib.
-
-Therefore, always link to mathlib:
-
---- a/ogg123/Makefile.am
-+++ b/ogg123/Makefile.am
-@@ -30,7 +30,7 @@
- ogg123_LDADD = @SHARE_LIBS@ \
- 	       @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
-                @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
--               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@
-+               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ -lm
- 
- ogg123_DEPENDENCIES = @SHARE_LIBS@
- ogg123_SOURCES = audio.c buffer.c callbacks.c \
---- a/oggenc/Makefile.am
-+++ b/oggenc/Makefile.am
-@@ -23,7 +23,7 @@
- 
- oggenc_LDADD = @SHARE_LIBS@ \
- 	       @VORBISENC_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ \
--	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@
-+	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@ -lm
- 
- oggenc_DEPENDENCIES = @SHARE_LIBS@
- 
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
deleted file mode 100644
index 51e642dbe33a..000000000000
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Tools for using the Ogg Vorbis sound file format"
-HOMEPAGE="http://www.vorbis.com"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="flac kate nls +ogg123 speex"
-
-RDEPEND="
-	>=media-libs/libvorbis-1.3.0
-	flac? ( media-libs/flac )
-	kate? ( media-libs/libkate )
-	ogg123? (
-		>=media-libs/libao-1.0.0
-		net-misc/curl
-	)
-	speex? ( media-libs/speex )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-CVE-2014-9640.patch
-	"${FILESDIR}"/${P}-CVE-2014-9638.patch
-	"${FILESDIR}"/${P}-docdir.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ogg123) \
-		$(use_with flac) \
-		$(use_with speex) \
-		$(use_with kate)
-}
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
index eaae1ed08819..9c088f59ceb2 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://ftp.osuosl.org/pub/xiph/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="flac kate nls +ogg123 speex"
 
 RDEPEND="
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index a0e1b4766ed4..9f06a0070226 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -2,5 +2,5 @@ AUX wavpack-5.3.2-fix-overflows.patch 2094 BLAKE2B 8c2abe6d72109b108d1e8f4400f5c
 DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
 DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
 EBUILD wavpack-5.3.2-r1.ebuild 1070 BLAKE2B 44d32a09ddbc7ba87f4af8fb53d1f57fe21525e1b50563fbf8063ab362b9e06040409ab91068a225ee4e32748ca0401b6bbea28661ef89ec985ffdc6183841a6 SHA512 c21d4e74634e9cde5ae49be7becbe7ff02dc0872caef71ffd067e73c8db5e6b008a1b5cef7673002a3684bc72c1d491d682e39bb8b43574a8572281e471c2f1d
-EBUILD wavpack-5.4.0.ebuild 829 BLAKE2B 6281f715c3a4e5236954d99118622d4404d181d92e4b54623ea16631b24343fa2a640f0b7d78caf1339b17aa38247c60a5c329ad125c3fdd25a050fc07f95acd SHA512 5c205476657936257f6d4c5a5221e72ad727a28e201ad98daa76f9651b49e5306c6e096c8d0a156353b664a68ffe987fafcdbffb9d37e333bdb784dde04d2957
+EBUILD wavpack-5.4.0.ebuild 828 BLAKE2B ab2b2363911c89d7c3fce6e8f3203d59f3693867831107bc3338f2a2f009443dfc92d5996d6ebdb342c4767bbd6447cdd2123cb53a932a545e43edc4336eae27 SHA512 7db9e5f3c9724cab760d76fff1b1b26030162b90b654a387cd5741bebf1be35a6cdd7d2a4d4c7e426cafd6b3e2644238d4178b4ca75652ba94fd9e77f7d80a86
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.4.0.ebuild
index 5cf9c05d1266..65dfcefe7f5d 100644
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"