gentoo resync : 25.11.2020

250 files changed, 3297 insertions, 4563 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 924d06888c85..565fe7950366 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 1c63c1498a47..e81110c75f46 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -4,6 +4,8 @@ AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
 DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
+DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
 EBUILD alsa-utils-1.2.2.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
-EBUILD alsa-utils-1.2.3.ebuild 2341 BLAKE2B d3634b987e5fe5917a2f5e336ef9603a141fc67b1e7a89d258ffaa7c04d5b674613f7232d8d6b1f00f687a0471ab8bdeb28e7e2eb4164a9f9e5b098cac614b43 SHA512 73cf0447b2e8e97e8d53d518a37a637ae939e6a9640a198847bc7be8e60d13e690ea5ba53691f837cf8e981fdd7b542fc4577f6fafb598285361cb46677ba9c8
+EBUILD alsa-utils-1.2.3.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
+EBUILD alsa-utils-1.2.4.ebuild 2341 BLAKE2B d3634b987e5fe5917a2f5e336ef9603a141fc67b1e7a89d258ffaa7c04d5b674613f7232d8d6b1f00f687a0471ab8bdeb28e7e2eb4164a9f9e5b098cac614b43 SHA512 73cf0447b2e8e97e8d53d518a37a637ae939e6a9640a198847bc7be8e60d13e690ea5ba53691f837cf8e981fdd7b542fc4577f6fafb598285361cb46677ba9c8
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
index 24b8ba3949fe..13b172c0891b 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
new file mode 100644
index 000000000000..24b8ba3949fe
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usex doc '' --disable-xmlto)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 81b002695c6e..2021d2ea0ebf 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -2,8 +2,6 @@ AUX apulse 488 BLAKE2B 20231c1041e1658e993ecc5f0dbd37f1d7e718aa5095b0bcb18b6c786
 AUX check-key-before-remove.patch 1888 BLAKE2B d8bee7f8acac213396d18d44740703746653a57d300c8d86967e83c24b73aca7d8ba5e91e38d7c3683d40c2a520cacb29210e2c1d739bf4b0403199beb9bda81 SHA512 e7edf75cdddc94a433ce387853cc59cfa40ef7fbdc955357141f42133bf9bde4e6528078d75c7d58001ab07dcaf209b0437a92445d770f6cd08f9b919e97caa4
 AUX man.patch 1054 BLAKE2B 37228832250f1c1e06edf79d00a4a4d7d5433f2d9b28ebb10eacb54bcfb7478d9ef64459e87f7f43a94be0b194eba024cde60175fc324ef6dad7a4ef9e2c1db3 SHA512 c2b05dd8c42f79994ae3be5df5ac495e95bfbc14355423faa75b23863418bad4bbc33524e2b86abc9e346678256c1ff454c160ebb5e09f48d466ef99cdfa407c
 AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6171e29546af97c374765bed081cdf13827add3d02e5cdb6b30adccaae03318c102dba4cff65 SHA512 f1f743d049c120f3c8d6d1387577b53e9637881d9d5e007c55b4e42feca21b170ee24146c5fb0cc050c3eb1c26659dc6363e673710ae08c76f2844306a1ca01d
-DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
 DIST apulse-0.1.13.tar.gz 117369 BLAKE2B 8cf527daf21420a72e46968a3b07ab61029f404a2b6574ac1f08dd40528f3e6e4baf7e38f5914b0c89252e16eec5e8f3722be51e5a61b6a71c683e994740b4bf SHA512 366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007
-EBUILD apulse-0.1.12-r4.ebuild 1449 BLAKE2B a906511d311d43c9c45f8f292c02b98add6e3d74d7fc9402a4ec9a6629ce70cdb839a98a5a23179ccdb8e821fc3016cabdb5679f4a2ddb4c0de02efd6202e8a3 SHA512 2b865a68d87ee96c614f92263936c3d9f0a183a603af84b8b46f306173b06ddd86a553b3f1c05fa8a860c2fe3582e0f650c14f29d2530b138e0ace95bf60bccc
 EBUILD apulse-0.1.13.ebuild 1665 BLAKE2B f200dcf1e3ff2829528f20d70d4a4d1d8e9a6b1c5a743c43d4e718f33533de85e022b8b66dabb1098e873994888c52389c8e41dd6df744a69493cfdfb447cebb SHA512 464984d964c6e4615ff6185f8483cd832f5b69427e1aed92b12ec14ef47df023faafeaf0439d3250f9a7ae119bf33bc140f39aff1af2c6e12b672629c2e17d2e
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild
deleted file mode 100644
index c91aa5a9d138..000000000000
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug sdk test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	sdk? ( !media-sound/pulseaudio ) "
-RDEPEND="${DEPEND}
-	!!media-plugins/alsa-plugins[pulseaudio]"
-
-PATCHES=( "${FILESDIR}/sdk.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use sdk; then
-		# Ensure all relevant libdirs are added, to support all ABIs
-		DIRS=
-		_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
-		multilib_foreach_abi _add_dir
-		sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DINSTALL_SDK=$(usex sdk)"
-		"-DLOG_TO_STDERR=$(usex debug)"
-		"-DWITH_TRACE=$(usex debug)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	# Do not use deprecated MULTILIB_CHOST_TOOLS
-	if ! use sdk; then
-		unset BUILD_DIR
-		_install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; }
-		multilib_foreach_abi _install_wrapper
-		dobin "${T}/apulse"
-	fi
-	einstalldocs
-}
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 6f60951bb82e..45f839ba1fb9 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,8 +1,10 @@
 AUX aqualung-1.0-ar.patch 505 BLAKE2B 957845ed9bbe2f9e7ee99209319cf7a438dc693611b37ef8b3447cb5d14636ef52208ddca09d94411071a20191b6177821c1ec6219893ebae7c66f343f1c1e32 SHA512 12a1740a7ebfa2c80d77a61fe23eead25ef3cb882caab9f2a13f56d4c06e6e9651fad8cbf5a6b755a9c0685de1b1f66f74e75458dca45ff61c816d54e90765e6
 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
 AUX aqualung-1.0-gcc10.patch 2199 BLAKE2B da146d5a6e3272ba1aa6a7ab4b77c330a54f7a070946e70d4cdc34bb09b5d41d27b2cca60cf81acdf4d7ca679c8c3d9b6e0ca7589cb47ce14883ebfacbc02e4e SHA512 b1c81ce1b27f4eba729aeae7084bdb2a435b06bacf00a003130682108a6a559129713d526a6eaa7f399b5acc9d8c6bdcde91b105cc924f763743d5a1dc9fa520
+AUX aqualung-1.1-ifp.patch 1445 BLAKE2B 80e4baadf577d17985d657ff3b3a357f30ec027d1c2e81398472226c87f787a37257eecc34ef3c8c435216e8746947d1d87dc9acb62d08d8a1c44f2ba51e8159 SHA512 c20426ff125f9273dc8297a188c768ca64ae57f8a507049ed534b58fb0214ad21477c8375a5c999c5dda5de96dd2f1599fda0c768878441f4ca7190ef75bf90e
 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
 EBUILD aqualung-1.0-r5.ebuild 2510 BLAKE2B 569242aeec1453ccbf040cc826847f27fac5e7e191054057308bf5b912d971a8b008020b7da76faf2bc225b38bae2b1533855bd909843ad2c813819350183f26 SHA512 f6d69930280c3d0068b1a960ccc8e968b2e9d476d4934edb94cc332f10ef805c834a12f062ec8567f839bb8663ce9d563c4deca51cafd800c48ddb7a6569e1c4
-EBUILD aqualung-1.1.ebuild 2337 BLAKE2B 3a5942269484135d29fabbff4dd86251f93768eb334ae33601a35b1fb7d89a251719a1e76fbba475495b971abca06999e3b82c78c42515ef003163ea55ad1ffc SHA512 578f8dcb316c739e383f102f67cba3159b2d7192b5e4064fc40e6fb284f82090683f377b949350bcf6d963cca33e68db0654f1c8fd34c97be4c5b6348527bd2a
+EBUILD aqualung-1.1-r1.ebuild 2378 BLAKE2B 2eb9c2e03793b9f74d26db75c711d945d65d168c4d69ce3055cdbd45da1016f1eac6e16db75ee644574ba7950d8164f16c91e9b53e5a0ce0b61c0cd1eef3eee8 SHA512 e6cdab2f38587bd78e0daf5d6fcc457448529cdf46c1f23f9d1f6bb982d1b6fc1c4d436596d5479f6983294dae5d29b16e9afd0c1fb23d48239eaf672cc50ab1
+EBUILD aqualung-1.1-r101.ebuild 2410 BLAKE2B 926df97011fea57dc6583a845a78f122cff136f0e10b41171324eab546dd987cb71c70de9262a25523dd8ae9cb16d0815a9a1403566a8298e3652a8cc359b4d4 SHA512 03c42a7ba861616768ed5254bfe1dd215945a1a83812bf873d1d5d5d75c56a244f1610bd9a6ba41bcfe5a5b76b46bb80fd12bcdc9237b9bb24194eb110b25794
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild
index ea7f3d62f5a9..c2442960c3c6 100644
--- a/media-sound/aqualung/aqualung-1.1.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
@@ -50,6 +50,10 @@ DEPEND="
 	${RDEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-ifp.patch"
+)
+
 src_configure() {
 	econf \
 		--disable-rpath \
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
new file mode 100644
index 000000000000..fe7a974b3a4a
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-2 )
+
+inherit autotools desktop lua-single xdg
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
+	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+	vorbis wavpack"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	ifp? ( media-libs/libifp )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lua? ( ${LUA_DEPS} )
+	mac? ( media-sound/mac )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ifp.patch"
+)
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--enable-loop \
+		--enable-nls \
+		--enable-transcoding \
+		$(use_enable debug) \
+		$(use_enable podcast) \
+		$(use_enable systray) \
+		$(use_enable jack jack-mgmt) \
+		$(use_with alsa) \
+		$(use_with cdda) \
+		$(use_with cddb) \
+		$(use_with ffmpeg lavc) \
+		$(use_with flac) \
+		$(use_with ifp) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with lame) \
+		$(use_with libsamplerate src) \
+		$(use_with lua) \
+		$(use_with mac) \
+		$(use_with modplug mod) \
+		$(use_with mp3 mpeg) \
+		$(use_with musepack mpc) \
+		$(use_with oss) \
+		$(use_with pulseaudio pulse) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis vorbis) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack)
+}
+
+src_install() {
+	default
+
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/files/aqualung-1.1-ifp.patch b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
new file mode 100644
index 000000000000..490999be9485
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
@@ -0,0 +1,41 @@
+From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats@offog.org>
+Date: Tue, 8 Sep 2020 15:55:12 +0100
+Subject: [PATCH] Fix arr_strlcpy call in ifp_device.
+
+directory_chooser needs to know the length of the target.
+---
+ src/ifp_device.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ifp_device.c b/src/ifp_device.c
+index 9ef5741..42236cb 100644
+--- a/src/ifp_device.c
++++ b/src/ifp_device.c
+@@ -824,7 +824,7 @@ gchar *npath;
+ 
+ 
+ void
+-directory_chooser(char * title, GtkWidget * parent, char * directory) {
++directory_chooser(char * title, GtkWidget * parent, char * directory, size_t directory_len) {
+ 
+         GtkWidget * dialog;
+ 	const gchar * selected_directory;
+@@ -855,7 +855,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) {
+ 			gtk_widget_destroy(dialog);
+ 		}
+ 
+-                arr_strlcpy(directory, selected_directory);
++                g_strlcpy(directory, selected_directory, directory_len);
+ 		g_free(utf8);
+         }
+ 
+@@ -865,7 +865,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) {
+ 
+ void
+ local_path_selected_cb(GtkButton * button, gpointer data) {
+-	directory_chooser(_("Please select a local path."), aifp_window, dest_dir);
++	directory_chooser(_("Please select a local path."), aifp_window, dest_dir, sizeof dest_dir);
+         gtk_entry_set_text(GTK_ENTRY(local_path_entry), dest_dir);
+ }
+ 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 58b190ba40c6..069467807534 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,8 +1,6 @@
-AUX ardour-6.2-fix-no-nls.patch 13153 BLAKE2B e246105d9c4b43c109155716903de02051bde2e1c77035e6c1295ec44fa7483e2a1cb0a92cfd7d26ebb7df9919390e462a50e269a38174d6ff54c6c5e358eb51 SHA512 98b3d10d6b7ee371ce2b32c2ec730555739188b555f273198b6e096972d58f37d49d205e6de97299b8cfcaa8ad5c27d461207fa6ea02999dc0ddc7e375c5fd9e
-AUX ardour-6.2-use-signed-int-for-atomic-operations.patch 2015 BLAKE2B 535da9c7318a2c5e12f2d531acb09a47ebcb570bd59583e5683df05c1067d81e09f0fbd7a45f89843571fbc3a655c68bf11313c4aa73f9ce02fdc52c68414fae SHA512 720ee2920cbb88ff5266202ffdf5464503550f47fa440466aa241e89380548c31079700a1cf55dd9dd76a4e9185be6fff9ee8d499cc5e0bfc7976a7ebd0869fe
-DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
 DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
-EBUILD ardour-6.2-r1.ebuild 4531 BLAKE2B bb80b35e9ee409319f2179d9d899d5c3364dc56db33f241d1881723a29bb16ad7f8ebff99c348163a17b0a3c27fa9de086a465b99d7d0f6866c7e0198018dd19 SHA512 9c37a9e9086300d93e2e462f3de52bb0f4985ae6b52790d54327b5eeeb71bab91afcff2db39091919d43fdb46c1399f18bfd97b8ac72157dd8f7eab53d373483
-EBUILD ardour-6.3.ebuild 4420 BLAKE2B b4d034279e29e9db62c0c890e28b216c44c37697b57f51c5f5a4db0f5ed3e3b1bd0432f3022a0e4179fe8df7cd7792b7362af88b8aecb58998d9c3db228b9383 SHA512 45b0ab3bf7e5fc8e27e7d6c0520b324d52f546ec3831dc4cf66203d37f4361b9c4851092f7ddbd77069eddca4f73de3b81f4c03bff65c53eb41c59dea0b5dbcb
-EBUILD ardour-9999.ebuild 4200 BLAKE2B cc1cc69ddb90f45526ad638f551b266a4742525634386cc24c48cbcd30986ec9c1c2e2cb6ebc88c654ae94e13583dc8dfda6491ef7110799d3aa8987fb9597b1 SHA512 863550b9a61b77aa128fe30d4772c2a2b6394d8cb3eddcd24da792ab94f788c0743c18d431cd055ac21a7bd1bfe976f94651721dfc87a9cf8654b3d83f2543a7
+DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
+EBUILD ardour-6.3.ebuild 4419 BLAKE2B d8ec8546041eb45e1aef45b41139af34e427d06094cf2cb852188e362f694283e24ccdb9d54d1a9767325755c5d243935eae05aaec1e1021decf3fd8107bf83c SHA512 8bfa2d6eec80d481544abd581ccbd8295d980a13569e2263534e412b25a83f70dd5908f099558844e13340d287d14432433a273cb9239b31388ebc45b6ea80eb
+EBUILD ardour-6.5.ebuild 4310 BLAKE2B b225682af4b2313a1b19d1783213e697db309087035342badbb16a859182a2dce8f2552ba1cc5aaccae230a28513e14050701a7bcdbb62a274c351be1b0a035e SHA512 ffc827acc249c59c0d9db99e0043ec4aeb99fb9caafc47f13e7a24d8fea0cce3375efba72ccc321f3e5a92f19309557c83a09ae7a9c3916507a47af8b0f52e6a
+EBUILD ardour-9999.ebuild 4090 BLAKE2B c3da061eefaee34c10f45e19c8d52be1a1de40fd2cc56f8668aabf932d7f18807dbc16885307548f77dc5c5007e6a30810636473d92f9c7d625c229675abbbcc SHA512 f527f0fce3f64cabf7be4555cb9bac3cb346eec8b25125c6a15449486b8449e30ac476fb315edf00d2cf4284aab7953f7df42e3d944a3b5d84736063b8b517eb
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
index 75cb0848c611..fa0b243c2ab8 100644
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -8,13 +8,13 @@ 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
 
 DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
+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"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.5.ebuild
index 735fd6555384..1630d2192905 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.5.ebuild
@@ -8,13 +8,13 @@ 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
 
 DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
+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"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
@@ -24,13 +24,13 @@ 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.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-cpp/glibmm
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
+	dev-libs/glib:2
 	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
 	media-libs/freetype:2
 	media-libs/libart_lgpl
 	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
 	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
+	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.8.1:2
+	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-0.6.10
-	>=media-libs/lv2-1.4.0"
-#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
+	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}
@@ -70,11 +70,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-no-nls.patch"
-	"${FILESDIR}/${P}-use-signed-int-for-atomic-operations.patch"
-)
-
 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"
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 9e5b5ec26e19..b4637a515b8a 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -8,7 +8,7 @@ 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
 
 DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
+HOMEPAGE="https://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
@@ -24,13 +24,13 @@ 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.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-cpp/glibmm
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
+	dev-libs/glib:2
 	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
 	media-libs/freetype:2
 	media-libs/libart_lgpl
 	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
 	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
+	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.8.1:2
+	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-0.6.10
-	>=media-libs/lv2-1.4.0"
-#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
+	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}
diff --git a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch b/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
deleted file mode 100644
index cc03d0baff50..000000000000
--- a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
+++ /dev/null
@@ -1,474 +0,0 @@
-From fcd347fe0c11e8e04aebc086da328921f54b947f Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Wed, 19 Aug 2020 17:39:32 +0200
-Subject: [PATCH 1/2] Fix --no-nls, i18n include order in libs -- #8361
-
-Ardour's "pbd/i18n.h" needs to be included last,
-after any include that may indirectly pull in getext or libintl.
-
-For that reason "pbd/i18n.h" must not be used in header files either.
----
- libs/ardour/ardour/disk_reader.h                           | 7 +------
- libs/ardour/ardour/disk_writer.h                           | 4 +---
- libs/ardour/ardour/transport_master.h                      | 3 +--
- libs/ardour/disk_reader.cc                                 | 6 ++++++
- libs/ardour/disk_writer.cc                                 | 6 ++++++
- libs/ardour/port.cc                                        | 3 ++-
- libs/ardour/port_engine_shared.cc                          | 3 ++-
- libs/ardour/region.cc                                      | 3 ++-
- libs/ardour/transport_fsm.cc                               | 3 ++-
- libs/ardour/transport_master.cc                            | 2 +-
- libs/surfaces/contourdesign/button_config_widget.cc        | 3 ++-
- libs/surfaces/contourdesign/contourdesign_gui.cc           | 4 ++--
- libs/surfaces/contourdesign/jump_distance_widget.cc        | 2 +-
- .../surfaces/generic_midi/generic_midi_control_protocol.cc | 3 ++-
- 14 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
-index 724c091b3..d9773bbeb 100644
---- a/libs/ardour/ardour/disk_reader.h
-+++ b/libs/ardour/ardour/disk_reader.h
-@@ -22,8 +22,6 @@
- 
- #include <boost/optional.hpp>
- 
--#include "pbd/i18n.h"
--
- #include "evoral/Curve.h"
- 
- #include "ardour/disk_io.h"
-@@ -46,10 +44,7 @@ public:
- 
- 	bool set_name (std::string const& str);
- 
--	std::string display_name () const
--	{
--		return std::string (_("player"));
--	}
-+	std::string display_name () const;
- 
- 	static samplecnt_t chunk_samples ()
- 	{
-diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
-index 2bd753a00..511b6bc4f 100644
---- a/libs/ardour/ardour/disk_writer.h
-+++ b/libs/ardour/ardour/disk_writer.h
-@@ -23,8 +23,6 @@
- #include <list>
- #include <vector>
- 
--#include "pbd/i18n.h"
--
- #include "ardour/disk_io.h"
- #include "ardour/midi_buffer.h"
- 
-@@ -42,7 +40,7 @@ public:
- 	~DiskWriter ();
- 
- 	bool set_name (std::string const& str);
--	std::string display_name () const { return std::string (_ ("recorder")); }
-+	std::string display_name () const;
- 
- 	bool recordable () const { return _flags & Recordable; }
- 
-diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h
-index d6b554ef8..af98c0b3a 100644
---- a/libs/ardour/ardour/transport_master.h
-+++ b/libs/ardour/ardour/transport_master.h
-@@ -29,7 +29,6 @@
- 
- #include <ltc.h>
- 
--#include "pbd/i18n.h"
- #include "pbd/properties.h"
- #include "pbd/signals.h"
- #include "pbd/statefuldestructible.h"
-@@ -123,7 +122,7 @@ struct LIBARDOUR_API SafeTime {
- 
- 		do {
- 			if (tries == 10) {
--				std::cerr << X_("SafeTime: atomic read of current time failed, sleeping!") << std::endl;
-+				std::cerr << "SafeTime: atomic read of current time failed, sleeping!" << std::endl;
- 				Glib::usleep (20);
- 				tries = 0;
- 			}
-diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
-index 252a84a65..5fa694485 100644
---- a/libs/ardour/disk_reader.cc
-+++ b/libs/ardour/disk_reader.cc
-@@ -76,6 +76,12 @@ DiskReader::~DiskReader ()
- 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskReader %1 @ %2 deleted\n", _name, this));
- }
- 
-+std::string
-+DiskReader::display_name () const
-+{
-+	return std::string (_("player"));
-+}
-+
- void
- DiskReader::ReaderChannelInfo::resize (samplecnt_t bufsize)
- {
-diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
-index aee4f9301..34aa3f1e9 100644
---- a/libs/ardour/disk_writer.cc
-+++ b/libs/ardour/disk_writer.cc
-@@ -85,6 +85,12 @@ DiskWriter::default_chunk_samples ()
- 	return 65536;
- }
- 
-+std::string
-+DiskWriter::display_name () const
-+{
-+	return std::string (_ ("recorder"));
-+}
-+
- void
- DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize)
- {
-diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
-index 9bc318a14..8be47efbd 100644
---- a/libs/ardour/port.cc
-+++ b/libs/ardour/port.cc
-@@ -26,7 +26,6 @@
- #include "pbd/compose.h"
- #include "pbd/error.h"
- #include "pbd/failed_constructor.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/debug.h"
-@@ -34,6 +33,8 @@
- #include "ardour/port_engine.h"
- #include "ardour/rc_configuration.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/libs/ardour/port_engine_shared.cc b/libs/ardour/port_engine_shared.cc
-index f8ab0e204..ad32762f0 100644
---- a/libs/ardour/port_engine_shared.cc
-+++ b/libs/ardour/port_engine_shared.cc
-@@ -21,10 +21,11 @@
- #include <regex.h>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/port_engine_shared.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- 
- BackendPort::BackendPort (PortEngineSharedImpl &b, const std::string& name, PortFlags flags)
-diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
-index cb42f1d2c..ab6042af3 100644
---- a/libs/ardour/region.cc
-+++ b/libs/ardour/region.cc
-@@ -30,7 +30,6 @@
- 
- #include <glibmm/threads.h>
- 
--#include "pbd/i18n.h"
- #include "pbd/types_convert.h"
- #include "pbd/xml++.h"
- 
-@@ -47,6 +46,8 @@
- #include "ardour/transient_detector.h"
- #include "ardour/types_convert.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc
-index 484106785..59de3d1de 100644
---- a/libs/ardour/transport_fsm.cc
-+++ b/libs/ardour/transport_fsm.cc
-@@ -22,7 +22,6 @@
- #include <boost/none.hpp>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- #include "pbd/pthread_utils.h"
- #include "pbd/stacktrace.h"
- 
-@@ -31,6 +30,8 @@
- #include "ardour/session.h"
- #include "ardour/transport_fsm.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- 
-diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
-index ea56a860b..e76fd5eb6 100644
---- a/libs/ardour/transport_master.cc
-+++ b/libs/ardour/transport_master.cc
-@@ -21,7 +21,6 @@
- 
- #include "pbd/boost_debug.h"
- #include "pbd/debug.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/debug.h"
-@@ -32,6 +31,7 @@
- #include "ardour/types_convert.h"
- #include "ardour/utils.h"
- 
-+#include "pbd/i18n.h"
- 
- namespace ARDOUR {
- 	namespace Properties {
-diff --git a/libs/surfaces/contourdesign/button_config_widget.cc b/libs/surfaces/contourdesign/button_config_widget.cc
-index 785c8c6b1..f46f80f12 100644
---- a/libs/surfaces/contourdesign/button_config_widget.cc
-+++ b/libs/surfaces/contourdesign/button_config_widget.cc
-@@ -24,12 +24,13 @@
- #include "gtkmm2ext/actions.h"
- #include "gtkmm2ext/action_model.h"
- 
--#include "pbd/i18n.h"
- #include "pbd/strsplit.h"
- #include "pbd/signals.h"
- 
- #include "button_config_widget.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace Gtk;
- using namespace ArdourSurface;
-diff --git a/libs/surfaces/contourdesign/contourdesign_gui.cc b/libs/surfaces/contourdesign/contourdesign_gui.cc
-index 3d061b060..ed58c787d 100644
---- a/libs/surfaces/contourdesign/contourdesign_gui.cc
-+++ b/libs/surfaces/contourdesign/contourdesign_gui.cc
-@@ -37,12 +37,12 @@
- 
- #include "widgets/ardour_button.h"
- 
--#include "pbd/i18n.h"
--
- #include "contourdesign.h"
- #include "jump_distance_widget.h"
- #include "button_config_widget.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ArdourSurface;
- 
- class ContourDesignGUI : public Gtk::VBox, public PBD::ScopedConnectionList
-diff --git a/libs/surfaces/contourdesign/jump_distance_widget.cc b/libs/surfaces/contourdesign/jump_distance_widget.cc
-index 8469658a1..dacc3a752 100644
---- a/libs/surfaces/contourdesign/jump_distance_widget.cc
-+++ b/libs/surfaces/contourdesign/jump_distance_widget.cc
-@@ -21,10 +21,10 @@
- #include <gtkmm/spinbutton.h>
- 
- #include "gtkmm2ext/utils.h"
--#include "pbd/i18n.h"
- 
- #include "jump_distance_widget.h"
- 
-+#include "pbd/i18n.h"
- 
- using namespace std;
- using namespace Gtk;
-diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-index c5ba0b794..31e5383dc 100644
---- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-@@ -41,7 +41,6 @@
- #include "pbd/error.h"
- #include "pbd/failed_constructor.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/strsplit.h"
- #include "pbd/types_convert.h"
- #include "pbd/xml++.h"
-@@ -66,6 +65,8 @@
- 
- #include "pbd/abstract_ui.cc" // instantiate template
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Glib;
--- 
-2.28.0
-
-
-From a7a20e03ffc61e444c188411da0d3afa1d14548a Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Wed, 19 Aug 2020 17:40:02 +0200
-Subject: [PATCH 2/2] Fix --no-nls, i18n include order in UI -- #8361
-
----
- gtk2_ardour/ardour_ui_access_web.cc | 3 ++-
- gtk2_ardour/ardour_ui_dependents.cc | 3 ++-
- gtk2_ardour/pt_import_selector.cc   | 3 ++-
- gtk2_ardour/startup_fsm.cc          | 3 ++-
- gtk2_ardour/template_dialog.cc      | 4 ++--
- gtk2_ardour/transport_control.cc    | 4 ++--
- session_utils/fix_bbtppq.cc         | 3 ++-
- 7 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/gtk2_ardour/ardour_ui_access_web.cc b/gtk2_ardour/ardour_ui_access_web.cc
-index 7986e2ca3..781b65262 100644
---- a/gtk2_ardour/ardour_ui_access_web.cc
-+++ b/gtk2_ardour/ardour_ui_access_web.cc
-@@ -36,12 +36,13 @@
- #include "gtk2ardour-version.h"
- #endif
- 
--#include "pbd/i18n.h"
- #include "pbd/openuri.h"
- 
- #include "ardour_message.h"
- #include "ardour_ui.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Gtk;
-diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
-index d28ae7c14..24810d3e7 100644
---- a/gtk2_ardour/ardour_ui_dependents.cc
-+++ b/gtk2_ardour/ardour_ui_dependents.cc
-@@ -33,7 +33,6 @@
- #include <cstdio>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/session.h"
- #include "ardour/lv2_plugin.h"
-@@ -62,6 +61,8 @@
- #include <gdk/gdkx.h>
- #endif
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- using namespace PBD;
- 
-diff --git a/gtk2_ardour/pt_import_selector.cc b/gtk2_ardour/pt_import_selector.cc
-index da65bcb72..318da1e35 100644
---- a/gtk2_ardour/pt_import_selector.cc
-+++ b/gtk2_ardour/pt_import_selector.cc
-@@ -22,7 +22,6 @@
- #include <iostream>
- 
- #include "pbd/gstdio_compat.h"
--#include "pbd/i18n.h"
- #include "pbd/file_utils.h"
- 
- #include "ptformat/ptformat.h"
-@@ -33,6 +32,8 @@
- 
- #include "pt_import_selector.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc
-index c52b0ecea..dfdd01ce4 100644
---- a/gtk2_ardour/startup_fsm.cc
-+++ b/gtk2_ardour/startup_fsm.cc
-@@ -26,7 +26,6 @@
- #include "pbd/basename.h"
- #include "pbd/file_archive.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/filename_extensions.h"
-@@ -58,6 +57,8 @@
- #include "gtk2ardour-version.h"
- #endif
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace Gtk;
- using namespace Gtkmm2ext;
-diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
-index e0c5590ee..c9c37d00e 100644
---- a/gtk2_ardour/template_dialog.cc
-+++ b/gtk2_ardour/template_dialog.cc
-@@ -40,7 +40,6 @@
- #include "pbd/error.h"
- #include "pbd/file_archive.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/xml++.h"
- 
- #include "gtkmm2ext/gui_thread.h"
-@@ -52,9 +51,10 @@
- #include "ardour/template_utils.h"
- 
- #include "progress_reporter.h"
--
- #include "template_dialog.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace Gtk;
- using namespace PBD;
-diff --git a/gtk2_ardour/transport_control.cc b/gtk2_ardour/transport_control.cc
-index a7be5903d..0828febb6 100644
---- a/gtk2_ardour/transport_control.cc
-+++ b/gtk2_ardour/transport_control.cc
-@@ -16,8 +16,6 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
--#include "pbd/i18n.h"
--
- #include "ardour/location.h"
- #include "ardour/session.h"
- 
-@@ -25,6 +23,8 @@
- #include "ardour_ui.h"
- #include "transport_control.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- 
- TransportControlProvider::TransportControlProvider ()
-diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc
-index e3767c8cd..81b148bcc 100644
---- a/session_utils/fix_bbtppq.cc
-+++ b/session_utils/fix_bbtppq.cc
-@@ -25,7 +25,6 @@
- #include <glibmm.h>
- 
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/stateful.h"
- 
- #include "ardour/region_factory.h"
-@@ -44,6 +43,8 @@
- 
- #include "common.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace SessionUtils;
--- 
-2.28.0
-
diff --git a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch b/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
deleted file mode 100644
index 90454593b68d..000000000000
--- a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6d950d15ba5192a86c57d8045d1d26f9ad4be0db Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Thu, 16 Jul 2020 16:13:21 +0200
-Subject: [PATCH] Use signed int for atomic operations -- #8314
-
----
- libs/pbd/pbd/mpmc_queue.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libs/pbd/pbd/mpmc_queue.h b/libs/pbd/pbd/mpmc_queue.h
-index a7909a901..2c08068e1 100644
---- a/libs/pbd/pbd/mpmc_queue.h
-+++ b/libs/pbd/pbd/mpmc_queue.h
-@@ -82,7 +82,7 @@ public:
- 	push_back (T const& data)
- 	{
- 		cell_t* cell;
--		guint   pos = g_atomic_int_get (&_enqueue_pos);
-+		gint    pos = g_atomic_int_get (&_enqueue_pos);
- 		for (;;) {
- 			cell         = &_buffer[pos & _buffer_mask];
- 			guint    seq = g_atomic_int_get (&cell->_sequence);
-@@ -108,7 +108,7 @@ public:
- 	pop_front (T& data)
- 	{
- 		cell_t* cell;
--		guint   pos = g_atomic_int_get (&_dequeue_pos);
-+		gint    pos = g_atomic_int_get (&_dequeue_pos);
- 		for (;;) {
- 			cell         = &_buffer[pos & _buffer_mask];
- 			guint    seq = g_atomic_int_get (&cell->_sequence);
-@@ -138,8 +138,8 @@ private:
- 	cell_t* _buffer;
- 	size_t  _buffer_mask;
- 
--	volatile guint _enqueue_pos;
--	volatile guint _dequeue_pos;
-+	volatile gint _enqueue_pos;
-+	volatile gint _dequeue_pos;
- };
- 
- } /* end namespace */
--- 
-2.28.0
-
-From 9fcb51de2e34f9fee74838e57317ad44d21c40d0 Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Thu, 16 Jul 2020 18:07:14 +0200
-Subject: [PATCH] Use signed int for atomic operations part II -- #8314
-
----
- libs/ardour/ardour/session.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
-index dcc8c88ed..f491f7f17 100644
---- a/libs/ardour/ardour/session.h
-+++ b/libs/ardour/ardour/session.h
-@@ -1762,7 +1762,7 @@ private:
- 		OnlyLoop,
- 	};
- 
--	volatile guint _punch_or_loop; // enum PunchLoopLock
-+	volatile gint _punch_or_loop; // enum PunchLoopLock
- 	gint current_usecs_per_track;
- 
- 	bool punch_active () const;
--- 
-2.28.0
diff --git a/media-sound/aucdtect/Manifest b/media-sound/aucdtect/Manifest
index a32c8e38cfea..f4b08b4e1557 100644
--- a/media-sound/aucdtect/Manifest
+++ b/media-sound/aucdtect/Manifest
@@ -1,3 +1,3 @@
 DIST aucdtect-0.8.2.rpm 221616 BLAKE2B b1440c690b40cfb014ee1fd3d8fbf2b3c18ff7f09caca282bbabd594ecf8a13244f51eb711f231e63f1489d33b3ae29bc5e13b5abe20ec961f745ac60bd0c6f8 SHA512 9d7ff78915bb110e93907d74abc9201316927f80919c33617d7204027556ae30bdb358f90ce7688e4d02b4ac007b04409185c93ef59ed3212b6db2f55ee83d43
-EBUILD aucdtect-0.8.2-r1.ebuild 551 BLAKE2B 5ebc48019b839d31d300822ca050b153de5ce8cd0ae15bec0f9fdec71680212b531c6bd12260ba028b2ef805fbf555c0636732703c4f2354890eb3c69927691e SHA512 cf4e3d573eb5d453a05f9fa7bdf64991e7db139fac770d72103378dc5bc2e9d434c0ff3c15fa42d5621dcabb198c08747a99ae449a640a45d0650b186019b771
+EBUILD aucdtect-0.8.2-r1.ebuild 507 BLAKE2B e14fdbc1099f861b2a8ec0585b5fdbad2b426f0e790368308b4fcafb71ff4aa5855a7bf40ba2fa2afafa4a6bf0c301122483a4c75d85098474b601a776c16f88 SHA512 f2b677605442a85e063e42a299a5bf8cee99e60c6604bd10f88b80845f0c47b79ba1c461c7257d1c5b155cf86f7354383ebbd199f00b3e2c3d8d6628470a62e7
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild b/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
index 8bdbe7a48d9d..a8ef9d25a203 100644
--- a/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
+++ b/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit rpm versionator
+inherit rpm
 
-MY_PV=$(replace_version_separator 2 '-')
+MY_PV=$(ver_rs 2 '-')
 MY_P="${PN}-${MY_PV}"
 MY_PN="${PN/cd/CD}"
 
@@ -16,7 +16,6 @@ SRC_URI="http://en.true-audio.com/ftp/${MY_P}.i586.rpm -> ${P}.rpm"
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 S="${WORKDIR}/usr/local/bin"
 
@@ -24,5 +23,5 @@ QA_PREBUILT="opt/bin/.*"
 
 src_install() {
 	into /opt
-	dobin "${MY_PN}"
+	dobin auCDtect
 }
diff --git a/media-sound/aylet/Manifest b/media-sound/aylet/Manifest
index d90b90ba723a..6dbb72420155 100644
--- a/media-sound/aylet/Manifest
+++ b/media-sound/aylet/Manifest
@@ -1,4 +1,4 @@
 AUX aylet-0.5-gtk.patch 7850 BLAKE2B 9fcfc205b0bf76d6e9e2ed6c29074f18ee7d8f78060786ca2a2a102e04cb544877ab3a3ba347045d462f9ef61186fbffbbb7a03b83f1b06ffcd8203cc6e7867f SHA512 e35bcdf111e5b819cd286e22d30bd45522fb3672de1fd841aa3dee7b0556927a912f17ab84bcad21a765bcda452ca20621a60e165db7ac38a9dff209953acf88
 DIST aylet-0.5.tar.gz 43577 BLAKE2B a2de806d690fd039cadc2b735757d6de93e175914de961f8a5f0f6e96c01396b9a345cbb9925eca1fb97ea84979074c4ac6263f00c74163bc066f92d8858c0d9 SHA512 9f45982bdd18f4b9d001cd8681132b89a8fa379fd4f64131d00c749975308e9d9f7fb29c196448c60d07273f36295d9b85093a542a0993c184dec411c7fbb7f7
-EBUILD aylet-0.5.ebuild 848 BLAKE2B f39c7deb3bdceac5b1ed2640979375d657bf353c44fdb6fdd66af089ccefce81d2636d880504d657cb823e4549d39e211bc94dd98b0f88614e50055e6ff18f48 SHA512 f9d914e92ce725f8615b039e2827838dd5d6f8a4a1de3e3316b863dd541ba013dabe025f9c36c90eee018beafec470d0facbe668790f5346cce87b93423bd467
+EBUILD aylet-0.5.ebuild 837 BLAKE2B 17dc2834dcbe2f20edb98572ab753b574ed1355d4051dc1b0b2768cfa9953e3839e2e07276d4ba3f7b2c939a616f776e3ab9fb66463cf424953cae73ef3c23ee SHA512 ffdecbfedadae750305b9a535687542d156e29f98910dedc7e2b53b511d974a5173565e2623726cbc3d76709ca00b4b30c4e147a27f1f7a5c336707af6a514b2
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/aylet/aylet-0.5.ebuild b/media-sound/aylet/aylet-0.5.ebuild
index 05c703dca0f4..bab06f882fe1 100644
--- a/media-sound/aylet/aylet-0.5.ebuild
+++ b/media-sound/aylet/aylet-0.5.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Aylet plays music files in the .ay format"
 HOMEPAGE="http://rus.members.beeb.net/aylet.html"
@@ -13,28 +14,29 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="gtk"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="
+	sys-libs/ncurses:=
 	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gtk.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gtk.patch )
 
 src_compile() {
 	tc-export CC PKG_CONFIG
 
-	emake ${PN} CURSES_LIB="$( ${PKG_CONFIG} --libs ncurses)"
+	emake aylet CURSES_LIB="$(${PKG_CONFIG} --libs ncurses)"
 	use gtk && emake gtk2
 }
 
 src_install() {
-	dobin ${PN}
-	use gtk && dobin x${PN}
+	dobin aylet
+	use gtk && dobin xaylet
 
-	doman ${PN}.1
-	use gtk && echo '.so aylet.1' > "${D}"/usr/share/man/man1/xaylet.1
+	doman aylet.1
+	if use gtk; then
+		echo '.so aylet.1' > "${ED}"/usr/share/man/man1/xaylet.1 || die
+	fi
 
-	dodoc ChangeLog NEWS README TODO
+	einstalldocs
 }
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index a67a08d6db5d..27daa109b4dc 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,10 +1,7 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cdf2b790dfa63e03c039cd507b7e6d254a8109bcfda9d82dc3b9d0b42b404c375f73431d701c1ae380 SHA512 b268dea4662dcd8488a7c787d5e14a6bdb2208fa3db573ae6c71ff96906be4d1b43f98c8a7fd0f8bbe2b95b9493cf1306aac48e675c0635ce03c267c2abd63c1
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
-AUX bluez-alsa-2.1.0-gcc10.patch 4802 BLAKE2B f57c2920deaec93bf57e56440c20f01a23e58300e062f9d8f83b56719cbc8620dfac8e1420639db7cabc589a231e9f33ff6f2de6e8ad7ba9b2d9b2c18fa35b32 SHA512 e26c4cf6b4184c99ba85f9640f5f5db38ae66999560147af91aff1d9aebb10ef534dd631f8a8421164431401ee2a35da529c298deff6b955bd6747fc7a9f5605
-DIST bluez-alsa-2.1.0.tar.gz 129650 BLAKE2B 6ab1b618828b5ad6f35c62a711cd24a51536ae4e013227addff8193bb522e0e7322d054fa8e688b5322ec59f6d08a654760ebb5792a637fa11536afc41c5dba5 SHA512 8b6d520f5733799b1c509052ac527377cbe5e0106b75180f783f83071246937b5dc7a22c2d27f3e9e331c52c74be59f3bc6d78caab97b41f06cfd6ed5191b584
 DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
-EBUILD bluez-alsa-2.1.0-r1.ebuild 2105 BLAKE2B 6afd74d6e52478e52201bebf5b9a9991d8106488f090049361771824912f475f02653b8b8e56718a559fcd0135a1a0191d0bfe86bb66a40684f0c1ef138a478f SHA512 0e822dc45450a35fad11568875d45908e0db49bdf9fa21fe205481cbd1189902d900e808a6ede91b56ab7f5fb6c3e7a138fb9cde2b15e1e43fa1636c2aa98362
-EBUILD bluez-alsa-3.0.0.ebuild 2411 BLAKE2B ccccdb60eb19beb197eefd666298e63ba80df644179b0fdb08ca3555dac165393b416799e0b9d02489c6fb33cc2c9faa4096d90a15c182acd68a1e076c33e2b0 SHA512 6b2693c9de7acf55c4f614df6a24d3eda0180da00f951b9c8cf58ce4e14e3e33fb662c595cf07309d094188e3d59f177ea997b1a6c0a709148c5c14875124952
-EBUILD bluez-alsa-9999.ebuild 2411 BLAKE2B ccccdb60eb19beb197eefd666298e63ba80df644179b0fdb08ca3555dac165393b416799e0b9d02489c6fb33cc2c9faa4096d90a15c182acd68a1e076c33e2b0 SHA512 6b2693c9de7acf55c4f614df6a24d3eda0180da00f951b9c8cf58ce4e14e3e33fb662c595cf07309d094188e3d59f177ea997b1a6c0a709148c5c14875124952
+EBUILD bluez-alsa-3.0.0.ebuild 2406 BLAKE2B 68c8643f6084d40405f7888f84b56914c9a1c0e4310168bf373755b07898ca70bed4dc8231a22bd60560b3918ebc34d8bc5b1e6eb8e301d000786686f206a232 SHA512 8ac1d87dcc0c33646529363256cbcac8abdc1a3d29e1204044182eba99ea3c1db682ef719b73b5e349277e0d3a41b62becd6b31cf211b9292c1e4b7bf25034ee
+EBUILD bluez-alsa-9999.ebuild 2406 BLAKE2B 68c8643f6084d40405f7888f84b56914c9a1c0e4310168bf373755b07898ca70bed4dc8231a22bd60560b3918ebc34d8bc5b1e6eb8e301d000786686f206a232 SHA512 8ac1d87dcc0c33646529363256cbcac8abdc1a3d29e1204044182eba99ea3c1db682ef719b73b5e349277e0d3a41b62becd6b31cf211b9292c1e4b7bf25034ee
 MISC metadata.xml 780 BLAKE2B ac2e3d17efbdf9a80db3e6b58b47438931483a3ea4de163d171ee03157bb1d940d4b720b63d645011bb5cdfd89ef05574593501f79402cf5d64e1d19138231f6 SHA512 e6a7a33cf5da26f96d49bad352a26ae08665ade39ac1b676c1a4dcbd815116ce65fa5f9d788ec668e393a4c1fe3a4d6092a3d9a8c8404eed6017dfaa3afbfd29
diff --git a/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
deleted file mode 100644
index f654ac56596f..000000000000
--- a/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal systemd
-
-DESCRIPTION="Bluetooth Audio ALSA Backend"
-HOMEPAGE="https://github.com/Arkq/bluez-alsa"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="aac debug hcitop ldac ofono static-libs test upower"
-RESTRICT="!test? ( test )"
-
-# bluez-alsa does not directly link to upower but
-# is using the upower interface via dbus calls.
-RDEPEND="
-	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
-	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
-	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
-	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
-	hcitop? (
-		dev-libs/libbsd
-		sys-libs/ncurses:0=
-	)
-	ldac? ( >=media-libs/libldac-2.0.0 )
-	upower? ( sys-power/upower )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch" #706680
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-rfcomm
-		$(use_enable aac)
-		$(use_enable debug)
-		$(use_enable ofono)
-		$(use_enable static-libs static)
-		$(use_enable test)
-		$(multilib_native_use_enable hcitop)
-		$(multilib_native_use_enable ldac)
-		$(multilib_native_use_enable upower)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
-	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-	systemd_dounit "${FILESDIR}"/bluealsa.service
-
-	# Add config file to alsa datadir as well to preserve changes in /etc
-	insinto "/usr/share/alsa/alsa.conf.d/"
-	doins "src/asound/20-bluealsa.conf"
-}
-
-pkg_postinst() {
-	elog "Users can use this service when they are members of the \"audio\" group."
-}
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 3ab8343e3815..c8620648df98 100644
--- a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 # bluez-alsa does not directly link to upower but
 # is using the upower interface via dbus calls.
 RDEPEND="
-	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 3ab8343e3815..c8620648df98 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 # bluez-alsa does not directly link to upower but
 # is using the upower interface via dbus calls.
 RDEPEND="
-	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch b/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch
deleted file mode 100644
index df8e148842e2..000000000000
--- a/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 450ba2c898303cea2cba9a5efa99c7d919fc9e55 Mon Sep 17 00:00:00 2001
-From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
-Date: Sun, 9 Feb 2020 22:26:16 +0100
-Subject: [PATCH] Fix linkage - mark external variable as extern
-
----
- src/bluealsa-iface.h | 6 +++---
- src/bluez-a2dp.h     | 4 ++--
- src/bluez-iface.h    | 6 +++---
- src/ofono-iface.h    | 4 ++--
- test/server-mock.c   | 1 +
- test/test-ba.c       | 1 +
- test/test-io.c       | 1 +
- test/test-rfcomm.c   | 1 +
- 8 files changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/bluealsa-iface.h b/src/bluealsa-iface.h
-index 262fb76..1d3366d 100644
---- a/src/bluealsa-iface.h
-+++ b/src/bluealsa-iface.h
-@@ -32,8 +32,8 @@
- #define BLUEALSA_RFCOMM_MODE_HSP_AG "HSP-AG"
- #define BLUEALSA_RFCOMM_MODE_HSP_HS "HSP-HS"
- 
--const GDBusInterfaceInfo bluealsa_iface_manager;
--const GDBusInterfaceInfo bluealsa_iface_pcm;
--const GDBusInterfaceInfo bluealsa_iface_rfcomm;
-+extern const GDBusInterfaceInfo bluealsa_iface_manager;
-+extern const GDBusInterfaceInfo bluealsa_iface_pcm;
-+extern const GDBusInterfaceInfo bluealsa_iface_rfcomm;
- 
- #endif
-diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h
-index 7c0e33b..4a695d9 100644
---- a/src/bluez-a2dp.h
-+++ b/src/bluez-a2dp.h
-@@ -1,6 +1,6 @@
- /*
-  * BlueALSA - bluez-a2dp.h
-- * Copyright (c) 2016-2019 Arkadiusz Bokowy
-+ * Copyright (c) 2016-2020 Arkadiusz Bokowy
-  *
-  * This file is a part of bluez-alsa.
-  *
-@@ -58,6 +58,6 @@ struct bluez_a2dp_codec {
- };
- 
- /* NULL-terminated list of available A2DP codecs */
--const struct bluez_a2dp_codec **bluez_a2dp_codecs;
-+extern const struct bluez_a2dp_codec **bluez_a2dp_codecs;
- 
- #endif
-diff --git a/src/bluez-iface.h b/src/bluez-iface.h
-index 34269c5..ca8fba5 100644
---- a/src/bluez-iface.h
-+++ b/src/bluez-iface.h
-@@ -1,6 +1,6 @@
- /*
-  * BlueALSA - bluez-iface.h
-- * Copyright (c) 2016-2019 Arkadiusz Bokowy
-+ * Copyright (c) 2016-2020 Arkadiusz Bokowy
-  *
-  * This file is a part of bluez-alsa.
-  *
-@@ -27,7 +27,7 @@
- #define BLUEZ_TRANSPORT_STATE_PENDING "pending"
- #define BLUEZ_TRANSPORT_STATE_ACTIVE  "active"
- 
--const GDBusInterfaceInfo bluez_iface_endpoint;
--const GDBusInterfaceInfo bluez_iface_profile;
-+extern const GDBusInterfaceInfo bluez_iface_endpoint;
-+extern const GDBusInterfaceInfo bluez_iface_profile;
- 
- #endif
-diff --git a/src/ofono-iface.h b/src/ofono-iface.h
-index d5a6715..d5b9065 100644
---- a/src/ofono-iface.h
-+++ b/src/ofono-iface.h
-@@ -1,6 +1,6 @@
- /*
-  * BlueALSA - ofono-iface.h
-- * Copyright (c) 2016-2019 Arkadiusz Bokowy
-+ * Copyright (c) 2016-2020 Arkadiusz Bokowy
-  *               2018 Thierry Bultel
-  *
-  * This file is a part of bluez-alsa.
-@@ -27,6 +27,6 @@
- #define OFONO_AUDIO_CODEC_CVSD 0x01
- #define OFONO_AUDIO_CODEC_MSBC 0x02
- 
--const GDBusInterfaceInfo ofono_iface_hf_audio_agent;
-+extern const GDBusInterfaceInfo ofono_iface_hf_audio_agent;
- 
- #endif
-diff --git a/test/server-mock.c b/test/server-mock.c
-index 34934e8..a42e845 100644
---- a/test/server-mock.c
-+++ b/test/server-mock.c
-@@ -36,6 +36,7 @@
- #include "../src/ba-adapter.c"
- #include "../src/ba-device.c"
- #include "../src/ba-transport.c"
-+#include "../src/bluez-a2dp.c"
- #include "../src/hci.c"
- #include "../src/msbc.c"
- #include "../src/rfcomm.c"
-diff --git a/test/test-ba.c b/test/test-ba.c
-index f9eb145..97d57d6 100644
---- a/test/test-ba.c
-+++ b/test/test-ba.c
-@@ -22,6 +22,7 @@
- #include "../src/utils.c"
- #include "../src/shared/log.c"
- 
-+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL;
- int a2dp_thread_create(struct ba_transport *t) { (void)t; return 0; }
- void *rfcomm_thread(struct ba_transport *t) { (void)t; return 0; }
- void *sco_thread(struct ba_transport *t) { (void)t; return 0; }
-diff --git a/test/test-io.c b/test/test-io.c
-index 9dbd0e9..85d3fe7 100644
---- a/test/test-io.c
-+++ b/test/test-io.c
-@@ -33,6 +33,7 @@
- #include "../src/shared/log.c"
- #include "../src/shared/rt.c"
- 
-+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL;
- unsigned int bluealsa_dbus_pcm_register(struct ba_transport *t, GError **error) {
- 	debug("%s: %p", __func__, (void *)t); (void)error; return 0; }
- void bluealsa_dbus_pcm_update(struct ba_transport *t, unsigned int mask) {
-diff --git a/test/test-rfcomm.c b/test/test-rfcomm.c
-index d14a7bd..248939f 100644
---- a/test/test-rfcomm.c
-+++ b/test/test-rfcomm.c
-@@ -34,6 +34,7 @@ static pthread_mutex_t transport_codec_updated_mtx = PTHREAD_MUTEX_INITIALIZER;
- static pthread_cond_t transport_codec_updated = PTHREAD_COND_INITIALIZER;
- static unsigned int transport_codec_updated_cnt = 0;
- 
-+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL;
- unsigned int bluealsa_dbus_pcm_register(struct ba_transport *t, GError **error) {
- 	debug("%s: %p", __func__, (void *)t); (void)error; return 0; }
- void bluealsa_dbus_pcm_update(struct ba_transport *t, unsigned int mask) {
--- 
-2.24.1
-
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index 8333ad3ef6aa..2decf2dc66e3 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -3,5 +3,5 @@ AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6f
 AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8092b20d8c596ab2118fd862bc32e0f3fa55ceee488cc88d4599f22b4b373d67c2af3ea189f3508e30564ffc71acb5e812a1 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341
 AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 967 BLAKE2B 9da2f53f06e4db83c5fe280e3253c70a83e052304c9e5adcd6e64956c81ea7bfd9eaf1dd5d639aca581c16bb446140fcef591753b3325aa0f700ed3a8649f1db SHA512 a86aefdcb1a6431bce94dc062b4f3e73332196fc71a154c8d171991cd61b3694958229c5d329245e098976732f03f75516dd7521d887b822bd6441e66a1bd64a
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-EBUILD bristol-0.60.11-r1.ebuild 1162 BLAKE2B a91b2583ffa49b6f3d53c6d5948ece07764d9f4c8c6f1be25043d47556b41969b7329eeb5bf6cb63cbfe6298b63cdb3f28f1a161d2893333b241b6c1b2e0124c SHA512 b4f5aab7a0af100da9d95d6c7e621cf6b0e5a51abe5da4abdae323ba3158f79320a2452338d0e51df1b42821f256f79268148f7c693e04dfa35c331819046dbe
+EBUILD bristol-0.60.11-r1.ebuild 1199 BLAKE2B 3d2a3be49f1e7c19ad87c3ff58914848a3d1023562647bde073489d91f3f1a5e5e77ce0bbf01b512450e7698782a3690baa4d2359de0bfdac132d7603fbcb9bd SHA512 eec1abdf3b2d9eba270ed37bcdfdf51bcdfdc5e6054daba576f86d1c95de5ecc7ee3fa54d92b35146c5345cd4512cf26e58f4cc4f116b7053f7bcd74f594f703
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index 01ee6cb806e3..9948c638e796 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa oss static-libs"
 # osc : configure option but no code it seems...
 # jack: fails to build if disabled
@@ -23,7 +23,7 @@ BDEPEND="
 RDEPEND="
 	virtual/jack
 	x11-libs/libX11
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	alsa? ( media-libs/alsa-lib )
 "
 # osc? ( >=media-libs/liblo-0.22 )
 DEPEND="${RDEPEND}
@@ -52,6 +52,10 @@ src_configure() {
 		$(use_enable static-libs static)
 }
 
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 6fdbeea2eb19..1888f4efd73c 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,6 +1,6 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
 DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
-EBUILD cadence-0.9.1.ebuild 2446 BLAKE2B 0b6cb6c6ad38b5ef4e687b6f60137f3ae474248d5a36ca64c302652ec550de8a0405f17bd791c9d7942c41470fe4e28d0ef71283e3bec60cde375b505cc29277 SHA512 303a5166fd3c4ad4b17ecd162e11f2e10aadd5c915645f86d44cc36d6753c6158fb5820b56d5130492ba3bb099eebc38a79826c03efea01073f64d5cd97b7930
-EBUILD cadence-9999.ebuild 2412 BLAKE2B ce521fce0aad9cb56b3868b09ae28e267913ab2cee1ee8b42445b59ca45fef45e6e3906583e3d5666a3a72390c08ab239fb7ead259338b10c6b38ea54f1e398c SHA512 99de5daa886120a2cb05ebbb6e4a03c1665fdc2ea58b3d922a4028c0ccf144508ef3a02ba69f88421df48de182a7bca9e44859c98f074376a63dbe4f664c882a
+EBUILD cadence-0.9.1.ebuild 2428 BLAKE2B 28552234fb2a4fa4d9dd749b833b23086082a60ee146ad51862b05fa3f7f24816f92edce7cfcf1910da7d1acfbfcf1619af74dcff086a8b0e1312dbb3d7b880a SHA512 353af0b8b179ce72477fbf268e9eeca17d8c26877877dfc2115205ca11fc27030bef9b3b212ea03e3a58cdb31c125aba05745a3227b500aa2f9e6da959a1cdbd
+EBUILD cadence-9999.ebuild 2399 BLAKE2B 6c59cb40885e5ec21b437b666c62a262f98962b8e81ba79a35626a225bc32d35fa50a6cad3b2702a66434ad092e1f5f34cfbfac3c49014607f58b697a7596b3f SHA512 386ad4493a88328ca98e104f419cead45b7b1aa08107db35de2c14a8e3e11267b4f658e3b90f97aef0b5a7d1fdba7bdf4f52a2baf11168335dfed2a795eb57c5
 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild
index 0876fccd26df..2a6b12a15332 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -12,7 +12,6 @@ HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
-	KEYWORDS="amd64"
 else
 	SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64"
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 78605b5cf613..b290c1617367 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -12,7 +12,6 @@ HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 4c27edc5e5ad..43edfa2a2ff4 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,6 +1,4 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
-DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01 SHA512 9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439
 DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
-EBUILD cantata-2.4.1.ebuild 3020 BLAKE2B 090c658ea3a956a1bf37508d79a36fb607233f81f8861b01812292c8c760ad2c24ffb76ac56ee87bc56997c99a65c6d4762641c023776e7453571db185014b93 SHA512 5801447e3346cece5c6494cf1c3ba20a55f53a73efef8e4658f95184611ac015f4b0b671b706d0bdec1d1c4f1f93dd7e96415c0ecd147a99eb49fdf521dd4b75
-EBUILD cantata-2.4.2.ebuild 3028 BLAKE2B b9e6980eb68959b3b25c7c7452b48f683736677984aa9b1116d1547737678be792bd154ed0c1c8757cf76d64e0e1b8d6aa11548e8cf00d0e25fed0e7ce597713 SHA512 4a1a0b481f9538b62e5e78d87fb211c4b122094bf511cc40aa8940b0abf448e1c2dccf288838f6819b7c07d847d364ccbe84ac235ed5c0047b0f56b2bc798953
+EBUILD cantata-2.4.2.ebuild 3026 BLAKE2B 1194d8d7ba57cc991ef6f6d882c01dc450d6d1a562fd37bcd22e9b653f1e008ba9ddc16f8945c7537300dc4bc079ee0d0bf2a1e2e9a99e5ad2045f3c841e4cd9 SHA512 fb421f4d25473344a2b472c0ba8578e043beb717af80d71eea43c59f2d855d5b3bee92b5839a615542ae05233eaf10afee12b8f8b810be802dada5b2c472f387
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.4.1.ebuild b/media-sound/cantata/cantata-2.4.1.ebuild
deleted file mode 100644
index 22ab01578b8b..000000000000
--- a/media-sound/cantata/cantata-2.4.1.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
-
-PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
-inherit cmake l10n qmake-utils xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata"
-SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
-REQUIRED_USE="
-	?? ( cdda cdio )
-	cdda? ( udisks || ( cddb musicbrainz ) )
-	cddb? ( || ( cdio cdda ) taglib )
-	cdio? ( udisks || ( cddb musicbrainz ) )
-	mtp? ( taglib udisks )
-	musicbrainz? ( || ( cdio cdda ) taglib )
-	replaygain? ( taglib )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	virtual/libudev:=
-	cdda? ( media-sound/cdparanoia )
-	cddb? ( media-libs/libcddb )
-	cdio? ( dev-libs/libcdio-paranoia )
-	mtp? ( media-libs/libmtp )
-	musicbrainz? ( media-libs/musicbrainz:5= )
-	replaygain? (
-		media-libs/libebur128
-		media-sound/mpg123
-		media-video/ffmpeg:0=
-	)
-	streaming? ( dev-qt/qtmultimedia:5 )
-	taglib? (
-		media-libs/taglib[asf(+),mp4(+)]
-		udisks? ( sys-fs/udisks:2 )
-	)
-	zeroconf? ( net-dns/avahi )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl[ithreads]
-	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtconcurrent:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
-
-src_prepare() {
-	remove_locale() {
-		rm "translations/${PN}_${1}".ts || die
-	}
-
-	cmake_src_prepare
-
-	# Unbundle 3rd party libs
-	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-		-DENABLE_CDPARANOIA=$(usex cdda)
-		-DENABLE_CDDB=$(usex cddb)
-		-DENABLE_CDIOPARANOIA=$(usex cdio)
-		-DENABLE_HTTP_SERVER=$(usex http-server)
-		-DENABLE_MTP=$(usex mtp)
-		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		-DENABLE_FFMPEG=$(usex replaygain)
-		-DENABLE_MPG123=$(usex replaygain)
-		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
-		-DENABLE_TAGLIB=$(usex taglib)
-		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_REMOTE_DEVICES=OFF
-		-DENABLE_UDISKS2=ON
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	has_version media-sound/mpd || \
-		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
-
-	if ! has_version app-misc/media-player-info; then
-		elog "Install app-misc/media-player-info to enable identification"
-		elog "and querying of portable media players"
-	fi
-}
diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild
index d4dca81aed02..e9a9d73dcc34 100644
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
index 49f8a60c9bef..1dce0789c603 100644
--- a/media-sound/cmusfm/Manifest
+++ b/media-sound/cmusfm/Manifest
@@ -1,7 +1,3 @@
-DIST cmusfm-0.2.5.tar.gz 28651 BLAKE2B c69dcaa5900ed4cf3d1a0274ac3dc6e6322b73222a472c26434fa4912c2f351fa67b0f3ac1d91df9f707d5c38d6ffa7c4401ed3500ed929adcbb63b9e513f765 SHA512 0db8d865342438531bfb800d835800240e47732444795159f72ed3c91a4c3f0747ba2da1dcc8e71ef340ba5a3febdb39d8dd5868b134afcbcf7b3614a7790eae
-DIST cmusfm-0.3.1.tar.gz 34521 BLAKE2B d5f7ce5cb37a03114e910f0ad7fd39bb3e940ce9d0ad416e464dc6cfc5438bbe901845b610bd8d0e508bde236ef6ed9cb894afb5a4cae710b1347d3173ffa60b SHA512 2d4d551d2a82fc2d70c7f75705f8cec236a0cf7b8e5268c91cc32b4ede4ecd51c4577d673b8c36f041e514af59142f2c9c001cd422c0790f0e0b3596b4394064
 DIST cmusfm-0.3.3.tar.gz 37553 BLAKE2B f266d83edbed960d8c466cba80ce57d645c5c9cdfceac27c29d0ef424c8135f22377dc0490462d3107dfcfd32ac9d15fa6142269b453c8a80818da9bd10a28fd SHA512 6537905bdf09d04f09783237997536a1ee231ee4e589826d87f435c0dd7542dbd7d97167990bf949d2a9eb73c4a9a4da1bab17888de0aecedb2a63deaa873f39
-EBUILD cmusfm-0.2.5.ebuild 867 BLAKE2B 5fe3f2d2bb351af4f6ad3c45804fcde9852208f34f092be37c180602a96d79d17acc5ccc171366cc633b13ed9b2b8d732c96fe83bed39579022d7ac268afafb4 SHA512 852444e6d0acbd19536ddcd76822de5b5a056eb4d7b8c4e6dc355f0ac16a24d6bff8993b7032da28ad52c7265e0bf06b65cfa4bc73a1cfead5b7d8faa89b7b42
-EBUILD cmusfm-0.3.1.ebuild 840 BLAKE2B 0d11dacbaf8c1f76800f7047f75385dcf542fe38fe80f25a8397e435538a04960c507b8b41c0e6583be07188298eb565d2b42bbe97818b245f0b0c3d95a32821 SHA512 30d2b76f3ad5f5ae6d590f7d7432bfaef706021d98615424a2145edf15591254e7330316abbc392a66607767fdeafac8075dfaa9ce537432335a903607a3e6d8
 EBUILD cmusfm-0.3.3.ebuild 840 BLAKE2B e8f63cc66e0c89d19fe660b9b8dd9219262bc8fdd2540b65ff65ebdb4dffffe2f87293d4cb4752e50bd2056eeba3bce444bee134aaf3c5f92a2da98f5ecf7e9d SHA512 a5f8add218d22e8a95b4bac4fd2fba6edcfd0f6e1ab6c647f1701671c3ee0ec6984905160dc4a8ee2833149022224cc7cb1fcf20b7b594f9c69889f301e87d1a
 MISC metadata.xml 339 BLAKE2B 6a18cee3e017ee1e67fc035e63bcf5248a175a2e116964467f8f021e5b3f49606dbff1cc7aeb472e81d4f44c767e077b24fcd9f533868f0c4332f8d6465ec961 SHA512 78c63eceb28e387d635e34fe4800d0af9e30fd5ba4687955bb5383bd8ff4c9e3573d200ddcb36f3efd16d732cc6d7ca48c59381826ea80f6791a0c31da91d08b
diff --git a/media-sound/cmusfm/cmusfm-0.2.5.ebuild b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
deleted file mode 100644
index 704bd8f11246..000000000000
--- a/media-sound/cmusfm/cmusfm-0.2.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils readme.gentoo
-
-DESCRIPTION="Last.fm scrobbler for cmus music player"
-HOMEPAGE="https://github.com/Arkq/cmusfm"
-SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-DEPEND="net-misc/curl
-	dev-libs/openssl:0=
-	libnotify? ( x11-libs/libnotify )"
-RDEPEND="${DEPEND}
-	media-sound/cmus"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable libnotify)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-}
diff --git a/media-sound/cmusfm/cmusfm-0.3.1.ebuild b/media-sound/cmusfm/cmusfm-0.3.1.ebuild
deleted file mode 100644
index 841a36a0b073..000000000000
--- a/media-sound/cmusfm/cmusfm-0.3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools readme.gentoo-r1
-
-DESCRIPTION="Last.fm scrobbler for cmus music player"
-HOMEPAGE="https://github.com/Arkq/cmusfm"
-SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-CDEPEND="net-misc/curl
-	dev-libs/openssl:0=
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	media-sound/cmus"
-
-src_prepare() {
-	default
-	eautoreconf
-	DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
-}
-
-src_configure() {
-	econf $(use_enable libnotify)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-}
diff --git a/media-sound/codecgraph/Manifest b/media-sound/codecgraph/Manifest
deleted file mode 100644
index b87240d639aa..000000000000
--- a/media-sound/codecgraph/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 20120114-makefile-prefix.diff 657 BLAKE2B e9d0758a24066e29ba6f55e88dae0c4a351d111dabb1c3d2c914dd4d510f3e7d3cbfe40c78b5766eb11740004ada979edc973c59b0871dff38206d505d81898a SHA512 7d5fab593aefba8175e1e6301a1b47ad78de6efd88f30401a57e3693c022cc1af1073a1fab54f5bafb280a120b458d68f7ae53323d0200ccf66c1ce0f4e48097
-DIST codecgraph-20120114.tar.gz 94168 BLAKE2B 8c7a30d86197f53a8feb39c56257e7ba6b55eddee92963f04c35d8ed018f0369d83885f092c2d4ae040a77c166f65a29fa523018dcf6e29ddc437e6c50420b6b SHA512 85053ea83707c817e5d190a981458b271814602fda36757dd4dd14ded3a992abc613f4023dbb9eac7d10589f32fa1489fc68c98e80b235588fcde5390bdc099c
-EBUILD codecgraph-20120114-r2.ebuild 680 BLAKE2B d6f6783dfd406fce7a75cf15fb8e85055ade9aab3c6b15c699826e4e806d7c39f4f7361d1600858fe3f6e45f344971ae429749bde2511f4bb3c2e00595b0127c SHA512 d0f63d7e5c5ce98c601b102dccc838406b353fd46f7193e655c29ca92849304f1cb4fc5ec808f3eb094f24bdc990c870b02bfb219a410b8b381bb2d31f8d9354
-MISC metadata.xml 355 BLAKE2B 0b4bd7ae8bcc459e4ad681ca7063761fe84a6218ea53cca6c601a2da002c5d90cebb34f1d322cab5c2b3d1810d7a6f192ed8bf5fd0f448c1ed5f2ec07c43155f SHA512 67f7562f4f2882838136fa69cfc0927da31bc1f75b0e3226ffc8ae1ae0bb6997160b7de36294bf757b566a79e8937e1aafd74fd59e5978a4ef847fb1e4e876be
diff --git a/media-sound/codecgraph/codecgraph-20120114-r2.ebuild b/media-sound/codecgraph/codecgraph-20120114-r2.ebuild
deleted file mode 100644
index dfe7a09d932a..000000000000
--- a/media-sound/codecgraph/codecgraph-20120114-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Generates a graph based on the ALSA description of an HD Audio codec"
-HOMEPAGE="http://helllabs.org/codecgraph/"
-SRC_URI="http://helllabs.org/codecgraph/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick"
-
-PATCHES=( "${FILESDIR}/${PV}-makefile-prefix.diff" )
-
-src_configure() {
-	python_fix_shebang *.py
-}
-
-src_install() {
-	default
-	dodoc codecs.txt IDEAS
-}
diff --git a/media-sound/codecgraph/files/20120114-makefile-prefix.diff b/media-sound/codecgraph/files/20120114-makefile-prefix.diff
deleted file mode 100644
index 2636fad59e57..000000000000
--- a/media-sound/codecgraph/files/20120114-makefile-prefix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uNr codecgraph-20120114.ORIG/Makefile codecgraph-20120114/Makefile
---- codecgraph-20120114.ORIG/Makefile	2012-04-20 11:46:16.585852026 +0100
-+++ codecgraph-20120114/Makefile	2012-04-20 11:46:50.730851052 +0100
-@@ -1,4 +1,4 @@
--PREFIX = /usr/local
-+PREFIX = /usr
- DOTTY = dot
- 
- samples = \
-@@ -87,7 +87,7 @@
- install:
- 	install -m755 -D codecgraph $(DESTDIR)$(PREFIX)/bin/codecgraph
- 	install -m755 -D codecgraph.py $(DESTDIR)$(PREFIX)/bin/codecgraph.py
--	install -m644 -D codecgraph.1 $(DESTDIR)$(PREFIX)/man/man1/codecgraph.1
-+	install -m644 -D codecgraph.1 $(DESTDIR)$(PREFIX)/share/man/man1/codecgraph.1
- 
- thumbs: png
- 	for p in $(pngfiles);do \
diff --git a/media-sound/codecgraph/metadata.xml b/media-sound/codecgraph/metadata.xml
deleted file mode 100644
index 5f92e8882156..000000000000
--- a/media-sound/codecgraph/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="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
-<maintainer type="project">
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index ec6d3e29e315..58256f1cacec 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,6 +1,4 @@
 AUX darkice-1.3-include.patch 636 BLAKE2B 3598cf32c662453b1d4d7607b5c032e637a951fcd67943515f28bcccafb6e1110f64916563de9406a96d439990ee683a4151805ceafe08d8a44b52d49c30ae51 SHA512 14b461fe4282f9389d8a97d4b4942c0b7866860aabd91589bd6294a34796b6a0e74658ed8a0e43273fdc72bf776c14b6cf8889a1f31975ab6609f34021fdb434
-DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 DIST darkice-1.4.tar.gz 364782 BLAKE2B 6097ddc022c4ac8dfba2deea2b6ab6e6ad86e49cc542d573572643faf6091a2ed2996f0e5c24045c22a60e972e4222c2ecd80342b2641fae52610778b9775aee SHA512 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc
-EBUILD darkice-1.3.ebuild 1303 BLAKE2B c3c2ce08898fc8c1808db54aedd80e8f8a0dfb8fd1230de5c7b8a4d08d7901989887ac747c8c7cac8f98d1824bf34fda8be76ab4c3068e414739880862f48803 SHA512 55e372760bb5265c0514e0065339e03534a139ba3be66b1d0c56097a315e1e1ac9bdda7db8ecad905662eb6d07d8ecce0bd523b88c9ed080abc631bb27336f2b
-EBUILD darkice-1.4.ebuild 1326 BLAKE2B 484448a936363221c9101fa1db80c5b5df5aa37a1cbbbb33279b55ba952454f0f5289a48567c5094fdfa040df5c4539bc82a7f3453168c4210c8a501dada6e68 SHA512 6373f691ef14d967c176126aa0cc78a8ff940f47e58e20d42be4f0ba02beb7965db7644b0907899eae0949dd445bcc86dd12e53fea35dd9a41bfb3c3be1986bb
+EBUILD darkice-1.4.ebuild 1325 BLAKE2B 42128b9b5a5587593f9234ea484b692c02b15f4e94c3405dcc5ec70564dfb9ef65f34c0d33f69ae4b38f2d2488dc5d0d2c62bf042f7f0cf4c269b40f502d0b1d SHA512 9179a504719e084cc5c60a66da6e7aaa649f5eab006cb2fcebe4b26a826cea0b0be92fcc73dbe39b10b3c31e8790812b66ef603f1f5eedc98926a052ef078ba7
 MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild
deleted file mode 100644
index 20d7d39cbaf0..000000000000
--- a/media-sound/darkice/darkice-1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A live audio streamer"
-HOMEPAGE="http://www.darkice.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc sparc x86"
-IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
-
-RDEPEND="aac? ( media-libs/faac )
-	aacplus? ( >=media-libs/libaacplus-2.0.0 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	mp3? ( media-sound/lame )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
-		|| ( alsa jack pulseaudio )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-include.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_with aac faac)
-		$(use_with aacplus)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with libsamplerate samplerate)
-		$(use_with mp3 lame)
-		$(use_with opus)
-		$(use_with pulseaudio)
-		$(use_with twolame)
-		$(use_with vorbis)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
-}
diff --git a/media-sound/darkice/darkice-1.4.ebuild b/media-sound/darkice/darkice-1.4.ebuild
index b7a41066988a..b471a55018dc 100644
--- a/media-sound/darkice/darkice-1.4.ebuild
+++ b/media-sound/darkice/darkice-1.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
diff --git a/media-sound/dbmeasure/Manifest b/media-sound/dbmeasure/Manifest
index e13601fa8f2d..aac3fe226fa3 100644
--- a/media-sound/dbmeasure/Manifest
+++ b/media-sound/dbmeasure/Manifest
@@ -1,3 +1,4 @@
+AUX dbmeasure-0.0.20100217-makefile.patch 695 BLAKE2B 63505f9e09abd5b5fcade4fc3539aa1bc0c27cc3a0c9c32b98c6b2a8d5dde088dc7fc65fa382db7de428d3d9a4a546698c71634af098122765e00cb55c469bc4 SHA512 0db670b632bd34fcf15f2621996d79837f0f511f86f50699c0c9991d81a9de7485992806a8058fbbc741512edcf0af19f8f9b24d04eac9fded94aeb24cb74c93
 DIST dbmeasure-0.0.20100217-ed8105083ab72f9afac9d18b7563fbc3d6c1c925.tar.gz 6647 BLAKE2B e3732a664d8941f5990c9cad87411f9a204869acfa90c66fa4ba5648016095204f96eeaf6f0cbc2f9dc3dc4c37f5a3dffeb9c4b21b8f0805feb7b84643fe9bc6 SHA512 d52a6d8d34625b3ddbeff70e712ddefabfb955ceedc525377d672b472b57163c1194df29ffcc23d881bfb7a5d38cd2850c09ee7c5e30e579414f5c599ad2b78b
-EBUILD dbmeasure-0.0.20100217.ebuild 995 BLAKE2B fa3fe8c18b4245a8e6289d5a8f6d55efe3da4b93ae814681195e9849be8471ef64310d1a0ad8a8744236f4ce48d5af08eb480e7905ad5e56abdbe98842284b88 SHA512 9ae55290bb900b6d41fa5489c314f35a1b5b3b76a62e81c23c98816c448e0f2b6d80e1d0d2d516196e341c41f7e19eb73ab377b34ded2c4a7f45a8659447a5f2
+EBUILD dbmeasure-0.0.20100217.ebuild 824 BLAKE2B 176b0fd29ebea5865d2c2f58b3b1b3e1bcd8ee2e2139df03b4f09beda0c418e22f037aab6903391e53b5a7776feed6ad117b70ef622aff4c1bd506ea744fdde5 SHA512 1752b63fa096f56c427a8d43562c7e4e5affe5fe94a9267a6762da1223261095c725c550c5e9fbb36bb7b37f88306d99332f0882304882164a1d7d5b1f1064b7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
index 274d72ed6f75..6a8ba2c3976d 100644
--- a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
+++ b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 GIT_COMMITID="ed8105083ab72f9afac9d18b7563fbc3d6c1c925"
 MY_PV="${PV}-${GIT_COMMITID}"
 MY_P="${PN}-${MY_PV}"
@@ -15,24 +16,18 @@ SRC_URI="http://git.0pointer.de/?p=${PN}.git;a=snapshot;h=${GIT_COMMITID};sf=tgz
 LICENSE="BSD" # need to confirm w/ upstream
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=media-libs/alsa-lib-1.0.26"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
 
-S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_prepare() {
-	tc-export CC
-	# We drop the -g for debug output but we keep the -O0, as we don't want GCC
-	# to optimize out some critical math.
+src_configure() {
+	tc-export CC PKG_CONFIG
 	strip-flags
-	sed -i \
-		-e 's:$(CC):& $(LDFLAGS):' \
-		-e '/^CFLAGS/s:=:+=:' \
-		-e '/^CFLAGS/s:-g -pipe::' \
-		Makefile || die
 }
 
 src_install() {
diff --git a/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch b/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch
new file mode 100644
index 000000000000..6851c9b357c7
--- /dev/null
+++ b/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch
@@ -0,0 +1,23 @@
+We drop the -g for debug output but we keep the -O0, as we don't want GCC
+to optimize out some critical math.
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,13 @@
+-CFLAGS=-Wextra -Wall -O0 -g -pipe `pkg-config --cflags alsa`
+-LIBS=`pkg-config --libs alsa` -lm
++CFLAGS+=-Wextra -Wall -O0 $(shell $(PKG_CONFIG) --cflags alsa)
++LIBS=-lm $(shell $(PKG_CONFIG) --libs alsa)
+ 
+ all: dbmeasure dbverify
+ 
+ dbmeasure: dbmeasure.o
+-	$(CC) -o dbmeasure $^ $(CFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o dbmeasure $^ $(LIBS)
+ 
+ dbverify: dbverify.o
+-	$(CC) -o dbverify $^ $(CFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o dbverify $^ $(LIBS)
+ 
+ clean:
+ 	rm -f *.o dbmeasure dbverify
diff --git a/media-sound/dcadec/Manifest b/media-sound/dcadec/Manifest
index eec77bcde6e7..eaf18f8bbcac 100644
--- a/media-sound/dcadec/Manifest
+++ b/media-sound/dcadec/Manifest
@@ -1,3 +1,4 @@
+AUX dcadec-0.2.0-respect-CFLAGS.patch 318 BLAKE2B 120690767ace35da6611a6d32ae3e45728f2186268d6e3325aba9c15026e63ac46f7ba134466eae39ccf7d3f6b90a47f7812f444dd68c925cf00b5add2dc7a3d SHA512 12b1e5a2c582b6e026b6e5d6cc5e0faa0caba40f24074c67c7f05776db024ac7661387551e23d38e95a976136c4279547fbf1dd5acd90bb3584e044173264aad
 DIST dcadec-0.2.0.tar.gz 225305 BLAKE2B c68e1931358e18f7a3f7214a3155296dfb58138143a43a801e8fce417d83094ad280caad7dbc1d2c9350f0965248ccedf8e0be10155ebb86d82282ac2f30b634 SHA512 94edcc0b4449882ebeb08f8b39fe44a5302731df2dad3a3e0b0f787fd7c2c3e3992fed95e6f594af516e982cec34b057aab30e6457c098df61f495a487125acb
-EBUILD dcadec-0.2.0.ebuild 1284 BLAKE2B e2bc93b928363d5f058ff64292ab418900918f58717102113ab9fc9df0ae109c2e005f4b24f5d77cdcbf729a201ae4d7921a2a154571541e00263478ca91194d SHA512 8deabca5a101e9f5bb80f6e55836c6642fd7209603f83c1dd216957cc00f7783bfabcf82751d29d61ba452c9cded763eaa90ed736fb51cc90f1023cadafd8742
+EBUILD dcadec-0.2.0.ebuild 1146 BLAKE2B 24853e5af3a05b625d9edbdc884b11f4661bee61053ad9eee23b4c46801841c248d667304e2d4e643ee3b40fe328796318da4b6bdf188423dcef0d2741d57c32 SHA512 96e8e4a761466cce92771b6c42853ab0d52b52c451ddade26f11c92e7e8f7173f90e9a7a51dd3a42531085f3c712a38c19dbb020f68168d04b1684dfa431132e
 MISC metadata.xml 288 BLAKE2B ff78df85f41e86f31dca119cad241145cba4250d177e3bedbda11c2212546102b0d853b377781aefc4a6a7933224980e27bc0eaf273f94f6ef5776e350f5c8de SHA512 8fb0bfd20af44eddc2b9c9b94595a7237bb22f7ea33ac7c16056bce5b62e406ecf66eafbf1a664efad44cd8eb44fe207139d123c03d8d062f5c169fd296e4877
diff --git a/media-sound/dcadec/dcadec-0.2.0.ebuild b/media-sound/dcadec/dcadec-0.2.0.ebuild
index d49effdb57c4..68303aac6077 100644
--- a/media-sound/dcadec/dcadec-0.2.0.ebuild
+++ b/media-sound/dcadec/dcadec-0.2.0.ebuild
@@ -1,54 +1,46 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/foo86/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/foo86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-fi
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="DTS Coherent Acoustics decoder with support for HD extensions"
 HOMEPAGE="https://github.com/foo86/dcadec"
+SRC_URI="https://github.com/foo86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE=""
-DOCS=( CHANGELOG.md README.md )
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/s:-O3::' \
-		Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
+
+multilib_src_configure() {
+	tc-export AR CC
 
-multilib_src_compile() {
 	# Build shared libs
-	echo 'CONFIG_SHARED=1' >> .config
+	echo 'CONFIG_SHARED=1' >> .config || die
+}
 
+multilib_src_compile() {
 	local target=all
 	multilib_is_native_abi || target=lib
-	tc-export AR CC
-	PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		emake -f "${S}/Makefile" ${target}
+
+	PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		emake -f "${S}"/Makefile ${target}
 }
 
 multilib_src_install() {
 	local target=install
 	multilib_is_native_abi || target=install-lib
-	PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		emake -f "${S}/Makefile" DESTDIR="${D}" ${target}
+
+	PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		emake -f "${S}"/Makefile DESTDIR="${D}" ${target}
 }
 
 multilib_src_install_all() {
 	# Rename the executable since it conflicts with libdca.
 	mv "${ED}"/usr/bin/dcadec{,-new} || die
 
-	einstalldocs
+	dodoc CHANGELOG.md README.md
 }
diff --git a/media-sound/dcadec/files/dcadec-0.2.0-respect-CFLAGS.patch b/media-sound/dcadec/files/dcadec-0.2.0-respect-CFLAGS.patch
new file mode 100644
index 000000000000..d232cd2ce78c
--- /dev/null
+++ b/media-sound/dcadec/files/dcadec-0.2.0-respect-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ API_MINOR = 1
+ API_PATCH = 0
+ 
+-CFLAGS := -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -O3 -ffast-math -g -MMD $(CFLAGS)
++CFLAGS := -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -ffast-math -MMD $(CFLAGS) $(CPPFLAGS)
+ 
+ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 615cc8e4f603..d9c0d564e954 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,9 +1,8 @@
-AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114f80b86e35d6d94e48d224fc615c20103dc2b18d63a331ef88c0ee8dfed50e6f4ae0feb9d62a89f8bbf1bf12e68b7b94c9eba48 SHA512 bc85b3150067b26faebc494146e60062658cd8c8110523becbf85ff2034e5a949103ef0a46ff4941338a035a299a7475c9a1bb208e3bdd1935e725723b42416f
-AUX din-47.1-makefile.patch 588 BLAKE2B 5afba801148decc167b4d7bf50ce1b0e770f37d6f85806b151a35958b43749ce7f7a3fd70fbd5028e2d301737011bdcf2fa9f58c7c91ef34f7859bb4071ec1d3 SHA512 d19c72a72b2e3d081e12eb46114a3176b4ea497687df1d017e8c4ba8f1a7a049df169384f4345b45d97688544c7dace2ccc339aa9f64d65ae90657d73a271fdd
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-48-makefile.patch 1886 BLAKE2B 091197f5d2bd421be5ebd2a6d9dc90d5a6f34a65c2e26bf3b639312b15017b61162922ff3834f3f00a7ad098eff2397ad312057c0ba712d0e9a88a83973d3e97 SHA512 f451ccdfdc7c17b975a3b0077bb92f5131c9e22bb9bf224d3b991c3e61679dfc602642311f05b47ecb0ad0963d554467e697e4ec0b15f775af93e9d3299d3369
-DIST din-47.1.tar.gz 3667502 BLAKE2B 21621e4e0909d9da534901811ae28ac5adf226387e2ea47476576fd1d4c45925c460babff04489a54e5e51d1f9ea916389168315108d80965df7b89868150786 SHA512 883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17
+AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
 DIST din-48.tar.gz 3673917 BLAKE2B 90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1 SHA512 3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940
-EBUILD din-47.1.ebuild 1084 BLAKE2B 976f42912df993640acba0cfeb2f0d6ecd027f95ce4711df06afdf1e05a9458714cc05f434b1b00ad08fd591d3b13d2ee2c9c151307da283349cad9584b0cb9a SHA512 467cfccf073e867affbd1fe78c57acb5f13a0ff8b854bb1c8cb40c4c6bee22a042da30ac698ae16031b27a48cc4270a5c2b0178793b54cd23e9d9b322964c510
-EBUILD din-48.ebuild 1078 BLAKE2B 68d5d618a2a3d165f6ba9f31393244ccf583a216ae30e1d9aec081381ae255bec06d7b110feec5b1a4b12673a7ca2c4574158c2d668f239dfc605440b7e2ec2a SHA512 2fdf558fafff9ebead738b57f63b3b1e70f111e0ccfed2b05e0f4b4fec71d6746a6dcce0633d3fee3666a37646b12153d99323aa8e3b7bb8ee3eb5aada1101b7
+DIST din-49.1.tar.gz 3677087 BLAKE2B 7b696597327493d354c5efd31df243c70f23ec8d68514892c79212b9d3d398c7debb28ad95b6ccb04dc76ac0a9b01ee57d8245260dd4af99cd3f3b27bc2ecbcf SHA512 8f72fd1dce7197135e174bc8c4fb5325e7755e656d7817bbd82c964083ca48b0b5cc939472acf3464fd0404631767bbea1f20b7dea073b6829582e76d2879e04
+EBUILD din-48.ebuild 1076 BLAKE2B 5fc293baa092bfe143a36ea2b46c8765e10add99708f628878eefd549f5d9a0fec9d4b8f1df5a1e88f8d8ec35d2a60b91b81802364166a5a7b2262a734fb67a1 SHA512 6d54111f3e24d870cb93996502989da83a7c2012680d35476e01056910b00ab1e651870bee1c9c5dfc4ab10ee105a0fd1d79dde6ec9a03fbf9b5ff6a1189d885
+EBUILD din-49.1.ebuild 1082 BLAKE2B 71400c1f53cfb279b695c9b43902d9318177d7585c840fa66145c23b3e1cf2fdf44ba9129f2e27e06204480df87178a7240abcff47990445d7b3f38a414e1cb2 SHA512 ba7eec5911baaa664977596200220b28f24f16cad8fd507540ebbb4d2089b3cd40783416b42497811c46b9b5852f89654fd69067f2ad56497abc62bfce30d655
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-48.ebuild b/media-sound/din/din-48.ebuild
index 14fecc8a11cf..5be0674fc55e 100644
--- a/media-sound/din/din-48.ebuild
+++ b/media-sound/din/din-48.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/din/din-47.1.ebuild b/media-sound/din/din-49.1.ebuild
index a67d55f2e191..08b3a14fa0f7 100644
--- a/media-sound/din/din-47.1.ebuild
+++ b/media-sound/din/din-49.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+alsa jack"
 
 RDEPEND="
@@ -34,7 +34,7 @@ REQUIRED_USE="|| ( alsa jack )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${PN}-43.0.1-fix-random-constants.patch"
+	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/din/files/din-43.0.1-fix-random-constants.patch b/media-sound/din/files/din-43.0.1-fix-random-constants.patch
deleted file mode 100644
index 29f75d35f496..000000000000
--- a/media-sound/din/files/din-43.0.1-fix-random-constants.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/random.h b/include/random.h
-index 99d79fb..91ed250 100644
---- a/include/random.h
-+++ b/include/random.h
-@@ -16,8 +16,8 @@
- const int N = 624;

- const int M = 397;

- const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */

--const int UPPER_MASK = 0x80000000; /* most significant w-r bits */

--const int LOWER_MASK = 0x7fffffff; /* least significant r bits */

-+const unsigned int UPPER_MASK = 0x80000000; /* most significant w-r bits */

-+const unsigned int LOWER_MASK = 0x7fffffff; /* least significant r bits */

- 

- static unsigned int mt[N]; /* the array for the state vector  */

- static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */

diff --git a/media-sound/din/files/din-47.1-makefile.patch b/media-sound/din/files/din-47.1-makefile.patch
deleted file mode 100644
index 62e7229f0f50..000000000000
--- a/media-sound/din/files/din-47.1-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b24e856..a624610 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = -I ../include -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
--LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- AM_CFLAGS = -I ../include
- bin_PROGRAMS = din
diff --git a/media-sound/din/files/din-49.1-makefile.patch b/media-sound/din/files/din-49.1-makefile.patch
new file mode 100644
index 000000000000..0a96d894c2c0
--- /dev/null
+++ b/media-sound/din/files/din-49.1-makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c7cc5ce..2b07a9b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ #dinincludedir = $(pkgsrcdir)
+ 
+-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
+-LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ bin_PROGRAMS = din
+ din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drone.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 03c469550adb..42cf9c6d641e 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,3 @@
-DIST elisa-20.04.3.tar.xz 1409336 BLAKE2B a1432294cb46562145ecb6f41b07a8a1ae352abffd40253670ef17b79e27b221b2589bf14934a7ce4e0001f90e84a0889a1b0c4dd069101e2e614f1fc51a20cc SHA512 00afa92eaab736f5f38759a3076b9f579ee3f5fce84404042a73e11cdfe0e004b32a83f9e542ca6d0a962d66bcb3fcce9d12fc5dbdd8f937d9d4cea9321687b4
-DIST elisa-20.08.1.tar.xz 1634492 BLAKE2B 2ea1f8eb1c6e20d7b0e383fc660af2605a30f174110f0ece059d4c063e62811ae8c0ff89225429c00977633d29315e5bbb89e7207a2ca4c6c49fb450fdf25ab2 SHA512 a273fe799c701f1acad3966b382189aa69448ee5b0532ea7c47744f0a350c0125193a49d6a100efd448cfcbc878fb45c6fbc248d9135155fad5fac554b673c93
-EBUILD elisa-20.04.3.ebuild 1652 BLAKE2B a9a35dfbe3892ccf19a15195236fc0c26fecc770c5ad0ab9471506bcca11eeb696f6b8670d558b14901c6a01f4d4c054c6930d07f5e57d933479a33ec0acd42f SHA512 1dd4cf67f5fe799e5c60daa24a77510c3172f7e9779ea57d33d5045acbc2b3c6e7006bc850bb105d7e76d65f403c43619b1ca91f12ee2c83203108a62e2d1673
-EBUILD elisa-20.08.1.ebuild 1664 BLAKE2B 1cbb080fa448357801a6d6f8ba0ba3236673b6f2f2e198e21c2966b8080379b6b56f385c6b5bc4df0b1ea33ea0e5b809bd77c05714989bec79a14a43b5c79d46 SHA512 acf9ca4b313fdc6c48023acb8d615570ddaf2e626e4afa8aa9725c089115eb09e135fc42479bdcb57563812b6eba3ca4f062b47996a47433f67ee2bbfacd25c3
+DIST elisa-20.08.3.tar.xz 1635656 BLAKE2B 74b28f7acb8561918aa57f2aaa3a0fde9c041c5dded88fa4d134391288c7b545e058e347d42d3247586ee3a3451e3c072adc3b4367d3bf7fced37d2e33a17f66 SHA512 0ac2c8bb5e4a1df4259b10361acd4094ff32e00f340e4c2418483d8c8538fb439d8205f52af1ca3f31fbc7c129ac1f8e1e3edcbcb96e85f9c8cf270ec8ce081a
+EBUILD elisa-20.08.3.ebuild 1660 BLAKE2B 0f2f97fb2a63060c6b2de73204577be1a798be207188e261789a517e75054989ab25af613ed58c24b828b1035944a3a7494aac5c9bd2c35f9dd7279f21f2eb53 SHA512 a8b51c1155cfc602f3e69bbfe176ada35229bfe38c553f794a96946205405dabb428aeadaaea402acedb021b0ed546fbcc8c730a735da83d0cc34d202f636d0c
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.04.3.ebuild b/media-sound/elisa/elisa-20.04.3.ebuild
deleted file mode 100644
index 08fe72fcd012..000000000000
--- a/media-sound/elisa/elisa-20.04.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KDE_RELEASE_SERVICE="true"
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://kde.org/applications/en/elisa"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="mpris semantic-desktop +vlc"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	mpris? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	vlc? ( media-video/vlc:= )
-	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package mpris KF5DBusAddons)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-sound/elisa/elisa-20.08.1.ebuild b/media-sound/elisa/elisa-20.08.3.ebuild
index 9eecd3942ffb..9d44e8467a23 100644
--- a/media-sound/elisa/elisa-20.08.1.ebuild
+++ b/media-sound/elisa/elisa-20.08.3.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 KDE_RELEASE_SERVICE="true"
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://kde.org/applications/en/elisa"
+HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/en/elisa"
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="mpris semantic-desktop +vlc"
 
 BDEPEND="sys-devel/gettext"
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 8e9a26c14b2e..f4b0741548dd 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,7 @@
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
 DIST fluidsynth-2.1.4.tar.gz 1363975 BLAKE2B 068a8a1722036a5a409331b1bdcf566cb9a1e7b4a27c78adec51c6d82f7c53cba9178c87013f1a9c0ef62d26b1ba876fad567e4c8bb41b8d478632699876e41d SHA512 22e8d2f8b144f96a334aff1f7d183b91e6c5418482bd61553028ff571836b0ca13fff89e7e3cc1c2d08e106a430331d179e607d78b00e218baec433b6d140190
+DIST fluidsynth-2.1.5.tar.gz 1364924 BLAKE2B f5669f49db481ded6d953ee2cdaa8c59bb751f79210d993b69967cca1b71dce12b50fbf258512c144b1578441e78cc5299d96004da5fed44a40fc33858254bc0 SHA512 171ee6b1983ab9636086fb414ae464508f7a9a412cd2c1e7800a19a84d3dff21bbd86d1971f9bb5985e977f808b60e0d0cfbde4551b85fcc4aae4928a1abadbc
 EBUILD fluidsynth-2.1.0.ebuild 3304 BLAKE2B 8ec259e373d03e5fe66892dec0b0c5d97a8454007fce7d5c9b3b4099829d4dc38ce3c943e85e8b54d2aed26a2d0d90c5ef380a9bd163772eb3d3e60fa01efec6 SHA512 9ef42039f11d1262ad04428cf5aa9ecd4727822c63e1e10e5e72293a873e1b260012348b15a2b6c4e955e1e98c0423b103a8792c0e46f706aa0dcb09097dcfa1
 EBUILD fluidsynth-2.1.4.ebuild 3312 BLAKE2B 1c8a6afa7230da8a6873b141fd8d8e04c1bc028fa554e8fbb7ec0e22dcac7e4bc54f061276aa00d5ad68d95036ce45d17749b6158f6de6a0209d7eb448f9d46e SHA512 28eed5a1a2dc075479633380c28f4be8f46270b7244cb900b37a9d922e4e014da67aa690671a593b174f013799d9145281cabb9ac44c23cc34a7fda1700172bb
+EBUILD fluidsynth-2.1.5.ebuild 3312 BLAKE2B 1c8a6afa7230da8a6873b141fd8d8e04c1bc028fa554e8fbb7ec0e22dcac7e4bc54f061276aa00d5ad68d95036ce45d17749b6158f6de6a0209d7eb448f9d46e SHA512 28eed5a1a2dc075479633380c28f4be8f46270b7244cb900b37a9d922e4e014da67aa690671a593b174f013799d9145281cabb9ac44c23cc34a7fda1700172bb
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
new file mode 100644
index 000000000000..d5fdde4142d4
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
+		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/fmtools/Manifest b/media-sound/fmtools/Manifest
index d1d269bc6e23..6c0a64678213 100644
--- a/media-sound/fmtools/Manifest
+++ b/media-sound/fmtools/Manifest
@@ -1,3 +1,3 @@
 DIST fmtools-2.0.7.tar.gz 113250 BLAKE2B 3a88b72b22d1f4a470d82ce46bbd2530c05a26e87156d5bcfabb675b9056da30ae841fe15abfb0f36334fa7839e6150e6bf8d16413b60e784ab566b94efc6c68 SHA512 d63790cecaad8c3724e66c11820a15654f8c11399b154412f07b931c50b2b4852fcc74df7611d3374af2ec228db21bd5be7653abe3cb42b5c00cce0ccb32fb51
-EBUILD fmtools-2.0.7.ebuild 338 BLAKE2B 477e85fbb946c8e7e40e80180c2265d8a2128577a0171d245c083953e5fd7239aab1d7b5fc6fbc3b56ad366a01f775aa4b3444ede3a83b7b815254aa5d4c6b45 SHA512 a2e1d599ec6901a29e6bfa6ca78cbc68fa734edb26999546158e362e830f71a87eb1c8b1fd8b80e482abee23f80924bc237d4f43f6b79322dd18f0c533414d43
+EBUILD fmtools-2.0.7.ebuild 335 BLAKE2B be0c5a7b608409f9a235d5235d6dcea8f6b32e2fa99fe3880ef6f634f75cd4921e5adbc9a038bfe7f7339d4dabc62f50a1de1d832c10f5e715f2226735afb58d SHA512 03d8e18afaa546218310cf9c51c37e74dbbf676565e608eb95a1dba46ed2c04599b95acb33129c0afe6ec71bb63a03e75be004133cf60b8065b8ea47d72f8bc6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/fmtools/fmtools-2.0.7.ebuild b/media-sound/fmtools/fmtools-2.0.7.ebuild
index 1bed06a20375..dcf8ace90a88 100644
--- a/media-sound/fmtools/fmtools-2.0.7.ebuild
+++ b/media-sound/fmtools/fmtools-2.0.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A collection of programs for controlling v4l radio card drivers"
 HOMEPAGE="https://benpfaff.org/fmtools/"
diff --git a/media-sound/freebirth/Manifest b/media-sound/freebirth/Manifest
deleted file mode 100644
index 570f244f3c23..000000000000
--- a/media-sound/freebirth/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX freebirth-0.3.2-gentoo-2.patch 6589 BLAKE2B 44c1b99bd2ca3870a44cd8305e1354ffecd629ffc998bf124d584af40f4b71a97cff017e47e2d498fbf2b5f4f24500e385266c274dbd0e562b14f0ea6400773e SHA512 9ce3c911276b5f732c478b64e343b73aa3d0f0f805a594ba4c26e6d93eda2db2b056261a50fedbce6e27ccd3dd8889c384176c02fb78b70cc90d983696766cc4
-AUX freebirth-0.3.2-segfault.patch 519 BLAKE2B 5ed47d231e49f87052f433aa8b044c67fdd2e89fe7f746688a235ea7993466a4384d27bd81cec7871939f92dece4e71598ab272d025a52e54419c318eb9589f5 SHA512 61bacbeaa5599a88f3f7a446ab2300f3a611c86e8e728b9d847322e9d8cc4b54a6580428342025322e01e0b4a1cf8a3547ce873842704a98f9167f5a3e67d0c2
-DIST freebirth-0.3.2.tar.gz 2456900 BLAKE2B 1000dbf87cb1138c7650e26a5d2c8ff08c986ab86a24742f43d5334c2b02b6e88231a3131ca437fd3bbb6ce024b91a1104cce3e3b369ce0087b4f9cc451f626f SHA512 a532905e687d8ebc415dea3794a4dfc4c55037123c79cc0dd2111fc74e6db1ba367e8210da75e3586c5ee4d2521a21b5cd03a5a0afcfd3a04e678834f140590a
-EBUILD freebirth-0.3.2-r1.ebuild 763 BLAKE2B 74f38e3c8886b821f80081ecaf238ada59f7667615c27763713b5420f075b3200cfae19a79b268ba4dd6300627cad44d4e8b79461c6136cfdbe70c8d658a8c80 SHA512 0f6175f17f99eb7392f99428395fd8231ef428e4e7c36dcdfbc4c59708b148798f85ae1e7e2bd4f9c7dab6a1cc28cb19bbc9d7deaf13850f214f1ad0e66e23b9
-MISC metadata.xml 325 BLAKE2B 3925fb11706ee3f27ebc7c1390c91ae55f2b69d8aa3c694a87869597efb17d4212d99419245ccdafa039c427d01fab40f22df9d0a27c3c25a69e28ef5c89bfca SHA512 633be59eb61315afe57a92345666505b9428cbb0b910ffc550803bbebed0258fd838197b69349e998ba346a1e4703b99f474db977eeef690633956176231b4a2
diff --git a/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch b/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch
deleted file mode 100644
index 52b184b04b2f..000000000000
--- a/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- freebirth.c
-+++ freebirth.c
-@@ -248,15 +248,15 @@
-   //bass_e    = env_new(1025,10000,(sample_producer *)osc_blender);
-   sl = g_slist_append(sl, bass_e);
- 
--  kick   = raw_wave_new("raw/kick.raw");
-+  kick   = raw_wave_new("/usr/share/freebirth/raw/kick.raw");
-   sl = g_slist_append(sl, kick);
--  snare  = raw_wave_new("raw/snare.raw");
-+  snare  = raw_wave_new("/usr/share/freebirth/raw/snare.raw");
-   sl = g_slist_append(sl, snare);
--  cl_hat = raw_wave_new("raw/cl_hat.raw");
-+  cl_hat = raw_wave_new("/usr/share/freebirth/raw/cl_hat.raw");
-   sl = g_slist_append(sl, cl_hat);
--  op_hat = raw_wave_new("raw/op_hat.raw");
-+  op_hat = raw_wave_new("/usr/share/freebirth/raw/op_hat.raw");
-   sl = g_slist_append(sl, op_hat);
--  samp_1 = raw_wave_new("raw/samp_1.raw");
-+  samp_1 = raw_wave_new("/usr/share/freebirth/raw/samp_1.raw");
-   sl = g_slist_append(sl, samp_1);
- 
-   sources = (sample_producer**)
-@@ -1087,7 +1087,7 @@
-   
- 
-   /*effect window */
--  effect_window = gtk_window_new (GTK_WINDOW_DIALOG);
-+  effect_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   gtk_window_set_title(GTK_WINDOW (effect_window), "Effects");
-   gtk_widget_set_style(effect_window,window_style);
-   effect_box    = gtk_vbox_new(FALSE,10);
-@@ -1109,7 +1109,7 @@
- 
-   
-   /* sample freq window */
--  sample_freq_window = gtk_window_new (GTK_WINDOW_DIALOG);
-+  sample_freq_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   gtk_window_set_title(GTK_WINDOW (sample_freq_window), "Sample Pitch");
-   sample_freq_box    = gtk_vbox_new(TRUE,10);
-   gtk_widget_set_style(sample_freq_window,window_style);
---- fuse_loops.c
-+++ fuse_loops.c
-@@ -122,7 +122,18 @@
-   fprintf(file, "/* generated file -- don't edit */\n");
-   fprintf(file, "#include <unistd.h>\n");
-   fprintf(file, "#include <math.h>\n");
-+  fprintf(file, "#include <endian.h>\n");
-   fprintf(file, "#include \"freebirth.h\"\n");
-+  fprintf(file, "/* borrowed from glib2 */\n");
-+  fprintf(file, "#define SHORT_SWAP_LE_BE(val)  ((short) ( \\\n");
-+  fprintf(file, "    (short) ((short) (val) >> 8) |     \\\n");
-+  fprintf(file, "    (short) ((short) (val) << 8)))\n");
-+  fprintf(file, "static void swap_endian(short *data, int length)\n");
-+  fprintf(file, "{\n");
-+  fprintf(file, "       int i;\n");
-+  fprintf(file, "       for (i = 0; i < length; i += 1, data++)\n");
-+  fprintf(file, "               *data = SHORT_SWAP_LE_BE(*data);\n");
-+  fprintf(file, "}\n");
-   fprintf(file, "\n");
- 
-   fprintf(file, "sample_producer *sp[%d];\n", g_list_length(order));
-@@ -172,6 +183,9 @@
-   fprintf(file, "  }\n");
-   fprintf(file, "\n");
- 
-+  fprintf(file, "#if __BYTE_ORDER == __BIG_ENDIAN\n");
-+  fprintf(file, "  swap_endian(buffer, 2 * TBASS_BUFF_SIZE);\n");
-+  fprintf(file, "#endif\n");
-   fprintf(file, "  write(fd, buffer, 2 * TBASS_BUFF_SIZE * sizeof(short));\n");
-   fprintf(file, "\n");
- 
---- gtkdial.c
-+++ gtkdial.c
-@@ -75,8 +75,6 @@
-               sizeof (GtkDialClass),
-               (GtkClassInitFunc) gtk_dial_class_init,
-               (GtkObjectInitFunc) gtk_dial_init,
--              (GtkArgSetFunc) NULL,
--              (GtkArgGetFunc) NULL,
-             };
- 
-             dial_type = gtk_type_unique (gtk_widget_get_type (), &dial_info);
---- Makefile
-+++ Makefile
-@@ -1,10 +1,9 @@
- # Makefile for Freebirth 
- #
- 
--CC=gcc
--LOADLIBES=-lm $(shell gtk-config --libs)
--CFLAGS=-g  -O6  -Wall $(shell gtk-config --cflags)
--LDFLAGS= 
-+CC?=gcc
-+CFLAGS+=-Wall $(shell pkg-config --cflags gtk+-2.0)
-+LIBS=-lm $(shell pkg-config --libs gtk+-2.0)
- 
- OFILES=\
- oscillator.o sequencer.o envelope.o filter.o gtkdial.o mixer.o \
-@@ -22,16 +21,18 @@
- 	-rm -f *.o freebirth fusebirth fused_loop.c Makefile.deps *~ 
- 
- freebirth: $(OFILES) fused_loop.o freebirth.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o freebirth $(OFILES) fused_loop.o freebirth.o $(LIBS)
- 
- fused_loop.c: fusebirth
- 	./fusebirth > fused_loop.c 2>/dev/null
- 
- fusebirth: $(OFILES) fuse_loops.o fusebirth.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o fusebirth $(OFILES) fuse_loops.o fusebirth.o $(LIBS)
- 
- fusebirth.o: freebirth.c
- 	$(CC) -c $(CFLAGS) -DFUSE_LOOPS -o fusebirth.o freebirth.c
- 
- Makefile.deps:
--	gcc -MM $(CFLAGS) $(CFILES) > Makefile.deps
-+	$(CC) -MM $(CFLAGS) $(CFILES) > Makefile.deps
- 
- include Makefile.deps
---- raw_wave.c
-+++ raw_wave.c
-@@ -21,18 +21,36 @@
- #include "raw_wave.h"
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <math.h>
-+#include <endian.h>
-+
-+/* borrowed from glib2 */
-+#define SHORT_SWAP_LE_BE(val)  ((short) ( \
-+    (short) ((short) (val) >> 8) |      \
-+    (short) ((short) (val) << 8)))
-+static void swap_endian(short *data, int length)
-+{
-+       int i;
-+       for (i = 0; i < length; i += 1, data++)
-+               *data = SHORT_SWAP_LE_BE(*data);
-+}
- 
- static char *get_full_path(char *fn)
- {
-   char *full_fn;
-   char *fb_samples;
- 
--  if (fn == NULL || fn[0] == '/') return fn;
-   fb_samples = getenv("FB_SAMPLES");
-   if (fb_samples == NULL) fb_samples = FB_SAMPLES;
--  sprintf(full_fn = (char *)malloc(strlen(fb_samples) + 1 + strlen(fn) + 1),
--	  "%s/%s", fb_samples, fn);
-+  full_fn = (char *)malloc(strlen(fb_samples) + 1 + strlen(fn) + 1);
-+   
-+  if (fn == NULL || fn[0] == '/') { /* path is valid already */
-+     sprintf(full_fn, "%s", fn); 
-+  } else {
-+     sprintf(full_fn, "%s/%s", fb_samples, fn); /* add path */
-+  }
-+   
-   return full_fn;
- }
- 
-@@ -76,10 +94,13 @@
- 
-   }
-   this->length += count;
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+  swap_endian(tmp, this->length);
-+#endif
-   this->table = (sample *)malloc(sizeof(sample) * this->length);
--  for(i = 0; i < this->length;i++)
-+  for(i = 0; i < this->length;i++) {
-     this->table[i] = (sample)tmp[i];
--  
-+  }
-   fclose(in);
-   free(tmp);
- }
-@@ -126,6 +147,7 @@
- 	
- 	}
-     }
-+
-   return this->buffer;  
- }
-   
-@@ -145,7 +167,7 @@
- void raw_wave_set_sample_file(raw_wave* this, char *filename)
- {
-   FILE *in;
--  if (this->filename != 0) free(this->filename);
-+  if (this->filename != NULL) free(this->filename);
-   this->filename = get_full_path(filename);
-   in = fopen(this->filename,"r");
-   if( in==NULL )
-@@ -243,7 +265,7 @@
-   /* set table to zero here check if it is zero in */
-   /* _fill_table */
-   out->table = 0;
--  out->filename = 0;
-+  out->filename = NULL;
-   raw_wave_set_sample_file(out, filename);
- 
-   out->buffer   = (sample *)malloc(sizeof(sample) * TBASS_BUFF_SIZE);
---- raw_wave.h
-+++ raw_wave.h
-@@ -62,7 +62,7 @@
- event *event_pitch_change_new(int seq_handle, double pitch);
- 
- // #define FB_SAMPLES "/usr/local/lib/freebirth"
--#define FB_SAMPLES "."
-+#define FB_SAMPLES "/usr/share/freebirth"
- 
- /*
-   Local Variables:
diff --git a/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch b/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch
deleted file mode 100644
index 2a3a40711f1c..000000000000
--- a/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=320123
-
-Index: freebirth-0.3.2/oscillator.c
-===================================================================
---- freebirth-0.3.2.orig/oscillator.c
-+++ freebirth-0.3.2/oscillator.c
-@@ -237,8 +237,8 @@ event *event_freq_change_new(int seq_han
- 
- static sample_producer **get_children(osc *this)
- {
--  static sample_producer *no_kids[] = { NULL };
--  return no_kids;
-+  static sample_producer no_kids[] = {{ NULL }};
-+  return &no_kids;
- }
- 
- static char **get_header(osc *this)
diff --git a/media-sound/freebirth/freebirth-0.3.2-r1.ebuild b/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
deleted file mode 100644
index 271853ab4567..000000000000
--- a/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Free software bass synthesizer step sequencer"
-HOMEPAGE="http://freshmeat.net/releases/8834"
-SRC_URI="http://www.bitmechanic.com/projects/freebirth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo-2.patch \
-		"${FILESDIR}"/${P}-segfault.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/share/${PN}/raw
-	doins raw/*.raw
-
-	dodoc CHANGES NEXT_VERSION README
-
-	doicon xpm/${PN}.xpm
-	make_desktop_entry ${PN} ${PN}
-}
diff --git a/media-sound/freebirth/metadata.xml b/media-sound/freebirth/metadata.xml
deleted file mode 100644
index a38ef435258d..000000000000
--- a/media-sound/freebirth/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-		<remote-id type="freshmeat">8834</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index dc04f080e688..05820d4e7b76 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-music-3.34.6.tar.xz 1415360 BLAKE2B 0b8f3a2b17242f41f3a77a9eeb60cf1f10cac57d983de6e7f44ba1a243526e0831ee2ad5baec17b726bbbe9df52e26b79dedc2b2abe4dba87c59cc4fcd4a083f SHA512 76561adf8c6ce4342825eb976de11c98c2aa66cb08075dbe46d8c7787daf7fc77763d55c2fe475dd9c75536adc98f8afbdd90bfb2b64791d05cdf11e3ed00b03
 DIST gnome-music-3.36.4.1.tar.xz 979064 BLAKE2B e744bee915a48a5d2366350cda7ebb0c43382f46de07d9203d95675cad45d825f2d93cc07be7865eceb5be3554ab478ecf84c52d9b8f5defc198b4f1b6638926 SHA512 8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca
-EBUILD gnome-music-3.34.6.ebuild 2033 BLAKE2B f6c46beb2c44f23ce20f49d46ed9783ee8c2f157fc7e067947914e943bbeaa0c4e2233ee7f3f94f76e57b1193a09d8e74efc5987da26c87d1050c6dc07070006 SHA512 7f85851e01d6be1cf7c51893ad1135f8e0ce1760e56c6b7e5ac0a136f091723267110bb70f0dfb16f3618048b97ba6be08e85e5a11b8debfb6d4d8c4c31d7791
 EBUILD gnome-music-3.36.4.1.ebuild 2045 BLAKE2B 6e3adace7160f1aa9a1d6ad9d3c36158326e3c055ac21a7c465e4e2d31e35c1ad06d001a21519b32fc745e56eec137d1533de54351dd267be3ed3476c15b29ac SHA512 817d8419483d631160fcf4bead6a54b6505f00422d2feba1445a8153ae29a94ba1cde7729117065d545d6148fcae6d68542016f79caf111be9e911feab113017
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.34.6.ebuild b/media-sound/gnome-music/gnome-music-3.34.6.ebuild
deleted file mode 100644
index c16a85cdeef5..000000000000
--- a/media-sound/gnome-music/gnome-music-3.34.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	net-libs/gnome-online-accounts[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.7:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-2.2.0:=[introspection(+)]
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.9:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.9:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		>=app-misc/tracker-miners-2.2.0[gstreamer]
-		>=app-misc/tracker-miners-2.2.0[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index f3c8cd2fedfa..1233f9cbce62 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,3 +1,3 @@
 DIST gpodder-3.10.16.tar.gz 1058386 BLAKE2B d73bc8a9d9d2cfe642a6c1e7ae3e7811e05db8c1ebf566904e669a5f9d029c6bce73599da737d25f42c4740d23537b1c414e7a23cf15076394fb714a2f33c79c SHA512 ce9525864e5a640dd82fb535021d63e1d1ddeb7785774b00c668ff86a279a45e075ab7488120ec93d1a07a0a943daa0abb786f822d74866e0fd8c6713d7f8531
-EBUILD gpodder-3.10.16-r1.ebuild 1649 BLAKE2B 75d0d5b950b18ec839f4b32dc7c5aa9bd84594ab2b97aaaf10acbbac3cd56b6fd532bc7a58357742027d2a2955ce9f5ba90b1dfde1d0ca3ed9defa898bed21a4 SHA512 1e70b9211308809829bec8f934bf04e8f7dd2e5d180f5877d8f5787130e28ef9e0bdda28e2e8969e895d08a7be94318b28dd10923f365d1b9305dbb802be033a
+EBUILD gpodder-3.10.16-r1.ebuild 1675 BLAKE2B c6b7bbec03dd8872bf091dc9fce22603cd7d643390cc2ed6176282dc617252bfbdc79ed8538c1782be4d4849b3751c0ed8b809cc057ecaa76f79b9015d3efcaa SHA512 5642bb096dc6313657257c0712024b8f233361c89a9e53fd509cb47bc78a86535f45780c50b1fa499e0f0f8915de669521648b4ad1ca74b29862357d2b8de4d9
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
index cc68686076a4..37b510d6394d 100644
--- a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 xdg
 
@@ -14,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus bluetooth kernel_linux mtp test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-sound/gqradio/Manifest b/media-sound/gqradio/Manifest
index 69a1fb0c4156..4daa5266523b 100644
--- a/media-sound/gqradio/Manifest
+++ b/media-sound/gqradio/Manifest
@@ -1,4 +1,5 @@
-AUX gqradio-1.9.2-underlinking.patch 642 BLAKE2B 67f47fa4b337813b605a06dc1efb32a70575440a0df2760b7576161fa3b07d966ab7ce4fbed131326221eff1764aa1f780d772822183bb9123208d8ef11e3a4d SHA512 596dd4109ec4c1e356af0403e6195d3331102a96a14e6525874ed4044d9cae90e9a70942097fd57b70bccbcc3f3befc81e50324e8389df14bc3a6e6f093f468a
+AUX gqradio-1.9.2-desktop-QA.patch 439 BLAKE2B cb8ce333958dd809a2700e79a4368b13d886488617e540b38aac1e4553096c9605c2a8545ff57e5649d98a1620dd149c4352a7b6575203ac5827324feba6b395 SHA512 1f4430aeba883db95ca26f3b24ad5af2e485384a8c4d7b8b382444aa32e088dbc1a9627f0a5e1e8dbf28d81f54f0826a33e9cfb1a009e35bd65a89412d2ebed9
+AUX gqradio-1.9.2-underlinking.patch 646 BLAKE2B 7bde36350fb9bdc2930dea78116ac340094025234b7b34d58efdc26157a67d2a55a10f880ce029f787c9925aab2b2335c667701c76c2d19f100b0bb64103449d SHA512 75af9b293930da87ad8482ccddfa39ab64421fe6403cf80e060426f75c1b81c8e6c464f3ac29f263daa464b24cbdadf70680ef314a5cb94d68a5771bdfac385d
 DIST gqradio-1.9.2.tar.gz 444114 BLAKE2B 8430a494b85fd7d856aaf3ca7b2678f8ce3f52c6e05feab1fba525bbfa7cee49dacb0887b91a9bb4adebdca91a7d9d0f7cae403eca7a6b40257792fd92cf9993 SHA512 7b749f03ff110b78a644fc6b574f5a9d9d3a6db22976c4c8871b8f5c781515d29112745df5b5a4a70e4c48ba3cc9fd4921af64de39415ac179f57a26d33a4e5a
-EBUILD gqradio-1.9.2.ebuild 605 BLAKE2B ae6ef9f029909274936e86e70f94fd1945a4e5e20f4826b2722a5b97c0ecc8a6d221d81d11b76307d2338bca171f90153ed914300bb40dc88a70a3f81fcdaeff SHA512 4928f04866f9fc9b2c4ea70dcb63a33f31e237c30112581109e82a7234dcbea9c68cc95accbe0134fa925ebbf3d74d83072abca02486c5bf231d89e86a90ea49
+EBUILD gqradio-1.9.2.ebuild 631 BLAKE2B 30f67ea3ec9aa76bfb35bcac96dd2607b05eca4cab785c5b669fe95239128dea17d269093c93056cee423a06cfbcf98b0e5ea96b3ed8fbe5d4f2c25c019bf938 SHA512 ecfa58aea1541413318618fc23fc701b3ca1a24184754505cc71794daa477343069114f01a3fbb26d441ae7ed52a59196174afd693d83cd14dde9463214f0b30
 MISC metadata.xml 656 BLAKE2B 887c6e754554837b10711e46688dfb0f22dc80a54612cc57a2d11b32c4a6ad80008d2a30df43bd7899f87287211ffe0d20242b8f01fdc539e9ac6d321fad51de SHA512 944ed11ad30e97bc4266d63ff4b4bc17b37ee142e4ed8758cc8959fcfc18fb295afbfaba2eda07ec553b0a741eaa19ded8ac15f5e64316954fe167b9fa854cfd
diff --git a/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch b/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch
new file mode 100644
index 000000000000..b9ec631f59fb
--- /dev/null
+++ b/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch
@@ -0,0 +1,20 @@
+--- a/gqradio.desktop
++++ b/gqradio.desktop
+@@ -3,12 +3,12 @@
+ Comment=Radio tuner
+ Comment[fr]=Tuner radio
+ Exec=gqradio
+-Icon=gqradio.png
+-Info=Radio tuner app.
+-Info[fr]=Application tuner radio
+-Terminal=0
++Icon=gqradio
++X-Info=Radio tuner app.
++X-Info[fr]=Application tuner radio
++Terminal=false
+ Type=Application
+ StartupNotify=false
+ StartupWMClass=gqradio
+ Encoding=UTF-8
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
diff --git a/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
index bcedc3e40f10..f6e75954607f 100644
--- a/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
+++ b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -30,6 +30,16 @@
  AC_DEFINE_UNQUOTED(GQRADIO_SKINDIR, "$prefix/share/gqradio/skins", [Location of skins])
  AC_DEFINE_UNQUOTED(GQRADIO_HELPDIR, "$prefix/share/doc/gqradio-$VERSION", [Location of documentation files])
diff --git a/media-sound/gqradio/gqradio-1.9.2.ebuild b/media-sound/gqradio/gqradio-1.9.2.ebuild
index 7f87210ea6e2..235f711463f2 100644
--- a/media-sound/gqradio/gqradio-1.9.2.ebuild
+++ b/media-sound/gqradio/gqradio-1.9.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="An FM radio tuner app from the people who brought you GQmpeg"
 HOMEPAGE="http://gqmpeg.sourceforge.net/radio.html"
@@ -11,16 +12,20 @@ SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog README SKIN-SPECS TODO"
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
index 025b4f8c406c..566220231523 100644
--- a/media-sound/gramofile/Manifest
+++ b/media-sound/gramofile/Manifest
@@ -2,5 +2,5 @@ AUX gramofile-1.6_p9-gentoo.patch 1100 BLAKE2B 69842cf58285f4621c04b6bc290f28aa7
 AUX gramofile-1.6_p9-strlen_and_exit.patch 392 BLAKE2B a42c5dedc28f607c77c308154cf61e5012309904862a34c20efc91b2748e3cffd6585a9c1c75a0da68683e80444ad144a17cfe9b2617b24c3c448d54b0de775c SHA512 266dcbce4654c31e120d97e30e56764bac9f44dd412015c602bd43d902c38eb9fd9aa47dd7fe64961a1ea28eee1bcc992ec1d83a024cb1482a2b8d9e70c55034
 DIST gramofile_1.6-9.diff.gz 25244 BLAKE2B 60170f960693932d894022d0c576b2d58764e546e6f2a13461ab78abfb92235007047bb9f35964859908c580c815d21e8c80d73ddd4e33b0c1d25deda78d395a SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249
 DIST gramofile_1.6.orig.tar.gz 108596 BLAKE2B fc076c60d3f2f46ab33f63194db165b6d0df6bd76996bade730968dfd821d234b0a88f486e98f84e76804efb8b08fb2538cb553de5f9eb09eb3dde60b441fbf4 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5
-EBUILD gramofile-1.6_p9.ebuild 1030 BLAKE2B cfbd8db5cdd4e121f65444110f22b0ee2d30ab66be12df097d83d606a52c43ec16eae35d6ab98b3c69b28bfaada415a322b80bc01cbefee3848dc97e6e9932ab SHA512 70953a351837675088878537887c964a109a985c524de264f8ab358fbcb52d4f2f0707f272fb72ee86502ee7ad61f3d7b31594a97f218b2f1881a4a29a6a77e0
+EBUILD gramofile-1.6_p9.ebuild 963 BLAKE2B ad6352f2fc156402468501f33242978fb3052436cc36bd7bed9ebb06152ebefe6f9c162b8bc16db52ef26dba539adcd153d53d37c27b39ccd9752810498a351f SHA512 276013b3a84dd13accf15adb55400e71ca23f986e31a228b62b47fa3f978fd866ee5b202ae1b4c89691552ac6c492e3b564783a8066f3cf430efa3c88e282ee3
 MISC metadata.xml 871 BLAKE2B 19a80d0e429503c3b745ec38782480b79631e083c51e676e831ffebcf38ad342013e3cafec545dbe05f830e1267db85634f5c6c83fb6188fe1666e4a9d7d97c9 SHA512 12ff2b2a524bb2e9b3d54c4a1cb4f1739f4ff5a664a01074a1759cf34593e110ddd80f5128a2d2ed222e20f80e329cd3af231ec726665c23bc36cd25cd384b22
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
index 481ba2576b05..c0697de57da2 100644
--- a/media-sound/gramofile/gramofile-1.6_p9.ebuild
+++ b/media-sound/gramofile/gramofile-1.6_p9.ebuild
@@ -1,45 +1,45 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Transfer sound from gramophone records to CD"
 HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
 SRC_URI="
 	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}.orig.tar.gz
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
-"
+	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
-	sys-libs/ncurses
-	sci-libs/fftw:2.1
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P/_p*}
+	sys-libs/ncurses:=
+	sci-libs/fftw:2.1"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${P/_p*}/debian/patches
+S="${WORKDIR}/${P/_p*}"
 
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-strlen_and_exit.patch
+PATCHES=(
+	"${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
+	"${S}"/debian/patches
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-strlen_and_exit.patch
+)
 
+src_configure() {
 	tc-export CC PKG_CONFIG
 }
 
 src_install() {
-	dobin ${PN}
-	exeinto /usr/$(get_libdir)/${PN}
+	dobin gramofile
+
+	exeinto /usr/$(get_libdir)/gramofile
 	doexe bplay_gramo brec_gramo
+
 	dodoc ChangeLog README TODO *.txt
-	newdoc ${P/_p*}/debian/changelog ChangeLog.debian
+	newdoc debian/changelog ChangeLog.debian
 }
diff --git a/media-sound/gtkguitune/Manifest b/media-sound/gtkguitune/Manifest
index d74d107ab34a..087666a29a49 100644
--- a/media-sound/gtkguitune/Manifest
+++ b/media-sound/gtkguitune/Manifest
@@ -1,3 +1,3 @@
 DIST gtkguitune-gtk2-0.8.tar.gz 660808 BLAKE2B b71a6d5ca8508da3b305b81b3c45f2236676bea5c560404a557b48e9ac3a8ccc9f7b56d7c674e1def041ac47dd8e4e5c730189834e0a14ecb67d43243f3bb8da SHA512 40f23e0661c87e3723a127fd2ceb0acc031b548809e99871611c2dd05140a8ffedbe48c52853a5ff43c7175d77de0f90e5d94d850f999aca29336e055247cf2a
-EBUILD gtkguitune-0.8.ebuild 792 BLAKE2B 7e63f4dedfa893be34854469f34477538412879887be1ab68f6b14ec4b311f5cc32d68c14a432742c8a512780d2759b0fd46e8e7c898da1601f6066a3fbf332e SHA512 c82782d70cad782ec82eb31702e29e60dd607ab36786d4271f9b0407902b0e925ad0db526e940a7da4a363d01eb8207b58ae4e91f02c6a6ec2e018ca8f560737
+EBUILD gtkguitune-0.8.ebuild 705 BLAKE2B 92e32e4e2e1a847dfa3c706fd1643d8d58ad5a9f88c5317c54d40936d0f96e2a00d50d8ef750181ba2d14ca379cda7febc752b3968467beebf7412fe2bf55219 SHA512 102f2095aa3ee3b71a6f62df6462afafe95ad1fc9f53536da7489266cd6ff981d11b6309893644e6a29719293141e02d669ca83f7f869e26052efb8ebf4a6bbe
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gtkguitune/gtkguitune-0.8.ebuild b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
index c0fcf6da9d6f..3373aab1e71a 100644
--- a/media-sound/gtkguitune/gtkguitune-0.8.ebuild
+++ b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils
+EAPI=7
+
+inherit desktop xdg
 
 DESCRIPTION="A guitar tuning program that uses Schmitt-triggering for quick feedback"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,25 +12,24 @@ SRC_URI="mirror://gentoo/${PN}-gtk2-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
-RDEPEND="dev-cpp/glibmm:2
+RDEPEND="
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
 	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
-src_prepare() {
-	append-cxxflags -std=c++11
+src_configure() {
+	# improperly packaged tarball, contains object code
+	emake distclean
+
+	default
 }
 
 src_install() {
 	default
-	make_desktop_entry ${PN} Guitune guitune_logo
+	make_desktop_entry gtkguitune Guitune guitune_logo
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index 6277cc6efd75..4ab1d4bf0ee8 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -1,9 +1,7 @@
 AUX guayadeque-0.4.5_p20170110-missing-aui-component.patch 404 BLAKE2B 9c17048796afe328fb136808c2cb88f8f9a7cada5a4f6cd8a01c0a398e8b93cc0d6158792097cf88e600beebd6105bd9036e9aa3ddf8da16878e7d5f82746ea2 SHA512 539fac802c3e91217f4eb6c5adf456f7e5bc2d53e1103cf54255514b0793e3ed17de84048ea31c5a03ea6121fae01ef712339dcc8e269d678e1272f757976029
 AUX guayadeque-0.4.6-gcc10.patch 2981 BLAKE2B a925446bca10a9f96a0babe889d151cc49792810c95295a0c0dc17796744b7486307c354fb47c07518e0f33b41cb8428feb1cc355678c78fb731cecf378c0068 SHA512 a998f055ef831bbd30c624b157de31ad847d3a8f838586e40ba7f978e184eb22914e036fb927794e61b432352d888cf808a90dde2e29458e203297e11079d144
 AUX guayadeque-0.4.6-metadata.patch 716 BLAKE2B 2dfd57e859eebfb174b6e66c3b9f11cad4af49a3ad615f1f6e53d7cd86c4e9851c8d7d78ba47ed1785cd2eab4017bc43720e9b3dbf4990d06165355c505fba32 SHA512 5d3d861eebaa629031de6186846353798b7178801d6b7c07344bf75d952891d17f90237986949bc4b12984b8635ae4d1f9fc8a319d2199bd6f22cc7669dcc564
-DIST guayadeque-0.4.5_p20170110.tar.gz 2070855 BLAKE2B a8783a61df636e3ddf1473ba20450c89eeb977e06491e840743e7b8a7aa1a7515138ecf8f6c92a27f0c762363ef12c094927192b254ae238196ac6d967fd84d1 SHA512 57215ba47574fba615b33d72f45279c3726035bea38746f7d927a39866fb3fa8a3fb1dbd13fe672c7daba16a2131fbf4b89afed6a3bf8d9a584e5112d926f518
 DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7
-EBUILD guayadeque-0.4.5_p20170110.ebuild 2184 BLAKE2B e02a617872ba5b769eeff72398dcae731cd59c6751452ad04fe814125177287625f331f3d843c4a20a756721155d8b37216db1e14895e2021f21c987585d1029 SHA512 714a5a08df3e418aa14b188fc6108b940f93259cc3a5197517c5726de51fa9a940ef6ed93e69a4f88bafd074e75e1ea1c4939faa720c831978e5eea611104f55
-EBUILD guayadeque-0.4.6.ebuild 2358 BLAKE2B 1de77cf75e181cca529643b64d9a1ba4d472733839cef373404fa137017129abc4a138858363ea640e79e34b6f73e6003f50899cbb294fe1de672456c80aeb60 SHA512 6307ffe61b9e819ad93bff03d441850583702432a60fe8b00933cae6fc836adc17bb7371ee2429efa33e4c5d2ab6ab9f172987472708aa317857e900b5072c3f
+EBUILD guayadeque-0.4.6.ebuild 2356 BLAKE2B b7b8c58c38fad216bd73f236cf7797b49e8ff19b1aedf7291a5ff9a6b8db31dbb5c36153b3c5b86ab1f42ac3a8e83968d95b572325d5e9395c16986c3b62c9d7 SHA512 c0b9aef324c9e370e5262c1ba8e0c3efa08c103eeec067bda9dbb69e4cf33794c6fbb6ff931423c5b9e6f30875a8e3cb17ca3df800cbb0b618eaab14de1ec266
 EBUILD guayadeque-9999.ebuild 2282 BLAKE2B f785e50bc117afb1baa8076399c26d12a8afd75564745c966e87ad8b5d1696b4b0eb56f881c932b9680871aa60104b5bcb86d6ad2c8b9bd90b7389b1b3d1d77b SHA512 f9b444bef5266a22cef7bc802a1ef36317b2ad21a0a9801ef63f8a477c573cf5788fb0c8f89fd3dc765129f7c714bf1d55733ad0270f4d93996901c24e549bb0
 MISC metadata.xml 410 BLAKE2B d61d13faa8d5bb87bf8ef99b6841a4a05091db82d5961c69d5d922782d091639aff1919f843a92da39ee7181dcd1a8d94d63b83b9c80f1c17cc6c55fc79bf985 SHA512 826a540e373fdbe9027eb0bf9f66a6e7fd61c1b355a5b0cdbc00e2517e3b2e1b23224e6f0bc6025553c49135f4851422ff2055a2c681c9d42fa11f2fab905f3c
diff --git a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
deleted file mode 100644
index 5becf50651c6..000000000000
--- a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0
-
-inherit cmake-utils vcs-snapshot wxwidgets
-
-DESCRIPTION="Music management program designed for all music enthusiasts"
-HOMEPAGE="https://guayadeque.org/"
-SRC_URI="https://github.com/anonbeat/${PN}/archive/9fec4f7b85095fa2d9f8e4d39c0cf5015f7624fa.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator ipod +minimal"
-
-# No test available, Making src_test fail
-RESTRICT="test"
-
-GST_DEPS="
-	media-libs/gnonlin:1.0
-	media-plugins/gst-plugins-libav:1.0
-	media-plugins/gst-plugins-libnice:1.0
-	media-plugins/gst-plugins-pulse:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-ugly:1.0
-"
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-db/wxsqlite3-3.2.1
-	dev-libs/glib:2
-	media-libs/flac
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	>=media-libs/taglib-1.6.4
-	net-misc/curl
-	sys-apps/dbus
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	appindicator? ( >=dev-libs/libindicate-0.7 )
-	ipod? ( media-libs/libgpod )
-	!minimal? ( ${GST_DEPS} )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PF}-missing-aui-component.patch"
-)
-
-# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
-LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled libs
-	rm -rf src/wx/wxsql* src/wxsqlite3 || die
-
-	# comment out unused languages
-	cd po || die
-	local l
-	for l in "${LANGS[@]}"; do
-		! has ${l} ${LINGUAS-${l}} && cmake_comment_add_subdirectory ${l}
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_IPOD=$(usex ipod)
-		-DENABLE_LIBINDICATE=$(usex appindicator)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use minimal; then
-		elog "If you are missing functionalities consider setting USE=-minimal"
-		elog "or install any of the following packages:"
-
-		local pkg
-		for pkg in ${GST_DEPS}; do
-			elog "\t ${pkg}"
-		done
-	fi
-}
diff --git a/media-sound/guayadeque/guayadeque-0.4.6.ebuild b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
index d9bb5a095471..02eecd472933 100644
--- a/media-sound/guayadeque/guayadeque-0.4.6.ebuild
+++ b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://guayadeque.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="appindicator ipod +minimal"
 
 # No test available, Making src_test fail
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 25490191ad08..94b5d41f31f6 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,11 +1,5 @@
-AUX guitarix-0.40.0-noexecstack.patch 972 BLAKE2B 7ecadff2c2882392b9eab28721135dcf8f70eb83397b1fed77c483b38be0d1ff74bcc2dab774e4a5449bb29049748b808683d5a2fe3406feb2c0f40c5a106eed SHA512 805172b4dbe22f9d45e25e8da5fb838bc635773d67b7db038105e6b1f61b3a3c05c5a473038127b6487e9bf339b272f77d73b30d266cd3ab65339a587fe747d5
-AUX guitarix-0.40.0-nostrip.patch 687 BLAKE2B 001f397a93b03578e6f214b517cf7af9e09a210adb0b5a5bf343ab74a9f3bc197b2d54c244bd55b6cd91ac0617299cd0937f2fed265b348253123c9873018212 SHA512 e0ee0431a19fe014b0008ff1ef94604f97aeba3bccef6571cf2fca425882081ec1eb255573a069effd9cca40427024f4ecb54836bb60e53b8c4198ae141ef240
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
-DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
-DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8
 DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
-EBUILD guitarix-0.39.0.ebuild 1726 BLAKE2B 2efb30118ea92aef65ed8e921378324ab38eb2632812803716ced8cde854b8ed710f9c668cc9d946eecbc7d6996577c2f819d8594b6f640a5a81e41a76fd814e SHA512 065c47eb37638e4c0c60cd0eba8e613c8502ce972f534aeee6fe9ffb3235a0ef9b3bb65a69aaffbbfe2f82580d3580dcc5b42d771bb682a94b219da9f4447d59
-EBUILD guitarix-0.40.0.ebuild 1801 BLAKE2B 8b171e16c2211e54bc6b536c94fa73846b244868bcbc1e757a2bf2d02fb5d273111dfa501640b3e334ff65e071ede7ed289757d93fc0e1d0c4089c44f9f610a1 SHA512 0c14080f5f7fa841cf0ad20ef1c64b399654bcbbf12bed9c33ecbe1daf9bf29fedb70fdc981cb5cb7a45e9e291db34d00361633209cf6cf67528e75f56ffc43b
-EBUILD guitarix-0.41.0.ebuild 1823 BLAKE2B 5c91bf8b09a117cc5b8c06c685ae589204e166fc1fa41eb5e7588bfa6eee9f44aa9cb7f595b66146aa66ff0f0252c2e89903885a8da566478cefdb4181fd724e SHA512 f19c54cdb9abf09349ee1f6679c590cc12877b505111a8b43fdd31acd45ab9c9771bb07931950dbb6ce1c38a1eea74ece1e536f9987936344b6f309755221f91
+EBUILD guitarix-0.41.0.ebuild 1822 BLAKE2B a970ec4c6f688c4949f3ea3d4dd49764f7d27607135b27b78f6ffe79c42ee71a28c840dac9737187907a5b17dd5b9db4541555113a9f126d29d76b550473f6da SHA512 85992e50d2a78ced1d41116c1023f3960c2d938f1ce2336090f15aec6143b3f480dd6ae445cc11fe1575148633b0f05b08029736257d1108cdeedd1446484c53
 EBUILD guitarix-9999.ebuild 1794 BLAKE2B f0e2ea5236e0a460125fbaf455c75436f689098fbf424de42c5edf3f2410c6a7e027dfcfbf089bb6dbdb90ac9709887350c9542e8863fde0fa0a3930f708c179 SHA512 e19797d623d28ee9a5ba40d100a59b476c1906919e0c088c0a5eea95b95557febaa66235800c5c2ee78653037d935e452338892546dffe510f797666c9ab3cf3
 MISC metadata.xml 661 BLAKE2B b68ff384f8ed21006ee3f7722a481b3b0060729786386ca7f6804dc38481f998a66e714800801417f5b0b429ca42cfb562f9bd289e899365a5d9a4ff53a6e489 SHA512 087467e4dc44968f8ae3ed95daf1da4ef6c39e0af8c58e1bb280ae08c46a568b672a7bd7022ad1a81e86fc6c7a15a13e4cfd61d2eb95ccd019b132a4386d2c28
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
deleted file mode 100644
index f64a21f26b51..000000000000
--- a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fc3e0b4754425bb262c8bcfd24cd345dd10e8d60 Mon Sep 17 00:00:00 2001
-From: brummer10 <brummer-@web.de>
-Date: Fri, 5 Jun 2020 06:41:30 +0200
-Subject: [PATCH] Fix issue #104 lv2 plugins contains executable stack, patch
- by Alexander Tsoy
-
----
- trunk/src/LV2/xputty/resources/wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/LV2/xputty/resources/wscript b/src/LV2/xputty/resources/wscript
-index a2f0402c..3c383393 100644
---- a/src/LV2/xputty/resources/wscript
-+++ b/src/LV2/xputty/resources/wscript
-@@ -41,7 +41,7 @@ def img2obj(task):
-     src = " ".join(["'%s'" % os.path.splitext(v.name)[0] for v in task.inputs[0:]])
-     cmd = ("cd src/LV2/xputty/resources/ \
-     && for f in %s; do\
--     %s -r -b binary ${f}.png -o  ${f}.o; \
-+     %s -r -b binary -z noexecstack ${f}.png -o  ${f}.o; \
-      done " % (src, env.LD[0]) )
-    # Logs.debug("runner: system command -> %s" % cmd)
-     ret = task.exec_command(cmd, shell=True)
--- 
-2.26.2
-
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
deleted file mode 100644
index 2bc77f443b16..000000000000
--- a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3dd1e0a8ea7db95b76a7b38e27a9b54d6fe75c76 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Fri, 5 Jun 2020 17:21:10 +0300
-Subject: [PATCH] Do not strip lv2 plugins
-
----
- trunk/wscript | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index 2699325f..f2d8f86d 100644
---- a/wscript
-+++ b/wscript
-@@ -375,7 +375,6 @@ def configure(conf):
-     conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
-     conf.env['BIN_NAME'] = APPNAME
-     if opt.lv2:
--        conf.gxload('strip')
-         conf.gxload('lv2')
-     conf.env['LADSPA'] = opt.ladspa
-     conf.env['NEW_LADSPA'] = opt.new_ladspa
--- 
-2.26.2
-
diff --git a/media-sound/guitarix/guitarix-0.39.0.ebuild b/media-sound/guitarix/guitarix-0.39.0.ebuild
deleted file mode 100644
index 688596340430..000000000000
--- a/media-sound/guitarix/guitarix-0.39.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils xdg
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="bluetooth debug lv2 nls +standalone zeroconf"
-REQUIRED_USE="|| ( lv2 standalone )"
-
-COMMON_DEPEND="dev-cpp/eigen:3
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
-	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.1.2:3.0=
-	x11-libs/gtk+:2
-	lv2? ( media-libs/lv2 )
-	standalone? (
-		dev-libs/boost:=
-		media-libs/liblrdf
-		media-libs/lilv
-		virtual/jack
-		bluetooth? ( net-wireless/bluez )
-		zeroconf? ( net-dns/avahi )
-	)
-"
-# clearlooks gtk engine and roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gtk-engines
-	standalone? (
-		media-fonts/roboto
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-
-DOCS=( changelog README )
-
-src_configure() {
-	local myconf=(
-		--cxxflags-debug=""
-		--cxxflags-release="-DNDEBUG"
-		--ldflags="${LDFLAGS}"
-		--enable-lfs
-		--lib-dev
-		--no-desktop-update
-		--no-faust
-		--no-ldconfig
-		--shared-lib
-		$(use_enable nls)
-		$(usex bluetooth "" "--no-bluez")
-		$(usex debug "--debug" "")
-		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
-		$(usex standalone "" "--no-standalone")
-		$(usex zeroconf "" "--no-avahi")
-	)
-	waf-utils_src_configure "${myconf[@]}"
-}
diff --git a/media-sound/guitarix/guitarix-0.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild
deleted file mode 100644
index 7a7c6a6d4525..000000000000
--- a/media-sound/guitarix/guitarix-0.40.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils xdg
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="bluetooth debug lv2 nls +standalone zeroconf"
-REQUIRED_USE="|| ( lv2 standalone )"
-
-COMMON_DEPEND="dev-cpp/eigen:3
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
-	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.1.2:3.0=
-	x11-libs/gtk+:3
-	lv2? ( media-libs/lv2 )
-	standalone? (
-		dev-libs/boost:=
-		media-libs/liblrdf
-		media-libs/lilv
-		virtual/jack
-		bluetooth? ( net-wireless/bluez )
-		zeroconf? ( net-dns/avahi )
-	)
-"
-# roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
-	standalone? (
-		media-fonts/roboto
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-lang/sassc
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-DOCS=( changelog README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noexecstack.patch
-	"${FILESDIR}"/${P}-nostrip.patch
-)
-
-src_configure() {
-	local myconf=(
-		--cxxflags-debug=""
-		--cxxflags-release="-DNDEBUG"
-		--ldflags="${LDFLAGS}"
-		--enable-lfs
-		--lib-dev
-		--no-desktop-update
-		--no-faust
-		--no-ldconfig
-		--shared-lib
-		$(use_enable nls)
-		$(usex bluetooth "" "--no-bluez")
-		$(usex debug "--debug" "")
-		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
-		$(usex standalone "" "--no-standalone")
-		$(usex zeroconf "" "--no-avahi")
-	)
-	waf-utils_src_configure "${myconf[@]}"
-}
diff --git a/media-sound/guitarix/guitarix-0.41.0.ebuild b/media-sound/guitarix/guitarix-0.41.0.ebuild
index 95583d16f7a2..6e027895e479 100644
--- a/media-sound/guitarix/guitarix-0.41.0.ebuild
+++ b/media-sound/guitarix/guitarix-0.41.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index e016420e84ec..7af706de6c04 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,9 +1,6 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
-AUX hydrogen-1.0.0-i18n-path.patch 455 BLAKE2B 099fe7bae1d7a9e5cf7eb8b7fc650f0421c91d0170b7ef3577d0b5249fa23fd71e802d8edd8ac80f9c2487473f9b7aa4a84b912d8fe8f3e4de6d2a5e418ab219 SHA512 cb96acb38f37803676be410082009ca7e0e0e6f83cbfb9d519c0f83212caa903891db12275201ab0395bde5edf1204508f81c45e9ea3e49ae33834719d277517
 AUX hydrogen-9999-i18n-path.patch 457 BLAKE2B dde2e8b80ca79f52c05a2512d2d07333cb118c96da92326716533c27908fd68dfb5159a8015a2e3347bb20cc7be96217bba09ec1833cdef06d4d3c2ace8d4aae SHA512 85f974df6d490650562a34dbb4dc126d6b67c85bdf1e91303967714738999a9299e64fdac3492d1b7da4bbccfb1773972888840f54327dba3b4efb0671023841
-DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
-EBUILD hydrogen-1.0.0.ebuild 2141 BLAKE2B 593e3032d4d642b27be0e2cac1fa755e39639707747edd1472b53e9c845f85f6c65251aae06eff3969c68bcd2e51139e3c8ef810b9e6adb8631c4c61747070fc SHA512 bd68bc8ef58b5f1723f5ad272252fbf1edd11ee646a44a207c351f8d6fcbfc9d55a56dbaad42b3879e801ef7a3134a546c462a91f433ffe1be45b448c5930ec7
-EBUILD hydrogen-1.0.1.ebuild 2096 BLAKE2B 9372a442451a8aee63ab861496fa820e47396ee4ee2b0b9cbfc389ed8f7930c05efbb9e7cd61a9fd672f65c6dd207a98a6ff1ed237c7ceef79ff94bf5f060173 SHA512 e37238a1baf16a6f41ee930dd9c18a0d8d918c99eaba1a7f10deb311374c679355bea9dbee356381489b3e61cb894fd46f927e0aabdea865d628c57ef539a752
+EBUILD hydrogen-1.0.1.ebuild 2111 BLAKE2B 115614e67d1001f2af423710998ee7340838baee2cf67c4289edbdf0ab5ff4423721c2923a7f66b71087ba917dd00c6ca022ca3ce3e69e5fdd7f359701653697 SHA512 c91594162fc4787dfcbafac06985fc2be98370ec773c6284ebe9b822dadb45e70db7ffb66a198653b441e05c42eb7b9b1fb15d12c30c4feca8d59d6b9519e65b
 EBUILD hydrogen-9999.ebuild 2133 BLAKE2B 129548ab21f33bd626ea3b7235ff61471142038109998683dff4aa98884b4fbab2b71c4088297f3ec06924d98eabad62852d58ad2fedb11b49e2a0cd76bd23ee SHA512 5ab310fa51b3a856441b5c332957838aa1725b7da740781dcf56c3a8ab8a08e6760b99a4b9c70ccfa35c741dd6a9bd1fb7e955d18771c4ff2d5fd8551cf32053
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
deleted file mode 100644
index 075d0d444a0c..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/data/i18n/CMakeLists.txt	2020-09-07 08:47:15.743516826 +0200
-+++ b/data/i18n/CMakeLists.txt	2020-09-07 09:03:56.084304480 +0200
-@@ -5,4 +5,9 @@
- 
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
- ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
--INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+
-+IF(MINGW)
-+	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+ELSE()
-+	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
-+ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-1.0.0.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
deleted file mode 100644
index e2d0ee7185f4..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS="amd64 ppc ppc64 x86"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-fi
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-i18n-path.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
index 245dc874f114..86ef3e86fe01 100644
--- a/media-sound/hydrogen/hydrogen-1.0.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS=""
+	KEYWORDS="amd64 ppc ppc64 x86"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index fb7f7b6569a4..91a3148d324b 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,5 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2177 BLAKE2B 4491d00931c9c5fafead84e39a4c168c6c909d973956386df81e69e8c2c7240fa536293838da1cd367196378a2d07d8c8f1e902afda0849fe23fb223e1b13fdb SHA512 f36b36278ce5c6424efb9f501e10c20e73cbc728f0c7f70a38fa8d996969e880e746927db77d1eb45abe61ea883201f8499135b9355e1c4f2aa2daf7a5a0733e
-EBUILD jack-audio-connection-kit-0.125.0.ebuild 1947 BLAKE2B 54ad16c5a76b562c2a9cff2bb545463121870f2414171f0b7cd46bae55a52a4e431fed51527eace5244cabd35130964fb031916d4a5028d2965c85448ef92889 SHA512 e4407c136e6a24006cbb0ae3597493d862eccd5b60e04dcc4f0418defbd10fe3d98f687d90db33f89fbada2dbe556ae86e1d1df9a7e56d222f7dc8780eb0d5b5
+EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2170 BLAKE2B 74ce1268c6c37e705aba8bc4934d8a434761a38aa3bea2acd133666ab8182acee1dda5dc52ad0b05f033e95ab30e33b749b9b3870b74b1a7e14955f9232bef9a SHA512 237ded91cebae386ca8f697bc6bf08675d3c000b37916882e37fda77ee3f3b335dda2217a4a4581fae9c6b4ae6f3045da8fef94e018ed4593b9e8fb128fb5b0c
 MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
index 1cc33faedb26..b53cf5201545 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
deleted file mode 100644
index 2bf8c095b503..000000000000
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org"
-SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
-
-# readline: only used for jack_transport -> useless for non native ABIs
-# libsndfile: ditto for jackrec
-RDEPEND="
-	sys-libs/db:=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=media-libs/libsndfile-1.0.0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	alsa? ( sys-process/lsof )
-	pam? ( sys-auth/realtime-base )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS TODO README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.125.0-freebsd.patch"
-)
-
-multilib_src_configure() {
-	local myconf=""
-
-	# Disabling CPU Detection (dynsimd) disables optimized asm routines (3dnow
-	# or sse)
-	if use cpu_flags_x86_3dnow || use cpu_flags_x86_sse ; then
-		myconf="${myconf} --enable-dynsimd"
-	fi
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable oss) \
-		--disable-portaudio \
-		--disable-firewire \
-		$(use_enable cpu_flags_x86_sse sse) \
-		--with-html-dir=/usr/share/doc/${PF} \
-		${myconf}
-
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		for i in tools man ; do
-			sed -i -e "s/ ${i}//" Makefile || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use examples; then
-		dodoc -r "${S}/example-clients"
-		docompress -x /usr/share/doc/${PF}/example-clients
-	fi
-}
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 600622c5afce..92bd63cebece 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,7 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
 DIST jack2-1.9.14.tar.gz 6495043 BLAKE2B 9ace1cef2c15c2894831c79bb8d73637df27a21462f654e04b7fb8fc05731e6df898aaefc343a9be4799bcd70576aa7397f2d48b7d2530b682f62463ce3d4a07 SHA512 ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd
-EBUILD jack2-1.9.14.ebuild 2432 BLAKE2B 3902fe7a37ee2429232c90465d946a85bd101e0b9fb4f7440cb9217c6978503f5189bb90013018ddc2737fcd81dad66cb8517cc4e85c00bce135d5feb21635f7 SHA512 73c6eb3774ef227ffb6c8ad83077e9328c9a24e30f88a38808d978ffca5ea43be0bdb9f0912e37d6ce03b90363a93e933581ea936c1f48ef4fd87801f4a8c9d7
-EBUILD jack2-9999.ebuild 2406 BLAKE2B 4cf6581a7cf3bf8e9a60dd063fbe8d0dd2cad8734e91ff09c08c4af5431502d9f30f65a3571bf3f5e2b589a31da31b3aecf8f62338496a52d1caa20caa480744 SHA512 0abe0f5bee6a76730cd21737e6391783b1f2109b82a0b80ccf9cd2d72d5b6e2dcb52daf55465d5032882968c41da0e0f154c97386cb1c4d66e4d3d2c39aa8132
+DIST jack2-1.9.16.tar.gz 974652 BLAKE2B ff20d57f544bd636d93e77c2c6dec3af3afbafe4a217ba480c66247ddb6d8ca60755fa55599240fdd75e8ce2c1f7d8fb4f1bf68de8a212268588245f35731ead SHA512 8e4717cad097806a436e3a7b7977faa65987ca0fe59fd285014d6207899c62f9abbb79474170d0e5a6e82d0dbfe998c1310b13c4de8cd68cea0a6935ba579fd1
+EBUILD jack2-1.9.14.ebuild 2428 BLAKE2B b400fa2fa9949fac29d1b01a5caa917370357c160c8f4336ff358df5f294d2a044ff1b81cb231b05239c0454e63c4f8d4ec7f6a42e579f62a383cd772c7b0b26 SHA512 514103873e13a1cbc5fb946d12e8dad8739b8b7a68cac4c9bea0825ca6fddd473e8afb5874b8bcb8e5462859fb921b6cffeaf3f16127c260b24099b4927d7b1b
+EBUILD jack2-1.9.16.ebuild 2446 BLAKE2B 458db801cca023bf6b148deedac1e1c736dd9bc7851c4070a36d5f2be3f476d3b87322948a48be8b33f7b8a9b69b28acaba97c488234e3df546e60fc52e02e9f SHA512 a20fb21cc8fa2e18efe1d4d83ec6a1b0a496882618d2996027782401ad583e716617fea707617351a97640f38db849241299e243d899f1dfb31c7234a927f840
+EBUILD jack2-9999.ebuild 2391 BLAKE2B 0387559dc6fe6026a6cf52f23c9b83f86e15171809973c4e2ea9ebc1a13b21ec6436de1e4e0bb2b1a72e5d543032bc54b708251e1b62e6c4b8938afbeccf1bd7 SHA512 d9bf79c776b8f58ea33197bf7f97f01904e08f7a85174e363c1d0e54d46ead8d72401b8ee8ab91ba6fe06fc9dece0ce33523a2007a82ef982228a0e4178efbd4
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.14.ebuild b/media-sound/jack2/jack2-1.9.14.ebuild
index b321f22400c8..3e5b96e0d923 100644
--- a/media-sound/jack2/jack2-1.9.14.ebuild
+++ b/media-sound/jack2/jack2-1.9.14.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/releases/download/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/jack2/jack2-1.9.16.ebuild b/media-sound/jack2/jack2-1.9.16.ebuild
new file mode 100644
index 000000000000..d0bf48e41848
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.16.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,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
+	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-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index a05c1b121090..d76f72a16250 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -17,18 +17,19 @@ else
 	MY_PV="${PV/_rc/-RC}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz""
-	KEYWORDS="~amd64 ~ppc ~x86"
+	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}
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
 
-COMMON_DEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
 	media-libs/libsamplerate
 	media-libs/libsndfile
 	sys-libs/readline:0=
@@ -40,10 +41,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
 	metadata? ( sys-libs/db:* )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	dbus? (
 		$(python_gen_cond_dep '
 			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 3832270188db..cbc2a14fbbb8 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,3 @@
-DIST kid3-3.8.3.tar.gz 3091795 BLAKE2B 245009d074c4b0734ee9fd39eb796e2679c416915e03773ca4f6fe7d570e17fefc73eaaaa03f4c42a3d81c2f2c4778b500bc8dfdff0a0cf07293d39571b8ab9f SHA512 5381c76b032e30b4a6382d160406f5ed75915c0e23bed62b3070dd875a1c812f907a7ecae833b82753fd2372f96d460b17a879ca9043c3786109074391199a5a
 DIST kid3-3.8.4.tar.gz 3161673 BLAKE2B 0055805bd0470bd000549c970c69cf911eb12d0ca291985759d0ebc2b6aa7394c65a72193606a4730136eeafef7a3d7a21822e998f2d841caa0a23c424a1f906 SHA512 c5abef6b0b7b4cfe606aa547563efff77f70b06770ea8423ed2cb25099a5c015e5de4badf5e87e080b05926459423584bd747aa3e475393026d92f6d73c9782a
-EBUILD kid3-3.8.3.ebuild 1759 BLAKE2B eaf9e42b64cdb1e82e80bbda06cbba78698457787894313f7f1a591ae247d59f1cf2cee27559903cdfc1aca44ada970727d4e98cdaa64d8121147ab59d4a4dd4 SHA512 bb5bf320186a277d31ba6e97c7c774adda87e8dd51a6c6b4f44dc20a4e10f4d5d1bc97262be8f096e978913f4d740e7f213d8dc2a63a1f6aa6eb5cef3854cb6a
-EBUILD kid3-3.8.4.ebuild 1784 BLAKE2B 515b193d147282df1e7817c5381dcd2d04d89c611ca13ee0a2e3c9f38785a502b08e52c72465a813fc342593b85504c5091481e57c81b410b9b4f115f4ac6f8e SHA512 377a24fe14a021b31cb3911dcc7410a952be40797d0bc6332b97dbc1fae3f20058fcfbd8fd224418c724d5b07f7b568593c09983487ed42ccc36aafcf56ebac4
+EBUILD kid3-3.8.4.ebuild 1782 BLAKE2B 6d0bab38a20dbd1c35869368f0f3ee9cc92489db759e2dd789cdd48ec176f06b3dcca310c7744c2c14fcbbe9992d21b815d34e99b8a57149207167e3068acb97 SHA512 2d5745d314c1977b4fa63e7211c68fb0960e6d51f9154eeac52796621c0bf1ed4a87c6f4d2a2b827b334167577f0d5641a6392d90df8b2ae4090ff7efcff4414
 MISC metadata.xml 581 BLAKE2B aaf7af21490a043596d92081040312887a687778836e126b6057db01eaf8bae1bb677ebdf2513bf5ab36f7ad95a7327315de3e42384915b7575d45ef1959e148 SHA512 6f4f92be39dd0099d1f762a07407e1fb6a75b9f0a7b01f0b60f7273eb1c04716e999633720b4535a7d42ea0ca447f8080377f00f93686c019baebfbce2cc25d8
diff --git a/media-sound/kid3/kid3-3.8.3.ebuild b/media-sound/kid3/kid3-3.8.3.ebuild
deleted file mode 100644
index e547876a20a7..000000000000
--- a/media-sound/kid3/kid3-3.8.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org cmake xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		media-video/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	mpris? ( dev-qt/qtdbus:5 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}
-	!media-sound/kid3:4
-"
-
-src_prepare() {
-	# overengineered upstream build system
-	cmake_src_prepare
-	# applies broken python hacks, bug #614950
-	cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_DBUS=$(usex mpris)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.8.4.ebuild b/media-sound/kid3/kid3-3.8.4.ebuild
index fad5b2f8ed0e..ff949e076256 100644
--- a/media-sound/kid3/kid3-3.8.4.ebuild
+++ b/media-sound/kid3/kid3-3.8.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://kid3.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 9a1f009d21a4..2729e0396ea0 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -4,5 +4,5 @@ AUX lash-0.5.4-strcmp.patch 252 BLAKE2B f2b002772df6dab5c2942039d36e681697894cc5
 AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434b823740c1cdd1bddd3c7a52ed505bc1acea64ddc145e1e7f9ffe7da31b7fd500f296b26c64d07c2a59149c49d18e0e4e0dc4e9e1a2 SHA512 39c3d82372592d6864a2c1e0de94ee150a434e107357ab549cf406cd58b7eb2f79cded6e97775f50e2e602906315aaf167869a53adb1b143eb3b5bb7147705bc
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
-EBUILD lash-0.5.4-r4.ebuild 2601 BLAKE2B b4be88f579f6d7e081dd752a41ff4d0225276a78482164bd654f983107a597d7ff491b77e6cfd7bc05541b3f41319df288df628c284fbc69f4eef7503945cc17 SHA512 465759a5527aac1227ce4623165fe76707d0b0883b957a2d3817091cd22b022e072c15f0b63e75c36a7b623cd54e25ef7440c1e142bfe94fd9d422079d07bea8
+EBUILD lash-0.5.4-r4.ebuild 2589 BLAKE2B c73b7e8b2040baae60532313ba6c4111230811c7101e0a18a46b15f7a4c6997902ad5a0e8158f014d9efaadd6b9f1a1be728894528ab7c8b2bb2163b33b3998a SHA512 a5a19f3fb55842ea11c141a568b338f6bf73d23784746d8071170db3de17dbaed8fd0c1eb55d4333868c4f73806d1eb57476cb744534c33e18f2e15915fa7412
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
index 95da6954e5d9..da41b2341e12 100644
--- a/media-sound/lash/lash-0.5.4-r4.ebuild
+++ b/media-sound/lash/lash-0.5.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 BDEPEND="
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index bc196ef89ef0..5850c630aff1 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,11 +1,8 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
-AUX lilypond-fix-cve-2020-17353.patch 2867 BLAKE2B 135d6ccc6ed93786189b54ea77219d527e6febd59434a10b33255e2d3c21db600ea9e231d852d188a8933c6acf5f1567f48c4b7e8f905f8bc87dda1b13d8d936 SHA512 83f513a6c4999579102b592e7babc556f49a4d04f799203ff790ec211c0744a91a17700b6742c3a2044ef90c2ce52a6f768f69f376952867715315bc8096689c
-DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860
 DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958
 DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
-EBUILD lilypond-2.21.4-r1.ebuild 3053 BLAKE2B f8f2f771482766d84725f1237f65a3fd7d9f83043a9458ef0f9484609fb27e0a83586956a091cfa75b31a4c567cacf60cea51a6e8052c49d2428dd08abf0f997 SHA512 0a089d91141293c8c85f839c00b7524afb1fb4cc06a78eea49faa16d3c678c904fd393eaf1aa007015f029eaed18cc71fd4ddbf34ae78436c3c8e6c6670eee3a
-EBUILD lilypond-2.21.5.ebuild 3343 BLAKE2B 77b92a732c68cefb1c1cdff69ed0e54b20b633d6b5ee1a292d543a45385bafe67594381d9b0ebbfa4a42f92cdc56509f0a0295c0c983b28bab027c525a3f93bd SHA512 6f6cb65f7e1a951ea2a1039bece43658471ff32cdfa5159649b87fd83681b3923ca2c05254417c2d54a9608afbecf004c50738be90f7e29ef6091d4b07dc208b
+EBUILD lilypond-2.21.5.ebuild 3340 BLAKE2B a81e2194ec53dfba4f7dfc6159e591a2cce5b43dac3b60d193fbe8ad21f3f491ee85734cdff90e5783c5d5da36ac9dc069f8a82e3430cc425b3f9ae9692deace SHA512 800ae82e1574a273a4338127b7d08264c0f271e4a4d6d2d1677a884fd2a6718e856e8023793d8153a40d09a5ca95399e25eb32aecfc4615f6b720fb287ec8eda
 EBUILD lilypond-2.21.6.ebuild 3264 BLAKE2B 733deba469734f1a9b5446258c87a35a9cdc05b887e7ff97772608780614d7b317e10a1781d3907f983cc8ba36ee74069eafb2fe3db1e96acd5cc77ba70059c8 SHA512 5437df0f0642ca4375fd2c03f358c782be2cce1a5867dbec647cea56a69753f488b9a094d39f84e3093048a48f98e8b44a693fb1e4415313f0c25c8bc68c9eb0
 EBUILD lilypond-9999.ebuild 3264 BLAKE2B 733deba469734f1a9b5446258c87a35a9cdc05b887e7ff97772608780614d7b317e10a1781d3907f983cc8ba36ee74069eafb2fe3db1e96acd5cc77ba70059c8 SHA512 5437df0f0642ca4375fd2c03f358c782be2cce1a5867dbec647cea56a69753f488b9a094d39f84e3093048a48f98e8b44a693fb1e4415313f0c25c8bc68c9eb0
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch
deleted file mode 100644
index e91947eae056..000000000000
--- a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From b84ea4740f3279516905c5db05f4074e777c16ff Mon Sep 17 00:00:00 2001
-From: Han-Wen Nienhuys <hanwenn@gmail.com>
-Date: Tue, 21 Jul 2020 14:45:08 +0200
-Subject: [PATCH] scm: disable embedded-ps and embedded-svg in -dsafe mode
-
-This prevents executing privileged PostScript and exploiting
-Ghostscript vulnerablilities
-
-Tested:
- $ lilypond -dsafe input/regression/les-nereides.ly
- (works, kinda)
-
- $ cat f.ly
- { c4_ \markup \postscript #" (x) show " }
-
- $ lilypond -dsafe f
- Preprocessing graphical objects.../home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: In procedure ly_make_stencil in expression (ly:make-stencil (list # #) (quote #) ...):
-  /home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: Wrong type argument in position 1 (expecting registered stencil expression): (embedded-ps "
----
- scm/define-stencil-commands.scm | 65 ++++++++++++++++++++++-------------------
- 1 file changed, 35 insertions(+), 30 deletions(-)
-
-diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm
-index 09a2299..e388788 100644
---- a/scm/define-stencil-commands.scm
-+++ b/scm/define-stencil-commands.scm
-@@ -21,36 +21,41 @@
- (define-public (ly:all-stencil-commands)
-   "Return the list of stencil commands that can be
- defined in the output modules (@file{output-*.scm})."
--  '(blank
--    char
--    circle
--    dashed-line
--    draw-line
--    ellipse
--    embedded-ps
--    embedded-svg
--    end-group-node
--    glyph-string
--    grob-cause
--    named-glyph
--    no-origin
--    page-link
--    path
--    partial-ellipse
--    placebox
--    polygon
--    resetcolor
--    resetrotation
--    resetscale
--    round-filled-box
--    setcolor
--    setrotation
--    setscale
--    start-group-node
--    text
--    unknown
--    url-link
--    utf-8-string
-+  (let*
-+      ((commands '(blank
-+                   char
-+                   circle
-+                   dashed-line
-+                   draw-line
-+                   ellipse
-+                   end-group-node
-+                   glyph-string
-+                   grob-cause
-+                   named-glyph
-+                   no-origin
-+                   page-link
-+                   path
-+                   partial-ellipse
-+                   placebox
-+                   polygon
-+                   resetcolor
-+                   resetrotation
-+                   resetscale
-+                   round-filled-box
-+                   setcolor
-+                   setrotation
-+                   setscale
-+                   start-group-node
-+                   text
-+                   unknown
-+                   url-link
-+                   utf-8-string
-+                   )))
-+
-+    (if (ly:get-option 'safe)
-+        commands
-+        (append '(embedded-ps embedded-svg)
-+                commands))
-     ))
- 
- ;; TODO:
--- 
-1.9.1
-
diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
deleted file mode 100644
index 7d751530c323..000000000000
--- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-IUSE="debug emacs guile2 profile vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	>=dev-texlive/texlive-metapost-2020
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=x11-libs/pango-1.12.3
-	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2.2:12 )
-	!guile2? (
-		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	media-gfx/fontforge[png,python]
-	sys-devel/gettext"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
-	"${FILESDIR}"/${PN}-fix-cve-2020-17353.patch
-)
-
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# fix hardcoded `ar`
-	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable profile profiling)
-	)
-
-	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
-
-	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.21.5.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild
index c03d4b781515..a213efeabbd2 100644
--- a/media-sound/lilypond/lilypond-2.21.5.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.5.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/lltag/Manifest b/media-sound/lltag/Manifest
index 2dc307aa89f2..b73afdfc5671 100644
--- a/media-sound/lltag/Manifest
+++ b/media-sound/lltag/Manifest
@@ -1,5 +1,3 @@
-DIST lltag-0.14.5.tar.bz2 48035 BLAKE2B 15352a388fd96882d78803905c12074288b6084b72c46a5ea15a2dbe504bd416201315c0047492329f06413100ca432040a974dbe56869772dd0a36d3d18a927 SHA512 64d16ae1bfb920f2e10add6728bdbe261662688b5c99e4cc92ffa5d7dd5fe596c6c3ccbe61b432a4594e49003fc981b20588def9523a65ee934418afb512bedd
 DIST lltag-0.14.6.tar.gz 57162 BLAKE2B 9b21fa026644722bdb0cbb91e3a5f27247c4e8470273823aca71b71253e5ee50703e3cb14b1c4e8e6079e9d5d46dccc03d7a4892782c1c53189d5a13992ddd11 SHA512 9eb488ac1444ec11b02ca9c396903b5c6ef1e2f19558a6ef9d5e8d3fadb639fad902b4d6cdde8f4374768fdea553cfd6550c4151df9a755c9ae4a5652128a836
-EBUILD lltag-0.14.5.ebuild 1006 BLAKE2B fa19a939185695aeedf84ca9bf13b98a206f8a3615df7148a3d010bdb88622ae10d7096c2a91d77ea012b8839f5697c53f284b1431c8c5d0fed375474a2000c3 SHA512 730621ff84e758482e0afe16f5ffe786988140ec4593e5bbf8722e37b2c9f15d757c5bd390c13e63732d14a2be4902fd842b56e47de4a9c1bd1976f9501e5563
 EBUILD lltag-0.14.6.ebuild 1076 BLAKE2B 49f65836acf36cee3cf7419c1880468447fcbe1d33bdb2edad0636d62614c9f5ce9ee1aa23a4ab9d31eff0004d62391ef735737a4929f3d7956690de6c131f01 SHA512 efc874f98817d443b1d502669321afcf7526e450253d3c0320f2ac11fac32b40443db8bce08680f24ce9513eba069df65dfb547b2839730b744fb8e761e47a54
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/lltag/lltag-0.14.5.ebuild b/media-sound/lltag/lltag-0.14.5.ebuild
deleted file mode 100644
index 3f3775797d97..000000000000
--- a/media-sound/lltag/lltag-0.14.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit perl-module
-
-DESCRIPTION="Automatic command-line mp3/ogg/flac file tagger and renamer"
-HOMEPAGE="http://home.gna.org/lltag"
-SRC_URI="http://download.gna.org/lltag/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac mp3 ogg readline"
-
-RDEPEND="dev-perl/libwww-perl
-	mp3? ( media-sound/mp3info dev-perl/MP3-Tag )
-	ogg? ( media-sound/vorbis-tools )
-	flac? ( media-libs/flac )
-	readline? ( dev-perl/Term-ReadLine-Perl )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	mylltagopts=(
-		"DESTDIR=${D}"
-		"PREFIX=/usr"
-		"SYSCONFDIR=/etc"
-		"MANDIR=/usr/share/man"
-		"PERL_INSTALLDIRS=vendor"
-		"DOCDIR=/usr/share/doc/${PF}"
-		)
-}
-
-src_compile() {
-	emake "${mylltagopts[@]}"
-}
-
-src_install() {
-	emake "${mylltagopts[@]}" install{,-doc,-man}
-	dodoc Changes
-	perl_delete_localpod
-	# Move config to recommended location
-	mv "${D}usr/share/doc/${PF}"/config "${D}"etc/lltag/ || die
-}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index fc9c3ad9e0cf..c29e8723487b 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,3 +1,3 @@
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
-EBUILD lollypop-1.2.35.ebuild 1535 BLAKE2B 6cfe98b69a1171b60f9b1bb2f42d4a65185c61e6e05fb11d2b470f71f51cbd4958a713751ce34c9bd84ebc93914241ef636425daaa3b0f6188d39d60dcbaf170 SHA512 dff7c63b08491fb8bddba5e95fc8df4ba17a3a8fe93c31091d772a986b1826969541d3b9c0899bf93fdeffd36e1d896e4e3ff8666c931c840bc3efd2412df630
+EBUILD lollypop-1.2.35.ebuild 1522 BLAKE2B c699c58634ae71062603aa05880b71ca852a5ae134acb54a4d3b7f96460f5d443cef9e90527b408b89e1c10bfcc65238b4ab81c3e51ca4f176cd3cc5178f4b97 SHA512 9086cc448d207e3c1bf202cbf21a81a5bb9ca4c60a37b5c5e0e72ba16bb23421f6b7774c6e3c996da28e2506291710fe96170bee790b968b29859b15dc1d691c
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 8cc6542ee210..70b5f2889b80 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 gnome2-utils meson xdg-utils
+inherit python-single-r1 gnome2-utils meson xdg
 
 DESCRIPTION="Modern music player for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
@@ -49,23 +49,24 @@ RDEPEND="${DEPEND}
 
 RESTRICT="test"
 
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
 src_install() {
 	meson_src_install
 	python_optimize
 }
 
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_schemas_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
 	gnome2_gconf_uninstall
 	gnome2_schemas_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-sound/mangler/Manifest b/media-sound/mangler/Manifest
index 84888924b25f..f04cb043514d 100644
--- a/media-sound/mangler/Manifest
+++ b/media-sound/mangler/Manifest
@@ -1,3 +1,3 @@
 DIST mangler-1.2.5.tar.bz2 5390985 BLAKE2B b2b61d49683b356be5bcaf111d0e75cc0ff30cbb131b0de360128e2973a415eb87736b55a965fb30651e5d3580a2274754ddb8a44b345c55fc6ba0caa26de0a5 SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38
-EBUILD mangler-1.2.5-r1.ebuild 1300 BLAKE2B b59d5d1f7a5ac8e34735e3b3428d28100d3b57c9f62fee6e30b8bd3342e63f9b6332a310406f36c4f87ce09dd594a9c6398426f6a523ad982d693f33088eb054 SHA512 d05442c365a077984c363bfe45267d0eecbd68944fc462487ef1daeb787610c528c2c31e3180341fce68b7effa195e76e9bdcd1921acb785337d55e2cf5f6a75
+EBUILD mangler-1.2.5-r1.ebuild 1273 BLAKE2B c1ebb869c10de4ebe45bb1bf6e64ab3a14820ba3e901e4fa081b29c955c072756ded5f74c63939c80d1c626f709b35ed70d8d0446ad84590fc206e76f5e28bd5 SHA512 97602659cd9ad37e2a7f9a23578a784d8d09676ad5c30c7860ceb217dab590bd663c064f810e995df30179d9fbeeb5bd9170eafd152e9b98a51413be4ef0b1b9
 MISC metadata.xml 470 BLAKE2B dba7ffdefd9ed484e5397a60c4b13f051879ffd760fc32cf423f51343242cca71578ab6d3d87471250f9b223d0247bd92ba3ee2ff1b5b2d05f92dd4ee89b72f1 SHA512 dec3e027307afb3b5589f56e595371026232d5f328fe9520b6d21282eba626b736dbefa7768cb06c4821e75b45340a04a7252e0a1b1380b618ef1f9d54b1692c
diff --git a/media-sound/mangler/mangler-1.2.5-r1.ebuild b/media-sound/mangler/mangler-1.2.5-r1.ebuild
index 6c07765cec25..8f58aefd5e7c 100644
--- a/media-sound/mangler/mangler-1.2.5-r1.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic ltprune toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
 HOMEPAGE="http://www.mangler.org/"
@@ -11,9 +12,10 @@ SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+alsa opus espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
+IUSE="+alsa opus espeak g15 +gsm oss pulseaudio +speex +xosd"
 
-RDEPEND="dev-cpp/gtkmm:2.4
+RDEPEND="
+	dev-cpp/gtkmm:2.4
 	gnome-base/librsvg
 	>=dev-libs/dbus-glib-0.80
 	>=dev-libs/glib-2.20.1:2
@@ -28,14 +30,14 @@ RDEPEND="dev-cpp/gtkmm:2.4
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
 	speex? ( >=media-libs/speex-1.2_rc1 )
 	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	tc-export CC
-	append-cxxflags -std=c++11
+
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable gsm) \
 		$(use_enable speex) \
 		$(use_enable opus) \
@@ -49,5 +51,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 70ad7704d964..f0ad97149202 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,10 +1,12 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
-AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
-DIST mpd-0.21.25.tar.xz 683768 BLAKE2B 9bc294850ddd2b5e1468d4988179f633c8fec14f7f99ffa2581d1aa30991a85ace8361a558e674f5c4b8e7471c9911dcb1286f61f1d42a2315ad05db4dfd9053 SHA512 67e0cbf176d18cd63effab0d12b22bea846458cbaa383ead9078c4b5f2a472dbb1d7308af4d6898691e8864a911c808af5ca2c553d8233323b8aaedfdc7189fc
+AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
 DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a
-DIST mpd-0.22.tar.xz 722940 BLAKE2B 8b95c2a4927e139d2f44d45101e0903ce7b8f0caf7d7d83d978d4aa782369270096c03db398fe13138621d7142c87a15131e20f57fecbc760c2fbaf5cbdcd52b SHA512 2a6671dc2392dbac65d8339b8cfe86626fc46727bedab80266b24c6d63b0a26a832fc233576866ab5115627efdaa61bbe6876f4d33cb48c21e16fb5b74d3cfe4
-EBUILD mpd-0.21.25.ebuild 7988 BLAKE2B b0af2e073675581b9dba7441771a7332649eef6967a59f541c25cb4f4938a201a747e9a9fa03179d80c2d22b0c51b09800964bd1f8dba4fed7c449f8b94f0b26 SHA512 a22dedd01642892ec5c9f74a075e0c554069e167639acd28b73fca817d9b439303ad3c1271fc70942341a5187f72f63036d535dfb4973db291735989b3f95027
-EBUILD mpd-0.21.26.ebuild 7990 BLAKE2B 98503ddf2a9b0783bf4396740f897223227ae79cd3eb1eb4ed3390ccc31c5f589a3e92f8a2475625247cf2f05723123710917f56465378e02e160ec09aaca932 SHA512 f53f6b14b1cefcff81e862efc1cf86f23c9441627667ca64a648567d8cf297b7b7f61e8b6f9d63dac09995da59c94a1d0c2cc6b64c6738d3fdfbaeddae69bbb8
-EBUILD mpd-0.22.ebuild 8065 BLAKE2B 8cb58cdbdaa46b74b7c93b2d7ff0714a5401a27a513c0bd56a6597586ebad85bc15d8ee1b3780f1e73aea8514d4f7a27118790386ee23a45a844d3ad3417385b SHA512 f4e4539004249014ce6a3d774a2dc8cdbd163141d3f7402fa6f1d9b86580bdce845aa9f642ec519eccc2bf44bbc7bd7eee4617c5f7b63313b6f68689d50808f1
+DIST mpd-0.22.1.tar.xz 725204 BLAKE2B 7032472776129c9cb302545d8bdd266a7551df4647d6fc09e9f5e287f25b25158759316dde5bb481a7b87366d7eaa5a91613bbc6679a9f1b768297b63b1fb9fb SHA512 b7c0156bb85bbc551435bbb9a49ed719e51fe0446dcecbaadbe083e705fc16da9d03d83814c7dcc041075a46544473cf63e5d1576dbc3961bfdfa44ef5fb27d7
+DIST mpd-0.22.2.tar.xz 725808 BLAKE2B 5961177dd33b5e008b17131c6a83b8fc61df62317acdfd6bac4e20a9e31111d1307be79223a23fdaa0e2ae0593aa8015ac140648ea4b5b699a8b64632fc589ef SHA512 13ec85bda79d0c2588c50e2ebbf53b733f23c9700abfd7ccd4140db8080a4c496073727c8c04e9a2f8897669beeced0d77caa2bac7e2ca9adb41ad56dcf92aeb
+DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
+EBUILD mpd-0.21.26.ebuild 7986 BLAKE2B 24b791d8b86389dd6d4eb123e05c1bdc8ded128edf559e6a203220fcbbe043013cb44bbd185458755e5f1a8f225909b90f8a5b0c2ddb53a04b6f5e487dcac795 SHA512 1f385dbe89c5a91960426734f4a23827495afefe71817a09ef170877d546087e87df69e2e58257b1ce670a1d58c835cb0536dd5412d581ea303922e903a5c74c
+EBUILD mpd-0.22.1-r1.ebuild 8111 BLAKE2B b76a3ed4dbfaa32716471d001f22f1bfeae706c35bafe6d5883342500c8ed9f256e2ad28e70b8924fc198fd2f6e11d115993ebd277bea267e65ecdeac75be6e9 SHA512 efead4f892bbba2f997954900047b2a0edb2981a6c54a5198e97d49944591ddcd30babdc40cd4a62d09a7dfdcb6e8df278189cff5d0e96cd323bacede7027d9d
+EBUILD mpd-0.22.2-r1.ebuild 8111 BLAKE2B b76a3ed4dbfaa32716471d001f22f1bfeae706c35bafe6d5883342500c8ed9f256e2ad28e70b8924fc198fd2f6e11d115993ebd277bea267e65ecdeac75be6e9 SHA512 efead4f892bbba2f997954900047b2a0edb2981a6c54a5198e97d49944591ddcd30babdc40cd4a62d09a7dfdcb6e8df278189cff5d0e96cd323bacede7027d9d
+EBUILD mpd-0.22.3.ebuild 8111 BLAKE2B b76a3ed4dbfaa32716471d001f22f1bfeae706c35bafe6d5883342500c8ed9f256e2ad28e70b8924fc198fd2f6e11d115993ebd277bea267e65ecdeac75be6e9 SHA512 efead4f892bbba2f997954900047b2a0edb2981a6c54a5198e97d49944591ddcd30babdc40cd4a62d09a7dfdcb6e8df278189cff5d0e96cd323bacede7027d9d
 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/files/mpd-0.21.4.init b/media-sound/mpd/files/mpd-0.21.4.init
index 7f0950c62938..72fede85765a 100644
--- a/media-sound/mpd/files/mpd-0.21.4.init
+++ b/media-sound/mpd/files/mpd-0.21.4.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 : CFGFILE=${CFGFILE:=/etc/mpd.conf}
@@ -19,6 +19,8 @@ get_config() {
 }
 
 extra_started_commands='reload'
+# Required by io_uring
+rc_ulimit="-l 65535"
 command=/usr/bin/mpd
 command_args=${CFGFILE}
 required_files=${CFGFILE}
diff --git a/media-sound/mpd/mpd-0.21.26.ebuild b/media-sound/mpd/mpd-0.21.26.ebuild
index fda03cb33440..b658891c0356 100644
--- a/media-sound/mpd/mpd-0.21.26.ebuild
+++ b/media-sound/mpd/mpd-0.21.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.22.ebuild b/media-sound/mpd/mpd-0.22.1-r1.ebuild
index 96419725bc8b..bf08e1431b44 100644
--- a/media-sound/mpd/mpd-0.22.ebuild
+++ b/media-sound/mpd/mpd-0.22.1-r1.ebuild
@@ -7,7 +7,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"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -38,7 +38,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
-	sys-libs/liburing
+	sys-libs/liburing:=
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
@@ -286,6 +286,8 @@ src_install() {
 	keepdir /var/lib/mpd/music
 	keepdir /var/lib/mpd/playlists
 
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.21.25.ebuild b/media-sound/mpd/mpd-0.22.2-r1.ebuild
index a168f3877037..bf08e1431b44 100644
--- a/media-sound/mpd/mpd-0.21.25.ebuild
+++ b/media-sound/mpd/mpd-0.22.2-r1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+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
@@ -38,6 +38,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
+	sys-libs/liburing:=
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
@@ -54,6 +55,7 @@ RDEPEND="
 	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= )
@@ -149,7 +151,6 @@ src_configure() {
 		-Dcue=$(usex cue true false)
 		-Dcurl=$(usex curl enabled disabled)
 		-Ddbus=$(usex dbus enabled disabled)
-		-Ddebug=$(usex debug true false)
 		-Deventfd=$(usex eventfd true false)
 		-Dexpat=$(usex expat enabled disabled)
 		-Dicu=$(usex icu enabled disabled)
@@ -238,12 +239,13 @@ src_configure() {
 
 	emesonargs+=(
 		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=false
+		-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)"
@@ -275,13 +277,17 @@ src_install() {
 			"${ED}"/etc/mpd.conf || die "sed failed"
 	fi
 
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
+	if use doc; then
+		doman doc/mpd.1
+		doman doc/mpd.conf.5
+	fi
 
 	keepdir /var/lib/mpd
 	keepdir /var/lib/mpd/music
 	keepdir /var/lib/mpd/playlists
 
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.22.3.ebuild b/media-sound/mpd/mpd-0.22.3.ebuild
new file mode 100644
index 000000000000..bf08e1431b44
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.3.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2020 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 unicode 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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-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.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	if use doc; then
+		doman doc/mpd.1
+		doman doc/mpd.conf.5
+	fi
+
+	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/mpg123/Manifest b/media-sound/mpg123/Manifest
index aec476515232..273ddef90a0c 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,9 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
 DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
 DIST mpg123-1.26.2.tar.bz2 1047437 BLAKE2B 31b3434968fe48c81f599a9aa23557937ac71ed485c6c933f40f1ef2fdfaabcf8c34059de7f62e163286036db987932b6fcbf4f63f752c64659c9b9a805cf63c SHA512 aa63fcb08b243a1e09f7701b3d84a19d7412a87253d54d49f014fdb9e75bbc81d152a41ed750fccde901453929b2a001585a7645351b41845ad205c17a73dcc9
+DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
 EBUILD mpg123-1.25.10-r1.ebuild 2840 BLAKE2B b5fc0883aef5242b4cddfc142cb6eaea54b11a3cac3ae4ee891e32bbeda4abfda304bb76c2c55dc2d88aadbd3555e2b2639a09294d40114e432403af75c956e8 SHA512 321fbcaf8be4780387f8af4451bb8c18863c64cd8686596d9657738be8cf5a76ecc4fedc89ecd1380bd7f671ac669800ab56f889305ca3d504808dd5081481f9
-EBUILD mpg123-1.25.13.ebuild 2883 BLAKE2B a4ad4f83a516e57cf4181987fa4d59ca0680fe609b9477085e514a4227f82a819476489178db12e4caee26144416e6f73b3841f8741476a74135f61ff4e22e29 SHA512 1f9ded3f159a9bd6fbc85e1871d410d6919fde7c6cae3f069ec77c9dad3043f866cd74ab5ebd60868bbe2043f3e95f095154461821b7fb159a22125018f1bfde
+EBUILD mpg123-1.25.13.ebuild 2882 BLAKE2B 6df742a1cda39743d832103757aa2792896122bf9aeb32b9ed057f7aa633069fe561cf07b1758ddbc82cb5894bcb5aa1252ac149a9d92560b653423ef7173ab2 SHA512 d5ee996bc7d276f9fc9440b85a9c8dc3a46b8b36b9b4ad3244ed89e10dc3b38dee78caa692c05d3ee81ba9c7762fbf7d8abbcc5ada6f318d3a335278d2159347
 EBUILD mpg123-1.26.2.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
+EBUILD mpg123-1.26.3.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.13.ebuild b/media-sound/mpg123/mpg123-1.25.13.ebuild
index 6476f6e637a5..a3bb45a165b6 100644
--- a/media-sound/mpg123/mpg123-1.25.13.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.26.3.ebuild b/media-sound/mpg123/mpg123-1.26.3.ebuild
new file mode 100644
index 000000000000..0b76cb7da365
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.26.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="
+	app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index bff6664e2cd2..3a169a8685f0 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,8 @@
 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
 DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
+DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba
 EBUILD mumble-1.3.2.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
-EBUILD mumble-9999.ebuild 3791 BLAKE2B 8c2fa233598fbddf33686117cedea1d146cac6752320c07ab07ded9098ab99a0c4691f8cc2564ef8b8b1349ef7ce0af4840d87d15f37301aff1e2366b68f99e4 SHA512 c5edbd19160921df5671c305200b153fef8d629086b2f3d3df4b3d3e207a0f2f557d7d6e976e7f39be4f01224c75055e6a3899a2752671a2153b7c51fb8bf75e
+EBUILD mumble-1.3.3.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
+EBUILD mumble-9999.ebuild 3057 BLAKE2B 8e2614ae3c594f82c09860adaf34a9186874d44e78faec04a3c209d50f13985c4930e6cba0c700a1d65265bb96e67b2b5767ea7d6e4ea819995fbc09e5a232a5 SHA512 6cdb85d603f3b1303e1caef0369dda4e7b7ed8e09a70a72ddd5eb1e33bd21f9ce11c87899dee90ca99b3b832252215ec182676ca4fe2ec9a2ac08e6f0b797254
 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
new file mode 100644
index 000000000000..df7176498fdf
--- /dev/null
+++ b/media-sound/mumble/mumble-1.3.3.ebuild
@@ -0,0 +1,161 @@
+# 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/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index d821055f5f3c..1109a96055d6 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop multilib-build qmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -26,7 +26,8 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+IUSE="+alsa +dbus debug g15 jack libressl portaudio pulseaudio nls +rnnoise speech test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -38,6 +39,7 @@ RDEPEND="
 	dev-qt/qtxml:5
 	>=dev-libs/protobuf-2.2.0:=
 	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/opus-1.3.1
 	>=media-libs/speex-1.2.0
 	media-libs/speexdsp
 	sys-apps/lsb-release
@@ -49,7 +51,6 @@ RDEPEND="
 	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 )
@@ -64,97 +65,54 @@ BDEPEND="
 	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"
+src_prepare() {
+        # required because of xdg.eclass also providing src_prepare
+        cmake_src_prepare
 }
 
-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_configure() {
 
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
+	local mycmakeargs=(
+		-Dalsa="$(usex alsa)"
+		-DBUILD_TESTING="$(usex test)"
+		-Dbundled-celt="ON"
+		-Dbundled-opus="OFF"
+		-Dbundled-speex="OFF"
+		-Ddbus="$(usex dbus)"
+		-Dg15="$(usex g15)"
+		-Djackaudio="$(usex jack)"
+		-Doverlay="ON"
+		-Dportaudio="$(usex portaudio)"
+		-Dpulseaudio="$(usex pulseaudio)"
+		-Drnnoise="$(usex rnnoise)"
+		-Dserver="OFF"
+		-Dspeechd="$(usex speech)"
+		-Dtranslations="$(usex nls)"
+		-Dupdate="OFF"
+		-Dzeroconf="$(usex zeroconf)"
+	)
 
-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
+	cmake_src_configure
 }
 
 src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	dodoc CHANGES README.md
-	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
+	cmake_src_install
+
+	if use amd64 ; then
+		# The 32bit overlay library gets automatically built and installed on x86_64 platforms.
+		# Install it into the correct 32bit lib dir.
+		local libdir_64="/usr/$(get_libdir)/mumble"
+		local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble"
+		dodir ${libdir_32}
+		mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \
+			"${ED}"/${libdir_32}/ || die
+	fi
 }
 
 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)."
+	elog "Run 'mumble-overlay <program>' to start the OpenGL overlay (after starting mumble)."
 	echo
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 5cdc87a47306..c32457ac1f65 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -4,7 +4,9 @@ AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
 DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
+DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
 EBUILD murmur-1.3.2.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
-EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
-MISC metadata.xml 435 BLAKE2B 6628c9f2a8a849eea9d7a987a5226835529032a1b7acd443efb9f5f5f46249da602939f8cb5291ce596856ff7258be09665886a24937eb1425c05efea0d7313f SHA512 ea4d122a1a40ff30ea188254cd241f62fa1e47d873089491088228680e336ca47d5ee5941aa53e47976dd8979554f496df75bbb7688b99f26112ef27d004e85d
+EBUILD murmur-1.3.3.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
+EBUILD murmur-9999.ebuild 3748 BLAKE2B 220d4e0fd63cf2464fe0586938525c8c3c8c8b26f3b08c55d5c8e5dd4f9a7a996567fb28f7fb9bef6a602c3f041b743180445f0fd1024583dc68b4a81d472b23 SHA512 0cfb9421a3c7e389ea3dea6a536e49485fd586a6785d0813435165ece1401597b7e7858f6378bf1ca7793ddbdaecdbf9410e0bc5ffbdfcc13d392ba59156c404
+MISC metadata.xml 530 BLAKE2B a6618cb804deee82cf3f88ee683a5b406eee1317e9ca815f7f4e363a0e14c7c8cc2bcf4400d3a79b62f5652881e46be4405d0ac88afe610187419978ac57c9a6 SHA512 ef162d69805d3262f9f4f1732e9d8a031cac73e130f04013123d8f8e1d8e48132df243653ef2464bda1d8b8c0b88485fd32edaab8b3e62555a6295c676c1f5b5
diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml
index 2299d0735ea9..786a950d6d06 100644
--- a/media-sound/murmur/metadata.xml
+++ b/media-sound/murmur/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Lars Wendler</name>
 	</maintainer>
 	<use>
+		<flag name="grpc">Use <pkg>net-libs/grpc</pkg> to enable remote control capabilities.</flag>
 		<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
new file mode 100644
index 000000000000..17d28a117c43
--- /dev/null
+++ b/media-sound/murmur/murmur-1.3.3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils systemd readme.gentoo-r1
+
+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=( '-*' )
+else
+	MY_PN="mumble"
+	if [[ "${PV}" == *_pre* ]] ; then
+		MY_P="${MY_PN}-${PV}"
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+		S="${WORKDIR}/${MY_P}"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${MY_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}/${MY_PN}-${PV/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	>=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	|| (
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsql:5[mysql]
+	)
+	dev-qt/qtxml:5
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dbus? ( dev-qt/qtdbus:5 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+"
+BDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	virtual/pkgconfig
+"
+
+if [[ "${PV}" == *9999 ]] ; then
+	# Required for the mkini.sh script which calls perl multiple times
+	BDEPEND+="
+		dev-lang/perl
+	"
+fi
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == *9999 ]] ; then
+		pushd scripts &>/dev/null || die
+		./mkini.sh || die
+		popd &>/dev/null || die
+	fi
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+
+	# Adjust systemd service file to our config location #689208
+	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-i scripts/${PN}.service || die
+}
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myconf: No use flag given."
+		use ${1} || echo "no-${1}"
+	}
+	local conf_add=(
+		no-client
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse ice)
+		$(myuse pch)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	eqmake5 main.pro -recursive \
+		CONFIG+="${conf_add[*]}"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc -r scripts/server
+	docompress -x /usr/share/doc/${PF}/scripts
+
+	local dir="$(usex debug debug release)"
+	dobin "${dir}"/murmurd
+
+	local etcdir="/etc/murmur"
+	insinto ${etcdir}
+	newins scripts/${PN}.ini.system ${PN}.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	systemd_dounit scripts/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur ${etcdir}/murmur.ini
+	fperms 640 ${etcdir}/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 6a55b9734426..761b2f65bbb7 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils systemd readme.gentoo-r1
+inherit cmake systemd readme.gentoo-r1
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -29,7 +29,8 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
+IUSE="+dbus grpc +ice test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-group/murmur
@@ -46,6 +47,7 @@ RDEPEND="
 	sys-apps/lsb-release
 	>=sys-libs/libcap-2.15
 	dbus? ( dev-qt/qtdbus:5 )
+	grpc? ( net-libs/grpc )
 	ice? ( dev-libs/Ice:= )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 "
@@ -93,6 +95,8 @@ src_prepare() {
 	# Adjust systemd service file to our config location #689208
 	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
 		-i scripts/${PN}.service || die
+
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -100,29 +104,30 @@ src_configure() {
 		[[ -n "${1}" ]] || die "myconf: No use flag given."
 		use ${1} || echo "no-${1}"
 	}
-	local conf_add=(
-		no-client
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse ice)
-		$(myuse pch)
-		$(usex zeroconf '' no-bonjour)
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-Dclient="OFF"
+		-Ddbus="$(usex dbus)"
+		-Dg15="OFF"
+		-Dgrpc="$(usex grpc)"
+		-Dice="$(usex ice)"
+		-Doverlay="OFF"
+		-Dserver="ON"
+		-Dzeroconf="$(usex zeroconf)"
 	)
 
-	eqmake5 main.pro -recursive \
-		CONFIG+="${conf_add[*]}"
+	cmake_src_configure
 }
 
 src_install() {
-	dodoc README CHANGES
+	cmake_src_install
+
+	dodoc README.md CHANGES
 
 	docinto scripts
 	dodoc -r scripts/server
 	docompress -x /usr/share/doc/${PF}/scripts
 
-	local dir="$(usex debug debug release)"
-	dobin "${dir}"/murmurd
-
 	local etcdir="/etc/murmur"
 	insinto ${etcdir}
 	newins scripts/${PN}.ini.system ${PN}.ini
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index a07e51accc83..9b89cf4051ed 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,5 +1,5 @@
 AUX musepack-tools-465-fno-common.patch 659 BLAKE2B 603213fe4c979b4a79b9a2103117eb63e3b90933119cbefef32c18c3523d24c6f0eca8beea685d1ef6effb3bec82e53004bdaeed2062a2a14f4a1e7bb398fd97 SHA512 239b353380d534f09fb381520eb29b919cb3f69ac51be8a813e67338de928c91c99c249b6a5b27f297cd0a741b7c10e7c61171b4bd42b5016402b52efa00cca0
-AUX musepack-tools-465-gentoo.patch 1558 BLAKE2B 292111fc2b795a98cc2c1926b63799114e4b6ea2c11aa9ddee78c24332181ac9d5c4ab403398470014b5f33cf246def98214026d0def5979e11df2a1e2747050 SHA512 c260e1f96fa4ab79f09d78f16ede4522a802f703d565cf6db974b918e8db48233211a561ce64e0e8bc7cbd177ebf2986c46e5c9811ac15515f8126458c15b0af
+AUX musepack-tools-465-gentoo.patch 2982 BLAKE2B 0783de2ac04e77d8ff337e3ed52b09174e6268aaa9a1c2709b65343753880437b42af8fd17fbf1361811bdeb5caed625f78fa8440c7ccbddbdf80b827da3374e SHA512 5eee2985b4a3201e6d93d24e7cd9244d7e7f64208ae80656cdd6932d3adee2403e14e17ede45a83071a5c5bf21aa938e4786267a2c4b3118053c900aa18b2105
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 867 BLAKE2B 3e2e6ef1d0059aeb0f184fccbc750bc684a6cb4687a7fd2b48363f7a9979b89f5bb2e1455e31fa05a0ff1dcd64b97d820b0170592b438853999b908d12e97b45 SHA512 63540e27bd3deabc966c14a2c3bc5a726e2844602a38abfc8310a9b83862873198f8650212dfff51c4f9de317ea49616346c1d6999a9c90738bd56cd1fd6515e
+EBUILD musepack-tools-465-r1.ebuild 857 BLAKE2B 33b98c1579e40beb7b48cdd2060fc18059f0f2b5144d8e4bfcd5aec1abec5e0fbdd29749e92ab8e6d1099a6e8ce010ca02537da63ec3a98f7e9679dbcda6596b SHA512 2c9315102a948846f8b4d5014f5923175c704a6c447cdb16603b8f18b1c552f124e7af9ee86ce393e3fabf20abb5d4ec2cbd6386271b15831bc29759398507ad
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
index 51df29910742..5c80531d96f4 100644
--- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
@@ -13,28 +13,79 @@
  add_subdirectory(libmpcenc)
 --- a/libmpcdec/CMakeLists.txt
 +++ b/libmpcdec/CMakeLists.txt
-@@ -1,7 +1,22 @@
+@@ -1,7 +1,15 @@
  include_directories(${libmpc_SOURCE_DIR}/include)
- if(SHARED)
-   add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+-if(SHARED)
+-  add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
 -else(SHARED)
 -  add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
-+  set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
-+  if(NOT MSVC)
-+    target_link_libraries(mpcdec_shared m)
-+  endif(NOT MSVC)
- endif(SHARED)
+-endif(SHARED)
  
-+add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
++if(NOT MSVC)
++  target_link_libraries(mpcdec_shared m)
++endif(NOT MSVC)
 +
-+set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1)
++add_library(mpcdec_shared STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
 +
 +if(NOT MSVC)
-+  target_link_libraries(mpcdec_static m)
++  target_link_libraries(mpcdec_shared m)
 +endif(NOT MSVC)
 +
-+install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-+
-+if(SHARED)
-+  install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-+endif(SHARED)
++install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+--- a/mpc2sv8/CMakeLists.txt
++++ b/mpc2sv8/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ if(SHARED)
+   target_link_libraries(mpc2sv8 mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpc2sv8 mpcdec_static)
++  target_link_libraries(mpc2sv8 mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpc2sv8 mpcenc_static)
+--- a/mpcchap/CMakeLists.txt
++++ b/mpcchap/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ if(SHARED)
+   target_link_libraries(mpcchap mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcchap mpcdec_static)
++  target_link_libraries(mpcchap mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpcchap mpcenc_static)
+--- a/mpccut/CMakeLists.txt
++++ b/mpccut/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ if(SHARED)
+   target_link_libraries(mpccut mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpccut mpcdec_static)
++  target_link_libraries(mpccut mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpccut mpcenc_static)
+--- a/mpcdec/CMakeLists.txt
++++ b/mpcdec/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ if(SHARED)
+   target_link_libraries(mpcdec mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcdec mpcdec_static)
++  target_link_libraries(mpcdec mpcdec_shared)
+ endif(SHARED)
+ 
+ install(TARGETS mpcdec RUNTIME DESTINATION bin)
+--- a/mpcgain/CMakeLists.txt
++++ b/mpcgain/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ if(SHARED)
+   target_link_libraries(mpcgain mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcgain mpcdec_static)
++  target_link_libraries(mpcgain mpcdec_shared)
+ endif(SHARED)
+ 
+ if(NOT MSVC)
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index 6c28404bd48e..e7f1c0e71931 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -16,18 +16,15 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 DEPEND="
 	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
-	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
-"
+	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7
-"
+	!media-libs/libmpcdecsv7"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 6adab12b1aaf..8544a34925b6 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,7 +3,7 @@ AUX musescore-3.5-lambda-capture-this.patch 562 BLAKE2B 4443f04bc90e01dbca81cac5
 AUX musescore-3.5-remove-duplicite-declaration.patch 245 BLAKE2B 5d42790b4c1147a34bc75bdd46f3b3832007734702d1be5f81dc41537347574e5f0955a141f9d412ce00f95370717bcb31d272b0625e7462ce3f640e69d71ac6 SHA512 7f3cc05a05c208dedd18094639534131ffbde748da653e309c21fcc414d005ad744de82186cd7484a46cb230d08e643f52555d6fe371c237686b58a559947cda
 AUX musescore-9999-lambda-capture-this.patch 549 BLAKE2B 2aaf1ffb0383bce4f862d6172c3e0eb2fdd756a03b2345df9f8b1ea08f30d3ef29ea89c16f56268d0116e2e65c73b974f891ddef55da3816c2d1a94f234babc0 SHA512 bcf4ed087bca2ac9771dceaf0506d0870bcc1ebc2a233157550ad2bce209a2d24c6dbb36d7474f483ba4e2959b54bc7b368878c038dc79dfd50eab0c70f69eb1
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.5.tar.gz 66798006 BLAKE2B dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907 SHA512 db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96
-EBUILD musescore-3.5.ebuild 3020 BLAKE2B 017f8bfdc6afe898ded02b8efef8f613a99a3478a2e5220a77ec1854bcd99fa0e7ceba69e0bec9cb1798ab25c4a3d125fd211d8f627bcd31083e195e3e2df6d5 SHA512 0c4658e30d8b48d168022b4ac6da1bd76cff8c97aedfc57909e8588567974aff72a587f0dcf78aaef4f6e760878eb5c32eedf251e84d10b6772ffcd910dcdd5b
+DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb SHA512 4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
+EBUILD musescore-3.5.2.ebuild 3030 BLAKE2B 4b8499c5ad5672c7994173558fffff771dd8885314e76970d8f5519aa103507984ebcd0606a335861ea636351b22d60291a45cb2fd7eae0575cd5f24adf8c9ed SHA512 273facf45e3e610cf52c0792c79e69deb5ef2ea6db549f4e026d3e64817cdbd20a23988998a3739ceeb2f3a7091abd928c2b477bda2973f71e9d1a527d22bcab
 EBUILD musescore-9999.ebuild 2967 BLAKE2B 2c2ea26ba84b1b4755c89acb3cfb519bc07509a85fac00a3313659293c58025b9ee94e35e0cb44c590c186ec2b91d53d26f41928e11c1ad29fcac186a3263ae5 SHA512 12d38f75fc9c771a2255f4f5094183611310f60029d6beeb732e8cb57fa7b5f656b0b8c3ac8fca5c4906f05baa83b3c9a2473ea807e5b3c3b0433c757fc55ef1
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/musescore-3.5.ebuild b/media-sound/musescore/musescore-3.5.2.ebuild
index d3027a0f4a74..b8137e72faf0 100644
--- a/media-sound/musescore/musescore-3.5.ebuild
+++ b/media-sound/musescore/musescore-3.5.2.ebuild
@@ -62,8 +62,8 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${P}-lambda-capture-this.patch"
-	"${FILESDIR}/${P}-remove-duplicite-declaration.patch"
+	"${FILESDIR}/${PN}-3.5-lambda-capture-this.patch"
+	"${FILESDIR}/${PN}-3.5-remove-duplicite-declaration.patch"
 )
 
 src_unpack() {
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 5801cb996b51..4259ea8ddf8a 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -4,4 +4,4 @@ DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4
 EBUILD ncmpcpp-0.7.7.ebuild 1540 BLAKE2B 72f2e5ade800c373fe544ef0dea32e4cf4fd6d316fb047a7ddc645f0d43543656a7f55fe698ec371ea621a22577c491901e64d4a9450100e65e6786cfb72e1da SHA512 956131ca17f644a5c7666a8bc2f5326c93e95531930ffdfff812783624ccfe539eee1a84a232a6f50a024b49f181c324bf89870fa92f69d559421311bf06567d
 EBUILD ncmpcpp-0.8.2-r1.ebuild 1460 BLAKE2B c8b146f78c34b24fc9daf1f236c9dbbe2f9c02c2da1f758dee18cdf010c7af7c8482d52516af87c843a809ede79dc4395becc57669d31be6c402c2b0430f32f2 SHA512 c781f50146bc50994010e116a9697ddd47efd13afd5ecc5c772530fce3f7308f14a3cfeb53979ba4fe5905109c6fa591422320873b54b8a5dfeded7c826c3d77
 EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B 02aa9bc5abdba9b6464e55f95fafee07937954523c0ecd8c39a03c1fbef6c371c477e6a4d0c0d5b3d71bc51e38d5d141973733de796721f219484a01422cd072 SHA512 bd3d7d50ff46bce31d075372002f9de5a2f977c25d4e68c06c8c1a4110fd9db8d0543542133f90eb279d20e7c36f461aab982cc4ad4e4238cf512b245a8af352
-MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
+MISC metadata.xml 1094 BLAKE2B 03f876dd9fec08222052e01b13575058faea3ed2a0295e6fa09a3975d0490b205b4f7ef11444d236a37ad05dac2ed13956417379fa553f699865a583fda8457f SHA512 7736907dab3e73de891816987b8254d41013ec44641ac0f206cee5c3d12d7312d94a32dab44ca072c0fa1a770a702c29ed535eecadb39cdd1b34c5ba4802bec7
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index bc38f1746074..9730a091cab3 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<use>
 		<flag name="clock">Enable clock screen</flag>
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 140a33aa58b6..1c5f52dba73b 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.2+release.autotools.tar.gz 1466960 BLAKE2B 54d7188cc7835495e9ba9f182900c8f61309079cb4b86b23ebcde1ce4b91f9305c49b8295adcce95b26c1c5b20059a20d1f07116c9a914201370dd2838acdd31 SHA512 39143af8ef4e84cf4ec9e94724c09a12533fa7bcc0e106c506a032546a8e846ae8946f40417981eabbb7403d8e6dba53548c96a7200807e1a99bd50f278c6628
-EBUILD openmpt123-0.5.2.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98
+DIST libopenmpt-0.5.3+release.autotools.tar.gz 1468568 BLAKE2B 02f29f1d60aa0f318d4b478291d48487c2079001f9173420c0fb5ca8c21ac0f1b3ec02c0d2958a00d7d10e994b626a673de4b5cbe85b1900bf8f0e953616aebd SHA512 003e40a4fa5c44d38931f5008beb71fd82ea57f6989cffdf2f8687e403a244bd29d497c4de9744d594ecfb7d0dd2ba8ff17046a3987123f47bc56cd163f71d7d
+EBUILD openmpt123-0.5.3.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.5.2.ebuild b/media-sound/openmpt123/openmpt123-0.5.3.ebuild
index e80baefa2b25..e80baefa2b25 100644
--- a/media-sound/openmpt123/openmpt123-0.5.2.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.3.ebuild
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 42468c35da6b..a18e6244e6ae 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,3 +1,5 @@
 DIST pavucontrol-qt-0.15.0.tar.xz 97480 BLAKE2B 183c3cbbe87b6867bb116041d41dd29f5ba72156e9078a4f09e5ffcbd3e123f6511cb06c99ce3cc8ce243a0551b132438bad7b14ae759cc775974c2ad3388bf3 SHA512 c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600
+DIST pavucontrol-qt-0.16.0.tar.xz 99952 BLAKE2B 926e248f61b1652af04f772c09bc000d0f368ba6449cade308275473e970068a58ca25cccea5e4bea289424b507e3d24f30d54d76c13096e0e8047c5ea996950 SHA512 781122b57321cf1e3eff2210e7cb949c819d0148050897d3a9673e846c28fae7a926b4d840c603dac9dace8126bfc49179a737101f4d5b6ad4fe5946d82bd0d5
 EBUILD pavucontrol-qt-0.15.0.ebuild 704 BLAKE2B b2a1d666b2849b8f11e52d605e29b002e96e52ddaeb91819ad95350df2b9fe87cad729adfcb600c4008b7b378cf433a5a4dbe042309c13dabdd906b7c5769928 SHA512 b0351da1c8083bcc130c4ff560185a4dae136eb5a45071de6bb8a07703fa1de9a390f7a28d1acc00ba235a800bd612bcc2a23fe7659adc3412c3c2c4eea058d3
+EBUILD pavucontrol-qt-0.16.0.ebuild 706 BLAKE2B b2149c37c505825e04bbd8deaad1a1f61d8e52f18bb34311b56beb9192bec98dea7367ec17e9344a2b4f0f1553d1d690291628bf241fa0d64b6d3a4457f2780a SHA512 1bd729b1d2264f23a02f1b8b36115f557c7dd0d661815aedec32ebbe16684f1d5f661602f5bcb1a8c9fa8325c7a5e0efea76f906a76e88c63037ddad542e892d
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
new file mode 100644
index 000000000000..5b1a8c77bf4b
--- /dev/null
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt GUI Pulseaudio Mixer"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.8.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtwidgets:5
+	media-sound/pulseaudio[glib]
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index f4b92a44d14e..651ea8772083 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,3 @@
-DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
-EBUILD pavucontrol-3.0.ebuild 871 BLAKE2B 3a137fd6ab316730a519663bb163599146fa721bf4c1336f0dceb236c2b038bbe74effa3d3f31a5283a52acce3539e5264ffe1dbec17b2ae83e8d7b019a89625 SHA512 c820a7ac52a7b8f95d860a6349aa0e453ee9e3c54330ca3cb0f23e5fce2f790aca1d503b691db274a3494abb7639c07d92d9c71adc2ac7c410e3bf30611401eb
 EBUILD pavucontrol-4.0.ebuild 854 BLAKE2B 98d893b52f48860f6cf73360750be57d4215cfc78b623d7ee9b1782dd56d0c14833b0169e55c241469f0ed7018e7ce213462ef9c572722935774dd4557828409 SHA512 1df30060cbab2c3ae4e9efad9a52f28ea6fe3f0205c120766d9acc8d25d2e199ba501b02520b22674b3ec12364fe2304089a2b2caff26723d61ea86d1805520f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-3.0.ebuild b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
deleted file mode 100644
index 074bee782902..000000000000
--- a/media-sound/pavucontrol/pavucontrol-3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic
-
-DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
-HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc x86"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-cpp/gtkmm-3.0:3.0
-	>=dev-libs/libsigc++-2.2:2
-	>=media-libs/libcanberra-0.16[gtk3]
-	>=media-sound/pulseaudio-3[glib]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-src_configure() {
-	append-cxxflags -std=c++11 #567216
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-lynx \
-		$(use_enable nls)
-}
diff --git a/media-sound/pavumeter/Manifest b/media-sound/pavumeter/Manifest
index b4d151798332..8fe3d1c7b81a 100644
--- a/media-sound/pavumeter/Manifest
+++ b/media-sound/pavumeter/Manifest
@@ -1,3 +1,4 @@
+AUX pavumeter-0.9.3-desktop-QA.patch 436 BLAKE2B 6321febc7cc01dfefd534fe1c6e44c14e66da161a58f4f43442cf758952f7eee3900963557698f09b2228102526deeccc555e8f8cbbf6b58738ab2f92a699a69 SHA512 d6982f45bd87f205966e5f93c65a417b0b39bd101f8f8eb7a682021af2ef90547fbfe4c9248572840a628bcb7c3b1c4609dfe0cb602aeeb81915096a0178ed22
 DIST pavumeter-0.9.3.tar.gz 89241 BLAKE2B de72ed8e18ed705956553f9d134ae128f15fb5fc09d0aa1c477b46d9741f425b7c9a16a8c2c8298cf3f5c9ce57e7db06c52639e2924ab1b9be2459d7e5239c1b SHA512 7aa87e547a26b92d367c8b6d4ca827f9176ceabe4a66e3f4461d7b54ec85a4ac51a42ddd13793052f7948926f5152b5882d726f566176f499eea2d739a510ad8
-EBUILD pavumeter-0.9.3-r1.ebuild 682 BLAKE2B d934ea9d541060b7b1aaef1d2ee4257317a8ca6671e372fb2cfe41bb38c316e2a8f859854ba260f34a313306ff6a37e47162a08ec7ed64f69529a5215df8c34d SHA512 43367be8642dc73ef3e59aefdf50164b32ee49143480ffaa3970c96bc88050e0640091c881ff573e478bfa054c753fec7eac143a9bf4ceb9d220d4042165cff8
+EBUILD pavumeter-0.9.3-r1.ebuild 670 BLAKE2B 6831dc858d92767ffbe5101200dedc1a080498227354cca44adc78005e242214ce44cad49eee8f690cfcf0fc7134ed97d868f81454d9b0b86b796737d9bcafcc SHA512 bd2afefda5a75ad25483522363b14ac395f8de3c6f0b863453dfa55d2eb6e496ab08db45c825105648af141d84389c9aa58b7ec149362250e7bcf77aa656a08c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavumeter/files/pavumeter-0.9.3-desktop-QA.patch b/media-sound/pavumeter/files/pavumeter-0.9.3-desktop-QA.patch
new file mode 100644
index 000000000000..54214ed1d273
--- /dev/null
+++ b/media-sound/pavumeter/files/pavumeter-0.9.3-desktop-QA.patch
@@ -0,0 +1,16 @@
+--- a/src/pavumeter.desktop
++++ b/src/pavumeter.desktop
+@@ -7,4 +7,4 @@
+ Icon=audio-input-microphone
+ StartupNotify=true
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
+--- a/src/pavumeter-record.desktop
++++ b/src/pavumeter-record.desktop
+@@ -7,4 +7,4 @@
+ Icon=audio-input-microphone
+ StartupNotify=true
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
diff --git a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
index 85efd70acf71..891fe6fc3489 100644
--- a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
+++ b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit flag-o-matic
+EAPI=7
 
 DESCRIPTION="PulseAudio Volume Meter, simple GTK volume meter for PulseAudio"
 HOMEPAGE="http://0pointer.de/lennart/projects/pavumeter/"
@@ -11,22 +10,19 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
-IUSE=""
 
-RDEPEND="dev-cpp/gtkmm:2.4
+RDEPEND="
+	dev-cpp/gtkmm:2.4
 	dev-libs/libsigc++:2
 	>=media-sound/pulseaudio-0.9.7[glib]
 	x11-themes/tango-icon-theme"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-	append-cxxflags -std=c++11 #568592
-	econf \
-		--disable-lynx
-}
+PATCHES=( "${FILESDIR}"/${P}-desktop-QA.patch )
 
-src_install() {
-	default
-	dohtml -r doc
+HTML_DOCS=( doc/{README.html,style.css} )
+
+src_configure() {
+	econf --disable-lynx
 }
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index fdbabf21abc8..8e0157328031 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-DIST picard-2.3.1.tar.gz 3778379 BLAKE2B b829c29d95922e31479cea0c8bcb3294cd3751374e71f37d387a013529c294a695a2e2f4c8b73af5eeee2fa8f7423d24074bc18b7db130798411803c70a013ff SHA512 fb5ac4cbd02f4b832cb23e3c8b5881eeca04b7b101c015a97fc20c8e0e7871ad2098b750a0c486af958b2bf30221b0c28666313f768dc7d70389519dd795d9cd
 DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
-EBUILD picard-2.3.1.ebuild 1703 BLAKE2B 5a07646e7724a53aac11788c96938cb7b1bd0993637c1dac9915b93e1e6575fbea4a39b8b50f1aa2b951d72e62bc6f1e7eddf74f3a850812b7a521dcf4b67c2d SHA512 544e58c3e617592ec0827eaee0f2dc47f79bfd03f3c71f2542fe05339d25c8ecc05c32424e4c25fb2334c3f77488f040796ef2332910036514401afbdfc08947
-EBUILD picard-2.4.2.ebuild 1576 BLAKE2B 530f5650644056918559c1d7bd017447c7e88c81906c223c1a1dee5a32232820c0629300f9f1f0570b154039732b6546b3b6bc5fbe213d6594d5133e6d328cb4 SHA512 c7d0ed462bb8f99b1ee6f68c42c537e3583bfc2e9f7600d4cf3dcf2568e4c7e0f4c2da1872de794d9276389c085d2da25d575234c683864087ccb3e3217c3821
+EBUILD picard-2.4.2.ebuild 1575 BLAKE2B 8800306017fcb9d675bc1d8ee67bc844e9bfb8541fef28fe5053a72a3c963a47efa3adac4444ccb4a3bd870bd21954e16287b0f635da3436b8614da8f5e4a844 SHA512 d994e8ce751f06dca006dd6442b31029909a40457831870c35df7649c1e0da428445f2fa6cd951d74b6891a495908ea5b13f9b18a9981200d7b98e069e8da187
 EBUILD picard-9999.ebuild 1577 BLAKE2B 550fc9aee8118ccd7bf0a6cc622c42cd38fdcc479aa2b5dca84ba934c5c1bea2544cf863bc5572a51024ab0f91842c270f164c42f7aa4a693c56d367f7d4e430 SHA512 77f7a5f2045e79026c2ee10da9c1b9bd7e26dfd5733530b766823bb974f0b0e54964c107f5c99a72522dba48993dcac349aae0a80896d4d59f0f87da27d230ca
 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.3.1.ebuild b/media-sound/picard/picard-2.3.1.ebuild
deleted file mode 100644
index 6d0e749dc698..000000000000
--- a/media-sound/picard/picard-2.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="discid nls"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[dbus,declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtgui:5
-	media-libs/mutagen
-	discid? ( dev-python/python-discid )
-"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
-	rm ~/.config/MusicBrainz/Picard.conf"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_pkg_postinst
-}
diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
index 9e90f652f615..18c76e92214a 100644
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ b/media-sound/picard/picard-2.4.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index c4e8048f1337..18341a618ebf 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,5 +1,7 @@
 DIST playerctl-2.0.1.tar.gz 43700 BLAKE2B 9df01bdb5f71a589a40462ed807b0f150d8c90921d1e0ef96bf99f20d9e58345307af35b39cc95e8ab37fcf9e5686935d856e050b61210188008b65281e63557 SHA512 6a5807abc79358bab0ad30a11897a8109121d5eb7d9e17d2c695221ef83942c3c7235fc738ab27c9dd2d3364c04737355e9c88ec5d49f999565565fb4494f720
 DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
+DIST playerctl-2.2.1.tar.gz 66255 BLAKE2B 76732d8074b17ca958b7efe08d7be8d4bce3ba1ec65346a219478b4807c600218e1b8fe971892e7df16ad49273721a5b423bced2bd3441e9f89497375d4e0d84 SHA512 9c08a3f1d5517d7f4270ed92f226453618fc9f0688688d1af9ff55f0c77efeb1b67daa4adc481546215491550f8528095d376ab099c8ddca05235bfb34b36eb7
 EBUILD playerctl-2.0.1.ebuild 1053 BLAKE2B 2d5414790ca1e1745e6c86bf2524718c37c843c162050f688072ca9385d23054fb63494a9ac41fb89579eb5b28717650186f70b2ff10cdf0093b52c26dc0aa0f SHA512 d2b1bd2e41f60fb5c61923ec8088986ac5acd695462a5d4dd7be6b7689792072e8846de0da4071c26bb00add72e19f33ee063302760a26547948f4ce7782a84d
 EBUILD playerctl-2.0.2.ebuild 893 BLAKE2B 4c7298c6c3bd2ea410d2806014a53ca5d116cef4d816d347629ae7a9626a7f39a3bd6b9f2968e4aa15d6f9d86c209c8867e27237a198693a7a9481e3850766cd SHA512 861dd884b243df3975481e2b45e995f8db602705b9ba2be1e01a121cd8bbd0304af39ffe28aa8a6d9651256121b24e9583fd26bc3429b616edc09e67ab75c1e7
+EBUILD playerctl-2.2.1.ebuild 1128 BLAKE2B 3edf328c12029aebf3e1777a3d66d679549f3a1a9014dc3583713d9202d33836cfc2f13de5c7947b97897d8bb0dbcef37542aded0e33624d5cddde8a9c9875e3 SHA512 b8802416fbe90360c78b69ee3e2e4697a1561a9c44d5278279de0a36b4f57fb3282bc5be18ac86d23ca7ade83025d7fcffac00b278f22a924431c4b1b2b1e67d
 MISC metadata.xml 343 BLAKE2B ef2d8052365e3c1907a5f191523ae0abd08d81fe0da46e4429192003a4a8560d7bbe45507b0fcbc1600241e89fa3fd64c84e4c208f501a0fd0be26175c2b0c97 SHA512 8719414c1c680915060a614b3fc30b462562b953c6b5fc227f6525a8870d59010ce0e7c5c5744031ff14d4c8514bb6f451ae697f1adfd1f617de490070ea2c38
diff --git a/media-sound/playerctl/playerctl-2.2.1.ebuild b/media-sound/playerctl/playerctl-2.2.1.ebuild
new file mode 100644
index 000000000000..1c7dfe34655f
--- /dev/null
+++ b/media-sound/playerctl/playerctl-2.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 xdg-utils meson
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc introspection"
+RESTRICT="test" # Requires dbus-next python package that's not in the tree
+
+RDEPEND="
+	dev-libs/glib:2
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-util/gtk-doc )
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddatadir=share
+		-Dbindir=bin
+		$(meson_use doc gtk-doc)
+		$(meson_use introspection)
+	)
+
+	xdg_environment_reset # 596166
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	rm "${ED}"/usr/$(get_libdir)/libplayerctl.a || die
+
+	docinto examples
+	dodoc -r "${S}"/examples/.
+	docompress -x "/usr/share/doc/${PF}/examples"
+
+	newbashcomp data/playerctl.bash "${PN}"
+}
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
index 4d9d32ec4ce5..6b4b8b7fd2dc 100644
--- a/media-sound/pulseaudio-ctl/Manifest
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -1,3 +1,5 @@
 DIST pulseaudio-ctl-1.67.tar.gz 6615 BLAKE2B fd760fc5475cdd9c6bbced9f4bbe0f62e793364d375f0bc24686986d42c9ddcfeddde501950c3572a4bf004cdfba36d3dc5aa1df3eed7a9730a437e74eb97b26 SHA512 5ea1cbfd87cf073de46b6fd9953a3c7b9c6969da46103dd5dfc56aa3f179b2ba36ade5db7ca47d204f0f60ac02020f1a4f2dd58bbaf010f9a99780702295418c
+DIST pulseaudio-ctl-1.68.tar.gz 6575 BLAKE2B a126730f53687b8456ed06f205e13d9380f7cadd4581430b4263dff65ebd33b22ad698cad4271402f873d9fa6c3499fd805ba02e9108723dcd60690016fcc196 SHA512 8ed4383d123d235bcde2e89a0a81fea96daa81dabb37cc9428eb3dd8e0c80fde3b9adf2b3ff911abaf6c4e5cb7cdbd74ce6817e080b3dba65d9206677ce10de5
 EBUILD pulseaudio-ctl-1.67.ebuild 688 BLAKE2B 3a49094e376b4b94d8dc000bb482c7e1f05dcf27efde4a79ad3b98cd1cc0b908dab4a9a4008f19371b8ba5834de35bfc7813cb8c60240c2983011d77332add43 SHA512 1dddd8e10477b99d15c64cff2f05401c36c6f09ecbae7216b44b1a8c8abbe977c00bd9c304d51f6521dce8a70ff87c624d6f539f9c1c1de78175b64f97b10295
+EBUILD pulseaudio-ctl-1.68.ebuild 615 BLAKE2B 7c751c3dd17cd4a51e142ec436dcea1620c5e24bd5bc87a03a4b81e8933dfa885a65bcd5275929afbac1cbfb41f28aa30ded77812b6ffc629f111c0fc715112b SHA512 66c38fb2cc349bd2ef934f6760a14669463d9985c575a7ff63a8250419d7a6e8609460dfc26e66f217f75a79535f6e66cc8bc4b2c88fea11cbc00b67e8b36b4a
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
new file mode 100644
index 000000000000..71ae8973b850
--- /dev/null
+++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2019-2020 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/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 866858164f38..de0e5402db3a 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,5 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0.ebuild 11530 BLAKE2B 1bf048493de5cb266627873059c8d8f49652c04c9670595790462c52b4426d5ac61ff85112f9739de3f5ee64219eadfb4abe9c3fe7f4ae8584c8e413a15b17ea SHA512 874a0011e1e19f986e4490640f0b4c062c6f54e6f182749f9065b42ffcec7712e078b47f8078763dd050c6ed8bb543aa2f2108e72502f1816518b65288383c9b
+EBUILD pulseaudio-13.0-r1.ebuild 11386 BLAKE2B 4551dea00512ccd74ca102da0268b12cc65dfbc5d8c345ebbe3190e917da66a7c9937863959dc3c60f0dd1753e206e91672284326fbaf013b49a76c28e4a273d SHA512 902d95d0380c479d06f948310f93fd6c00bee11d59f9da3affb37b412b54c0e392e511a6d433f24213495d62fa970e4b8947882c4cc87891e32a7d079fd2091d
+EBUILD pulseaudio-13.0.ebuild 11596 BLAKE2B 37c0456268fc5185d778b25e6aac2958946dcb9dab0789b2a0d729db12eaae9def87a9547c4d0018d974bbe1f36feb6ab90bb0f9eafa36e22cc96902ae8d0185 SHA512 c01551288d13709e199153370e2a3b390314d2556056baf2883ed874991935bc8d076d4a804a74bdf5eddaba627760f3dfeb2b2b3dadc8e12be8ff2e49747382
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
new file mode 100644
index 000000000000..5c0f7d6d8e87
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
++gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset cpu_flags_arm_neon
+ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
++udev +webrtc-aec +X zeroconf"
+
+RESTRICT="!test? ( test )"
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	?? ( elogind systemd )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	realtime? ( dbus )
+	udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( virtual/jack )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	media-libs/speexdsp
+	gdbm? ( sys-libs/gdbm:= )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+	realtime? ( sys-auth/rtkit )
+	gconf? ( >=gnome-base/gconf-3.2.6 )
+" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
+
+DEPEND="${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt5 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-5 )
+		acct-user/pulse
+		acct-group/pulse-access
+	)
+	acct-group/audio
+"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	system-wide? ( dev-util/unifdef )
+	test? ( >=dev-libs/check-0.9.10 )
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+}
+
+src_prepare() {
+	default
+
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
+	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-adrian-aec
+		--disable-esound
+		--disable-gconf
+		--disable-solaris
+		--enable-largefile
+		--localstatedir="${EPREFIX}"/var
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(multilib_native_use_enable alsa)
+		$(multilib_native_use_enable bluetooth bluez5)
+		$(multilib_native_use_enable glib gsettings)
+		$(multilib_native_use_enable gtk gtk3)
+		$(multilib_native_use_enable jack)
+		$(multilib_native_use_enable libsamplerate samplerate)
+		$(multilib_native_use_enable lirc)
+		$(multilib_native_use_enable orc)
+		$(multilib_native_use_enable oss oss-output)
+		$(multilib_native_use_enable ssl openssl)
+		# tests involve random modules, so just do them for the native
+		$(multilib_native_use_enable test default-build-tests)
+		$(multilib_native_use_enable udev)
+		$(multilib_native_use_enable webrtc-aec)
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_use_with equalizer fftw)
+		$(multilib_native_use_with sox soxr)
+		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
+		$(use_enable glib glib2)
+		$(use_enable asyncns)
+		$(use_enable cpu_flags_arm_neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable dbus)
+		$(use_enable X x11)
+		$(use_enable systemd systemd-daemon)
+		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_with caps)
+	)
+
+	if use elogind && multilib_is_native_abi; then
+		local PKGCONFIG="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			--enable-systemd-login
+			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind" 2>/dev/null)"
+			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind" 2>/dev/null)"
+		)
+	fi
+
+	if use bluetooth; then
+		myconf+=(
+			$(multilib_native_use_enable native-headset bluez5-native-headset)
+			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
+		)
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	else
+		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
+		if use elibc_glibc ; then
+			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+		fi
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src ${targets[*]}
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		if use doc ; then
+			docinto html
+			dodoc -r doxygen/html/
+		fi
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+
+		# We need /var/run/pulse, bug #442852
+		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+	else
+		# Prevent warnings when system-wide is not used, bug #447694
+		if use dbus ; then
+			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf ; then
+		sed -e '/module-zeroconf-publish/s:^#::' \
+			-i "${ED}/etc/pulse/default.pa" || die
+	fi
+
+	dodoc NEWS README todo
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+	fi
+
+	if use equalizer && ! use qt5; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use equalizer && use qt5; then
+		elog "You will need to load some extra modules to make qpaeq work."
+		elog "You can do that by adding the following two lines in"
+		elog "/etc/pulse/default.pa and restarting pulseaudio:"
+		elog "load-module module-equalizer-sink"
+		elog "load-module module-dbus-protocol"
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index d1ed1d05bf32..737b28abb7fb 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
+inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs user udev multilib-minimal
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
@@ -202,10 +202,11 @@ multilib_src_configure() {
 	)
 
 	if use elogind && multilib_is_native_abi; then
+		local PKGCONFIG="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMDLOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind" 2>/dev/null)"
+			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind" 2>/dev/null)"
 		)
 	fi
 
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 6a29a27de919..42581d0b000e 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,11 +1,9 @@
 AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d5404aab1af91fe5c88af916ab91a16c9c527053beac018de0e1e2231b7df26e7d2271baf7be33db8f6af6955af1b SHA512 07c95e025e43f2c0a2bef0a5b1ca6eb7977bfb5a34c70f7c4d99a9a4d18d3192383ed82784a7548d6fe263b2860a361128c2cae008e41737d383f30fd324a581
 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
 DIST pulseeffects-4.7.3.tar.gz 2010399 BLAKE2B a77a24fe9f8708564b146d65eb10a0021a05f102bacd25ac137ce6a2d21017c4b5c68a57c5cb2345cc228280460f1163d5dbce038d3bd427829335c8aa78d9f4 SHA512 0170ae0fbc3f72120545657ad7013f81afb40a96224c690c41206b91ae7ac2637f17b19238ef7d8a9f21a361cb9e76a0e2bf83e84d1404cc69733e7ad156c3f4
-DIST pulseeffects-4.8.0.tar.gz 2003382 BLAKE2B 4ec1089d0d3051a9697c08adf8305ce9c0ef794d6cffe25a36ffdc174d5b63ac94dee09cca0970948c25fa948c8ec521bc750a2b2e08f7f204889eceb65c0de9 SHA512 1fa32f34d2e1aa9fc87eaaecc73a5aad017f2bfd26228edb0cba938e2ab0146e8882fef4b8d74364030d7a78467e728f4e517870be422619d87be2c964b55492
 DIST pulseeffects-4.8.2.tar.gz 2000571 BLAKE2B 70627741b41ca28489ab2e7813936d7b37fa521d3c9a81fa651ee5999d9b162e924db11fb780db7a9fe2b032b4d8596166336e59f754ffd1746f57b0ad41a34c SHA512 14fc30486568fd6729280bf1197b2e2292ddba188d984559c0ffe7faff1a9550e58e776d6d5aade12a6057aa608a58e0eb60830fdcb18d783c22d5f971e6d616
 EBUILD pulseeffects-4.7.2-r1.ebuild 1903 BLAKE2B 50882416becc1e4545bcef6dcf5a245465064aa11b876ff4191d79bcd8e0723fc01d05b76f5d4fb6930f2a330edb4644d4a0b63ad1083c589e7e93c400494a3d SHA512 1726d0a7c5135c9423c4d85613d4b3b90854452e25a51ca2ada570d9c502d923eb4ddf89c481dccb4ba12f4583f5b42d74efc7b0e59833fc104452d468c003bd
 EBUILD pulseeffects-4.7.3.ebuild 1853 BLAKE2B 39c86df9a5b0d56ed0ecf183bf47a7bc28ba4a7f89233249483ea9d49de0b3ff9982f33732b030f810317955f7fcc4fdbec53e8d0675abb42b293d0ddef956f5 SHA512 22100898b102036d3e8359430cac32b6256e97dfdb0284a144c5b89fe7415871da96d349da8724d8be7b70f107c3a6570b2070db242a806b177ece2ec2d00e6b
-EBUILD pulseeffects-4.8.0.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
 EBUILD pulseeffects-4.8.2.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
 EBUILD pulseeffects-9999.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.0.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.0.ebuild
deleted file mode 100644
index cbfd497f5e76..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.8.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 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 ~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
-	>=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
-	>=media-plugins/gst-plugins-pulse-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-sound/pulseaudio
-	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
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
index 6730ce95c065..e137d3a1007c 100644
--- a/media-sound/qastools/Manifest
+++ b/media-sound/qastools/Manifest
@@ -1,8 +1,4 @@
-AUX qastools-0.22.0-nomancompress.patch 4667 BLAKE2B e9d11e1aeae8eba81ca60dbfb37da0c5e8efcc30d62899806b9415898a2484ed833caa42dfab2f5532f551486f3ce592e260c9b8396289d27eb488be00a06344 SHA512 ee10a90d8c92eeb124bef8ae6edc023cf452585679380c4e7cb406ed41cd4d04db3b8075f89c2925d2d020fc9a0d035d8e3762e2af92085418e5eb94064c604c
-AUX qastools-0.22.0-qt-5.15.patch 2047 BLAKE2B 01a473dce7c070b47e611ea7f05d1a16b07a6c7c692f8a98bde7dd12b286cdea04fe79fdf62ab99e1b5cd5c678181fb4f266ec35627291674475918505a59dbf SHA512 9fdd644cbb100df9ef2d593a4ba24f9fa4cda242e41e4f909e57f3e23adde566763b50b82c7e756b40623038c3df88df49d59da3efec9509c6fc0b1101bfae5d
 AUX qastools-0.23.0-nomancompress.patch 4753 BLAKE2B 62755c3381455e89afc2c9de5fdb1668a93936c5f238b938cbddd608a3b4e7421982f5bcf4cae027e005db1db9c19e870f28aaffc098d421cb245a080b4c70ab SHA512 a3b54f0313e1c0019d6a25009befecb2e48b022fddf78ce38e1c52194ef8711160e9d72bc637bf3c55223a043e091550cfdb8582c1cfd1044bb5a96bbaa76dce
-DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712
 DIST qastools-v0.23.0.tar.gz 292875 BLAKE2B c0ba54462e702411bee7a15a913617870488b1c9c2676e3c6f69d0648cff79cc1989e0f367953ba6f27b94c014c9b2fa7ef74ae4800d03b99bb8336ce4535d4a SHA512 79042a41a0ad37097d297175b899af73052953b7ae14058a1878e3145769db839b8bd4350bd36646d8436a3e8b37b64da7b3004bee3c7c7780d46a942af1d3b9
-EBUILD qastools-0.22.0.ebuild 827 BLAKE2B 313456cebd163c4ecb5d9a73f41a2c7d246d37597a61d8904074b8d9fe4b13465bdde4cab980e9ac80fa8803ef5d324789ba73f0bc8845ef84ab55ec6433f340 SHA512 ddc5f654b3f99831537df6f76a40852f0d098729aad24e4131bb310463ea37281801409693ed55009936325d80831469032f697d58f2719ba15bf37d7d0d637e
-EBUILD qastools-0.23.0.ebuild 794 BLAKE2B 8d5d7e15b2d3c806294ba7d48bc3b76ae5c1ab97ace908d5658f7e4d615ef4fd3256a6842b47511beb852e78aed9e88311bd8b759d87060e14006ce1799e99e4 SHA512 618ab55bf38feb98e234e508d3c32f70b2a60aa3b93f71fb766fce21bb0a89c81096a7faafb1fbe9de4f5432bf1f739849f6dc1c2bf2f395fcf49774349a9c7a
+EBUILD qastools-0.23.0.ebuild 792 BLAKE2B 4e369718024cfb3cb4c564b8fc1630168f38fa73a5ff89683d7b43dd92283d2e9bb045ba729cb64b412fd9f547bdf3412ec1348b54423923efbc7ca520b08175 SHA512 0708e92db81091cef8de8a579eb70ccf441a9069ad122f39c50e7f98e2abac1607c795f7b791b610f5ec715fe3a02e03fea051de34dc9ac4e59f243799120ea0
 MISC metadata.xml 325 BLAKE2B 1568315a082d0a94f0dc43ae932dce5ca93e9cbced0c7cf7f518900b594281f012809f729e62501271606bfd0f31ec04870f3849e47730fb196689f16088b73c SHA512 311b842ee0ea6099f1beea4753e44e6af6ba70ded6c54f6321b244c5366b47071ac80a0c7012b1473e0d5afc47b44f23665630adc36b96fe1f55bfad753b2276
diff --git a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch
deleted file mode 100644
index 49756a91b4c0..000000000000
--- a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 58649d44b4f1362c8fe5f88828be97e10b4fc00b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 8 Jun 2020 11:45:09 +0200
-Subject: [PATCH] Compress manpages optionally
-
----
- qasconfig/share/man/CMakeLists.txt | 24 ++++++++++++------------
- qashctl/share/man/CMakeLists.txt   | 26 +++++++++++++-------------
- qasmixer/share/man/CMakeLists.txt  | 24 ++++++++++++------------
- 3 files changed, 37 insertions(+), 37 deletions(-)
-
-diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt
-index 083ca91..628be1b 100644
---- a/qasconfig/share/man/CMakeLists.txt
-+++ b/qasconfig/share/man/CMakeLists.txt
-@@ -1,27 +1,27 @@
- # Find gzip
--FIND_PACKAGE ( UnixCommands REQUIRED )
--
--IF ( NOT GZIP )
--	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
--ENDIF ( NOT GZIP )
--
-+FIND_PACKAGE ( UnixCommands )
- 
- # Configure manpages
- 
- SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
- SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
--SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
-+SET ( man_gz .gz )
- 
- CONFIGURE_FILE ( ${man_src} ${man_plain} )
- 
- 
- # Compress manpages
- 
-+IF ( NOT GZIP )
-+	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
-+	SET ( man_gz "" )
-+ELSE()
- ADD_CUSTOM_COMMAND (
--	OUTPUT ${man_gz}
--	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
-+	OUTPUT ${man_plain}${man_gz}
-+	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
- 	DEPENDS ${man_plain}
--	COMMENT "Building ${man_gz}" )
-+	COMMENT "Building ${man_plain}${man_gz}" )
-+ENDIF()
- 
- ADD_CUSTOM_TARGET (
- 	qasconfig_manpage ALL
-@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET (
- 
- # Installation of the manpage
- 
--INSTALL ( FILES ${man_gz}
-+INSTALL ( FILES ${man_plain}${man_gz}
- 	DESTINATION ${INSTALL_DIR_MAN}
--	RENAME ${PROGRAM_NAME}.1.gz )
-+	RENAME ${PROGRAM_NAME}.1${man_gz} )
-diff --git a/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt
-index 911ea43..5f6ba15 100644
---- a/qashctl/share/man/CMakeLists.txt
-+++ b/qashctl/share/man/CMakeLists.txt
-@@ -1,35 +1,35 @@
- # Find gzip
--FIND_PACKAGE ( UnixCommands REQUIRED )
--
--IF ( NOT GZIP )
--	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
--ENDIF ( NOT GZIP )
--
-+FIND_PACKAGE ( UnixCommands )
- 
- # Configure manpages
- 
- SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
- SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
--SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
-+SET ( man_gz .gz )
- 
- CONFIGURE_FILE ( ${man_src} ${man_plain} )
- 
- 
- # Compress manpages
- 
-+IF ( NOT GZIP )
-+	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
-+	SET ( man_gz "" )
-+ELSE()
- ADD_CUSTOM_COMMAND (
--	OUTPUT ${man_gz}
--	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
-+	OUTPUT ${man_plain}${man_gz}
-+	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
- 	DEPENDS ${man_plain}
--	COMMENT "Building ${man_gz}" )
-+	COMMENT "Building ${man_plain}${man_gz}" )
-+ENDIF()
- 
- ADD_CUSTOM_TARGET (
- 	qashctl_manpage ALL
--	DEPENDS ${man_gz} )
-+	DEPENDS ${man_plain}${man_gz} )
- 
- 
- # Installation of the manpage
- 
--INSTALL ( FILES ${man_gz}
-+INSTALL ( FILES ${man_plain}${man_gz}
- 	DESTINATION ${INSTALL_DIR_MAN}
--	RENAME ${PROGRAM_NAME}.1.gz )
-+	RENAME ${PROGRAM_NAME}.1${man_gz} )
-diff --git a/qasmixer/share/man/CMakeLists.txt b/qasmixer/share/man/CMakeLists.txt
-index 5aea9af..c2bd872 100644
---- a/qasmixer/share/man/CMakeLists.txt
-+++ b/qasmixer/share/man/CMakeLists.txt
-@@ -1,27 +1,27 @@
- # Find gzip
--FIND_PACKAGE ( UnixCommands REQUIRED )
--
--IF ( NOT GZIP )
--	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
--ENDIF ( NOT GZIP )
--
-+FIND_PACKAGE ( UnixCommands )
- 
- # Configure manpages
- 
- SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
- SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
--SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
-+SET ( man_gz .gz )
- 
- CONFIGURE_FILE ( ${man_src} ${man_plain} )
- 
- 
- # Compress manpages
- 
-+IF ( NOT GZIP )
-+	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
-+	SET ( man_gz "" )
-+ELSE()
- ADD_CUSTOM_COMMAND (
--	OUTPUT ${man_gz}
--	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
-+	OUTPUT ${man_plain}${man_gz}
-+	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
- 	DEPENDS ${man_plain}
--	COMMENT "Building ${man_gz}" )
-+	COMMENT "Building ${man_plain}${man_gz}" )
-+ENDIF()
- 
- ADD_CUSTOM_TARGET (
- 	qasmixer_manpage ALL
-@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET (
- 
- # Installation of the manpage
- 
--INSTALL ( FILES ${man_gz}
-+INSTALL ( FILES ${man_plain}${man_gz}
- 	DESTINATION ${INSTALL_DIR_MAN}
--	RENAME ${PROGRAM_NAME}.1.gz )
-+	RENAME ${PROGRAM_NAME}.1${man_gz} )
--- 
-2.27.0
-
diff --git a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch b/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch
deleted file mode 100644
index 606630d7eebb..000000000000
--- a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9975fe653c8159504807ca6288bd974b4f6057b7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 8 Jun 2020 11:01:33 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath includes)
-
-Fixes https://gitlab.com/sebholt/qastools/-/issues/1
----
- shared/src/wdg/ds_slider_painter_bevelled.cpp | 1 +
- shared/src/wdg/ds_switch_painter_circle.cpp   | 1 +
- shared/src/wdg/ds_switch_painter_close.cpp    | 1 +
- shared/src/wdg/sliders_pad_style.hpp          | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/shared/src/wdg/ds_slider_painter_bevelled.cpp b/shared/src/wdg/ds_slider_painter_bevelled.cpp
-index 3c90143..1748c6e 100644
---- a/shared/src/wdg/ds_slider_painter_bevelled.cpp
-+++ b/shared/src/wdg/ds_slider_painter_bevelled.cpp
-@@ -15,6 +15,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QRadialGradient>
- #include <QScopedPointer>
-diff --git a/shared/src/wdg/ds_switch_painter_circle.cpp b/shared/src/wdg/ds_switch_painter_circle.cpp
-index 32fa8f1..36933af 100644
---- a/shared/src/wdg/ds_switch_painter_circle.cpp
-+++ b/shared/src/wdg/ds_switch_painter_circle.cpp
-@@ -13,6 +13,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QScopedPointer>
- 
-diff --git a/shared/src/wdg/ds_switch_painter_close.cpp b/shared/src/wdg/ds_switch_painter_close.cpp
-index ef058a3..76932cc 100644
---- a/shared/src/wdg/ds_switch_painter_close.cpp
-+++ b/shared/src/wdg/ds_switch_painter_close.cpp
-@@ -13,6 +13,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QScopedPointer>
- 
-diff --git a/shared/src/wdg/sliders_pad_style.hpp b/shared/src/wdg/sliders_pad_style.hpp
-index 3108f92..81a9075 100644
---- a/shared/src/wdg/sliders_pad_style.hpp
-+++ b/shared/src/wdg/sliders_pad_style.hpp
-@@ -5,6 +5,7 @@
- #define __INC_sliders_pad_style_hpp__
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPicture>
- #include <QPen>
- 
--- 
-2.27.0
-
diff --git a/media-sound/qastools/qastools-0.22.0.ebuild b/media-sound/qastools/qastools-0.22.0.ebuild
deleted file mode 100644
index 579642b937f1..000000000000
--- a/media-sound/qastools/qastools-0.22.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser"
-HOMEPAGE="https://gitlab.com/sebholt/qastools"
-SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	virtual/libudev:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.15.patch"
-	"${FILESDIR}/${P}-nomancompress.patch"
-)
-
-S="${WORKDIR}"/${PN}-v${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKIP_LICENSE_INSTALL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qastools/qastools-0.23.0.ebuild b/media-sound/qastools/qastools-0.23.0.ebuild
index 9f055f434b6b..739a04e7b390 100644
--- a/media-sound/qastools/qastools-0.23.0.ebuild
+++ b/media-sound/qastools/qastools-0.23.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 02caf82a5ce2..87998b816710 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,4 @@
-DIST qmmp-1.4.1.tar.bz2 1296224 BLAKE2B 4a4b72f30bbfb06d312d69c9c0d48fcaaed2d936453ab29c0bd5223819358d2894f4f016a8203c2ea15b7a193b811ae2892e700dec98e580393a9fbf5e0f767c SHA512 af971447383730328e33dc724b9d598a26404517d5aa6e8bb5a2d84bbeb1f628d363383bb5ddc571855d8416b084edd09f64174de7985788671e47317ec9f1bf
 DIST qmmp-1.4.2.tar.bz2 1295867 BLAKE2B ce282f543dc6b14ccd027aa9a4ad85f190a8aee149049798ad5e51bf944cd34ce7773dcfb7b6ea4bdf0a8a69baea430802f04de631e9b12b68d2d23a8c599461 SHA512 00ed0c4bd74dc50294c9d8e717f249a577fb26f5d4eb93dbc42c6c79964188fd885ab577904dea5aec31db0d2b828d7038febca1ffdfd2f4bfe81f931bbed7ff
-EBUILD qmmp-1.4.1.ebuild 4049 BLAKE2B a8fec81aa1ae3d48da3785ad3d053a7f6e0dacc7b34fe0a4e6946f8e56df3677045617f92b4cea827682bdca444ae0bcbca4b14e4281b5df1459dab0548787f5 SHA512 aff0ba05f9d2ee7eba8563888827a1f74d9b0f44e13325ea9358231efb0ef9b7ae459327a8652aecdfe7b633bdf133eab552a55938c4df0275ec82b693c05655
-EBUILD qmmp-1.4.2.ebuild 4051 BLAKE2B 929ab4d9ce347da133a2a2361279d3dee81def809c3513de8cdc3c8ebcb5fc936829583141fc2f51f62eb49e6790a68fad62de0a327dc5de4f08d390ec04d261 SHA512 bca26cdc36d0a35003603930eb4ec8f356084c7acee01cf87492d7765d75aabb72eb247202c0bb235e53f7999e82567f60e6b514c84bdb444beab5309545dc65
+EBUILD qmmp-1.4.2.ebuild 4049 BLAKE2B a8fec81aa1ae3d48da3785ad3d053a7f6e0dacc7b34fe0a4e6946f8e56df3677045617f92b4cea827682bdca444ae0bcbca4b14e4281b5df1459dab0548787f5 SHA512 aff0ba05f9d2ee7eba8563888827a1f74d9b0f44e13325ea9358231efb0ef9b7ae459327a8652aecdfe7b633bdf133eab552a55938c4df0275ec82b693c05655
 EBUILD qmmp-9999.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.4.1.ebuild b/media-sound/qmmp/qmmp-1.4.1.ebuild
deleted file mode 100644
index 2e5fa0978838..000000000000
--- a/media-sound/qmmp/qmmp-1.4.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-else
-	QMMP_DEV_BRANCH="1.3"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		virtual/jack
-	)
-	ladspa? ( media-plugins/cmt-plugins )
-	mad? (
-		media-libs/libmad:=
-		media-sound/mpg123:=
-	)
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm:=
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-1.4.2.ebuild b/media-sound/qmmp/qmmp-1.4.2.ebuild
index e87ff148dc7a..2e5fa0978838 100644
--- a/media-sound/qmmp/qmmp-1.4.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.4.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	QMMP_DEV_BRANCH="1.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index c48da3f7bde2..3d8144d08f05 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,7 +1,5 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.6.2.tar.gz 383146 BLAKE2B 6e93a1d16dc57ce5cc180932eec049cbd62eb64d6667cbfc748c474fe2b751273ff50a94a5497f1d268e2d413831095bea92a2f086b417625f02fecf1bc6ec9d SHA512 6e6f5dc64c39ab18ad1a9e791376e0dcf6eea4882986b1723a5a2f7c53309ce166d443a198c62b33ac31ed3fc17100c3a4f8e3b1e474b70afcec0ffa7f1ffc08
 DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
-EBUILD qsynth-0.6.2.ebuild 1400 BLAKE2B a1cb77b898f94ed280c1ba061bd6af65e7819fbcd204b1c52f6ed712f4b8b997eb1049c692a1b72c8a620eb4dcc118d44d8e42931a9adfab4f0bbab17bb6cf20 SHA512 cc3fa6b94b342d42541cb9b01aacaf349dee2cd9c73fab482c0ee8d78de5cb3dbecd2ca2924c7f6790ab565143690b324352a0bc1e19ca339252f9dec4e83f75
-EBUILD qsynth-0.6.3.ebuild 1360 BLAKE2B 85c307a92f7b1168e5798740147434197642ebbc375b34e25c0ad67c81aee08a9ef92346a0d5e411ad6acad722c9291b982dd7eb0fc3270bb729897fe1a1db5c SHA512 697327bee1cdb81af3e3b68eaf2d247b7a26785d9c8ae89450deacf63dc9f391520eae1694de9ebef6569bf1a47c96b539bf31c42d80d5ee1268b2d470c231b3
+EBUILD qsynth-0.6.3.ebuild 1356 BLAKE2B 2d396d07ec3843126aa2b5b71a052da811c8fa56629f45990b5b7e3fddbd6282595fce10e1df195964ff5576191fb63941608c50c28c6a611e0eb8a2001b2241 SHA512 17d3439d50c5352298faeb06c0065abb4c306372ebae87d933532c80b09fbe4a789109a7b776006f86319bf9012905c6ddc40303fba06e53cddceb82b7e6177f
 EBUILD qsynth-9999.ebuild 1342 BLAKE2B 50e392bce3538d4575431df3b0254d0f9d757673288d85acef014a7054e6929bcc7f2a5af6fc74d27ab90fe2bacb3a3460349de3b8bc46979ea550d62c89e298 SHA512 442cc6f5eeb08d94fb4113cf710d1f22218e57fee336110ba8a9462174655fc04971bbb63d10a5957f2671ddb2155f415fffd7e21c0952877737c8bb4c59aed2
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.6.2.ebuild b/media-sound/qsynth/qsynth-0.6.2.ebuild
deleted file mode 100644
index c820943f1db3..000000000000
--- a/media-sound/qsynth/qsynth-0.6.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qsynth/qsynth-0.6.3.ebuild b/media-sound/qsynth/qsynth-0.6.3.ebuild
index 5cb416916d3d..2e469dea3b30 100644
--- a/media-sound/qsynth/qsynth-0.6.3.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 318ebabdaa91..4efed7323cd6 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,7 +1,6 @@
-AUX qtractor-0.9.13-dont-compress-manpages.patch 515 BLAKE2B edaa13a27776997913b9f2049d4c607dc622ae721ab03b3265b9e9c2729aac5796c43c8730d61cd1996a246a6752ab99041bbcccac0e3fa5879864c20499d43f SHA512 3a49c5e175e7b64ff0a2d1a791c59a38b44b0f7116d068fe2877e3fd1636259288becda9cb922150a8166ef7df116df6ec34783a750ff4aec3e276d681c05a0a
 AUX qtractor-0.9.17-dont-compress-manpages.patch 701 BLAKE2B 2d36699ef29e21dc80bb51b4530bb06f039b35006106e5f88bae29e1a813529cc70d861cef134e680036964c034c9f8c9f2b9bf11e115df5c213489e27890de5 SHA512 95d1c8135ceb2afa1b92410ec26a0b6586bd5bb419e4d91f83944d39fa3a877519e60e8c0bda9e4365fa358e9e2fecbd80a61bddded22a745265bc6ada95bbc5
-DIST qtractor-0.9.16.tar.gz 1937425 BLAKE2B b49c2455338bf14c918b9a00567855d68e0bc954ce1e7d4df53cb8330a44e65d51e6ea21571d0cc22900182a39efa099194d2cc676c9f353eb76ee69a62d48ab SHA512 7312b73bccf79e1ca2cadb0bf33b492b221a65fec9894225e78512d63a9ac65b8387edb854607c44cc8a7ecd72758437c5c67ef901e58e495b09c0f48bbda01a
 DIST qtractor-0.9.17.tar.gz 1934317 BLAKE2B 2cb387484203fcd6511a87364db9ed00d4d21452948abc0bad7d2775f022ab9a224537a8300a46ec220ddc497d071072456ed4e46a3e73c52954b5992bb1ba52 SHA512 9392eb594920be5c826613bfd75be93ac006a718c14256b20bf8d6af23f9316f56c801e5422548b9387ccfd4fe3ba926f1a01cacc2324eab1ca66255f02c9c93
-EBUILD qtractor-0.9.16.ebuild 1553 BLAKE2B 4535de76cc27d77876c0bd9b0156eb5ed9861873a2950fddbe8ccbfc258bd6d61874661f7c37b2930e6a5be68e56bb4d6f77d6eecb486355d0898de722f22ca5 SHA512 803fd64d73659c1e24e9cfbd566a881d676a4f7dab93291c1e4b94037e3243181d3f2e64d2dfcf664dea939df26081e338ce7878890c595b54a0a0ff27ca0224
-EBUILD qtractor-0.9.17.ebuild 1547 BLAKE2B 96f976ae7dbfd2063277d6bf63b73c425a386f5394c6f446ea49218ef69e7d8b62a9170851cc4100c63ecc015d876ef582c2b6d03cb6db85b217bad19c04b263 SHA512 839f7d51c0e9c8648a1dcced994128cbe99ab8be1edaafb6a0f6f06ff67d8082ad1c2c0b570978149529507d8e1edeee6244f487556789a31d0814d3214473a8
+DIST qtractor-0.9.18.tar.gz 1937478 BLAKE2B 269d2fd9cdb3171155ba32d7af5d6c0ad0037287311d2e77efb706820071fde353c84ba6958c0c0fb75f3ecc22eea5e5f7204018d1503bbfb424f48aefc60150 SHA512 e488f95becde10117fc675a5b20b66378e8ae1f8c388fb12042cafa1f4434292d4156f5fe613b93e0c7409c414df9bf0e614afce843e0a42e4a1bce7c9ee9125
+EBUILD qtractor-0.9.17.ebuild 1545 BLAKE2B 0d644eb5ee0de071a1c9ad0e614557399d7ced7f895a48f1f312279a331bdbc9093e93c81ff4c187585dfdc6c77da4741c102b463bebf2eaf0dc9047e12e48dd SHA512 c1476707f35b119671865fecfefdd936c12e9e99050c2c1b247b0a373dfad29520bf8815d9dee027bec6a7e65721122e88620127490faa38ffc95a629beccca9
+EBUILD qtractor-0.9.18.ebuild 1555 BLAKE2B ec3f76ed0662ef927b6d4ea233a9cc733a6a241f9c9ef9438e2421a66aff059ae848a4c3510f3ce2dc5fb276e1bd0d86796f6943c16686a947c96dc39b9c8225 SHA512 1907bded7b038d5b7bac972acb96fa58525c4436b1606c008e477c0406a00f45ccffc9d477b8c3ba24772832cdb89327008f01f46964039970d75ea1fe3ceab1
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/files/qtractor-0.9.13-dont-compress-manpages.patch b/media-sound/qtractor/files/qtractor-0.9.13-dont-compress-manpages.patch
deleted file mode 100644
index 4520a6b8df9f..000000000000
--- a/media-sound/qtractor/files/qtractor-0.9.13-dont-compress-manpages.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index c2fa808..d72bbe2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -345,7 +345,6 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qtractor/qtractor-0.9.17.ebuild b/media-sound/qtractor/qtractor-0.9.17.ebuild
index bc0c143c3e97..174c125ccf79 100644
--- a/media-sound/qtractor/qtractor-0.9.17.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
diff --git a/media-sound/qtractor/qtractor-0.9.16.ebuild b/media-sound/qtractor/qtractor-0.9.18.ebuild
index f4986fa3a51a..1d009c34ea23 100644
--- a/media-sound/qtractor/qtractor-0.9.16.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
@@ -44,7 +44,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.13-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-0.9.17-dont-compress-manpages.patch"
 )
 
 src_configure() {
diff --git a/media-sound/quimup/Manifest b/media-sound/quimup/Manifest
index cf583feb12ed..9a3803bfe78a 100644
--- a/media-sound/quimup/Manifest
+++ b/media-sound/quimup/Manifest
@@ -1,5 +1,3 @@
 DIST Quimup_1.4.4_source.tar.gz 240902 BLAKE2B a411653b1c5ced5dc7f4b9ebe6244380d23cd165eaf2b14760a3f87946094f7ffad3df73afe500c0f8ea8f6d77e690391e78a0403b9436485b4c670de3c3b0da SHA512 4fac921df6e7157952536e1cdda0e468b72f70f8f938ccfd5d1a7d286f4b7d7ac063ca2c6111f38fb76b2a6235a323858f2f898165c80702b2c0aaeaff8869c9
-DIST quimup_1.4.3_source.tar.gz 587260 BLAKE2B ee2ce0d9f71c63db73af00fe385d643f5ec08e322137c0c4d372fec68b875587e0f46ca2a46d9afc366afdd29e5381816457e4b3b3891af8c0113c577385aa23 SHA512 fb3727bf5c0f756c888484f7c061da95a1ece15673079ac8e6ffc82289f78cfce3dda7245ae25b1d705ffe057f1b0930baf2338bdfe0f16c900dc1ffd3fef807
-EBUILD quimup-1.4.3.ebuild 792 BLAKE2B a87e111bc4e8eab3950bf1cce8ae6317bf081d74f4102bfcf7a615990b3d297e39aafaa7bf512f0777c345b30d04bf27f88ff10626e99847b6f1d681e3108d00 SHA512 901c1890a815ecd838b218aea2d55ba939c2dc263bcb52f11e52e2620dbbbc538b8984bb247f025902238d7c6065713708e88aeff7dc69376ea09117cdb8af2b
-EBUILD quimup-1.4.4.ebuild 779 BLAKE2B 6f49ff008facdfb611691ca0216feabf90d7d2fc51228032bf83f87bcaf071d0ebd4576bd89fcc0fbaf249569d51e74cdd6a2a9935d46d3d4af25fbe6ea4b965 SHA512 84c354ef0a8069df63e282dd2bd5ac59a65cf08178356d5ebf6f99e933f4b1e2c87a406c00a52d0e51427829c4fa296c988c748de379b8739b8ac7baaa72328b
+EBUILD quimup-1.4.4.ebuild 777 BLAKE2B 3fed6c6df7879802ca0cbcdef80d362f9d81d4a8da08f7480b887f241be6fe1253b5012c652313ae1a09a384f4b82f249be33b03c30430134fd9a95e49e22e41 SHA512 0c5ce255a822c70d871e2047cede9fa5b16cf6488557bf6def581e168ee52bcca29462d90ae34ce2413191b6d3de0af392f6da76dba60b201eae36cea6df5c0a
 MISC metadata.xml 339 BLAKE2B 6bb8fc9b606a6375c7997836909a5396bba8e726e2f0e06820e43574353a83ebe8cfe7fda125c6a1c892eed799195c7b74f1fa5c365686e0335a75f82848bbeb SHA512 02c262de7f82e49ebd91d60aa4e6577b8c4cead1b0b1df8a7bc18b575358e93b17384bc42ace5cf64b13116db9077fbc2262f110f6308cfa3621e994170cebd6
diff --git a/media-sound/quimup/quimup-1.4.3.ebuild b/media-sound/quimup/quimup-1.4.3.ebuild
deleted file mode 100644
index 2c80b78db1c2..000000000000
--- a/media-sound/quimup/quimup-1.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="A Qt5 client for the music player daemon (MPD) written in C++"
-HOMEPAGE="https://sourceforge.net/projects/quimup/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	>=media-libs/libmpdclient-2.3
-	media-libs/taglib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN^}_${PV}"
-
-DOCS=( changelog FAQ.txt README )
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	default
-	dobin ${PN}
-
-	newicon src/resources/mn_icon.png ${PN}.png
-	make_desktop_entry ${PN} Quimup
-}
diff --git a/media-sound/quimup/quimup-1.4.4.ebuild b/media-sound/quimup/quimup-1.4.4.ebuild
index c3c815355b9c..074276e6cf8e 100644
--- a/media-sound/quimup/quimup-1.4.4.ebuild
+++ b/media-sound/quimup/quimup-1.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN^}_${PV}_source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/redoflacs/Manifest b/media-sound/redoflacs/Manifest
index b4bc999fc3e7..036d2ceedafc 100644
--- a/media-sound/redoflacs/Manifest
+++ b/media-sound/redoflacs/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 203 BLAKE2B ed3d597cea8b95586dbb2d34468926f1a7344f4bafa4ff022d73b473dafad28c62a463d612b3ac8f1aa62ee54319230cd9b2b1906dbe2f97adba27a7eba0cb80 SHA512 0a19f8694e723ba19871dd6bac72e91d7df9320205ef5feb67fcc7c4bc5a345c126661704470274e4375824a3acc16b4c20a17ac5cfba8486596334b9bbf9266
 DIST redoflacs-0.30.tar.gz 40711 BLAKE2B afa4ddd4892b006092df769be753a6861dc75564021432ef255aef5046e870173c31a76c756362b7c530611432531dab2199155824457623c1ad805b8c51dc57 SHA512 bdd706909f4609668da1dd80635c486821616310d8de1caac1d4dbce17d8eb76ae04657f7f77fe22a05aabcb0b12d34e2e2c0812d16e973af132ab8a420afc4a
-EBUILD redoflacs-0.30.ebuild 562 BLAKE2B 968f203851d6571e8aacd9c0b865a075f3e06d49849e436c51566ea94e2f308c05b18bf3fd1f395efac4c987a8a9e0f5d782f0ff057028ab92397b168b7ce03d SHA512 20a93abcbd9e339d74d9ab048ed3c24e088efbc2df36b11e5bf8bbec2ee2b71465e3b40f89d0750ebe8efd05e1ee7e4565255045f242ad31290de7216f99684e
+EBUILD redoflacs-0.30.ebuild 544 BLAKE2B eba0a28f6f9dea67768e933fa114e1b000e6fdad5aa8715176928725404ea1934269a60996a42b3431d5ce828e0bd28e0653c51267cc661cc1b95115183bb7d9 SHA512 5f3c66de2284c4b608718e2bf00c024e4ba9472a4de4a5b709acda17b92efa96050f09b6037d4d169680d1a2214be2beb5a91cec0c81f35175ef55f38028b522
 MISC metadata.xml 346 BLAKE2B 869cc7c76112c00ce5496804a6456d3646e8c12acab6edff3a069795e47b5f1307bf4d8adcc16d3648a24287d9d7a471169a499461911829f04b19decfff35de SHA512 5d4b3441227598c1dac9c9f901a195cbe8a2d616bdbf851dc755b5e74f36c6b93542ca73666d7cb54dbfb5d44612d6b3ac17fe8b5a64b02778b0de5fd59544eb
diff --git a/media-sound/redoflacs/redoflacs-0.30.ebuild b/media-sound/redoflacs/redoflacs-0.30.ebuild
index a41aaed10bde..cb5eed7d1a02 100644
--- a/media-sound/redoflacs/redoflacs-0.30.ebuild
+++ b/media-sound/redoflacs/redoflacs-0.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit readme.gentoo vcs-snapshot
+inherit readme.gentoo-r1 vcs-snapshot
 
 DESCRIPTION="Bash commandline flac compressor, verifier, organizer, analyzer, retagger"
 HOMEPAGE="https://github.com/sirjaren/redoflacs"
@@ -12,9 +12,7 @@ SRC_URI="https://github.com/sirjaren/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND="
 	>=app-shells/bash-4
 	media-libs/flac
diff --git a/media-sound/ripperx/Manifest b/media-sound/ripperx/Manifest
index 35c845c39540..ec7e31795961 100644
--- a/media-sound/ripperx/Manifest
+++ b/media-sound/ripperx/Manifest
@@ -1,5 +1,6 @@
-AUX ripperx-2.7.3-ldflags.patch 360 BLAKE2B 9fd12e89687879502a8cc8f10035ce3a1041eb1761ab32b67031ca6f64de22bb169a07464632b526e336d6787b88e5de933079251b2e35d452897f8182f72a69 SHA512 f430e043284f4d35f88b3fc8349fd4cfe9df87f6f1ec11cd52b97c25e853b9394a87066a54612f828987023dcfe4724cb31fd39c91c319d76b2f3209aa6546c4
-AUX ripperx-2.7.3-pkgconfig.patch 210 BLAKE2B 188ec668dd55bc711a43569e8c9a805df87c736054e1ecbdf256f26420cfffcc24cd102b8723050cf8512fc881c3942822f772d6c7ac69a8d6afed65a55aaf64 SHA512 87382681d64c65e9353940d3e0c8955f5f7113b9dd23d58c06034ccfb13ac4369577e3ad1cc325bd44e2b38f453ae82870198c45af6335fab7fe0c70993ac276
+AUX ripperx-2.7.3-ceilf-underlink.patch 176 BLAKE2B 99181a760fb5d9656780a450ae4518c9e5b953c4e40cf441d885af0945a1ea2955aaafeac1f44fa0501c6564d8761b7fa79b4190293d8c2e1af4255874176e8c SHA512 f82ef9f0f04653059b70cb1ba3836108603ace739331dcb0db4131fe2f3c05de16b4efa0428b0bc05a3336d7be288a7182aa3ca6dd05a5c162c3bca9fbc48cdf
+AUX ripperx-2.7.3-ldflags.patch 376 BLAKE2B 7b650dcebad5ea0beafdf4d7c454b399beed50e35239c2a9fc184b8de3b6f0fbf1d78a8d4ee91bca258fd1aeb68aeac445e57b097934aaec7c4962f1de245d69 SHA512 efd180beb0755f67cc7c1b24f9b4e44e7af3e417f74ee90b7323db9421f4a27f14a9a4662846f5abba2c5291bdc2c9b65e9f2644943319f33f15525d0b3571c5
+AUX ripperx-2.7.3-pkgconfig.patch 214 BLAKE2B 5d823a71886332b93fa186b92f8a5a3a50a733c51654b441749a109956532c775a482df189e39f9443417d6ccbea9fa6e791fada69c573a1a2a955e8dd2302fa SHA512 f373e3343e013e7af95e3069ecda12e0fc5a0348684ee1baffeede445a3d1f4702e5a318844af81f97113f93c532332edc428fc953195ed47cb18a3dbd4c3c72
 DIST ripperX-2.7.3.tar.gz 536059 BLAKE2B 2aab1e79d066333eefbc830202da1d5aa1f7924569aa8a6659265d193df3a6473e9091ea0087e3d69302f330274787068a02e71708c4df4c2cbebb1bea56f790 SHA512 fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea
-EBUILD ripperx-2.7.3.ebuild 1058 BLAKE2B 80d2dfbb3d75b8da59dc5e232c4b630a9bc4864ec94c2345aecd8ae4f074d490508af6aef2787084d4f1dde0407e640d4a412ac4da5f372652a7f2d77dff7b4b SHA512 b0b324da5b629c17b46d6332f52437751a50736f5a1b274a2f8f0863c7b01772527bc3a334a1ae0e44b0bc31d80520840739e9dd2a607e3fdc8a51bd0ae70969
+EBUILD ripperx-2.7.3.ebuild 842 BLAKE2B 656eae2576a520c41d239873123b4f6402b53d4331246d84f04bd6f67319b85e262c4bcab3b999afba38f8de9d5501a46f7ab3c41ceef8bafcd39430660c6828 SHA512 73f0003ba6c68f96e803f42b0cbe2ee6a7342ddaeea6de36473cd9131e3d16dcd33f54e7a4ac18935fbd68b310e9d96e0ccd43ec54e03dea2333a121e416d9a8
 MISC metadata.xml 340 BLAKE2B b5581bbcc58715541149c30a4762596dc3dd9e99c93e2c3308fff69438d0e4a4f4597a40ca05efe84512714b2eae35a2a93a55fdcb486663b9c6bad026d111f9 SHA512 0e9310c5b4c10d5a2663b6da6d247e5f992011c11c6c49a679c72b34e110a10509f40382fcdb1ae21ff529a1b8756820be197fbc0e4d64f30f1ce47430ae81d8
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch b/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch
new file mode 100644
index 000000000000..56e40f132658
--- /dev/null
+++ b/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -264,7 +264,7 @@
+ 	$(GTK_CFLAGS) \
+ 	-I$(includedir)
+ 
+-ripperX_LDADD = \
++ripperX_LDADD = -lm \
+ 	$(INTLLIBS) \
+ 	$(GTK_LIBS)
+ 
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch b/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
index 11e18972e638..e7e8a066b3b7 100644
--- a/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
+++ b/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
@@ -1,11 +1,11 @@
---- plugins/Makefile.in
-+++ plugins/Makefile.in
+--- a/plugins/Makefile.in
++++ b/plugins/Makefile.in
 @@ -658,7 +658,7 @@ uninstall-am: uninstall-binPROGRAMS
  all: ripperX_plugin_tester $(PLUGINS)
  
  .c.o:
 -	$(CC) $(CFLAGS) $(LDFLAGS) -c $< -o $@
-+	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch b/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
index 48c24f4054a9..d6a311a60b05 100644
--- a/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
+++ b/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
@@ -1,5 +1,5 @@
---- ripperX.pc.in
-+++ ripperX.pc.in
+--- a/ripperX.pc.in
++++ b/ripperX.pc.in
 @@ -1,6 +1,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
diff --git a/media-sound/ripperx/ripperx-2.7.3.ebuild b/media-sound/ripperx/ripperx-2.7.3.ebuild
index 96bb4e62f35e..2656cb3b070a 100644
--- a/media-sound/ripperx/ripperx-2.7.3.ebuild
+++ b/media-sound/ripperx/ripperx-2.7.3.ebuild
@@ -1,47 +1,44 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
-MY_P=${P/x/X}
-MY_PN=${PN/x/X}
+inherit desktop
 
-DESCRIPTION="a GTK program to rip CD audio tracks and encode them to the Ogg, MP3, or FLAC formats"
+DESCRIPTION="GTK program to rip CD audio tracks to Ogg, MP3 or FLAC"
 HOMEPAGE="https://sourceforge.net/projects/ripperx"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P/x/X}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND="media-libs/id3lib
+RDEPEND="
+	media-libs/id3lib
 	media-sound/cdparanoia
 	media-sound/lame
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${P/x/X}"
 
-src_prepare() {
-	# AC_CHECK_LIB(m, ceilf, [], [MATH_LIB="-lm" MATH_LIB=""]) #401867
-	sed -i -e '/ripperX_LDADD/s:=:= -lm:' src/Makefile.in || die
-
-	epatch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-pkgconfig.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-ceilf-underlink.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-pkgconfig.patch
+)
 
 src_configure() {
 	econf $(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS CHANGES FAQ README* TODO
-	doicon src/xpms/${MY_PN}-icon.xpm
-	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}-icon
+	default
+
+	doicon src/xpms/ripperX-icon.xpm
+	make_desktop_entry ripperX ripperX ripperX-icon
 }
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index 47ed1fbe925e..145d67f5326c 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,5 +1,5 @@
 AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
 DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2-r3.ebuild 1212 BLAKE2B 9a6e96da066f988874acbc4080e3d2d41ce714f6baaa1ffc77aa2a2293692471c0d0c38ebcbf0c6af71d98961f43b404542891b42b01a361c566ad8e426b9e81 SHA512 2a447d94097f420411ec7d978901c024b082ebb9688903a627b3e0a513918f24725170dfde53424ee99a69041c5c3dd63ec11ae9ef500e94e1a29ae8d0e752e4
+EBUILD rplay-3.3.2-r3.ebuild 1255 BLAKE2B 6df3b36be8b0b7cc731b517cf4f2a4d26b8175f0c0e61e048a6f259a253098411bd5c22442e0342173612391d43366305d5212afdf56799adcdcd2cd5dc03d75 SHA512 0008d3553d9f059f313ae539e0f3f5b51b97eae9102c9a4ad778de5c0e00b0a69bcada9c083bd751fbcd9c6da090608e506c634e3c1af2ba53387148623bf86b
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index 6ecec5d4fe4c..faf1dd2c8545 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -51,4 +51,6 @@ src_install() {
 		mandir="${ED}/usr/share/man" \
 		sysconfdir="${ED}/etc" \
 		install
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index 9a3cd7e1ea63..8a4d21ed741f 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -2,11 +2,17 @@ AUX ohnet.makefile.patch 1233 BLAKE2B 1a877c58ec3b37c96dd4ea3830159de8bc3c34cd99
 AUX ohnet.optionparser.patch 449 BLAKE2B 55133d193ebb7dc249f71ad8d249b22569c03456e0ad687e3af27e88ed0502e134b8e70128cae4fe1d92b503e52f94c8d567159fca9ff6133f99b25c791044f9 SHA512 fe723ee9f734b5ae3a5d1a2ee3c0cb22b887d154314cc776253d14adff20de86d51a8563ba1dfb2b0f37a9c77e24277d961c45941e23a644f2769a17d050d665
 AUX ohnetgenerated.commonmk.patch 1473 BLAKE2B 6d2d8497fcd7e4e9e0f2210fc24308eab4559f8974f3e6f2d6e39163a54fb7b848455d496b0191e7260c83dc27bdb96e0f1bcbaa124165b3de603b22e5adabea SHA512 a9b6b8e2d23ca661c7590fb55c34b02a248fb4b95b843e4d87fd11ec08b360fcc386d7738fd3a6433bec22cdaaa81932b81342c19d99ac5673dcfb6c29215c9f
 AUX ohnetgenerated.makefile.patch 1138 BLAKE2B a65ff04a64c64ad86625f635990615271a206cb4657fb7eef423a0b04d1718b113eaab0aa57b1b52f7235ec8a1f41dcd6a8f2e949ae45336dd1c55380a19f791 SHA512 4bcd0e5044fd89a51a9be29f2f445f59292a8b36a249f09a74aa9a7ff215b6359be8a526e1ddf9b1c7fab56f6e2453afe5841b543552fe3abf78ce5c84b25e9c
+AUX sc2mpd-1.1.5-werror.patch 4448 BLAKE2B d41c363b6db9ab7b3170e7adf6ebd9e72d94d8e708ecc5a273765ba922b8098f7f706a2245b9f23f8146d253d6c7ad2ac00b28199eb8609be6af121b42c32150 SHA512 ea7805a2a572bd8995418115ea5c256a6897d787dbacc7d31482b39672c78b3b25bc087acb6cf1d0945bacaebed4112e1de19e9484e556978c6c851dac2cac30
+AUX sc2mpd-1.1.7-python.patch 4186 BLAKE2B 8037ab9b33d25a65ec4b72b616de23c8ab12f3e93d6fe3b607039b0ad3f69f3aa37d6e7b39dc0b91767b953307464c7bd9066dc8210ef2a4c3090ad01ece220c SHA512 45b17410a6499cefd7b596c08e5fee288f16a3057e1c84da96e6388132a2fb56060f2010b65ffa38cbef0d179f8fe1c6f88da9d355f177e5524ca674bbdf0b75
+AUX sc2mpd-1.1.7-werror.patch 4237 BLAKE2B f3922de425df679e9b9e7c5249994a39e9fcda6a539f1b3d084ece8f44c8e81546b975375ca3fd8d0e81504bb712791bc99e1aa139d422805ef7dd16d79d8f16 SHA512 28d6ca71fc41ed11fab780f48861f04b28d853240107db2eed6911f3e58710e50e31bbc3f3d5c047599c1d1e544a921bc4ea4bc37e5900a02a4092c7de520fe5
 DIST ohdevtools.d35861.tar.gz 1187475 BLAKE2B 82138d9b64f3172d540402e99b716e9b56bde2133b2565b442bfe6ae6b0e2235226027c4b43b17e3eb005b6f52a4d6a278e0895d267222a63f910ea556e4d76c SHA512 25188c3ae837db12e5c7f349ab01a315f8c68909e3eaa530dc9ba09fb2bcb3cd0a671676b3dd4902ef019b7e331d2acac0978649bce29df585e54d13158ff162
 DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B 82724b7f2cd5cd0dcaa54786394a2560b965f5f16df7bb84037795f1334b8052a4cfeff8f5f39bdc5d7a0ccb2093190c38de987957463d10cac407d9694a6a92 SHA512 67ccdbee6d909df30acb7c89aeba75d3accdbb533dda5abc02c66f867e2fad9a360696d5e28dd1decdc575a1396d026824329450e85e3a3b3e4f7af2e144140a
 DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906 SHA512 9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811
 DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661
 DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
+DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
 DIST sc2mpd-1.1.5.tar.gz 219031 BLAKE2B ac8a3b4da6caff58db4948c32d643bf9244efa4ad77e29c18aa7e10036715a9a84c9f69478f5a2eabf6769112fb61ea15e1d7e8e613fbae05794cef609f21247 SHA512 8ea47b8bda62b8e97b95b0ddf0ab7979a54ae8bc599c67ef7bdd16ea876254446c8be440fade7355be93742c94c6f20b56e40a5756cc3c0dbe0409612dc3788e
-EBUILD sc2mpd-1.1.5.ebuild 4562 BLAKE2B fbecb9f945afb3d1ba06e15cdcabefc762cd4a68919208001843fbf6dac4b5b52bd773934b8db7f685f31e9f2508a4d06e4c05223c69fb3658a2a681ceaf3a2a SHA512 c2f91e7fb6b48cda77c204c631d44f6765433d7d9f01872a17a99f588f3fe09dc2827cbc48104b8752defb27b607612dc7bbd20fc478748a9f52fba435c221c8
+DIST sc2mpd-1.1.7.tar.gz 238674 BLAKE2B 35fd57797612e3883ad5cc04be3f5328dbf4ec9aedb0461a801fe79566ef20de4026ad653eec6e7d932ffcd0385bb618331a519ec54838fd856d09c20f1971b8 SHA512 0b39e200f013602c851bec1ba41210c40d1a984638c86bd8dd5d61286aff19b315f282182753426e4470c8e6ccb60265b16dc6ba2e5117f59a3d40194464b4b3
+EBUILD sc2mpd-1.1.5.ebuild 4603 BLAKE2B 7d06773dce9de0204ffa7c32663b4dd169236ebfafd08a5d7a0790c920d659303451b392ba7bb1b2365139cb520f75dc45fcb202c83942ae5dc1ac6ea251ee0a SHA512 2bb100f9816c88d41cb8f8c01d0d768c79426d63bb6a5e6eff3f99b1f8a6608d080fb6451a574cb3ff39711ad1a79331cbf68fe7c74013aa87843d8be4b11d07
+EBUILD sc2mpd-1.1.7.ebuild 3255 BLAKE2B 9d132bf0e35d92ead2f130fd377c080ebd29b01b9a1092d82ad5b92ad98a6c68f526053f8c7c599f3c87e9e1cd6981dd4c409063f9647e5826aa6eaa6e419f4f SHA512 2cd018f872c01aa7e2417e8d0e22b655bb5a8a3a3e3fbb14d57f7c2d5018d4c3aedfe96919ad45602a506e6830dc0ba59dd5a59258c8c8f889a79a12388d328c
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
new file mode 100644
index 000000000000..ecc415f91b54
--- /dev/null
+++ b/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
@@ -0,0 +1,72 @@
+diff -ur sc2mpd-1.1.5/work/openhome/ohNet/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNet/Makefile
+--- a/openhome/ohNet/Makefile   2020-11-16 20:49:27.220636318 -0600
++++ b/openhome/ohNet/Makefile   2020-11-16 20:46:19.822974263 -0600
+@@ -310,13 +310,13 @@
+ cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
+ cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
+ ifeq ($(nocpp11), yes)
+-    cppflags = $(cflags_base) -Werror
++    cppflags = $(cflags_base)
+ else ifeq ($(platform),IntelMac)
+-    cppflags = $(cflags_base) -std=c++11 -Werror
++    cppflags = $(cflags_base) -std=c++11
+ else
+-    cppflags = $(cflags_base) -std=c++0x -Werror
++    cppflags = $(cflags_base) -std=c++0x
+ endif
+-cflags = $(cflags_base) -Werror
++cflags = $(cflags_base)
+ inc_build = Build/Include
+ includes = -IBuild/Include/ $(version_specific_includes)
+ bundle_build = Build/Bundles
+@@ -371,7 +371,7 @@
+        jar = $(JAVA_HOME)/bin/jar
+ endif
+
+-java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
++java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
+ jarflags = cf
+ dirsep = /
+ prefix = /usr/local
+diff -ur sc2mpd-1.1.5/work/openhome/ohNetGenerated/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNetGenerated/Makefile
+--- a/openhome/ohNetGenerated/Makefile  2020-11-16 20:49:27.262636458 -0600
++++ b/openhome/ohNetGenerated/Makefile  2020-11-16 20:45:36.594809974 -0600
+@@ -273,13 +273,13 @@
+ cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
+ cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
+ ifeq ($(nocpp11), yes)
+-    cppflags = $(cflags_base) -Werror
++    cppflags = $(cflags_base)
+ else ifeq ($(platform),IntelMac)
+-    cppflags = $(cflags_base) -std=c++11 -Werror
++    cppflags = $(cflags_base) -std=c++11
+ else
+-    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
++    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
+ endif
+-cflags = $(cflags_base) -Werror
++cflags = $(cflags_base)
+ depsPlatform = ${openhome_system}-${openhome_architecture}
+ header_install = Build/Include
+ inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
+@@ -334,7 +334,7 @@
+        jar = $(JAVA_HOME)/bin/jar
+ endif
+
+-java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
++java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
+ jarflags = cf
+ dirsep = /
+ prefix = /usr/local
+diff -ur sc2mpd-1.1.5/work/openhome/ohSongcast/Makefile sc2mpd-1.1.5.altered/work/openhome/ohSongcast/Makefile
+--- a/openhome/ohSongcast/Makefile      2016-10-18 02:34:33.000000000 -0500
++++ b/openhome/ohSongcast/Makefile      2020-11-16 20:46:57.123112193 -0600
+@@ -38,7 +38,7 @@
+ # Macros used by Common.mak
+
+ ar = ${CROSS_COMPILE}ar rc $(objdir)
+-cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
++cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
+ ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
+ ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
+ ohtopologydir = ../ohTopology/build/
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch
new file mode 100644
index 000000000000..d4103a522451
--- /dev/null
+++ b/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch
@@ -0,0 +1,64 @@
+diff -ur work.orig/ohNet/bundle_binaries.py work/ohNet/bundle_binaries.py
+--- a/openhome/ohNet/bundle_binaries.py	2020-11-10 00:24:29.640122646 -0600
++++ b/openhome/ohNet/bundle_binaries.py	2020-11-10 00:26:38.441470487 -0600
+@@ -121,22 +121,22 @@
+     parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")

+     options, args = parser.parse_args()

+     if len(args)>0:

+-        print "Too many arguments."

++        print("Too many arguments.")

+         sys.exit(1)

+     if options.system not in ALL_SYSTEMS:

+-        print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))

++        print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))

+         sys.exit(1)

+     if options.architecture not in ALL_ARCHITECTURES:

+-        print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))

++        print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))

+         sys.exit(1)

+     if options.configuration not in ALL_CONFIGURATIONS:

+-        print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))

++        print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))

+         sys.exit(1)

+     target = BuildTarget(options.system, options.architecture, options.configuration)

+     if target not in ALL_TARGETS:

+-        print "Unrecognized target combination. Valid combinations are:"

++        print("Unrecognized target combination. Valid combinations are:")

+         for valid_target in sorted(ALL_TARGETS.keys()):

+-            print "    " + get_target_as_option_string(valid_target)

++            print("    " + get_target_as_option_string(valid_target))

+         sys.exit(1)

+ 

+     buildinfo = ALL_TARGETS[target]

+diff -ur work.orig/ohNetGenerated/bundle_binaries.py work/ohNetGenerated/bundle_binaries.py
+--- a/openhome/ohNetGenerated/bundle_binaries.py	2020-11-10 00:24:29.847123204 -0600
++++ b/openhome/ohNetGenerated/bundle_binaries.py	2020-11-10 00:26:11.793398395 -0600
+@@ -96,22 +96,22 @@
+     parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")

+     options, args = parser.parse_args()

+     if len(args)>0:

+-        print "Too many arguments."

++        print("Too many arguments.")

+         sys.exit(1)

+     if options.system not in ALL_SYSTEMS:

+-        print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))

++        print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))

+         sys.exit(1)

+     if options.architecture not in ALL_ARCHITECTURES:

+-        print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))

++        print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))

+         sys.exit(1)

+     if options.configuration not in ALL_CONFIGURATIONS:

+-        print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))

++        print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))

+         sys.exit(1)

+     target = BuildTarget(options.system, options.architecture, options.configuration)

+     if target not in ALL_TARGETS:

+-        print "Unrecognized target combination. Valid combinations are:"

++        print("Unrecognized target combination. Valid combinations are:")

+         for valid_target in sorted(ALL_TARGETS.keys()):

+-            print "    " + get_target_as_option_string(valid_target)

++            print("    " + get_target_as_option_string(valid_target))

+         sys.exit(1)

+ 

+     buildinfo = ALL_TARGETS[target]

diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch
new file mode 100644
index 000000000000..fd079e26fb8a
--- /dev/null
+++ b/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch
@@ -0,0 +1,72 @@
+diff -ur ohNet/Makefile ohNet/Makefile
+--- a/openhome/ohNet/Makefile	2020-11-09 23:46:21.295605850 -0600
++++ b/openhome/ohNet/Makefile	2020-11-09 23:48:05.977868337 -0600
+@@ -344,13 +344,13 @@
+ cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
+ cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
+ ifeq ($(nocpp11), yes)
+-    cppflags = $(cflags_base) -Werror
++    cppflags = $(cflags_base)
+ else ifeq ($(platform),IntelMac)
+-    cppflags = $(cflags_base) -std=c++11 -Werror
++    cppflags = $(cflags_base) -std=c++11
+ else
+-    cppflags = $(cflags_base) -std=c++0x -Werror
++    cppflags = $(cflags_base) -std=c++0x
+ endif
+-cflags = $(cflags_base) -Werror
++cflags = $(cflags_base)
+ inc_build = Build/Include
+ includes = -IBuild/Include/ $(version_specific_includes)
+ bundle_build = Build/Bundles
+@@ -407,7 +407,7 @@
+ 	jar = $(JAVA_HOME)/bin/jar
+ endif
+ 
+-java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
++java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
+ jarflags = cf
+ dirsep = /
+ prefix = /usr/local
+diff -ur ohNetGenerated/Makefile ohNetGenerated/Makefile
+--- a/openhome/ohNetGenerated/Makefile	2020-11-09 23:46:21.344605971 -0600
++++ b/openhome/ohNetGenerated/Makefile	2020-11-09 23:47:44.656814158 -0600
+@@ -276,13 +276,13 @@
+ cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
+ cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
+ ifeq ($(nocpp11), yes)
+-    cppflags = $(cflags_base) -Werror
++    cppflags = $(cflags_base)
+ else ifeq ($(platform),IntelMac)
+-    cppflags = $(cflags_base) -std=c++11 -Werror
++    cppflags = $(cflags_base) -std=c++11
+ else
+-    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
++    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
+ endif
+-cflags = $(cflags_base) -Werror
++cflags = $(cflags_base)
+ depsPlatform = ${openhome_system}-${openhome_architecture}
+ header_install = Build/Include
+ inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
+@@ -337,7 +337,7 @@
+ 	jar = $(JAVA_HOME)/bin/jar
+ endif
+ 
+-java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
++java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
+ jarflags = cf
+ dirsep = /
+ prefix = /usr/local
+diff -ur ohSongcast/Makefile ohSongcast/Makefile
+--- a/openhome/ohSongcast/Makefile	2020-11-09 23:46:21.256605754 -0600
++++ b/openhome/ohSongcast/Makefile	2020-11-09 23:47:23.130759816 -0600
+@@ -38,7 +38,7 @@
+ # Macros used by Common.mak
+ 
+ ar = ${CROSS_COMPILE}ar rc $(objdir)
+-cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
++cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
+ ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
+ ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
+ ohtopologydir = ../ohTopology/build/
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
index 88eb814868c4..dd5733ae60e6 100644
--- a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
+++ b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,8 @@ src_prepare() {
 	mv ohTopology-${sha_topology} openhome/ohTopology || die "Couldn't mv ohTopology"
 	mv ohSongcast-${sha_songcast} openhome/ohSongcast || die "Couldn't mv ohSongcast"
 
+	eapply "${FILESDIR}/${P}-werror.patch"
+
 	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
 	epatch "${FILESDIR}/ohnet.makefile.patch"
 	epatch "${FILESDIR}/ohnet.optionparser.patch"
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
new file mode 100644
index 000000000000..5e598bc0f586
--- /dev/null
+++ b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+
+openhome_packageversion="20200704"
+
+SRC_URI="
+	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
+	https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-${openhome_packageversion}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/expat
+	media-libs/alsa-lib
+	media-libs/libsamplerate
+	media-libs/libmpdclient
+	<=net-libs/libmicrohttpd-0.9.70
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mkdir openhome || die "Can't create openhome directory"
+	cd openhome || die "Can't enter openhome directory"
+	unpack openhome-sc2-${openhome_packageversion}.tar.gz
+}
+
+src_prepare() {
+	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
+	eapply "${FILESDIR}/${P}-python.patch"
+	eapply "${FILESDIR}/${P}-werror.patch"
+	eapply_user
+}
+
+src_configure() {
+	econf "--with-openhome=${WORKDIR}/openhome"
+}
+
+src_compile() {
+
+	#### Begin ohbuild.sh reverse engineer
+
+	# build_ohNet
+	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
+	make native_only=yes || die "ohnet make failed"
+
+	# build_ohNetGenerated
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
+	# TODO: get from environment/make target
+	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
+	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
+	cd $deps || die "Couldn't cd to deps dir"
+
+	ohnet="${WORKDIR}/openhome/ohNet"
+	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
+		 -exec cp '{}' lib ';' \
+		|| die "Couldn't cp binary libs"
+
+	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
+	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
+	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
+	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
+	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
+	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
+	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
+	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
+	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
+	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
+	make native_only=yes || die "ohnetgenerated make failed"
+
+	cd "Build/Include" || die "Couldn't cd later to include"
+	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
+
+	# build_ohTopology
+	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
+	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
+	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
+
+	# build_ohSongcast
+	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
+	make release=1 library_static || die "Failed to build ohSongcast"
+
+	#### End ohbuild.sh reverse engineer
+
+	cd "${S}" || die "Failed to cd to source directory"
+	make || die "Failed to make sc2mpd"
+}
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 42c23f526a5a..d800cdcee755 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -3,7 +3,7 @@ AUX snapclient.confd 641 BLAKE2B 74bae4c2c11fb7c1a7d4f2bd0f199c92a5ee11f68efb71d
 AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd987fa51e9885f4968b0144106883a1a48e502c3e3558ca408babd38c46663b13ee56215caa108c3be SHA512 f429dfef7abd5705a8afc38f68125a7a6e5a812cd68733c8f47a65c7fb6aa22fc665c91e557726b8f35edbaced7b2e72ffad0ba123a6ed33bf8a6d333e8c1bae
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
-DIST snapcast-0.15.0.tar.gz 667452 BLAKE2B 0bf7e28ba52356c8fff8066ded3d741243c2ba88cdc6cefda113c0d6866fe14b2fea6198d7809e564cd61d32a336a2c30ee22f6f5d6ae77368a6f3e254cc5065 SHA512 3751eeaa9be4ffd5c7633b8770f36e87360ab83004f090a8350e377f60a79d9502b92b92c5c9c35f513705e6484d113de9942f0a896824d7c5f806ba0010e84e
-EBUILD snapcast-0.15.0-r1.ebuild 2036 BLAKE2B 6221864068dd147e0c642269a979969d0ab3d13b929c0724dfa69963404c8af29d1c1476db4dac01548256e6a37c2319f0f724b702f651b62ed89d60e7a057e0 SHA512 48a7583b6bebb86f55663a37465b7614f99e8eaac0412ff67837ada3f6124a212d1d4c773b3cd4eb6af625aa27eb8ed0dda2ab76b4992e1b0d70cae32cb6c0ef
-EBUILD snapcast-9999.ebuild 1975 BLAKE2B 6c93cb43de41804b2b4a89b22605b42ccc897c8f40eff5d0cd067e4691c72a9b1ad1851e6d2db3178336b78a79e8349c4e75de86b01736ecb78fd5a7dca987e7 SHA512 4a378e359b9727a45b8cb5c2a2ae7169848e5d89617ed5d89de62d89d847226fdaa8e00a665d624ef19608093d7a1848592b5c033cc3f67d36ba6774e2df2681
-MISC metadata.xml 959 BLAKE2B d4b44404f4c57a17bf2d995848175c105956ade8ec89e8680de754f3d0efba4b834ef1f2418e1acd39aafecd393534a5d261ba0cb5e3b4632d108fee8cdecfc7 SHA512 ca08cff7c2bc7e4924df7c39999068ebca369de57af174ebae7f8532c0103d1129dbd8e627506fe41c6e99abe24f4313fd9c208f68cfb17ae3bb4bd467536fa7
+DIST snapcast-0.20.0.tar.gz 729346 BLAKE2B 01a937b74d12f40717cec049e9af0c03f01cc957a97aa0c7316cac2c90f29d8a79dae99a0ae390b72e1a6ff8dce8e6134d40c83ac051641a97bbcd8df90ef64e SHA512 55542a5d915e359b4d8dcb69292dc8ee61067c5b35318151542d875b47a357b8713780ec03fb247ee424645457e68371499e84bae38fbb197737b1369dc7b622
+EBUILD snapcast-0.20.0.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
+EBUILD snapcast-9999.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
+MISC metadata.xml 1160 BLAKE2B e83d0f2140876511608032fc416c0b12861005cb4db45aaea56602e6e86f4bfa3d48df7c97d7cf56b4ba78ef635cea275ccd1c164991eecd99a6f19bd8998e44 SHA512 f1de473f51108a4f25e503404071830284ba0dfbaa458530fa93b737385e7cd651fb28bf27b841dba259f215b5603ea6f425120f74f559c8fdaf47a9e01fbe76
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml
index 820ffc2b0d8b..a11864f7a852 100644
--- a/media-sound/snapcast/metadata.xml
+++ b/media-sound/snapcast/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="client">Build and install Snapcast client component</flag>
 		<flag name="server">Build and install Snapcast server component</flag>
diff --git a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild b/media-sound/snapcast/snapcast-0.20.0.ebuild
index ee8268aab953..6228cd7ec667 100644
--- a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
+++ b/media-sound/snapcast/snapcast-0.20.0.ebuild
@@ -1,32 +1,38 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="Synchronous multi-room audio player"
 HOMEPAGE="https://github.com/badaix/snapcast"
 
-if [[ ${PV} == *9999 ]] ; then
-	inherit user cmake-utils git-r3
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
 	EGIT_BRANCH="develop"
 else
-	inherit user cmake-utils
-
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
+IUSE="+client +expat +flac +opus +server static-libs tremor +vorbis +zeroconf"
 
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="client? ( media-libs/alsa-lib )
+RDEPEND="client? (
+		acct-user/snapclient
+		media-libs/alsa-lib )
+	expat? ( dev-libs/expat )
 	flac? ( media-libs/flac )
+	opus? ( media-libs/opus )
+	server? (
+		acct-group/snapserver
+		acct-user/snapserver )
 	tremor? ( media-libs/tremor )
 	vorbis? ( media-libs/libvorbis )
 	zeroconf? ( net-dns/avahi[dbus] )"
@@ -35,23 +41,12 @@ DEPEND="${RDEPEND}
 	>=dev-cpp/asio-1.12.1
 	>=dev-cpp/popl-1.2.0"
 
-PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" )
-
-pkg_setup() {
-	if use server ; then
-		enewgroup "snapserver"
-		enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver
-	fi
-
-	if use client ; then
-		enewuser "snapclient" -1 -1 /var/lib/snapclient audio
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_EXPAT=$(usex expat)
 		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_WITH_OPUS=$(usex opus)
 		-DBUILD_SERVER=$(usex server)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTS=no
@@ -60,11 +55,11 @@ src_configure() {
 		-DBUILD_WITH_AVAHI=$(usex zeroconf)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	for bin in server client ; do
 		if use ${bin} ; then
@@ -74,16 +69,4 @@ src_install() {
 			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
 		fi
 	done
-
-	if use client ; then
-		keepdir /var/lib/snapclient
-		fowners snapclient:audio /var/lib/snapclient
-		fperms 0770 /var/lib/snapclient
-	fi
-
-	if use server ; then
-		keepdir /var/lib/snapserver
-		fowners snapserver:snapserver /var/lib/snapserver
-		fperms 0770 /var/lib/snapserver
-	fi
 }
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
index 09e72be8ff2e..6228cd7ec667 100644
--- a/media-sound/snapcast/snapcast-9999.ebuild
+++ b/media-sound/snapcast/snapcast-9999.ebuild
@@ -1,32 +1,38 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="Synchronous multi-room audio player"
 HOMEPAGE="https://github.com/badaix/snapcast"
 
-if [[ ${PV} == *9999 ]] ; then
-	inherit user cmake-utils git-r3
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
 	EGIT_BRANCH="develop"
 else
-	inherit user cmake-utils
-
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
+IUSE="+client +expat +flac +opus +server static-libs tremor +vorbis +zeroconf"
 
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="client? ( media-libs/alsa-lib )
+RDEPEND="client? (
+		acct-user/snapclient
+		media-libs/alsa-lib )
+	expat? ( dev-libs/expat )
 	flac? ( media-libs/flac )
+	opus? ( media-libs/opus )
+	server? (
+		acct-group/snapserver
+		acct-user/snapserver )
 	tremor? ( media-libs/tremor )
 	vorbis? ( media-libs/libvorbis )
 	zeroconf? ( net-dns/avahi[dbus] )"
@@ -35,21 +41,12 @@ DEPEND="${RDEPEND}
 	>=dev-cpp/asio-1.12.1
 	>=dev-cpp/popl-1.2.0"
 
-pkg_setup() {
-	if use server ; then
-		enewgroup "snapserver"
-		enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver
-	fi
-
-	if use client ; then
-		enewuser "snapclient" -1 -1 /var/lib/snapclient audio
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_EXPAT=$(usex expat)
 		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_WITH_OPUS=$(usex opus)
 		-DBUILD_SERVER=$(usex server)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTS=no
@@ -58,11 +55,11 @@ src_configure() {
 		-DBUILD_WITH_AVAHI=$(usex zeroconf)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	for bin in server client ; do
 		if use ${bin} ; then
@@ -72,16 +69,4 @@ src_install() {
 			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
 		fi
 	done
-
-	if use client ; then
-		keepdir /var/lib/snapclient
-		fowners snapclient:audio /var/lib/snapclient
-		fperms 0770 /var/lib/snapclient
-	fi
-
-	if use server ; then
-		keepdir /var/lib/snapserver
-		fowners snapserver:snapserver /var/lib/snapserver
-		fperms 0770 /var/lib/snapserver
-	fi
 }
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 97a346583cef..06cd0a7c6f1a 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,11 +1,5 @@
 AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
-AUX sonic-visualiser-4.0.1-qt-5.15-fix.patch 951 BLAKE2B 0148b2a825891b74664dd84819d274ad979b1ce4ed6f5f2d6c2a1f1d496123545f1cc7dec79bdb5145da441143be5ed88366ce00756e1c22f05a7945df7639e1 SHA512 57d5f55524612fbc2da7ff3a671fa9cc6fb66097111feb57e72b2fc254173947813644b95fe983faf411359db694d540f177a13b310b45930cb5769c318a483d
-AUX sonic-visualiser-4.0.1-qt-deprecated.patch 564 BLAKE2B 4ee5743d4dac92c5cfe7530a5d57c97f8ab875ba95fa3148424bc827c3735f1833203e8e30a3777e0a9219c0404205514ca28ca06874e8a7357794890d607403 SHA512 8af7b53474244aed2c61bff7a1276fe826a1be933b79e5aa1cf5f3af579d5ba374ff9cc2e65f7f4f97d6cd8fd2d28d19915856db6f9e196b35e9ee3280a07421
 AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c17e28676d32c0adf1c479a7f46a28572ec055f1c9bb8331b91497afaf4d241ebff6d2cf81e0eaed725559e SHA512 16a3f2d6adb715bcbc49ddf549f163e06fd1919a2e475d54dbc80d7b4cb8a757bf3124f75e158e53df132bcd9c60ad68da61b2ac0164af62ec1e3bb00415b264
-DIST sonic-visualiser-4.0.1.tar.gz 6649178 BLAKE2B c231833f7cc6228d450600e5cbc6a6db85d0aa784ce67a225bedb1393ca82a99bca492912bbaf8bf87f5fcce48e57facc3f216b057233b53f596ccd71835d174 SHA512 6557d7c90618f7f2c18f8bb0058b8cd74a084f26376999074b9d5f23f04e1548b7e82ccbb73a301fa68c1d2f047810d312e568a85c9c7f3f25da9ec9b00c4220
-DIST sonic-visualiser-4.1.tar.gz 6535840 BLAKE2B b3afdb2026405148e2efb217e960a4e70fd8efbe3779c6cc3671b17a808f12e288efb89bbd5200da9ccfc8bdbd0c684d555f7394aab8e67d2963fd84f967da0c SHA512 57edfc52ddbc9198a6608460a8f4e4fc2a382588f2881b7ea99cc738d7944d66c942f24218a303fb20eaa698ee365f29006c985f2385afd7f5c27fec5a241adb
 DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
-EBUILD sonic-visualiser-4.0.1.ebuild 2790 BLAKE2B 776c2cf8fed6e68128ac5fa07adf129ae0ba0c4f44f3f37052d182029ab8744822266c8374654534201659089cd8e50b82d1cadec917314ab3c4afe26e77f477 SHA512 5ed5e4b90396c22c1d0e78bbb7efdedf3158f890dd23751a15d3bc04abebeb0df898e9fb751c3a2a20596b53a85a45deaf578411a2453bdff394b1b3eb176bef
-EBUILD sonic-visualiser-4.1.ebuild 2810 BLAKE2B c8cb7230027051bd096808dace111ef7ed9e4406bc9bd073c760f727290b3c80d1e436a8a250a92964a220920433aaa02cd42f577e7b63eb7c88d8dfeb71092f SHA512 dc85adec230e2a02006950d5c11ecdd4539b306561f54db9d5af45cc6858cb7309497b8024876d489295502e00376181700298404c50a8713287424df658d547
-EBUILD sonic-visualiser-4.2.ebuild 2859 BLAKE2B 76421cc79cc6e836fdd46023e2e2dda070086d5c211e1f13a1c7e19217e82e578644eb1e7d292131d2295157fbc18629e6323e06734ed4da035bd4957057deac SHA512 39ec9900d7d59e04b7b78229b108c782f1f9ecd960043c83a0d5c0451d9d1679f297d982e515f6b4e0515265671b8bd1ec15509c51ae4c68fed027797047b9c9
+EBUILD sonic-visualiser-4.2.ebuild 2857 BLAKE2B 480517d4a7be070af7e4b70727b66cb7fb6bccfd46fa532b9e1896685f092417b7ef4082019c414181ce551b8dcf7deff66af89acb1e2b27e17e5f2cf4967d4a SHA512 95e5d27ac10caac3752b45a01a75f07131cc0ad70d477b475c57382c1dd4493e7f7db433bf49ce84a30222c5a779f7a0c1f5099c72186561796193f42434750b
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
deleted file mode 100644
index 007df8ecbb67..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7ebbdfd514c70ab500c8079a11b8ed91d086fe5a Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Sat, 6 Jun 2020 11:09:16 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-
----
- svgui/layer/WaveformLayer.cpp | 1 +
- svgui/view/Overview.cpp       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/svgui/layer/WaveformLayer.cpp b/svgui/layer/WaveformLayer.cpp
-index 8499ba3..07b5b3c 100644
---- a/svgui/layer/WaveformLayer.cpp
-+++ b/svgui/layer/WaveformLayer.cpp
-@@ -27,6 +27,7 @@
- #include "data/model/WaveformOversampler.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QTextStream>
- 
-diff --git a/svgui/view/Overview.cpp b/svgui/view/Overview.cpp
-index 7e4248a..449ba63 100644
---- a/svgui/view/Overview.cpp
-+++ b/svgui/view/Overview.cpp
-@@ -20,6 +20,7 @@
- 
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <iostream>
- 
- //#define DEBUG_OVERVIEW 1
--- 
-2.26.2
-
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
deleted file mode 100644
index bf0bc76656b6..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/checker/src/plugincandidates.cpp b/checker/src/plugincandidates.cpp
-index 2990905..8297253 100644
---- a/checker/src/plugincandidates.cpp
-+++ b/checker/src/plugincandidates.cpp
-@@ -37,7 +37,7 @@
- 
- #include <QProcess>
- #include <QDir>
--#include <QTime>
-+#include <QElapsedTimer>
- 
- #if defined(_WIN32)
- #define PLUGIN_GLOB "*.dll"
-@@ -231,7 +231,7 @@ PluginCandidates::runHelper(vector<string> libraries, string descriptor)
-         process.write("\n", 1);
-     }
- 
--    QTime t;
-+    QElapsedTimer t;
-     t.start();
-     int timeout = 15000; // ms
- 
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
deleted file mode 100644
index 9e65f200e3ff..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop qmake-utils xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2607/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio"
-
-BDEPEND="
-	dev-qt/qttest:5
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	>=dev-libs/capnproto-0.6:=
-	dev-libs/serd
-	dev-libs/sord
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib
-	media-libs/dssi
-	media-libs/ladspa-sdk
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/rubberband
-	media-libs/speex
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libfishsound
-		media-libs/liboggz
-	)
-	opus? ( media-libs/opusfile )
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-notest.patch"
-	"${FILESDIR}/${P}-qt-deprecated.patch"
-	"${FILESDIR}/${P}-qt-5.15-fix.patch"
-)
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	default
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use opus || sv_disable_opt opus
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	# capnproto 0.7 requires c++14 now
-	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
-		-i configure.ac \
-		-i */configure.ac \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-	sed -e 's/std=gnu++11/std=gnu++14/g' \
-		-i Makefile.* \
-		-i checker/Makefile.* \
-		|| die
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
-		einfo "Running ${i}"
-		HOME="${T}" ./${i} || die
-	done
-}
-
-src_install() {
-	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
-	dodoc README*
-
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu sonic-visualiser.desktop
-
-	# mime types
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild
deleted file mode 100644
index 3279c15e7c9f..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop qmake-utils xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2717/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
-
-BDEPEND="
-	dev-qt/qttest:5
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	>=dev-libs/capnproto-0.6:=
-	dev-libs/serd
-	dev-libs/sord
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib
-	media-libs/dssi
-	media-libs/ladspa-sdk
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/rubberband
-	media-libs/speex
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libfishsound
-		media-libs/liboggz
-	)
-	opus? ( media-libs/opusfile )
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-# tests fail without mp3 support
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( jack pulseaudio portaudio )
-	test? ( id3tag mad )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-notest.patch"
-)
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	default
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use opus || sv_disable_opt opus
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	# capnproto 0.7 requires c++14 now
-	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
-		-i configure.ac \
-		-i */configure.ac \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-	sed -e 's/std=gnu++11/std=gnu++14/g' \
-		-i Makefile.* \
-		-i checker/Makefile.* \
-		|| die
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
-		einfo "Running ${i}"
-		HOME="${T}" ./${i} || die
-	done
-}
-
-src_install() {
-	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
-	dodoc README*
-
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu sonic-visualiser.desktop
-
-	# mime types
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
index 5c7e308417d2..f76d06d4e8a5 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
 
 BDEPEND="
diff --git a/media-sound/spek/Manifest b/media-sound/spek/Manifest
index 0a91d897ecf3..c8b4b3530cb2 100644
--- a/media-sound/spek/Manifest
+++ b/media-sound/spek/Manifest
@@ -1,8 +1,9 @@
 AUX spek-0.8.1-disable-updates.patch 273 BLAKE2B c13fa0288b4464289967484a0c3a482b2a9f19e170a52329445cf3875831e552b85aa363ca6fb07033dc29de0edbce38d4045d8b2ff01b693f26e103cce1208e SHA512 90ca3adcf4fb677953ae4d7e50dc1bed62ba21e92f52dd9ec724b146244084bcde15da3317dab0feac9da522d0b3e49e5bad17c16209a3f0cc9b1b8780141040
+AUX spek-0.8.3-AR.patch 416 BLAKE2B 4a4d83b1eda983d19b42008be2a3531be1b845df07381e3e543d64be3a4c0f30b3ff37cf49c8a9ed15561bdb224b150c5605f896ccc4e25f98d40b92cebc9cad SHA512 dd0375e46bb3130cc7d31e548abdb2799c63037532030f935a79cc1a4349485de4a368e81dbee0f1527174bd2c2c42380cf0682715306287f96d453ef955f5e0
 AUX spek-0.8.3-ffmpeg3-1.patch 1314 BLAKE2B b8bc16079d2c6e7a108a6b4c92991ff674e0b073aef65da05bafc4ae3f88eeef1ae1728b563b7efbd1b64b95157a7e7519dfceb8007acc31de67a2eb87c76e34 SHA512 86f3668bff3ae9475d5db10c69ebbf277c0d03b18da3a1e8abc5531c80ebd22c4124e2fa700d9dfa4afda42d3141fc5fb569e4f7f2d9be2c6986577a3285eaaa
 AUX spek-0.8.3-ffmpeg3.patch 1253 BLAKE2B 8111886d4e8fe3a6c7e942c617dbaecc16cf11691885458fc96dfb9988ef615392eb641454d26bcc40414fdbc0f590dab2f805f1f0e0549023edd7e6b5787a9c SHA512 3e56b1965e0bd07f11089c8e09af1d12f03ca34244f74703a006e5bb420cbcb9ae5f4af4e984b0735198f68b74143486bcc27f07c14dce4780b05b57fb87ed86
 AUX spek-0.8.3-replace-gnu+11-with-c++11.patch 248 BLAKE2B 90872d7bec32e44f4a792fc9c76ee38eb8c9406b1063dd217a8dc97794589a382eed1b34639e849382011f921ccb3b83032700277dd7a4bcb7b09659f14a46f4 SHA512 5bb0ac9970656a03d0c7ab7ddbde59660a0b443ffda59bf3a0e9897d8705f0b49211b8fec52f218c25aa7764d646eb47c489eb7b992bc6f32c7f82382e8d17b3
 AUX spek-0.8.3-stdlib.patch 472 BLAKE2B 3007ae0f366b366b67c3168e9e33cb18a72632e68886f8fcab428cde126c82fb84d7fc7d9b81fd0d8f77f81da49bcfdefd140d31afde4063a0b169d837d658e6 SHA512 d42906e7fbb0707fb8eefc3e3cc19a18c28f4af9b56995cdfa486fd3fab92c11cc313bc3b76fd115e99ada892e3191ff80f33020b0c4cc56fb26a0540b526ea4
 DIST spek-0.8.3.tar.gz 1349573 BLAKE2B ce783c319741c43f27462caf9dcd27e71f4c8fbc9d3a3d2ac0b977189cca4cf8ed14f258958bbf59532c4cae97562fa20819222ae68567e9e607f243a2777000 SHA512 a4b54746316d295574bc963e650728b23b3730ee6bcc8d78b043a5678baac70a0e859870120de2b0e6a17059e9e3757075f4691e2abde98c083afc393e93e17c
-EBUILD spek-0.8.3-r1.ebuild 1086 BLAKE2B 208de5a0476cc3ddeb9a97738700553826347907d709b68209be24e589c713249f5ccc8ea02d0754b9b869680dd46b780545fa2c36ec4f812c1c46209c4f69a3 SHA512 ab10d7964daaae4dda7e3d5e5f84ab81eae3312d0c646301857adc0a521b99b3cb6a34036546c081e20d2d771f66104452e856981ae42c49fff4dc7d6467335a
+EBUILD spek-0.8.3-r1.ebuild 893 BLAKE2B 81c94f5b4ae9f969d716ed1500199523cef3a36a6fc021161cb8c2369137d1d76c48b6aa14703f5fb4e40e17e0a5f152e3fc4b36b4d234445c6105a43e9de819 SHA512 e81fa761631491f921a4841a3df30aa54ff95d3c0d79da8788d99e0ca11b40070e355dff101577d1ee46c72632cf04cc165fc37daafd4277e4250d0fbe4b688a
 MISC metadata.xml 293 BLAKE2B fab72d60cfe06b97698b72a5c6949612f92696a41a1a32077e2d0e544a51c82d8429c0d823f6dc2fbb0ae17dc04a0a8471c2ffc202f1eaf5fbac18004ce1a509 SHA512 737aac30952de1d589f19e6e9643b7ccfff0773b07322efda37e6d18c5dfd4e6845bc938ab2faa605633610a62340f561eb67a5b011562caf153b8bd9f3b603f
diff --git a/media-sound/spek/files/spek-0.8.3-AR.patch b/media-sound/spek/files/spek-0.8.3-AR.patch
new file mode 100644
index 000000000000..be797ba663fc
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.3-AR.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/754861
+https://github.com/alexkay/spek/pull/198
+
+diff --git a/configure.ac b/configure.ac
+index 3fc451b..b270033 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE([1.11.1 foreign no-dist-gzip dist-xz serial-tests])
+ AM_SILENT_RULES([yes])
+ 
+ AC_LANG([C++])
++AM_PROG_AR
+ AC_PROG_CXX
+ CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
+ AC_PROG_CXXCPP
+-- 
+2.26.2
+
diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild b/media-sound/spek/spek-0.8.3-r1.ebuild
index 4c60f5cbe8a1..be7cff895114 100644
--- a/media-sound/spek/spek-0.8.3-r1.ebuild
+++ b/media-sound/spek/spek-0.8.3-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 WX_GTK_VER="3.0"
 
-inherit autotools eutils toolchain-funcs wxwidgets
+inherit autotools wxwidgets xdg
 
 DESCRIPTION="Analyse your audio files by showing their spectrogram"
 HOMEPAGE="http://www.spek-project.org/"
@@ -16,30 +17,28 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	media-video/ffmpeg:0=
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
-	virtual/pkgconfig
-	>=sys-devel/gcc-4.7
 	sys-devel/gettext
-"
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch
+	"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch
+	"${FILESDIR}"/${P}-stdlib.patch
+	"${FILESDIR}"/${P}-ffmpeg3.patch
+	"${FILESDIR}"/${P}-ffmpeg3-1.patch
+	"${FILESDIR}"/${P}-AR.patch
+)
 
 src_prepare() {
-	need-wxwidgets unicode
-
-	if [ $(gcc-major-version) -lt "4" ] ; then
-		die "You need to activate at least gcc:4.7"
-	fi
-	if [ $(gcc-major-version) -eq "4" -a $(gcc-minor-version) -lt "7" ] ; then
-		die "You need to activate at least gcc:4.7"
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch \
-		"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch \
-		"${FILESDIR}"/${P}-stdlib.patch \
-		"${FILESDIR}"/${P}-ffmpeg3.patch \
-		"${FILESDIR}"/${P}-ffmpeg3-1.patch
+	default
 	eautoreconf
 }
+
+src_configure() {
+	setup-wxwidgets unicode
+	default
+}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 69a4d5595934..41db40c4b11c 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
-DIST strawberry-0.6.13.tar.xz 10156576 BLAKE2B 04d27d8a96a8664348623c11f393324b410f8224b22089e200947cfd90eaafe04c3aa13cc5345a7c95d83d24ed04ec9221a8badfb2e3dc42922739b568fc2e90 SHA512 b3db58a30d50f74b313c0af5a492ea809d631c4152f856b19debb5f811688eb21d97ba35b58f3f1d00779fcd76220d88b4dafc32520416f7e749c6680257ad49
-DIST strawberry-0.7.2.tar.xz 10123596 BLAKE2B cfd3384ded94bc5e638d79e4dea8e4a04a42abcc36d1d34da5d39150c2f20e785fd5f199c91ca515d02391e90acd23d1a5d90602ec07f52fdfa711d3ec88bc0e SHA512 d664ce81c2eef2e1bbbbdda40e420142c6c0bf6df42a785cc1c7f572f9b7521e44161f93c4694434db8752d7056df946e6e2aa064a62f45b143da6860f007483
-EBUILD strawberry-0.6.13.ebuild 2864 BLAKE2B 1b35982666541292b3c1a38e53aca7c5c14d84f96d6a9da6f0660b1e7b9e00b260d3862663b30c7cbf6ca4b9dde3cc7832cb7403be34ecef6daba4f2e40de162 SHA512 8554f8920f8bf96d3790c85413a0b16dfcf74b91c0e0d0fffa99c9ce2e5a9f6d8ce07bc5f127da62cec3049d95d25f275e7a5a420b62bce2f98de444b0837eb0
-EBUILD strawberry-0.7.2.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39
-EBUILD strawberry-9999.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39
+DIST strawberry-0.8.3.tar.xz 10280356 BLAKE2B 3c99193af3e753d48822567a3391900b1d4326ece49582718b949eb3753fd15d3cae2469ffdcc28334db95099a914c1065ed84c397b4ade53c624e7eab5cdfe5 SHA512 e64c49a6b479677486ae7868107e945a63a028cbaa6dcfb68c9c0784fe0ea8a1133264832367d092628fb1094ca90d87d6ab49199d4aab7f56f2620eb4e9b2f7
+DIST strawberry-0.8.4.tar.xz 10781080 BLAKE2B 395898e68117848613666edb545d15db22eea418c7dce553c442c52b459406c88640368da9a98c4f25e5cbff40369127ee4cec2dfadacdb79e4cef4c17e0f875 SHA512 a93308e6ba3450e8164f02c2b46bd5e785995d59963be7a896e769fa8312467fe29f1c7d48f5fbc290ccd6392293dc6af65e24001912a9f54292f25a023468b4
+EBUILD strawberry-0.8.3.ebuild 2879 BLAKE2B 2aafb75ee7415b165024983c825759f0355c2c0b86e0d3a8e308633ada9a9b9eae2209bb9bb0c554ea6e7469cc5b84d7c48012354b5c72bc13cac3c64f433267 SHA512 36fc1bf4ee4a8aa2d221cb7f402bf1fe4277544d792980d85489b5242540d48f843d10af0eb66b2acf61d3c6ebff43b3a5cbc4444ba05ea40e9d49a573e6994a
+EBUILD strawberry-0.8.4.ebuild 2881 BLAKE2B 2e02483874fb74f25f69cecf46982485edf74df2b8c8a95d88ab50471ddf47f0c2a2ed36c77bd80360c5da0798210325c3f1398333fcee0a293d7e6f90ba5269 SHA512 c1c9df0afc346e7da6c7c9b14290969449b9bb1de94ad7c83f9e66aace65f9d5cb23c46341b09126184710f462234482017fcca2e683aa087b16af0e45ffeab3
+EBUILD strawberry-9999.ebuild 2881 BLAKE2B 2e02483874fb74f25f69cecf46982485edf74df2b8c8a95d88ab50471ddf47f0c2a2ed36c77bd80360c5da0798210325c3f1398333fcee0a293d7e6f90ba5269 SHA512 c1c9df0afc346e7da6c7c9b14290969449b9bb1de94ad7c83f9e66aace65f9d5cb23c46341b09126184710f462234482017fcca2e683aa087b16af0e45ffeab3
 MISC metadata.xml 448 BLAKE2B b29c1b35e64c59667f04698cb2d1c039fc7557aa7ad99fb1a8625b68d960b0e7af62e016aaf1ec68d5c44c77126f71047b046164c29a0e80d49cdcda0973ca6d SHA512 2c5af38b8518b1de981bae14422bf5931b76831c0b52b1fce29e187d9ceb25a947d8d0f7db1e7844e90ec14657cc8ab484726b31c89667e89d9fcfb6d2e7dfe7
diff --git a/media-sound/strawberry/strawberry-0.6.13.ebuild b/media-sound/strawberry/strawberry-0.8.3.ebuild
index 9ef36a11ada9..caca9c641006 100644
--- a/media-sound/strawberry/strawberry-0.6.13.ebuild
+++ b/media-sound/strawberry/strawberry-0.8.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
@@ -99,6 +99,7 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DUSE_SYSTEM_TAGLIB=ON
+		-DWITH_QT6=OFF
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/strawberry/strawberry-0.7.2.ebuild b/media-sound/strawberry/strawberry-0.8.4.ebuild
index 92c336d58feb..2e4b045125e9 100644
--- a/media-sound/strawberry/strawberry-0.7.2.ebuild
+++ b/media-sound/strawberry/strawberry-0.8.4.ebuild
@@ -80,8 +80,8 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake_src_prepare
 	rm -r 3rdparty/taglib || die
+	cmake_src_prepare
 }
 
 src_configure() {
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 92c336d58feb..2e4b045125e9 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -80,8 +80,8 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake_src_prepare
 	rm -r 3rdparty/taglib || die
+	cmake_src_prepare
 }
 
 src_configure() {
diff --git a/media-sound/subsonic-bin/Manifest b/media-sound/subsonic-bin/Manifest
index 0167c8aa3109..e52bc2a37330 100644
--- a/media-sound/subsonic-bin/Manifest
+++ b/media-sound/subsonic-bin/Manifest
@@ -1,5 +1,5 @@
 AUX subsonic.confd 420 BLAKE2B e7e1b0b6bd33ec62924a015036f3197581749ed74e07359f8ceca68fb6aceb8c63b80e0d195e28345f1f22ff84c826cc5ed362dec75c5c6c36f97fb6de036279 SHA512 2e79c5a6fb12d0b8d4c5107175da8ca65bcc10e42c385b056ba5c5bb4c98c7d9995c391a5bddd726237a1f13bf37d1cbdc48f7fa7b9d3dd1e3aab20a212b00be
 AUX subsonic.initd 1194 BLAKE2B 018257ead2e8c620715404b3ba91ecce53913b7aa554670d1af495b2e1d17abf4ef5b140c62ada2eba0f01589bb43d08320c81c6c93f55f5510b8bcefb02dcff SHA512 7e99eaf2663d346d42e883f3501017e4da565f7b07ef390e370e097d13f4fd039ddccaa761562c2f43c28dbf3ad5c355dbfcef7b4e67ecccf3cd31819c86b14b
 DIST subsonic-5.2.1-standalone.tar.gz 43671795 BLAKE2B 2cf2ff67aaac7dd2ce405d832bfbd1f7dd0a87f4e5698092048891778ebbcac35e70c535a1e2af012655bc49e555ffdcbcfaffea62ad16cd987458e0d30a0135 SHA512 1251b77cfbee80224d3e332945fecec981c79b27c129cb47f5880a82344db15d1f8d17b11dd272a4ad3d9794f4e3055d4a59826623d543b676de73fe1c83b936
-EBUILD subsonic-bin-5.2.1-r2.ebuild 1401 BLAKE2B ce5e2c13d283c34a40750451b0953a9eea865e9e8def57debe674ed7dd15db0ce620856312c8b789c92f59f478c9d3492adea0fcb355fa040f65a2978b8a748b SHA512 8525043fa0a9f94f8a360133cbe4dbe5f9d709f22605a068dcd330afe11b7adc53ef0aa7067c3eaef890ea18270beb9c08d3b0006905cf357eca8e4c5c9b1b44
+EBUILD subsonic-bin-5.2.1-r2.ebuild 1423 BLAKE2B c4014dbe92e4c03815d734770798f8062f60663e0d17eb01db6fb9dde7009681108f18b4fa17c9b17a7f92ff7d48515b060a44f057ed13ccaf2c065b3a73bde9 SHA512 c40cbe615fbe1a79624dc2ab4fcc26cd1b85b6be446b7132c3f473421a4affb6cbe182d300e71702ebb1b74cadc24a00110c2b63f59af32de982afde2206f8ce
 MISC metadata.xml 325 BLAKE2B 031eefbb5a58dcfdeca52016a4db3ffee06a097db0604cf95079f00e5897f13f25b12d6e9d5cb7d6e25bda3a41a230fa98d40d18c6a4acc5eaffe69423d25529 SHA512 f6fe0547df26e6c4f94b6b1e915a51731fa3d6f565c71adc64f2fc3d858dc67d4664e46fbb654fa982bf0ba5915d673e0891f20aabfaadc84c0df2c44df46865
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
index 1fe06db06e55..522f0e8ef95f 100644
--- a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
@@ -52,11 +52,11 @@ src_install() {
 
 	if use ffmpeg; then
 		dodir ${SUBSONIC_HOME}/transcode
-		dosym /usr/bin/ffmpeg ${SUBSONIC_HOME}/transcode/ffmpeg
+		dosym ../../../../usr/bin/ffmpeg ${SUBSONIC_HOME}/transcode/ffmpeg
 	fi
 
 	if use lame; then
 		dodir ${SUBSONIC_HOME}/transcode
-		dosym /usr/bin/lame ${SUBSONIC_HOME}/transcode/lame
+		dosym ../../../../usr/bin/lame ${SUBSONIC_HOME}/transcode/lame
 	fi
 }
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 8ec6b8138bbf..ffa9f6b5240a 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -3,5 +3,5 @@ AUX supercollider-3.11.0-boost-1.72.patch 1830 BLAKE2B b9a9f358199de97865fc0d8a2
 AUX supercollider-3.11.0-fewer-qt-deps.patch 4412 BLAKE2B 433a51ca1e6b537811392891bec8f4de5aa289473c733c78567d4dddb3c5bc1b2b36c8a8f79222f2a70aa3eb6f0908b20d1cae5e87a9a57c1e56e3725b3787cf SHA512 742b4991c3402acb70ad731d4c535bea9671916360b9e0f17c6611359c1488c23599b613c4a0ff4846a74a55a7af7b5848865998bb4ebae4b0a4944f9caa892c
 AUX supercollider-3.11.0-qt-5.15.patch 2709 BLAKE2B ec9fd1241d6a5c244716434e0b1b44528f7c55a29dc9df09b47099685f5453e708edec6f106af9282ab31034bd1aa8f8e73c359e0228bbd9d63dc85ed41b4ddf SHA512 d26ae878b83f6cd5c7eca29893954bda1dd0adf70252e074f218851d931c97bd7b9aa6fd3ca9234ed7e7f0a52e26a28ad77ba3d5d08a7dee37bed2313d22a9b8
 DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da
-EBUILD supercollider-3.11.0.ebuild 3239 BLAKE2B 6d25fe5fb7bd1d34e96dbcef45ebf4f815103685f861face7672e853563038d52ae89ab8b5f5170fce5d369870bbf7b08261eb15be4f00cc6f0d09d3233f5b5d SHA512 177c2e1771ca0b3b6b9f16aae9254b07705dae6fc66b43512b0c5520a70e354a90053418d752d5b48a696cff4d2c69006a650b1d1e8b15e86044a6297a3fa9db
+EBUILD supercollider-3.11.0-r1.ebuild 3293 BLAKE2B 3c9c99beb8780cdd5d1b98a14e8f788323dcc3c9709128e7961418e9cf559ee0dbc1e578fb54be2cc5b2bc0040c7cf16da9ba64e108a1dfdf81ec648224a1ec3 SHA512 ff2cc14e12060ab811878e841f576c282c31db2671696fd81c65c0bf9da9ba31b7a149b24fdbc9fd8fcf2212a3cbe9081ffed9eb0b67888ff140e9f9b018d9fa
 MISC metadata.xml 1118 BLAKE2B f73fdd5fe30a105f5e408c713ec865322da87a1961d91a22d7689b217a3867e98a327f4a1f6db39c527b103a11ef3b624067baf3e380794cd412f58908c519bf SHA512 31731d66bcabc0a2227b89d769159c1b0c936c9a512e082780e71d4531dd9eed9be3e0d05859b92e84d8a8281a129151aa7ead133181c298f121e7fb1a54671f
diff --git a/media-sound/supercollider/supercollider-3.11.0.ebuild b/media-sound/supercollider/supercollider-3.11.0-r1.ebuild
index c4f164b9dc16..5132d3a2743b 100644
--- a/media-sound/supercollider/supercollider-3.11.0.ebuild
+++ b/media-sound/supercollider/supercollider-3.11.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake readme.gentoo-r1 xdg-utils
+inherit cmake flag-o-matic readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="An environment and a programming language for real time audio synthesis."
 HOMEPAGE="https://supercollider.github.io/"
@@ -105,6 +105,8 @@ src_configure() {
 		-DGC_SANITYCHECK=ON
 	)
 
+	append-flags $(usex debug '' -DNDEBUG)
+
 	cmake_src_configure
 }
 
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 045cc13ffcbc..7144cc863d9e 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,7 +1,10 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.3.run 97454216 BLAKE2B 228542b7b5169bd4bc86f320f7d9b4e099d088db9bb5c944b7b1e9d029b8c505a50447468fb02bb2b5e34c0f3a4e088a1af2bab466a7ec71e128541fabe9b562 SHA512 8b0ea835b179596ec16c092790383691650f6cb92b97d4ab2012872edc2f4d82e0b3a3ea4551651c4824703b9ef01ba9c95a50ee262d5f279151d780dc3faef6
+DIST TeamSpeak3-Client-linux_amd64-3.5.5.run 97478893 BLAKE2B 4007613a04ef0d42521d7ce2f1ff26924e7fd8a5b3f4da87749365bd866c2cda245b5a013394c9f50248e61361ab86fddf79baa138b1c5bb52acfbab730a5c6c SHA512 0082464460860897519643f292323fb38e7739a62338bc38dfb9443d7f5582be929bfd82bd3cbe3c5b04979d9a146dc58c51c70bf7359dfbcc6f828fcdac95c6
 DIST TeamSpeak3-Client-linux_x86-3.5.3.run 95939656 BLAKE2B 5aec52b4461d45cd19947e3f87729a40bca23bc78d45565bad59a1f11b437e253f0bf073ad32ca1a43396b8bcf47794d0efb0673ec0b7314e3dd5c2a0dcdb140 SHA512 54a6d7ad03a357a78be71710e7878b9b5c0a54d175bf4242a35ba82df1abfa692dc4d4c921099677c5d163caf18b68db73a87b8637b216ef5c72eaa25b6deab7
-DIST teamspeak-client-5.0.0_beta24.tar.gz 98415731 BLAKE2B 47589e828a71037910df2164152e63afef5606cc296f93e50f38e89a357b6fce266dcc219f7edeb4ac2ed664c3cf9f4847fd4a0a6b6c1327b63d328656a09359 SHA512 7ee9d088cf4f2e5b6fddba10f8586ffe4309dcf346f5b44dde89ceb9203746f7191247a3a0e3eb48cf7f21728734be3445c44dd025dd93f14b0bfce62d7e3623
+DIST TeamSpeak3-Client-linux_x86-3.5.5.run 95960042 BLAKE2B 221b3dc69b35e959160d0941abd7bdf1103bc160ee5cf739ae61bfe8ca855997a708eb3e1feff5113b247b371526968272d68c4a84a8a4aea788c21108b09ef4 SHA512 7aa8e8da9c0be6ad9d52ef4cf500ce6cd4c56d2660f39075455951a556c92c03d44b76d8f9c79a612e1c1120191047d6e11d917c21f0010d65b9daa18cdeb435
+DIST teamspeak-client-5.0.0_beta32.tar.gz 111368604 BLAKE2B 85771c2e7078bf4a25073b66295a8629911a7ed6fcfce17840130abe26e79565df306756928edd7439e0bc8800071a126187cc184b7f9beda15334af2e14acc7 SHA512 ac806deb1c001da01d76ddb07babc8bbde45bebaa5fab0cf2359ccc043036f1d882bfbd973be2cd184451681c297224f3437c89f72212ce10112a42bb46a823b
 EBUILD teamspeak-client-3.5.3.ebuild 2889 BLAKE2B 0b35da3a0914574bbad363e0546f49af1a3d8518e0605767caea4d114718e9657968b6c1a5e498fea6e94cca60925222e5837e83211b8092c0466558eb190acc SHA512 62d27eb4da0f1a16de6ab1164e4dcb2c45b3a4b1f85ba667b556f6b2d6e642499b259395543e5d4167a8f74702820f69089cfe11d11a33467274f81d7a059982
-EBUILD teamspeak-client-5.0.0_beta24.ebuild 2153 BLAKE2B 2666978068ace8e28e3f336f648c4a6fa4dc6bcf5c587eb18cab0ffbadb849fab098eae1c30e8b4864235dbb3e6de68694f6317854b6d217c2b7338f62c176bb SHA512 57c875f227777fa96dad32aa0074dbd453253d9d854a1607425579576fe25ca74a35fff8023b4ded0f8a2009ce9c9a852317955ce7ba9ca85d4660c804afa823
+EBUILD teamspeak-client-3.5.5.ebuild 2891 BLAKE2B 826f44d98998f69b6eb9681b3e5ba9c8f34676c15613d6836ba2dece6bc39fe51ef24e085e51a7bc9b66a9c702ba0585c6739caddf8ac7dab576f1994a1bc470 SHA512 01dd3631b09452183da44b7c6934f4b72c6e83c0ea8fc44b092b89ad01078f0fe3bb3356b11c9458742ba54384c559be4a8528dd5a6cd9d5434079461c0adacd
+EBUILD teamspeak-client-5.0.0_beta32.ebuild 2076 BLAKE2B 1d950c346137e1bd0014b7e8d8f2f25a714b7baff2e60791b848ac4193b6daa832bc5e47b4d27cada76e80d970fe9e596b0e47dfa5593b9e212d735e49fd7a73 SHA512 02e62e1afa719556090692e9cc14753b292050b5fa3b5a27e3dbfced651b1c7bd058463fb9c030039bd8f7ebc400fd08b4848b661c84d474014cac8238faca66
 MISC metadata.xml 637 BLAKE2B 996d3156ecf21c789e3a7017d7922f7fae257722021bc4ff968ec3c9863df61f9631fe83e3482781f78ede7b91f2138b4510473d8654063347037031812758fe SHA512 934068091ef8dce4652021965a99d50c4df0a426a7a1d1f26adeca776a73e7f1150d976bf44b704905aa0877d8844dd5d53bfa71279f5126e00dec924f3afc5f
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.5.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.5.ebuild
new file mode 100644
index 000000000000..8f0015c7b7cd
--- /dev/null
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.5.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs unpacker xdg-utils
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="A client software for quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
+	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"
+IUSE="+alsa pulseaudio"
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+BDEPEND=">=dev-util/patchelf-0.10"
+
+RDEPEND="
+	app-arch/snappy:0/1
+	dev-libs/openssl:0
+	dev-libs/quazip
+	dev-qt/qtcore:5
+	|| (
+		dev-qt/qtgui:5[accessibility,dbus,X(-)]
+		dev-qt/qtgui:5[accessibility,dbus,xcb(-)]
+	)
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5[geolocation(+),widgets]
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	net-libs/libsrtp:0
+	sys-libs/libcxx[libcxxabi]
+	sys-libs/zlib:0/1
+	virtual/udev
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/teamspeak3-client/error_report
+	opt/teamspeak3-client/package_inst
+	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
+	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
+	opt/teamspeak3-client/ts3client
+	opt/teamspeak3-client/update
+"
+
+src_prepare() {
+	default
+
+	if ! use alsa; then
+		rm -f soundbackends/libalsa_linux_*.so || die
+	fi
+
+	if ! use pulseaudio ; then
+		rm -f 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 soname_files=( "error_report" "ts3client" )
+	for soname_file in ${soname_files[@]}; do
+		patchelf --replace-needed libquazip.so libquazip5.so.1 "${soname_file}" || die
+	done
+
+	tc-export CXX
+}
+
+src_install() {
+	exeinto /opt/teamspeak3-client
+	doexe error_report package_inst ts3client update
+	newexe "${FILESDIR}"/ts3client-bin-r2 ts3client-bin
+
+	exeinto /opt/teamspeak3-client/soundbackends
+	doexe soundbackends/*.so
+
+	insinto /opt/teamspeak3-client
+	doins -r gfx html resources sound styles translations
+
+	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
+
+	dodir /opt/bin
+	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
+
+	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta24.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta32.ebuild
index f35eafbb741c..1d1cf415618e 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta24.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta32.ebuild
@@ -7,7 +7,7 @@ inherit desktop xdg-utils
 
 DESCRIPTION="A client software for quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="teamspeak-client.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS=""
 LICENSE="teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )"
@@ -43,7 +43,7 @@ RDEPEND="
 	x11-libs/pango
 "
 
-RESTRICT="bindist fetch mirror"
+RESTRICT="bindist mirror"
 
 S="${WORKDIR}"
 
@@ -51,24 +51,17 @@ QA_PREBUILT="
 	opt/teamspeak5-client/chrome-sandbox
 	opt/teamspeak5-client/hotkey_helper
 	opt/teamspeak5-client/libcef.so
+	opt/teamspeak5-client/libtschat_client_lib.so
+	opt/teamspeak5-client/libtschat_client_lib_export.so
 	opt/teamspeak5-client/patcher
 	opt/teamspeak5-client/TeamSpeak
 	opt/teamspeak5-client/soundbackends/libalsa_linux_amd64.so
 	opt/teamspeak5-client/soundbackends/libpulseaudio_linux_amd64.so
 "
 
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://beta.teamspeak.com"
-	elog "and place it in your DISTDIR directory."
-	elog ""
-	elog "Please keep in mind, that this is a closed beta!"
-	elog "If you are not participating, you won't be able to download it!"
-}
-
 src_install() {
 	exeinto /opt/teamspeak5-client
-	doexe chrome-sandbox hotkey_helper patcher TeamSpeak libcef.so
+	doexe chrome-sandbox hotkey_helper patcher TeamSpeak libcef.so libtschat_client_lib.so libtschat_client_lib_export.so
 
 	insinto /opt/teamspeak5-client
 	doins *.bin *.dat *.pak
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 023d699c7688..1f2b36aaecd9 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,9 +1,16 @@
 AUX teamspeak.initd-r1 559 BLAKE2B fa37f29a3a03579d091da5cd01785dd93e15f38c070e06589619a3843ab85a86197be836ee0c8fe630c4ad8872c3efaf4e160b215a45cef3ebe8a07f9d749b82 SHA512 0fcfc65290ececdb3bf07cf2d88edeb325dc738aad6c7ae4ce0838fb272190f6a2667ed20a484fe92a0d4d9b529927b31a4df6ddcc2d4e917677f1d589d4f356
 AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7d01c8931a18bf63615b0a125dec420f35e2517dacfd760750957997fcf58e69bcd2ca0721b4e2054ae SHA512 a31633591ae97224f3aefef25ed9d50e6cedf252c94559f7c424065ae815e0724c75e1c71337283933283cc77626d106ba5e15f3cce5c5dfddfc74a1f99160ba
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
+AUX ts3db_postgresql.ini.sample 99 BLAKE2B 06931c928de8f46373b6c7102358379260432d9f4b8d25d83455b62242abdb3a74b124fce5ba08b0a5f06a6dbe8252712d88b4106200976a032024ff14da37dc SHA512 803763b93d2cc7e7b111ca9649deb6e582e1f0228bd9acd677f8d3f914cbed745381663562ada655618bdb955c07f0cdf02bdd4d8ce02861f082ca9aef8e480f
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
+AUX ts3server.ini-r2 721 BLAKE2B 8427ffb88e2856b0807fe3c3ed2411039fe330f65322cca1e4b35d57e68e021b982a3e3c9044994bc21ed7010ebd746adf6fcfa93b3e2e9f5b5a16e3a3779bd5 SHA512 8d5ce0e3bf30bacd88784504dde88c1561d886f2402398d5f84d0acac56159fa21181adec25fec01f42582e0489a576606c9f12e426edcb1e9c2436ada196c4c
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
+AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
+AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
 DIST teamspeak3-server_linux_amd64-3.12.1.tar.bz2 9428301 BLAKE2B aeab07edc31d1ee57ffd34b218aeb3f7e23f31ffb5b8b940cbc46bca91b6ef9caffb67f1a52c059439a64d73ceb8fce124c0e8101d3e04d752782344ff6c1843 SHA512 58bfb582deddc4137245fe73d3aabfbcd84c3c346fe5fd3db8c7756014fcdd1f0bd7798ee029aa9beebe454fa8021dd180dd577f147cc5f02c833b68d9253fc7
+DIST teamspeak3-server_linux_amd64-3.13.1.tar.bz2 9946950 BLAKE2B 3a84f969fdc7da5599a5b61720b5d598b066aa2eeb65295270f14929ea58027f603288b9258d7f9ba90499bfa7fd1e21a8fe38b3a038c3054bf1f017728330ee SHA512 20a24fd5f35dfd58647900c7b1dd541c7132be4e0ccfa2d6f57fc9778b9d303721a0b5371cda16089b543b964b1cdc8351fd68c99b347d225df63311231d11d7
 DIST teamspeak3-server_linux_x86-3.12.1.tar.bz2 9268349 BLAKE2B 61d0794944775e4e9bfb57bc2ac331c5cc9da04d6a3956d4c1ec6c6d36ef87cb04ea1f0004d75251adc4baa1b9be999373d08ea36ca9f86e10b00e03d0f20f38 SHA512 83222586ff6e157af7242afc151c900eb339f05813f8b5fef602f9989a109b80de46bc86c7381b6acce240c62e9859b86df655a0b0219225162315337ca609ef
+DIST teamspeak3-server_linux_x86-3.13.1.tar.bz2 9780835 BLAKE2B 4bcfd9c3567f58cc340bd5a08547c9f3dc272898cd79c653ae0892fd35b9af7a8efe56b0a0e730bfdc7c22ffbdf6dfee403a00839e0eb59a82e4f3b9d1c9bd57 SHA512 a479f6e4306b505d0a620aab9b98395c4def3ceb143b27a5aea29bf4bacf2a1c9a87902d247566e0f333fadccec21be2855e96863c9f1e0675a399ff5608039f
 EBUILD teamspeak-server-3.12.1.ebuild 3083 BLAKE2B 2790ceaad0373faf5fb5b6e7ebcb997590ac3916021efabedcd4573c5c785351a1c617e418b2075bc10545c79ca64106c4506bc3844d007dab4aa6add16deb86 SHA512 8c4f7e56d0b035946b02a236d1488be1f2052332012724ef0158f00e58c1c0a7a0b7037a59a838a283e905c72b9194de483c0633c5095097c5920c1307dbbab3
+EBUILD teamspeak-server-3.13.1.ebuild 3512 BLAKE2B b58690672fdab82da1f31cc1ca0707c7aec578719454bb80f141f9d996e512d20495bc5fe6a0c6a6b15176ab7c57af50c17deee6c85b905f2304aae44b05279f SHA512 a426856348012da8589a4d3c65c2fac8a87e1582a9aae66bf6176a67f3724e189e1f21187837cbc345ffbe4ed1e2d62058ffd6b39e109bce776d1cd32e4f226c
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/files/ts3db_postgresql.ini.sample b/media-sound/teamspeak-server/files/ts3db_postgresql.ini.sample
new file mode 100644
index 000000000000..2d7c711f2533
--- /dev/null
+++ b/media-sound/teamspeak-server/files/ts3db_postgresql.ini.sample
@@ -0,0 +1,7 @@
+[config]
+host=localhost
+port=5432
+username=teamspeak
+password=teamspeak
+database=teamspeak
+socket=
diff --git a/media-sound/teamspeak-server/files/ts3server.ini-r2 b/media-sound/teamspeak-server/files/ts3server.ini-r2
new file mode 100644
index 000000000000..34f11d3f72e9
--- /dev/null
+++ b/media-sound/teamspeak-server/files/ts3server.ini-r2
@@ -0,0 +1,29 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_allowlist=query_ip_allowlist.txt
+query_ip_denylist=query_ip_denylist.txt
+dbplugin=ts3db_sqlite3
+dbpluginparameter=
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_sqlite/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r2 b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r2
new file mode 100644
index 000000000000..ff93fb649322
--- /dev/null
+++ b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r2
@@ -0,0 +1,29 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_allowlist=query_ip_allowlist.txt
+query_ip_denylist=query_ip_denylist.txt
+dbplugin=ts3db_mariadb
+dbpluginparameter=/etc/teamspeak3-server/ts3db_mariadb.ini
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_mariadb/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/files/ts3server_postgresql.ini.sample b/media-sound/teamspeak-server/files/ts3server_postgresql.ini.sample
new file mode 100644
index 000000000000..4bfa86641add
--- /dev/null
+++ b/media-sound/teamspeak-server/files/ts3server_postgresql.ini.sample
@@ -0,0 +1,29 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_allowlist=query_ip_allowlist.txt
+query_ip_denylist=query_ip_denylist.txt
+dbplugin=ts3db_mariadb
+dbpluginparameter=/etc/teamspeak3-server/ts3db_postgresql.ini
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_postgresql/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.1.ebuild
new file mode 100644
index 000000000000..75790c371a7d
--- /dev/null
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A server software for hosting quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql postgres tsdns"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/teamspeak
+	acct-user/teamspeak
+	postgres? ( dev-db/postgresql )
+"
+
+QA_PREBUILT="
+	opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_postgresql.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/libts3_ssh.so
+	opt/teamspeak3-server/ts3server
+	opt/teamspeak3-server/tsdnsserver
+"
+
+src_unpack() {
+	default
+
+	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
+}
+
+src_install() {
+	diropts -o teamspeak -g teamspeak
+	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
+
+	diropts
+	keepdir /etc/teamspeak3-server
+
+	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
+
+	exeinto /opt/teamspeak3-server
+	doexe ts3server
+
+	dodir /opt/bin
+	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
+
+	exeinto /opt/teamspeak3-server
+	doexe libts3db_sqlite3.so libts3_ssh.so
+
+	insinto /opt/teamspeak3-server/serverquerydocs
+	doins -r serverquerydocs/.
+
+	insinto /opt/teamspeak3-server/sql
+	doins sql/*.sql
+	doins -r sql/create_sqlite
+
+	insinto /etc/teamspeak3-server
+	newins "${FILESDIR}"/ts3server.ini-r2 ts3server.ini
+
+	dodoc CHANGELOG
+	docinto ts3server
+	dodoc doc/*.{md,txt}
+
+	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
+
+	newenvd - 99teamspeak3-server <<- EOF
+		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
+	EOF
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/serverquery/.
+	fi
+
+	if use mysql; then
+		insinto /etc/teamspeak3-server
+		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r2 ts3server_mariadb.ini.sample
+		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_mariadb.so
+		doexe redist/libmariadb.so.2
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_mariadb
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use postgres; then
+		insinto /etc/teamspeak3-server
+		doins "${FILESDIR}"/ts3server_postgresql.ini.sample
+		doins "${FILESDIR}"/ts3db_postgresql.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_postgresql.so
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_postgresql
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use tsdns; then
+		exeinto /opt/teamspeak3-server
+		doexe tsdns/tsdnsserver
+		dodir /opt/bin
+		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
+
+		insinto /etc/teamspeak3-server
+		doins tsdns/tsdns_settings.ini.sample
+
+		docinto tsdns
+		dodoc tsdns/{README,USAGE}
+	fi
+}
+
+pkg_postinst() {
+	elog "If you have a license,"
+	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
+	elog "Please note, that the license must be writeable by the teamspeak user,"
+	elog "as it will be automatically updated every six months."
+}
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 1de42ca12300..214672d59ea5 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,4 +1,5 @@
+AUX terminatorx-4.0.1-desktop-QA.patch 268 BLAKE2B 0f99d7317802773c3afc3c0e54c7744f79df333b65480123d929ab7a8bf5cebbe2772db241fec1570a2fced0a0e3ad71f2f7602e5f9c12c2faf8165edb5e8547 SHA512 3aaed47fdecceceee188f37a6af2a0fe35c9605fec5a581f48d17c4cb237512d0abc38e5da59b42d8b22bd16cf03947291746460f0bd6c4991f36ead81de1010
 AUX terminatorx-4.0.1-gtkcombotext.patch 437 BLAKE2B 582d82d04bd443188325f127a9766f6b35d6547339a839bbc7460f800bcf0721e30c6c77e42cfcfb5a91c683a11c90fb967849e8b7577e68dc11448b1a1f9873 SHA512 d801d60deb2d18444979791246c9eac7b41f2e7f8ecf5fa25a9b4d9294b0c0bd5dc107ac63aab04a85962efdea316f43df9736ef6009a174f1e8d6a7eb53c1c3
 DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
-EBUILD terminatorx-4.0.1-r2.ebuild 1367 BLAKE2B f7739ab4a165bdf6c9f3beacc572ca36083f3a6612f40fb670d8ad9a1d6572279f2cd24ad793bda6d64344b3d9fd74a4245a4276b5073643b38523fff0b2fcec SHA512 c4250247ebde946f87228cc96d8e2ad761d4aca8d299b814b2ba5d320da4fd3804ef6936114e760d89850e4c70dcdb5d0c8e2db62d33a9565d5d773be514d0d5
+EBUILD terminatorx-4.0.1-r2.ebuild 1411 BLAKE2B c226688c9595acfd1c65058abf1ce6761fd02e49026710c59b42625c8caea0179228bfddb9f1867113436844d218ca6fac347726e800bf5cbfc20c78aa06bf2c SHA512 f13956c85e3f4cfa624139a82a322dd0ac0e621d42a668429a732dd17a5c32bfe363b215810769d026a7b16e979e8ce4b4267e0b734149112ea5faf2599ed6a7
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch b/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch
new file mode 100644
index 000000000000..970b72f4de81
--- /dev/null
+++ b/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch
@@ -0,0 +1,12 @@
+--- a/terminatorX.desktop
++++ b/terminatorX.desktop
+@@ -8,5 +8,5 @@ Comment=Versatile DJ scratching and mixing application.
+ Terminal=false
+ Type=Application
+ Icon=terminatorX
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
+ StartupNotify=true
+-- 
+2.26.2
+
diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
index 8e85e9878242..5940c58dd66f 100644
--- a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,8 @@ PATCHES=(
 	# Fails to build with USE="X vorbis -alsa -debug -mad -pulseaudio
 	# -sox", bug #604288
 	"${FILESDIR}"/${P}-gtkcombotext.patch
+	# 740502
+	"${FILESDIR}"/${P}-desktop-QA.patch
 )
 
 src_configure() {
diff --git a/media-sound/timidity-freepats/Manifest b/media-sound/timidity-freepats/Manifest
index 2e494218edd6..364fa5664fbd 100644
--- a/media-sound/timidity-freepats/Manifest
+++ b/media-sound/timidity-freepats/Manifest
@@ -1,3 +1,3 @@
 DIST freepats-20060219.tar.bz2 25791733 BLAKE2B fcf512bf85bca61e29a32640a45e3dbb6132cdf4246baa54c7ed4540c955451b47d2e3d7f01219dfb1be5837dbe0d7e332583ce5b29918229718b22b237a6026 SHA512 6b24bf387a52fac9906906cb52fd5f9d02decdfcecb8d88acea136b200db962ba9beeb3e78bccdd6024b47453d7f093980b01cb0661e1b8d29fedc45ed61cb4f
-EBUILD timidity-freepats-20060219-r1.ebuild 808 BLAKE2B db0855fc1c8c8d7f726a711c2e9db9c26291dda400f7be40570ba0b4a9994f4789423e3241acc3451d6a783175c6d1e994f99be121dbfda5beb677a4d147d0e4 SHA512 b41aa7233d1798c5cd780d5498cfeb1740a307c417346b5272abe74246f5cfe9be7453d0486c1979ee0c816b50251cdf8c3147e179e6ad72d579c93bc663d010
+EBUILD timidity-freepats-20060219-r1.ebuild 784 BLAKE2B 15b219508c08fbfdaac76b48071bfdd6717a239ae343b575e5049c81ac32aeabebc32f089f13eb3524c1ff7610bc78a0087d1f79e99861600ba28f0467e193f5 SHA512 671c2cfb9270521865933393da1a9b203a620c7835ece88aeed0d918d0e9afb516d1ff4b4f8bf4c1528cd1e0f1cf898ca071efacaedc146797c92bf5318706d3
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
index e7eb715cab55..a03901c51b53 100644
--- a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
+++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MY_PN=${PN/timidity-/}
+MY_PN="${PN/timidity-/}"
 
 DESCRIPTION="Free and open set of instrument patches"
 HOMEPAGE="http://freepats.opensrc.org/"
@@ -12,18 +12,15 @@ SRC_URI="http://freepats.opensrc.org/${MY_PN}-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
 RESTRICT="binchecks strip"
 
-RDEPEND=""
-DEPEND=">=app-eselect/eselect-timidity-20061203"
+RDEPEND="app-eselect/eselect-timidity"
 
-S=${WORKDIR}/${MY_PN}
+S="${WORKDIR}/${MY_PN}"
 
-src_prepare() {
+src_configure() {
 	echo "dir ${EPREFIX}/usr/share/timidity/${MY_PN}" > timidity.cfg || die
-	cat freepats.cfg >> timidity.cfg || due
+	cat freepats.cfg >> timidity.cfg || die
 }
 
 src_install() {
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index b9703fbe5e7a..cb6f36cad8a3 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,12 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
 DIST upmpdcli-1.4.0.tar.gz 469357 BLAKE2B edd46e86f367ff2f88346cfb4cb249dae4463095553bb220fbd9a4078315044ec7591f58c30a0f20840a9f217230e46bc3b3569989a0ae2c05a44aa140c234c4 SHA512 1ed1f0a89a02610d70fb9e380dcbdbd8d636bc4a0964a16d27bd7c04126674f7f14e50e5fe521a430a06ea04ecef1275c7ad5f1c276daae1c285b73cceba9dec
+DIST upmpdcli-1.4.14.tar.gz 552026 BLAKE2B 0e9722d9a3c278b085416df240d3256ae1eff136f3897b181a59ce9d3edcdfd70ed7e568d8d345b1d0b13a9906f877776d9816ba3e8797c41c1684933aa326e6 SHA512 9084f60a4551fb94be915e6539d59a9ac070d55745c383b1f201c0c83262634c9e6fb353f66bb2232c493752805671b19057cbcec00c5ed128e19e1d0a037976
 DIST upmpdcli-1.4.2.tar.gz 477650 BLAKE2B 8bc2f86e8821aaee29f969e6031553f29e3224fdaf4b9c7d443f55bda5f321f36607dbb7dc0af15f0d1e7b006e93595cd1d668f9d1975e8673a80b218ea7f570 SHA512 be855214b55686422689ce786103ff50748a9f9e7e556c8dbeaa7e39e0229a3e0b56502bdbeb7071771706416cd2ff36592cb5245b505d8438f0ba75c200e9c2
+DIST upmpdcli-1.5.0.tar.gz 550268 BLAKE2B 8c9c7c3c4d3bdeb7a3a0c4ff506970d8e8ddfa8dffaf7fff525e263817088d599087843707c5154a6fb5441bccbadbee28a80a0bb85561a1418235af3ebc931f SHA512 a04e4b039d72ac8e8b6769bd4794f995f31978f2807aa8f938183cbf0d07f7b16cf9289c9f8c55efea8fa6ba54883cd87135683e524143c7cf0759decc7390ad
 EBUILD upmpdcli-1.4.0.ebuild 1259 BLAKE2B f62c3642b43df9d6d6d78001d0c45aec8b3fc1e5be2fbf5843ec3a6c20f4c500a18f367c6c5abd687482d88a5e39f86d98c30f635e3d8508cc21bc6123a0f81b SHA512 6e97ea302f73f8a3f7ce05d92f06cfe5d7f0fbf9a6b872e271000392d0bd8dd8fdb4cfa96c72beec1c56f94fa7fd31531d393b77f71ab8920c4fc578ec4d9fb1
-EBUILD upmpdcli-1.4.2.ebuild 1261 BLAKE2B 022363689427e8477865e2b6e9dd21614a706447698d80b736e2e01d0f0fb137e1ff85950465f42f5edbe863bb9399241872c5c34caeaef2627f7c8a659ce6a5 SHA512 a7f2d8874e4fac75c628341b00b980a523f58b50b4696500ce0d772c2e7445b42531698e586d3b75d1f15a05f323a32d33f9ef1d8dc4c7501addca52075589f5
+EBUILD upmpdcli-1.4.14.ebuild 1243 BLAKE2B 4946da31fe9803e50daaa738189e4cd2ea16c40709d63273d7b1a22613dfa96d22844ca27f9f9f8502c0024c3315d8636972d69b128a3049dc67632765d1fd76 SHA512 affcd83fed4cabbe769dfab4353ed92cea177dd4a90ec05e41989ea7b611e414c768017537c096b91d9d76782f2413bbace7e9c856be1d84d622fe12ad7793fd
+EBUILD upmpdcli-1.4.2.ebuild 1270 BLAKE2B 07b16ba743c24de6ef481f8e1c519f2a082c33dbe0d537595d550be4a45fece35d162ce0c1fa11bf701628c455522cfaf46fd4ce2cf22657325f3f802bbf9c00 SHA512 1f6424cb78e18f8f36aa647c252e3321c3ed8431ab54dec916f201b0afcf50fd72abb10f8bcb19b929d37be80502dd0a9cdd5edec95fcaa103c9ddb2c6e3a9a6
+EBUILD upmpdcli-1.5.0-r1.ebuild 1268 BLAKE2B 6458a9fb1875e490e8ee5fb45a748c176c9fac2812b46b4239da1e50ccd7383471a19fe761c40a29b37289c293e9047d26ef46a2feb9fb8a8f16b4043e25e6b9 SHA512 86c8c689450786448bfe7576601e50765b73d7e8c109c7a6377e9978951a110616d7cc5d060c6e55a4b1f4622e9f0e1ae3f909c906f152ef050c98c1a2c0157e
+EBUILD upmpdcli-1.5.0.ebuild 1260 BLAKE2B f66e40d7fc617c24832fcb034ed5a12edb5314cbbf9b67204150c22602ba11288c7ffa264d914eaf859efb74e7b2f76ea487df7d96a3bf0712fbd0163f943da4 SHA512 6370ffc1419420a757a0bc1cafdb79466c6a6af3aedb682d8f15573ba4549f792c2ee41f2259b77287027e324687d3dfcaecf6e8ec6815973a88a023a4d049f6
 MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/upmpdcli-1.4.14.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.14.ebuild
new file mode 100644
index 000000000000..405d3053766d
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.4.14.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	>=net-libs/libupnpp-0.19.0
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/upmpdcli
+	acct-user/upmpdcli
+	thirdparty? ( dev-python/requests )
+"
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+	einfo
+	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
+	einfo "detects sc2mpd at run-time, capabilities are added"
+	einfo "including internet radio support.  See upstream docs"
+	einfo "for more information."
+}
diff --git a/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild
index 9d24547be31e..de1899cbdaf3 100644
--- a/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="thirdparty"
 DEPEND="
 	dev-libs/jsoncpp
 	media-libs/libmpdclient
-	net-libs/libmicrohttpd
+	<=net-libs/libmicrohttpd-0.9.70
 	>=net-libs/libupnpp-0.17.0
 "
 RDEPEND="
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.0-r1.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..0eb2b288b4ea
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.5.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	>=net-libs/libupnpp-0.20.0-r1
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/upmpdcli
+	acct-user/upmpdcli
+	app-misc/recoll
+	thirdparty? ( dev-python/requests )
+"
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+	einfo
+	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
+	einfo "detects sc2mpd at run-time, capabilities are added"
+	einfo "including internet radio support.  See upstream docs"
+	einfo "for more information."
+}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.0.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.0.ebuild
new file mode 100644
index 000000000000..5c2fe3e85607
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	>=net-libs/libupnpp-0.19.0
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/upmpdcli
+	acct-user/upmpdcli
+	app-misc/recoll
+	thirdparty? ( dev-python/requests )
+"
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+	einfo
+	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
+	einfo "detects sc2mpd at run-time, capabilities are added"
+	einfo "including internet radio support.  See upstream docs"
+	einfo "for more information."
+}
diff --git a/media-sound/volwheel/Manifest b/media-sound/volwheel/Manifest
index eac35cee4e84..f3497a0825a8 100644
--- a/media-sound/volwheel/Manifest
+++ b/media-sound/volwheel/Manifest
@@ -1,4 +1,5 @@
-AUX volwheel-0.2.8-perl516.patch 1086 BLAKE2B c88983b2ad6e97ce74d928591e7dce50f62ab546535298b8515a7528d0fb7e7ed212c87257fd29b6022d43cda14a8987079bedbe37733e4da2614190434609ed SHA512 388c57bcce988b78adb5b5e66d0d896650ad57338df79f90876596ea4d8493839d8c818f0889463adcff8f2fe61730429b8c21c9065ba7d5c8f6b4986e01cc14
+AUX volwheel-0.2.8-desktop-QA.patch 183 BLAKE2B 59e4701d0ddeaa73b27407c49948685a04d5e39b826de4239a3f9307f8373a5093b0f24712332fe9f1f9954ac49cf096f9cd66965d661d49e54d4bd1c9a9c845 SHA512 924a95990df5780981bc416c4af3f5f743148df4e695414f699606cafdf80022d232a3f3577d031f69044a12e6202c363807e1245d296e5ad3d76a9e6e8741f5
+AUX volwheel-0.2.8-perl516.patch 1090 BLAKE2B f4ebc18d9635e66e021e6dfb941405cedcb6136a8c4b9267056d29351d3186b454ddb0c1af00323d8307e472010b43437f02ec28fe18c718a011082f057963bf SHA512 4867253ec1bd5f8efe3bd1833298d9bf1db6825df539496f7e6ef957c4a850a6cc9b640499617537702c192b25073ad2025626aed423500aa117067d703a18a4
 DIST volwheel-0.2.8.tar.gz 43140 BLAKE2B 87e23aa333485f31b2d21d79825d61aa421283d7ef62fc20e30e21cd11a2c379f5ae536cdba08883ced2a112a4ef0f8de9e719908afdcf5cd94d0431ce92f8b6 SHA512 ee2d121d2a9e2c987407a30187a313db128f1557932d003421e0fbda683cf80d52b5fb3c4c4ab2d07b642e86bb580bb3764a1c091ea57f5068660a035e78721b
-EBUILD volwheel-0.2.8-r1.ebuild 805 BLAKE2B efc3f92a8238de305b543e400298acf8cd104f70fdd43080c917f23e6cb288492adc21f05da7d98ea0d3bf7f8bb33c1dc61d49a223095fd9b9be1f20a60037de SHA512 1491d3fe6ffd909573c8295e6a69aac7ce12bf99c125d597445854dc29992695c562f8ad793daf910b29709192554e090fcd74a8ce4fd625a2a7c99067df2042
+EBUILD volwheel-0.2.8-r1.ebuild 632 BLAKE2B d296fd1cf6111518f69f095e1fbf3392ef80792a7e67939b8abc1b795d1f8cae6e2248effa6b4797d2d6e5e12408851d2d3724c68f00878bcebd36de28b103bd SHA512 b4d9c921cd7612121a89a884ff020ac990a790e75dbb7542e1d9ab530a1733264788f761a466b9ac2da9820ed27ec35ffc7582f10e179f970a87adcdfb79580e
 MISC metadata.xml 331 BLAKE2B 3524bb7c1202728614805cd0c286d8417387cf15d871f108da38f0fb015811600a05a275e2685e47f0225d7bdd684e4c7bbca4a5e4d71074084830d606582b49 SHA512 4a10f6540d114212e21102d1daca1e58043e637300573475be33369de01373e64041be84cecea9138bf2cebb39a5c26242a05820bfa58673e90698a4dca45fea
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
new file mode 100644
index 000000000000..11af8697af6a
--- /dev/null
+++ b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
@@ -0,0 +1,9 @@
+--- a/volwheel.desktop
++++ b/volwheel.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=VolWheel
+ GenericName=VolWheel
+ Comment=Easy sound volume adjustment
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
index 130d9b7c331f..4a801cf5192f 100644
--- a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
+++ b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
@@ -1,7 +1,7 @@
 http://code.google.com/p/olwtools/issues/detail?id=8
 
---- install.pl
-+++ install.pl
+--- a/install.pl
++++ b/install.pl
 @@ -2,7 +2,6 @@
  
  use strict;
diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
index 51ff9c182eb0..49e02ece502f 100644
--- a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
+++ b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils
+EAPI=7
+
+inherit xdg
 
 DESCRIPTION="A volume control trayicon with mouse wheel support"
 HOMEPAGE="https://oliwer.net/b/volwheel.html"
@@ -18,16 +19,12 @@ RDEPEND="${DEPEND}
 	dev-perl/Gtk2
 	alsa? ( media-sound/alsa-utils )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-perl516.patch
-	sed -i -e '/^Encoding/d' ${PN}.desktop || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-perl516.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
 
 src_install() {
-	./install.pl prefix=/usr destdir="${D}" || die
-	dodoc ChangeLog README TODO
+	./install.pl prefix="${EPREFIX}"/usr destdir="${D}" || die
+	einstalldocs
 }
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index 97e3626bb40c..8e15dd42076e 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1,5 +1,5 @@
 AUX wavbreaker-0.10-pkgconfig.patch 350 BLAKE2B 85657b02fcb5b6f7c9be8e81217bc02c816732f57cf51e3cde17179dd71d62df46f05d378910e06702419a822a050a4840b6c5433628e6f56dcc791f9d5e67c6 SHA512 a8f75bc1592b4aab528175a055936fc23d50a266b8aaee317fa6039c5ccebed2e02db0454b2b4d6494fc8705ecd39bf04dfa485de6921961e53347dead9d0d45
 AUX wavbreaker-0.11-QA-desktop-file.patch 211 BLAKE2B 64b1f3198a0cafb45b1d81978e1b61e06140f97aa4f01145513d8f2e8361b90d918fb299fa5318031b902d0c89695a93cf882794d8a35ea2b177197649636cb0 SHA512 375cb7f844726439ea06feee9360029d59de86ca1eeef8bf9b312e1a4b2207841ca6a6fa6dd8f947481fc74c45f44587adc1dc1f01d3e0485f783cdf872cc548
 DIST wavbreaker-0.11.tar.gz 496733 BLAKE2B 2ecdad2f19071d672eea4960883af3f1e5b034d43307896cbd9caed9fb087579124851cab6fbfbc54276945c6b229f2ac6f2e7b9b839d02487569b08d65b0210 SHA512 3dee23ef7c0db651cd1ebae78db3f950b5b22ae4f0a323f66e1243a88c0e41390f9f4abde663ef7a1d1c841e0cbb779612d6078cd327a0f1d48e6a812c8ce4e1
-EBUILD wavbreaker-0.11.ebuild 884 BLAKE2B 90309d5788813766429b9c383c60d49e62ce5533b06270418963f7dd79144aa4030e7bc9b12d1f52b976f2612f8001489b88d83f7270902e7215db984b5d0f82 SHA512 44b2de9b8409befd228aea6c7e2759461062ed3a2abca139a9696d066dc6d2993f7b355575c922f024ab0be60dec506d5c21f6fb451b5fc4faf5d2be6b635b08
+EBUILD wavbreaker-0.11.ebuild 888 BLAKE2B 34a183a5805485fe742795d91c106d2ba4dcf889924c230c0da4538628b5ad55fb1c567200f01cb254b85d842e0bcd78ad288ad12b42528d622c00837fd64ec2 SHA512 748402257cd0f0db7472d371b756636c95f405a14e8a40bc3085bfad3c655376f1ec73d1b78d0d9d7c76d3da9c340b87857cbdbce136a44358ec7cb9bd818e6c
 MISC metadata.xml 333 BLAKE2B db08ea8f604d1e01bd8da72c1a8a907a8fc528d3384fd5a33d9584c6aace01ec7d972fa37c9f75d3898ee5d064adae7ce5d01eeb48bb85486afaf5330418860f SHA512 d96b3c68abb0afe8c0821d0c9d5b48089e201dcdffffedcc41ee93d44fa3cc11b22eb782b13ded1fde4bfe2187aa2b371a2167d7305ade2bfeff0d201657ac98
diff --git a/media-sound/wavbreaker/wavbreaker-0.11.ebuild b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
index 6ab4036ae813..157cac408b8e 100644
--- a/media-sound/wavbreaker/wavbreaker-0.11.ebuild
+++ b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
 HOMEPAGE="http://wavbreaker.sourceforge.net"
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index 62b087929502..18527fbf2100 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,4 +1,5 @@
-AUX wildmidi.cfg 4670 BLAKE2B 09b79b3c179a506b6b1b6bb7f5b271926dc6b03daa755fb33c8116adabbf2e592aec32ced336be2986982adc84b78eb811fb417de3b327df8da70f2993124522 SHA512 978d8aeec23430cc0fbd0d625795a63f0876375e168f3be3294553de4d63c0e930775154c8dfa3a925c87010bb83e9e96b9e897de2166f3dbd40c4c14cd3f3c1
 DIST wildmidi-0.3.13.tar.gz 132407 BLAKE2B 5f603adb7583d47ca0595a48a385412d09ca8b19e99c93ba474d91076fa17a54e12e08bb39ea73d16c07addeab86e6c9d8b778d19045ef6b7d551d041bbc58fa SHA512 e9ede8a98c97e57a7bd34e63fc725a1b47bbff6b41f5dca101249917f0e7756ce4d93a84b8d5b6f592687fd3deed369c22c727873c9bdd1bea6e8c31fdbb4fdb
+DIST wildmidi-0.4.3.tar.gz 196750 BLAKE2B 580903dd1e7dc61193b593f3706d5070ae5cf26394919f8d632098aa0dda14d8d65631c902a6a01d02d046e639df4d66727849954b5d6f76dba8d12235e20b8d SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f
 EBUILD wildmidi-0.3.13.ebuild 1853 BLAKE2B a0d488da7321843e051c5c0512efced597420298e86a89bf8e35bf425921e834135ea13f6d7b30d67897a594eb7dfc418bb9d9881f2ff1ddbd247963c8964abc SHA512 357412f782b044b36024adf9a4b77bc1bda16317ccb18746b75c53991d57519450c929baf19a04bba546c97cdb2cc7557c2e34400cc940bba2ec4304487efcd0
-MISC metadata.xml 375 BLAKE2B a642a1b0da135ba37ab54d3fb876f980c2a24725e121c4f0504d4d3e49c294cdc7ef9a7cc0b69f98cf72c3cb5a001a242c4eb821bf8f66876ca63bcb471775c2 SHA512 195e8dd23afe8b774740dc438e442981fc640c7191fa3319af3a811a51f840c73d025ff5d8c9377377ad246449be40e0dd9d117d9f1f20beb4bf7286fe6aee7d
+EBUILD wildmidi-0.4.3.ebuild 1327 BLAKE2B cb66382f250ca56f3ed9930375664a7edabec0f869888337dfbc933b4f957beca8ff0852208b351e3afc1fdac5b136f4030f283ea9daaf256e8e7e36d3cadb4b SHA512 36fafde7eab91f3ea6e568f42a6c40e0ddced17c7b5d8e1b25dce195dfbf10c015fced62c8a79ec23853bd08e4f2e24982fb302b98696e1a4dfb4f943ebc1503
+MISC metadata.xml 584 BLAKE2B d15f9bff872c58f447fd538e2726b8a9219ee24567cde6c4abb7d986d19bb046d43db9a743820102ff4a2c8092def068462ca9601d012aff5aac5d9a6a06443a SHA512 f7a7380f326968b403a57071a7acfcfcf35a5e5744ca79585145e4e81beae2d4ec8bd2bc5cbd0d8a1c49d10cdf52dac272319c18e6e5b6c7a02dd46aaddf6da8
diff --git a/media-sound/wildmidi/files/wildmidi.cfg b/media-sound/wildmidi/files/wildmidi.cfg
deleted file mode 100644
index 3cdfbd3c1445..000000000000
--- a/media-sound/wildmidi/files/wildmidi.cfg
+++ /dev/null
@@ -1,138 +0,0 @@
-# Automatically generated on Πεμ 26 Αύγ 2010 09:01:08 μμ EEST
-# by http://freepats.opensrc.org/mkcfg.sh.txt
-
-dir /usr/share/timidity/freepats
-drumset 0
-
- 25	Drum_000/025_Snare_Roll.pat 
- 26	Drum_000/026_Snap.pat 
- 27	Drum_000/027_High_Q.pat 
- 31	Drum_000/031_Sticks.pat 
- 32	Drum_000/032_Square_Click.pat 
- 33	Drum_000/033_Metronome_Click.pat 
- 34	Drum_000/034_Metronome_Bell.pat 
- 35	Drum_000/035_Kick_1.pat amp=100
- 36	Drum_000/036_Kick_2.pat amp=100
- 37	Drum_000/037_Stick_Rim.pat 
- 38	Drum_000/038_Snare_1.pat 
- 39	Drum_000/039_Clap_Hand.pat amp=100
- 40	Drum_000/040_Snare_2.pat 
- 41	Drum_000/041_Tom_Low_2.pat amp=100
- 42	Drum_000/042_Hi-Hat_Closed.pat 
- 43	Drum_000/043_Tom_Low_1.pat amp=100
- 44	Drum_000/044_Hi-Hat_Pedal.pat 
- 45	Drum_000/045_Tom_Mid_2.pat amp=100
- 46	Drum_000/046_Hi-Hat_Open.pat 
- 47	Drum_000/047_Tom_Mid_1.pat amp=100
- 48	Drum_000/048_Tom_High_2.pat amp=100
- 49	Drum_000/049_Cymbal_Crash_1.pat 
- 50	Drum_000/050_Tom_High_1.pat amp=100
- 51	Drum_000/051_Cymbal_Ride_1.pat 
- 52	Drum_000/052_Cymbal_Chinese.pat 
- 53	Drum_000/053_Cymbal_Ride_Bell.pat amp=100
- 54	Drum_000/054_Tombourine.pat 
- 55	Drum_000/055_Cymbal_Splash.pat 
- 56	Drum_000/056_Cow_Bell.pat 
- 57	Drum_000/057_Cymbal_Crash_2.pat 
- 58	Drum_000/058_Vibra-Slap.pat 
- 59	Drum_000/059_Cymbal_Ride_2.pat 
- 60	Drum_000/060_Bongo_High.pat 
- 61	Drum_000/061_Bongo_Low.pat 
- 62	Drum_000/062_Conga_High_1_Mute.pat 
- 63	Drum_000/063_Conga_High_2_Open.pat 
- 64	Drum_000/064_Conga_Low.pat 
- 65	Drum_000/065_Timbale_High.pat 
- 66	Drum_000/066_Timbale_Low.pat 
- 67	Drum_000/067_Agogo_High.pat 
- 68	Drum_000/068_Agogo_Low.pat 
- 69	Drum_000/069_Cabasa.pat amp=100
- 70	Drum_000/070_Maracas.pat 
- 71	Drum_000/071_Whistle_1_High_Short.pat 
- 72	Drum_000/072_Whistle_2_Low_Long.pat 
- 73	Drum_000/073_Guiro_1_Short.pat 
- 74	Drum_000/074_Guiro_2_Long.pat 
- 75	Drum_000/075_Claves.pat amp=100
- 76	Drum_000/076_Wood_Block_1_High.pat 
- 77	Drum_000/077_Wood_Block_2_Low.pat 
- 78	Drum_000/078_Cuica_1_Mute.pat amp=100
- 79	Drum_000/079_Cuica_2_Open.pat amp=100
- 80	Drum_000/080_Triangle_1_Mute.pat 
- 81	Drum_000/081_Triangle_2_Open.pat 
- 82	Drum_000/082_Shaker.pat 
- 84	Drum_000/084_Belltree.pat 
-
-bank 0
-
- 0	Tone_000/000_Acoustic_Grand_Piano.pat amp=120 pan=center
- 1	Tone_000/001_Acoustic_Brite_Piano.pat 
- 2	Tone_000/002_Electric_Grand_Piano.pat 
- 4	Tone_000/004_Electric_Piano_1_Rhodes.pat 
- 5	Tone_000/005_Electric_Piano_2_Chorused_Yamaha_DX.pat 
- 6	Tone_000/006_Harpsichord.pat 
- 7	Tone_000/007_Clavinet.pat 
- 8	Tone_000/008_Celesta.pat 
- 9	Tone_000/009_Glockenspiel.pat 
- 13	Tone_000/013_Xylophone.pat 
- 14	Tone_000/014_Tubular_Bells.pat 
- 15	Tone_000/015_Dulcimer.pat 
- 16	Tone_000/016_Hammond_Organ.pat 
- 19	Tone_000/019_Church_Organ.pat 
- 21	Tone_000/021_Accordion.pat 
- 23	Tone_000/023_Tango_Accordion.pat 
- 24	Tone_000/024_Nylon_Guitar.pat 
- 25	Tone_000/025_Steel_Guitar.pat 
- 26	Tone_000/026_Jazz_Guitar.pat 
- 27	Tone_000/027_Clean_Electric_Guitar.pat 
- 28	Tone_000/028_Muted_Electric_Guitar.pat 
- 29	Tone_000/029_Overdriven_Guitar.pat 
- 30	Tone_000/030_Distortion_Guitar.pat 
- 32	Tone_000/032_Acoustic_Bass.pat 
- 33	Tone_000/033_Finger_Bass.pat 
- 34	Tone_000/034_Pick_Bass.pat 
- 35	Tone_000/035_Fretless_Bass.pat 
- 36	Tone_000/036_Slap_Bass_1.pat 
- 37	Tone_000/037_Slap_Bass_2.pat 
- 38	Tone_000/038_Synth_Bass_1.pat 
- 40	Tone_000/040_Violin.pat 
- 42	Tone_000/042_Cello.pat 
- 44	Tone_000/044_Tremolo_Strings.pat 
- 45	Tone_000/045_Pizzicato_Strings.pat 
- 46	Tone_000/046_Harp.pat 
- 47	Tone_000/047_Timpani.pat 
- 48	Tone_000/048_String_Ensemble_1_Marcato.pat 
- 53	Tone_000/053_Voice_Oohs.pat 
- 56	Tone_000/056_Trumpet.pat 
- 57	Tone_000/057_Trombone.pat 
- 58	Tone_000/058_Tuba.pat 
- 59	Tone_000/059_Muted_Trumpet.pat 
- 60	Tone_000/060_French_Horn.pat 
- 61	Tone_000/061_Brass_Section.pat 
- 64	Tone_000/064_Soprano_Sax.pat 
- 65	Tone_000/065_Alto_Sax.pat 
- 66	Tone_000/066_Tenor_Sax.pat 
- 67	Tone_000/067_Baritone_Sax.pat 
- 68	Tone_000/068_Oboe.pat 
- 69	Tone_000/069_English_Horn.pat 
- 70	Tone_000/070_Bassoon.pat 
- 71	Tone_000/071_Clarinet.pat 
- 72	Tone_000/072_Piccolo.pat 
- 73	Tone_000/073_Flute.pat 
- 74	Tone_000/074_Recorder.pat 
- 75	Tone_000/075_Pan_Flute.pat 
- 76	Tone_000/076_Bottle_Blow.pat 
- 79	Tone_000/079_Ocarina.pat 
- 80	Tone_000/080_Square_Wave.pat 
- 84	Tone_000/084_Charang.pat 
- 88	Tone_000/088_New_Age.pat 
- 94	Tone_000/094_Halo_Pad.pat 
- 95	Tone_000/095_Sweep_Pad.pat 
- 98	Tone_000/098_Crystal.pat 
- 101	Tone_000/101_Goblins--Unicorn.pat 
- 102	Tone_000/102_Echo_Voice.pat 
- 104	Tone_000/104_Sitar.pat 
- 114	Tone_000/114_Steel_Drums.pat 
- 115	Tone_000/115_Wood_Block.pat 
- 120	Tone_000/120_Guitar_Fret_Noise.pat 
- 122	Tone_000/122_Seashore.pat 
- 125	Tone_000/125_Helicopter.pat 
-
diff --git a/media-sound/wildmidi/metadata.xml b/media-sound/wildmidi/metadata.xml
index 1943a163e7bd..17ff7e7576a6 100644
--- a/media-sound/wildmidi/metadata.xml
+++ b/media-sound/wildmidi/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="player">Install the wildmidi player</flag>
 	</use>
diff --git a/media-sound/wildmidi/wildmidi-0.4.3.ebuild b/media-sound/wildmidi/wildmidi-0.4.3.ebuild
new file mode 100644
index 000000000000..feabe2bbee67
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.4.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="MIDI processing library and player using the GUS patch set"
+HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
+SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+alsa openal oss +player"
+
+DEPEND="
+	player? (
+		alsa? ( media-libs/alsa-lib )
+		openal? ( media-libs/openal )
+	)
+"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats
+"
+
+REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
+
+DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
+	For more information please read the ${PN}.cfg manpage."
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	cmake_src_prepare
+	# Fix location of media-sound/timidity-freepats
+	# See #749759
+	sed -i -e "s:midi/freepats:timidity/freepats:" cfg/wildmidi.cfg || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PLAYER=$(usex player)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/${PN}/
+	doins cfg/wildmidi.cfg
+
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 72f9580a80a5..b2b5d5e2e6ad 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -9,5 +9,5 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r8.ebuild 8170 BLAKE2B 2a2dcdb540e6808e245ea4312c9b26d7b6aeb5207986bf99e2f3dea887247e1856565af939322cddb2fcc6c52b253d142e5681a21a9cf010929ceb9091daf417 SHA512 be02d615408596f1e195604068ad5ab299eb348b280a4ed5bcf819500127a0217e8701b0a61fa279298f02048c1833c22e4adb9075b0ea34c585565d9cd73a39
+EBUILD xmms2-0.8_p20161122-r8.ebuild 8258 BLAKE2B cfa1770f556744d0962eb46d97e9473d3c7cf22ec57f263ff54ee5c14ba1e64ae752d5597791d23e1254caf10b31bd3526aa96f181ac72c36723b244cdc3d3ec SHA512 5908aa6193c3d60604c0afd48cd84454f3bb030a32a388a25063fa51a51cee7a72f0a9d38c36516ade651c0d83f047be753bdd84c2a5b5fa868bda010e45a371
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
index 12fa7d074dc4..93e6b7087cd3 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit eutils multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
@@ -308,8 +308,11 @@ src_install() {
 	# to avoid code changed let's just un-gzip manpages
 	local m
 	for m in "${ED}"/usr/share/man/man1/*.gz; do
-		einfo "Uncompressing '${m#${ED}}' back."
-		gzip -d "${m}" || die
+		# For some combination of USEs no mans are installed.
+		if [[ -f $m ]]; then
+			einfo "Uncompressing '${m#${ED}}' back."
+			gzip -d "${m}" || die
+		fi
 	done
 }
 
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 7eeb4657f97a..980bb1972c87 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,6 +1,4 @@
 AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2
-DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015
 DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4
-EBUILD xwax-1.6-r1.ebuild 2017 BLAKE2B a1f9f5f24da4ea048258726735124962e479fe049e33156657a9a29674d7416e1ad495f3b211522a5c6032d14a2b9519c2a74654f88fb23bc00e4544e539d49a SHA512 dfdb53177359f6f5a02c5a6ee1f776ce6f7cdcbc8f2bafb60cc552fcccefc3c7c6083af0982ab19113b4981c2995c29763847ece04490d68c3f6dc0c366b75ac
-EBUILD xwax-1.7.ebuild 1996 BLAKE2B b73c4e2ef6ff8a5d791b6bfe740dd6cd18f0ad17e67c458759f702b56ec9d7f3c2baa113cc2daf29decaca29907d8ec84b9d8a5ca8e5304b0efc2ccf00790960 SHA512 053addad8cdbd8177349c999635c1796d7ff1430d9758f5851acd8007eee78136a7d2a97836789bdd2e30d46d16f583e99ccb5954a90f5cf3d054e1bd6798965
+EBUILD xwax-1.7.ebuild 1992 BLAKE2B 47073b5d08b53f0e3e7c430ad860692dea7dcda19cdff22925a2f0199f27a69b42774cffb158b248576bc9071bf7bf88ccc5f6536525eb30a85740cbb1c58ef3 SHA512 24430fb03f7185db5f3ac6b0d411c950af3870bb41f4c192e104066fce46a7f575287296fc4f932cf7ef0d519fd77dbb875e74c388ecb7df8e6692070f9b84c7
 MISC metadata.xml 705 BLAKE2B 0c5c6a1538fbe0faef37eac4c62ac8e806041e1dc2883b4341981e75e8829da8af4588f371215794e40a452b7178a538489abd4a1b211233370b85cdded4d9eb SHA512 39e87e361947199009b2b9c0d722418d21181d330f503e9fae493c6b7300e5ef287b78a2ef609e3084719c51de57cfe536e7ae726eae257b967871422639c54c
diff --git a/media-sound/xwax/xwax-1.6-r1.ebuild b/media-sound/xwax/xwax-1.6-r1.ebuild
deleted file mode 100644
index 174693166a4c..000000000000
--- a/media-sound/xwax/xwax-1.6-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="https://xwax.org/"
-SRC_URI="https://xwax.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
-
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
-
-DEPEND="
-	media-fonts/dejavu
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	sys-libs/glibc
-	sys-libs/pam
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( media-sound/cdparanoia )
-	fallback? ( media-video/ffmpeg )
-	jack? ( media-sound/jack-audio-connection-kit )
-	mp3? ( media-sound/mpg123 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README CHANGES )
-
-src_prepare() {
-	default
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	# Also remove the dependency on the .version target so we don't need
-	# git just to build
-	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
-		-e 's/^xwax\.o:.*\.version//' \
-		Makefile || die "sed failed"
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--prefix "${EROOT}/usr" \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable oss)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax
-	newbin scan xwax-scan
-	newbin import xwax-import
-	doman xwax.1
-
-	dodoc ${DOCS}
-
-	insinto "/etc/security/limits.d"
-	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
-}
-
-pkg_postinst() {
-	elog "Be sure to add any users that will be using ${PN} to the"
-	elog "\"${PN}\" group. Doing so will allow processes that user"
-	elog "runs to request realtime priority."
-}
diff --git a/media-sound/xwax/xwax-1.7.ebuild b/media-sound/xwax/xwax-1.7.ebuild
index edf6f44c7c6d..20b519759a8b 100644
--- a/media-sound/xwax/xwax-1.7.ebuild
+++ b/media-sound/xwax/xwax-1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xwax.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 
 REQUIRED_USE="|| ( cdda mp3 fallback )
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 57bdd730b650..6d0e61302aa0 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,6 +1,3 @@
-AUX yoshimi-1.7.1-fix-LV2_Descriptor.patch 3062 BLAKE2B 4c69d385c2b5e7b90e79b6e19bf6c41ee6fbe4219e3b96d1cd53cc4a760e0bc21379fc6c753c24c63c825463f5fefe9f94aadcb69be7dc3935b4a8b42601d8b8 SHA512 0a57f3a4e68e74569d4a8d9182a5d3692ca16f46e4c3dba126c8e49b4579c759554d451d7526ca1245a9e5947d4b37b9a1b12a78e322472f6c97e4dc985010ae
-DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
 DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9
-EBUILD yoshimi-1.7.1-r1.ebuild 1094 BLAKE2B 3ea86703750ade54eb4449a4a93afd589b366f58122649899d2f2b020e9ed8eaeb2925dec7da3f5efe354503475c805185fcb3bb1192f1f2836397ccea9e55d6 SHA512 8153ec253ded0aac30a759781e5ba6d3150213fdb8ac96a2b630179bcc67da0267a560c438250814e9194c30af851b5b46dfab4743752c4b64b9381b2cc72493
-EBUILD yoshimi-1.7.2.ebuild 1011 BLAKE2B b28c7c74baa9813d5cb76a114f259b758882a6100856c9bbdf3dd212cef46c927a9e9a9ffd41f6c84ca37bc0352aa1cbfe52db179b193b4c700df716e2d542bc SHA512 63906d2c45c61560fa04c1db3be7d7566fac17bb610f1b7906921b27e73a03401b0742a55f95bdfad4f34d60c080453eb5d648bc993c8c833c483be992c4ec73
+EBUILD yoshimi-1.7.2.ebuild 1009 BLAKE2B 397418f1d46c1d38a169b3547c8de577679b6f2fab97e06b899241487315a9273d23fae70b904a298ecfdf89f86ed88800d4c0618c2fb0b48fd1f9ccf1364376 SHA512 309654312886da14c56d25878944380259d1a9754b8066aa8bdc8ad93abd5499730fbcc20b3fef0fbc79b5612025d74a19c1435d55ec83fa53e38927f6b04b26
 MISC metadata.xml 1413 BLAKE2B c294d4bd44ddd5a51ae0294e12e053633da91e3ee4f6e71786e68d3ea674ff3966cd5992b5d9e7c43c677d64e3771662c23760b8e74a9382bd9118ca5e779a8c SHA512 d35e3df2eae6868adf65f4cb5f9e9306c9e72f930c427a01816f2dfe7b32e07641ea91c6829e7ef6c099cb3d7136541b2deedbfe926d50be66d364042c054ba4
diff --git a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
deleted file mode 100644
index 94e225e4f48f..000000000000
--- a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.cpp b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-index 3502689..9be6128 100644
---- a/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-+++ b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-@@ -378,7 +378,7 @@ bool YoshimiLV2Plugin::init()
- }
- 
- 
--LV2_Handle	YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
-+LV2_Handle	YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
- {
-     SynthEngine *synth = new SynthEngine(0, NULL, true);
-     if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){
-@@ -711,9 +711,9 @@ bool YoshimiLV2PluginUI::init()
- }
- 
- 
--LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
-+LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
- {
--    const _LV2UI_Descriptor *desc = descriptor;
-+    const LV2UI_Descriptor *desc = descriptor;
-     descriptor = desc;
-     const char *plug = plugin_uri;
-     plugin_uri = plug;
-diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.h b/src/LV2_Plugin/YoshimiLV2Plugin.h
-index a484a8b..47f4729 100644
---- a/src/LV2_Plugin/YoshimiLV2Plugin.h
-+++ b/src/LV2_Plugin/YoshimiLV2Plugin.h
-@@ -106,7 +106,7 @@ public:
-    virtual void registerAudioPort(int) {}
- 
-    //static methods
--   static LV2_Handle	instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-+   static LV2_Handle	instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-    static void connect_port(LV2_Handle instance, uint32_t port, void *data_location);
-    static void activate(LV2_Handle instance);
-    static void deactivate(LV2_Handle instance);
-@@ -159,7 +159,7 @@ public:
-     YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-     ~YoshimiLV2PluginUI();
-     bool init();
--    static LV2UI_Handle	instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-+    static LV2UI_Handle	instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-     static void cleanup(LV2UI_Handle ui);
-     static void static_guiClosed(void *arg);
-     void run();
diff --git a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
deleted file mode 100644
index 4c2573a12e31..000000000000
--- a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg flag-o-matic
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/mxml-2.5
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-DOCS=( Changelog README.txt )
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.1-fix-LV2_Descriptor.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
-}
diff --git a/media-sound/yoshimi/yoshimi-1.7.2.ebuild b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
index bb04f4a15df6..0d9ef3eefcc6 100644
--- a/media-sound/yoshimi/yoshimi-1.7.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"