gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /media-sound
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
85 files changed, 791 insertions, 1083 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 0342d28db12b..c842bf5f6d0b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 6c57b33ef901..c74326f7497e 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,7 +1,5 @@
-DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
 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-r1.ebuild 4778 BLAKE2B 936077b146fde6bce25de65c7b0a3f9c7a9a0f47455cc96657273ca7d88b1b20f1b7596938e38b53d638a2661c39d76d967e27be06f943b95dd385e3d9e00878 SHA512 c910db0ef73eebe05de80aa5cc013aed4a0f2cc4766f7a41933e42c5bc934cc1ab4cd0e38063a710dbe440f81ebd95b85c3b7cddcbf9f2bdcc53b1d57a413e04
-EBUILD ardour-6.5.ebuild 4309 BLAKE2B fb248e3568cbbe3bef26a4913814251a191586afa60bf032c95239aea33469ecd005f0b1fb2df4dbc8e5fb0c784fac943ffd30db4fa4b2a5e9f5bfc397ddfcdd SHA512 b2aeec9bf7afce73229840bf556cfb1d18ef79d31ca6f3e97abade00e7d24fc32bc90b84ed5a57a7c93ab50be889e25fa63be6e4cb5917f0c74c47d95bcc0206
+EBUILD ardour-6.5.ebuild 4308 BLAKE2B 9a95267bbb82a5cb0821414a9f4c87723cd28f1f25cb842aac3c396b1bae53a6bd0d28e8ca8a782845f8a05eeadb1fd91c5ce2001b28642bdde207fda65d07c5 SHA512 6009da8f6c1b26e0349a855e371d0f9009039b1482272d3d9533a02004f555e671dfd36c30afb38ad63cfbc1e22b2cb0232e29f52e01b412d6ff6524ff4c0929
 EBUILD ardour-9999.ebuild 4778 BLAKE2B 936077b146fde6bce25de65c7b0a3f9c7a9a0f47455cc96657273ca7d88b1b20f1b7596938e38b53d638a2661c39d76d967e27be06f943b95dd385e3d9e00878 SHA512 c910db0ef73eebe05de80aa5cc013aed4a0f2cc4766f7a41933e42c5bc934cc1ab4cd0e38063a710dbe440f81ebd95b85c3b7cddcbf9f2bdcc53b1d57a413e04
 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
deleted file mode 100644
index fa0b243c2ab8..000000000000
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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(+)'
-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="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	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/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...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	l10n_for_each_disabled_locale_do my_lcmsg
-}
-
-src_configure() {
-	local backends="alsa"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--configdir=/etc \
-		--optimize \
-		--with-backends=${backends} \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex phonehome "--phone-home" "--no-phone-home") \
-		$(usex nls "--nls" "--no-nls")
-#not possible right now		--use-external-libs
-}
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
-}
-
-pkg_postinst() {
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-6.5.ebuild b/media-sound/ardour/ardour-6.5.ebuild
index 5d07fea09b03..348085665a1e 100644
--- a/media-sound/ardour/ardour-6.5.ebuild
+++ b/media-sound/ardour/ardour-6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 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/bristol/Manifest b/media-sound/bristol/Manifest
index 2decf2dc66e3..4fd87c0e9366 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 1199 BLAKE2B 3d2a3be49f1e7c19ad87c3ff58914848a3d1023562647bde073489d91f3f1a5e5e77ce0bbf01b512450e7698782a3690baa4d2359de0bfdac132d7603fbcb9bd SHA512 eec1abdf3b2d9eba270ed37bcdfdf51bcdfdc5e6054daba576f86d1c95de5ecc7ee3fa54d92b35146c5345cd4512cf26e58f4cc4f116b7053f7bcd74f594f703
+EBUILD bristol-0.60.11-r1.ebuild 1232 BLAKE2B 90c97989a7c3fe0bbac01e06292b22a368b99c0821bf8e570cf9244518388d577d6009ae2298789aae967b3eb2ec6181344466185146a8bd79e642b5372d4885 SHA512 443c4c99ceb2cb4972df4317917d57220f4d30e809994a21c34883ab8fe52b7b0e4b89cf4fdde33605a0716ccb5d0f2caeebf742db0372598e94b64bf678b6d6
 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 9948c638e796..a98b921d23de 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
 HOMEPAGE="https://sourceforge.net/projects/bristol"
@@ -45,6 +45,7 @@ src_prepare() {
 }
 
 src_configure() {
+	add-flags -fcommon
 	econf \
 		--disable-version-check \
 		$(use_enable alsa) \
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 5a7536636481..9c7561721895 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-1.1.3.tar.gz 1358468 BLAKE2B af4cc923d380a1da66c835a6302e47e31c17ff90ba9277fe6063e6029c3d4d087e85905487a4dae657cdbfb743d2ac6e6c5a30c0905c9bc736d8666105e52099 SHA512 41990c269c41dc011e14c9bf008b983cd3722ea52429ec7eabaa5689a6f69b1760fc766604378c30bb1dfab537b77f7522a13377b873308835a0e7701d24448e
+DIST drumstick-2.0.0.tar.gz 1865424 BLAKE2B ee87dd222add121c8a6faaac5b8a755e2d6f7b257db890f6bbdbf5380d9771dc5b65a73d716f0cfd343a46c4227adcd2d85e4a359fcaa445b2291dc1ac188cfe SHA512 aacb4ca5a3354da6380ba146ee7ba57e646d19fe6a5d083e00b795221453a87d1baf25965784e7c8a97b9b00a3dda643bce144f62b6a27118f081c681089381a
 EBUILD drumstick-1.1.3.ebuild 1423 BLAKE2B 275235e1c697144a056c1fde8845b5e1dfe11fc91ab5d6e0bc601ba9fdda5a0cd6f34e0215a1c96736f89191a64b70e69790e8ccc5cf1154decb4daa60caf861 SHA512 f9111df83ca27d48c15c35b8adff813a05591c4cdadde60a7e382b7f0da1a24e3ab0802c0df21129b6135b035357c0a6709a83045039f04532a1eeda00272978
+EBUILD drumstick-2.0.0.ebuild 1559 BLAKE2B e5f96dd407fb9a222ec142bfd2628a4b3fa121e786e0a4e8a0ef632c7b98e6fefa0797b6bc2fd41c2255cce492e3d494f4fd5713498ceda184f6f99edd1213d6 SHA512 876fef2bfd96296b1c1c1f23b17a8c125dfbccf2bebcaa55416544a32740b54e4308ceea76bdd8640f0f3644edd6af6eee1ec2e8050477ceb8ed15f2ba3fda9a
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-2.0.0.ebuild b/media-sound/drumstick/drumstick-2.0.0.ebuild
new file mode 100644
index 000000000000..041eadd01f12
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.0.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="https://drumstick.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth pulseaudio"
+
+BDEPEND="
+	dev-libs/libxslt
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/docbook-xsl-stylesheets
+	)
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+RESTRICT="test"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use doc ; then
+		sed -e "/find_package(Doxygen/s/^/# disabled by -doc/" \
+			-i CMakeLists.txt || die
+	fi
+
+	if ! use fluidsynth ; then
+		sed -e "/pkg_check_modules(FLUIDSYNTH/s/^/# disabled by -fluidsynth/" \
+			-i library/rt-backends/CMakeLists.txt || die
+	fi
+
+	if ! use pulseaudio ; then
+		sed -e "/pkg_check_modules(PULSE/s/^/# disabled by -pulseaudio/" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DUSE_DBUS=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 5b765895d8ae..818dd5e9d299 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r1.ebuild 1796 BLAKE2B 7cbdf8ec929db109880aca5606ae53ec2fde880f8ddb662384f410e1864d4f3a2c4a7c9002996bec4d752cea9a557f604d0e0b1e73bd9cf1d4d1aa7258a1c697 SHA512 161b0041865339e2d586036f17d04516a0ff08efa3d75b813067f8c33e7c044565d78f517369d5e3b46aceee574d719ab9f5b5a904eba1bc8e39b31895d91ac2
+EBUILD easytag-2.4.3-r1.ebuild 1785 BLAKE2B 9eee6ad75c26f5a9c558f8aba79b8dfa90b38cea53e1ca39d0037a034128bf95b6dba3d7df79cc56991ffd6167526f3aa4ae7cb1d8dd036e1d7187100bf61004 SHA512 ded435b01fdfe250ec59de8b5856b92618cc100b27d3bfadb3a9203ce3cc09733c2f51043c775930c56d057d38f3fbf01feacbeca4d4899021bc7aeefc7506de
 MISC metadata.xml 514 BLAKE2B b5fdb67baedcef2a155492cf00b63b35ae13c7fe214ba657722043bf824e607dfdf3d50deeb24c4ebb2cc704b7deb41d66c8ea8aa2f3b5911a72cb833b9e05a4 SHA512 eb53f395ef50eb4a86865629809332930907f459cd3b7b2d052727e4c25a27fd9e1acd9660fc354eb16ce7f6ff41e323689548e8b8a671e0878344cc0eb9ddc9
diff --git a/media-sound/easytag/easytag-2.4.3-r1.ebuild b/media-sound/easytag/easytag-2.4.3-r1.ebuild
index 48dbede7e4dd..67e1b072a47b 100644
--- a/media-sound/easytag/easytag-2.4.3-r1.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index e5425ddfbd2f..b07c33c5a4c8 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,5 +1,5 @@
 AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54
 AUX ecasound-2.9.3-ldflags.patch 2718 BLAKE2B c37cfbe326e7219d97286ce1c298af6d5eb21989f986a80f58cc7fef8392f169757395cb0e72f3dce2221e9fe128856b252279d4ba85a77218264faad2053c86 SHA512 2f27fbb2ebfc85ecd91333e17a24964409471f791bed1f4f94210b13277bc836969d4d7f9ff3f70791f72fe32edb2ffa04a07ebbb2528be92ef33624861e39ee
 DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140
-EBUILD ecasound-2.9.3.ebuild 2360 BLAKE2B 2b5a9afa2fb487f557948a5dce8032bda2fa80b201055967144aec3c843752f62b80f7cb3abbddbb48d19a0b54cc6834d5c9f00ebe1631f4748d21d62f349826 SHA512 4fa747af863356a0d1e0f12ad92104d7b315dbd6fabf9367c1ac8565ad3145643aa2d43d0ed6b88b1a90ef4ca7c7089083fef00fca794f54b89b69f2e18c8d68
+EBUILD ecasound-2.9.3.ebuild 2349 BLAKE2B e7131b5b87aa6a464ed6b5f7ff5e0fbe111cec3178c01135401c3a50c517ae35b0377b3fa75d4984cf14bed45db472b4977b758ae30fffb2f216a669a1733ed2 SHA512 956596e5fa3ddbba97016946ea657840d742b02763febe36318c1aa0f01a6d0888ccca4f7ea0bf5564df7e73dccce8b1b15989a23263e3ef2e368a18d4ba4a6d
 MISC metadata.xml 991 BLAKE2B 5730449cc175d580ae46d63a1a463ee8f417dfeab0fcc305903cc511020a2f24b2313ae09cb89d0f627789837a80ad2754b900ceb2e1a9a8ded661bf00f3ce4d SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c
diff --git a/media-sound/ecasound/ecasound-2.9.3.ebuild b/media-sound/ecasound/ecasound-2.9.3.ebuild
index fb4f2a248045..88ce55e0de90 100644
--- a/media-sound/ecasound/ecasound-2.9.3.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
 python ruby sndfile static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index a2e52a1dfc03..0efba497c302 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-20.08.3.tar.xz 1635656 BLAKE2B 74b28f7acb8561918aa57f2aaa3a0fde9c041c5dded88fa4d134391288c7b545e058e347d42d3247586ee3a3451e3c072adc3b4367d3bf7fced37d2e33a17f66 SHA512 0ac2c8bb5e4a1df4259b10361acd4094ff32e00f340e4c2418483d8c8538fb439d8205f52af1ca3f31fbc7c129ac1f8e1e3edcbcb96e85f9c8cf270ec8ce081a
-DIST elisa-20.12.0.tar.xz 1660052 BLAKE2B b627087d652292b2a9cd367c6c600a22f9c33bece0b5cb0ee5de73a24b9453968a69c537f452f31a72e5418f45a017a2998aa4218e8ce728dd96705c85bc9768 SHA512 d8e1bbb8d234078b004b1849343aefa1a018f2db152e21c7f2a59ffddc7eb82b74f6f91aca59d57b2f1b58d2df2d4b2b92f0c4cce4e41a9f71f87e1080692b1f
+DIST elisa-20.12.1.tar.xz 1660660 BLAKE2B 2c4b71d820c302899ff4ad4071e8c2a4025fab0f9383a7ec60c6297e407c452cadc5682a040d013ceaf6f5e3606e76ca760f609ef41f15dbc6d24d0870cf6ea7 SHA512 8e565956dd896fcac8d55696c12f7646a935c38f498ce8a78adddb36a8fd2bae4823d558835a70256ea1cbc04d2af920db3ff5209abcac65ada593e45cda85da
 EBUILD elisa-20.08.3.ebuild 1660 BLAKE2B 0f2f97fb2a63060c6b2de73204577be1a798be207188e261789a517e75054989ab25af613ed58c24b828b1035944a3a7494aac5c9bd2c35f9dd7279f21f2eb53 SHA512 a8b51c1155cfc602f3e69bbfe176ada35229bfe38c553f794a96946205405dabb428aeadaaea402acedb021b0ed546fbcc8c730a735da83d0cc34d202f636d0c
-EBUILD elisa-20.12.0.ebuild 1663 BLAKE2B f6b1f327f6349bbaa8defd9297a1dccc8fee39f5f2739dc7808048dd4ffc0e6fcf2506c9cc2bc8de3cf10bf5dc01001cff5aa2c9a7d6216fc800f3d4473794ee SHA512 18b66ebc8062bb25475ac05052989a63c3fbbd307e6e9a670c02904a5926f796b18d02ed6ff36f324f20cfa9e34576e367230a678ffb0efa1d1bcdc9781a8026
+EBUILD elisa-20.12.1.ebuild 1663 BLAKE2B 1f368728110cf74bdf201e3a0716c36bfb9297a35ba856966d7450715038164da50e78c2ae3c05336d3a62cbb3967f0cf64f667f450cfc4d0bfaf5bfbd96ad72 SHA512 39123313f5f4efb30ca7a9de41c8657b9bce06275a13361eb5e1ab271c4f89e2ab35eff8bfbce0dfa4a64e6db99bf9c04d0bd1ff7beb86b12e2d37bf71da9dbb
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.12.0.ebuild b/media-sound/elisa/elisa-20.12.1.ebuild
index bbb78b393033..bd521419ba33 100644
--- a/media-sound/elisa/elisa-20.12.0.ebuild
+++ b/media-sound/elisa/elisa-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 6845e8310bb4..28623ca02539 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,5 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
 DIST jack2-1.9.16.tar.gz 974652 BLAKE2B ff20d57f544bd636d93e77c2c6dec3af3afbafe4a217ba480c66247ddb6d8ca60755fa55599240fdd75e8ce2c1f7d8fb4f1bf68de8a212268588245f35731ead SHA512 8e4717cad097806a436e3a7b7977faa65987ca0fe59fd285014d6207899c62f9abbb79474170d0e5a6e82d0dbfe998c1310b13c4de8cd68cea0a6935ba579fd1
-EBUILD jack2-1.9.16.ebuild 2440 BLAKE2B 33dec5a36b66f41d84ce3ebb1956c29d6858afa0474cddc5515368ec91d5e094ccbefe957854436faaed85c58ec6529895dc69e86e063b05d7a38329f6e218b3 SHA512 1ff88486e58b97cea636a7a93f865a9623fec2794680c010ef5630914eee25f4de31a4cf83e24b5f9a163c5db25164a330e460f970ee53e740176f325d0cff4a
-EBUILD jack2-9999.ebuild 2391 BLAKE2B 0387559dc6fe6026a6cf52f23c9b83f86e15171809973c4e2ea9ebc1a13b21ec6436de1e4e0bb2b1a72e5d543032bc54b708251e1b62e6c4b8938afbeccf1bd7 SHA512 d9bf79c776b8f58ea33197bf7f97f01904e08f7a85174e363c1d0e54d46ead8d72401b8ee8ab91ba6fe06fc9dece0ce33523a2007a82ef982228a0e4178efbd4
+EBUILD jack2-1.9.16.ebuild 2464 BLAKE2B abe608fac3c05547ff6c1d4d744f3ae5c5890962e9b693459fb2a01f10486f929454c1841fa5d82081dd42d7b7065123dc69c2efadb69deecbb22118d13377f6 SHA512 3afbbcd60963db78c35b5a15f4762fb676fa704461a41bc9717b3f93049c359660160345f687af5f6caa26464a24944b684d10237d22105589d36092524fc14f
+EBUILD jack2-9999.ebuild 2415 BLAKE2B 0037af7f8060e378f44d3b68c9854672c99156e16d89d8ade82030020c6959562ed391ef0834cb60f8ffa411c7d2387bde55e2543e9d1f0e0159d407ba327b97 SHA512 ad7234aa39d4cabe8fa83303b014766baef59fbd5031cf7fe5c5585ae90d77121eb7431cb6c8f6617f3d8fa0791a9b036b1659810a205dad5109fdf3f056c3fb
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.16.ebuild b/media-sound/jack2/jack2-1.9.16.ebuild
index e59a43a5b06a..cceb860aa7e3 100644
--- a/media-sound/jack2/jack2-1.9.16.ebuild
+++ b/media-sound/jack2/jack2-1.9.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,6 +61,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+	python_fix_shebang waf
 	multilib_copy_sources
 }
 
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index d76f72a16250..f80759ad3794 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,6 +57,7 @@ DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
 
 src_prepare() {
 	default
+	python_fix_shebang waf
 	multilib_copy_sources
 }
 
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index cbe1918a04c2..7d8be6d09efa 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1,3 +1,5 @@
 DIST kmetronome-1.0.1.tar.bz2 226758 BLAKE2B 9a9e7070f78fe109dce18d3fb66c29e1819f443bc578f03ec31670c994377d7f760367c0c6eb8edc40b2f64b58f2b461beed19b02eadc6dfc9762be537f9f196 SHA512 b5d4c290bb92cdc531ad432dda6ad21ea6c7ec9a144e0482aa4219293e2bc515dbb68ffdbbd4e552daf425c5206636c378e587adfc7029f7bc67d902b591897a
-EBUILD kmetronome-1.0.1.ebuild 608 BLAKE2B 063de9949ef07234e60361ff368f4930e9c42f7ea1d1f0e5f9e88fb73b52b7364521519cb789c4b744f274c9f174b612fb1d4df5de19dd72bf5875bc27373083 SHA512 18dcd2b85a2c28dd0eeff3010fe01e17e3f725184dd9857eef8b0ec1ebdf128eeb12c0721eff716318240d9d6beb7c9431c1374d2e6e03b6e8f56aac1db11b03
+DIST kmetronome-1.2.0.tar.bz2 227803 BLAKE2B 89d95f088ff038586ceee56315ae8172715a32e8b1c3c2b482fff4e072b523900016b2004b16d19e0e0210b743a8a6753552be8c0ca3e2873038cbbfd8fc5b9a SHA512 6bfba857661b031da37067a88a3ed07f687167ad218f924295d2b953ee555722d00bd5700d541207a93a43afce3f95ded11809630d15657b6d4b0df055792ead
+EBUILD kmetronome-1.0.1-r1.ebuild 604 BLAKE2B a22a7218831d884f68ea5dfbe4712830639c7d45ae029b8402d386e865a61f1e925ba90ccd41b505a6d78ad80a1b71a5be0d296c2688a3648bbc44963efdc125 SHA512 8eb66e02a2f23a0278edb48f6644d44d57e9369b7d0ce20782f5551901d7db5de11c53efd3741f8d288bb99970bab0a1167c2196cca9d725b972162ca30a07a8
+EBUILD kmetronome-1.2.0.ebuild 610 BLAKE2B 9358c095063eff10f1614662a4aa0aa3a42a8f3749558a176d3f0754baae8fe58a70130d5557700c4041f37e3798900ee9676bc26b49648df8aaa5ceb0a726ba SHA512 885daa3c2c06520759aebbc9255a781eebc20faab8051eb4995c80e0a96903ad81600754e1514d6b1414a99143043a886c6a0a3f2a37d86ed334c73a986542af
 MISC metadata.xml 443 BLAKE2B 876e9d079153472e0e765f0071063bd904b9ca42252af016611512091634add2a7adf2742217c424f8b7280eb11569f3cb97bf26b4f0652d1d072fa5c7b23739 SHA512 7c8104d0ad8340cea75364d5688924517c6b1f3d9ef7c71b73d8c9f6188ebc7aa22f366777a3e7395e55493a630610e674b5bd2e26f4d6a0fed13cedc4dac38b
diff --git a/media-sound/kmetronome/kmetronome-1.0.1.ebuild b/media-sound/kmetronome/kmetronome-1.0.1-r1.ebuild
index d690d4807621..d9f51bb24774 100644
--- a/media-sound/kmetronome/kmetronome-1.0.1.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg
 
 DESCRIPTION="MIDI based metronome using ALSA sequencer"
-HOMEPAGE="http://kmetronome.sourceforge.net/"
+HOMEPAGE="https://kmetronome.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -25,7 +25,7 @@ DEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
-	>=media-sound/drumstick-1.0.0
+	=media-sound/drumstick-1*
 "
 RDEPEND="${DEPEND}"
 
diff --git a/media-sound/kmetronome/kmetronome-1.2.0.ebuild b/media-sound/kmetronome/kmetronome-1.2.0.ebuild
new file mode 100644
index 000000000000..dc9fee36a96d
--- /dev/null
+++ b/media-sound/kmetronome/kmetronome-1.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="MIDI based metronome using ALSA sequencer"
+HOMEPAGE="https://kmetronome.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	>=media-sound/drumstick-2.0.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
new file mode 100644
index 000000000000..adac9719f0a7
--- /dev/null
+++ b/media-sound/kmidimon/Manifest
@@ -0,0 +1,3 @@
+DIST kmidimon-1.0.0_pre20201003.zip 559637 BLAKE2B 57843d2718b8efb6d0be1174390bb21949e200efddc8a7ed65a67eef422eb0976f6008184bdb836bcaa3aabba9a1ea6e2ae848f931a26255a97cc11a29b85643 SHA512 0e6750196a0ecd138746602f6e9c2344aa3fe1ea49a0bb6a40d0626e7a428fb3c8fe51bed76b4df342eef32163c83deffd610bd3904108706943ee6e969b5b26
+EBUILD kmidimon-1.0.0_pre20201003.ebuild 786 BLAKE2B 94095ea9faf1548fe1e6721d66d4ccad2c5b8cd611092220a8b225d1a2cb9c4cfbb7d651c339a154e8db50f8db265e4592c6b8b13bba96ae30bc48c82a770dbb SHA512 d8525d0fcdbdca88ea7eee1163917ed6ff8b6af708a72063a24d9402df91d6f4bb67538b96893ea3330e0ce9697cc096f2bdb7563b1b6494b8d66cda5684f214
+MISC metadata.xml 441 BLAKE2B 195a2ad1c9248b2177c4bd699fe9c8bc5fa06544be5cb691958208d824ca5dc3ccb773bb21288811cc6a68c826b5a2b6d16bcee8120b01bc3f680d10df740d4c SHA512 808a8adb5fa17e514718fe01205c460ec78922a0db62f44e72aba02920bae36cef1731067931902b1632676380d1355df1c0087c6ac345434b87f8681573af06
diff --git a/media-sound/kmidimon/kmidimon-1.0.0_pre20201003.ebuild b/media-sound/kmidimon/kmidimon-1.0.0_pre20201003.ebuild
new file mode 100644
index 000000000000..230e713785ec
--- /dev/null
+++ b/media-sound/kmidimon/kmidimon-1.0.0_pre20201003.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="MIDI monitor for ALSA sequencer"
+HOMEPAGE="https://kmidimon.sourceforge.io/"
+SRC_URI="https://sourceforge.net/code-snapshots/svn/k/km/${PN}/code/${PN}-code-r217-trunk.zip -> ${P}.zip"
+S="${WORKDIR}/${PN}-code-r217-trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	>=media-sound/drumstick-2.0.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/kmidimon/metadata.xml b/media-sound/kmidimon/metadata.xml
new file mode 100644
index 000000000000..e3a6e95b81ee
--- /dev/null
+++ b/media-sound/kmidimon/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kmidimon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 190f98b19afd..bf511828bc6a 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,5 +5,5 @@ AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcb
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r3.ebuild 2258 BLAKE2B 1887873bff2605c8cf72a48373306a8be8bb5660bfb321a764c131981969581bd00eaac787be88d81db91effef28f336a6f38e55ce801e4c6ae4a3ed0f210d2b SHA512 945142ac3fdae5dc7a17bcd40a6f84c5af1112a597a3fa6747d3a482e3e25dd57a93f7e94ae2b9b182dcad326b40512ab1a2084d04bda23ed8df3747abef463a
+EBUILD lame-3.100-r3.ebuild 2247 BLAKE2B d9669899c584b257b86775b00caeee2116b536ba3daf7ce59d65547e6ff1a56158f3ef1f915cd1288e62c42fed9c96d906be563ff80408e50db5b0148c3ea39f SHA512 7f7524bd2637875b315ed512380f0f817685a0b10c54e382f054aa45f2ef3c73a5087b37283e3b272b384afa6740fbfa10179b0d80b5424923e6c7a38658350c
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r3.ebuild b/media-sound/lame/lame-3.100-r3.ebuild
index 8217e424a4ba..87f1c4a92de7 100644
--- a/media-sound/lame/lame-3.100-r3.ebuild
+++ b/media-sound/lame/lame-3.100-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index 71e354f2e3ae..0b851df5e0c6 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,5 +1,5 @@
 AUX madplay-0.15.2b-fix-autoconf.patch 3680 BLAKE2B 43f6c7ea82daf816bd6df38f51c808efff962b62edafe8af59cf643632de8ed075ccde4c109368de75df0afa80eec5dd803f36d9ce36d99a519118c4fa0bf48e SHA512 232758235370d5280bd8ca8980edc503d92d0a18edceffff06a2683152b12b9a8fce3a8656284e6d58a91b251978b7a5f88d368452cdf4e9c2bcbbc73514e265
 AUX madplay-macos.patch 593 BLAKE2B 306d4013251f9abf1791c8115f1ccdaf06c706ebae4ec073ff1a6f8f09086c80fc5b3a64d923f9818967f01f2793916ea301b7a078fac5bb879b8d0627180ae4 SHA512 d8989ed522212e984f0173dbb346ed624a2e8664a4c06d2186238018baf20c1f67d4109baa866ccb13cec6695db751be9ab6ac81466e3c786b13a89de4e066a0
 DIST madplay-0.15.2b.tar.gz 590929 BLAKE2B 93a62d04a36247ae8e1f4a63fe183735a2b5a7cd75fcde1ff2261222fad08ec96069b3fe5b7f06ad78a37d5060cff1d233d8139d7d0ff02c5231d2c384fb1a22 SHA512 0e79cdf0c32f48599083ec7a0716d816e3f03254705b7225b1ea9008d53eefd48342dd687b0507f0ff15942218fc07ad1e38c4172508c27755f3e9a0e5412f34
-EBUILD madplay-0.15.2b-r1.ebuild 779 BLAKE2B 14a2ed6996f72ae46bf268dc77a6ae50f6048c7e32790eae94d64dca622cfdb688e3f813307b2922fbd070ed7c8d482db9869935f53ea09d248288b44b2c7bfc SHA512 e66e1f37fc26a5c98141c8b374c09e3bbfe5baaa06c1fbff5fc92b9d5aa621e4a11e25e3a03b192a2fe524a8cfe91b7ea997c8aff368b13a4aa21bf219c95e86
+EBUILD madplay-0.15.2b-r1.ebuild 768 BLAKE2B 3427de788425caf4c53b83868714b9eeb685384c341b9ecd43c0d46464ebe5be21ca819ac56be6914f9c1ba7258736971f3c34733abbaab176db7afbb9620546 SHA512 8d2913d788a6cdba4930a3f5450cade3caf5d9aef467156e377c568e9d446e5f3a153e39c26c3e1029f10acf7f0879e36cecef29a7a09fa4487261c622571190
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
index e65827d1cec3..444be063a6b9 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="alsa nls"
 
 RDEPEND="
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 1eac839a4ede..2e1c301c7b0c 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,7 +1,8 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54
 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
+AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
 EBUILD mixxx-2.2.4.ebuild 3178 BLAKE2B 1e3c0021ae0f7f22cdaa690d3995638d863b2289c8366b49fcb5d80876898d10474983ad359d84802441008c106387bfc5b1343260a0ed2f464e46bb4299ddd1 SHA512 709ea52ec18f6aeb35c4abbe19ef7df24a6ed6e95218090048ffd5a9ad29e3bfc9d6741db7cd69733adb72a1b53789bbefb767a15f3469141797071e14a1192e
-EBUILD mixxx-9999.ebuild 3081 BLAKE2B bc18db6124d898a6517b822ec959832d3782b605c2bdfd11fc48c7c6aa4fc44c2a4103657b9deeedfd04a54179846ee969e66efa77ba2a1ace7ed6619d2052f2 SHA512 3bd11e7eae8a549583c1aed47da56a6cf80f002afcd2dd4cd39b09242d110ca665fc32298309c021636018b46bf276924285ab8342477388da2f09e917eba606
-MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
+EBUILD mixxx-9999.ebuild 2576 BLAKE2B f4a04d4500297dc2c2ff75d088127b1b09f3d1c9fd182a3e1695e6a3ae99b55e35ce4bc1dc73696cdab7006dc1c2ac617a582f2a10e7351d6500b9989941a329 SHA512 19b8bdae260828ff5b4203d5269cb60873765930d09e6c1ad9c6793d869ceabe415b492e2caf86cb71e91839cbf4fb232e2a4e02746503447c5ac4e6b8f6abb3
+MISC metadata.xml 849 BLAKE2B 7b6df4e7a68267848242fb26c50caf028960d3f3059ee74d0d0009be20b7385ca4fdfbc9a36b5cb5a7897e23085ddabddef6ea7a39a88874e3be8051753cfdb3 SHA512 e99a796d33b8a3b67993386565a61517b554b957548bcdef159a48571ce4cc5a1bcf2a4e4171c9a8d965418e2d469193f5682f1ce7068f50b958a3908a683fa6
diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch b/media-sound/mixxx/files/mixxx-9999-docs.patch
new file mode 100644
index 000000000000..d1de4e6e9443
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-docs.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0cc5b3a7ba..63f18bfda4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1142,15 +1142,6 @@ install(
+     "${MIXXX_INSTALL_LICENSEDIR}"
+ )
+ 
+-# Documentation
+-install(
+-  FILES
+-    "${CMAKE_CURRENT_SOURCE_DIR}/README"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf"
+-  DESTINATION
+-    "${MIXXX_INSTALL_DOCDIR}"
+-)
+-
+ # Additional Linux-only files
+ if(UNIX AND NOT APPLE)
+   # .desktop file for KDE/GNOME menu
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index da78302375e8..5e69aa297bf4 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,7 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
+		<flag name="keyfinder">Enable musical key detection support via <pkg>media-libs/libkeyfinder</pkg></flag>
 		<flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag>
+		<flag name="qtkeychain">Enable Secure credential storage support via <pkg>dev-libs/qtkeychain</pkg></flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 8b6b845279eb..bbfbe57f1f07 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8})
-
-inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
+inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
@@ -13,7 +11,6 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
 else
-	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
 	KEYWORDS="~amd64 ~x86"
@@ -21,10 +18,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
+IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
 
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
 RDEPEND="
 	dev-db/sqlite
 	dev-libs/glib:2
@@ -43,12 +38,13 @@ RDEPEND="
 	dev-qt/qtxml:5
 	media-libs/chromaprint
 	media-libs/flac
+	media-libs/libebur128
 	media-libs/libid3tag
 	media-libs/libogg
 	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
+	media-libs/libsoundtouch
 	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
+	media-libs/portaudio
 	media-libs/portmidi
 	media-libs/rubberband
 	media-libs/taglib
@@ -58,75 +54,68 @@ RDEPEND="
 	virtual/glu
 	virtual/libusb:1
 	virtual/opengl
+	virtual/udev
 	x11-libs/libX11
 	aac? (
 		media-libs/faad2
 		media-libs/libmp4v2:0
 	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	hid? ( dev-libs/hidapi )
-	lv2? ( >=media-libs/lilv-0.24.2-r3 )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	shout? ( media-libs/libshout )
+	qtkeychain? ( dev-libs/qtkeychain )
+	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-	${PYTHON_DEPS}
-"
+	dev-qt/qtxmlpatterns:5"
 
-src_prepare() {
-	# use multilib compatible directory for plugins
-	sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die
+PATCHES=(
+	"${FILESDIR}"/mixxx-9999-docs.patch
+	)
 
-	default
+src_prepare() {
+	cmake_src_prepare
 }
 
 src_configure() {
-	local myoptimize=0
 
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	MYSCONS=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		lilv="$(usex lv2 1 0)"
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		opus="$(usex opus 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
+	local mycmakeargs=(
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DOPTIMIZE="off"
+		-DCCACHE_SUPPORT="off"
+		-DOPUS="$(usex opus on off)"
+		-DBROADCAST="$(usex shout on off)"
+		-DVINYLCONTROL="on"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DWAVPACK="$(usex wavpack on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DKEYFINDER="$(usex keyfinder on off)"
 	)
+
+	cmake_src_configure
 }
 
 src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]}
+	cmake_src_compile
 }
 
 src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \
-		install_root="${ED}"/usr install
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
 
-	dodoc README Mixxx-Manual.pdf
+	if use doc ; then
+		dodoc README Mixxx-Manual.pdf
+	fi
 }
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index dc90129ec59f..7d3d9893ba4b 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,4 +1,4 @@
 AUX mp3gain-1.6.2-CVE-2019-18359-plus.patch 6742 BLAKE2B 1216085064f712751ad9c7739a5d7a3ae9ca258ce41860a177756005b911371b6784a6ee4b7b68e829e5e1b4eede86287abd048cca01db99c53aa1ac9ff94c8f SHA512 b795167c594b106b8f6336d4c975bb73812a4fbcd5e16cfcedfaeff0c291f6ea01e62f20318d5107e62c9c42e843e8cd618745acdd17fd35c4e9a5052d85227e
 DIST mp3gain-1_6_2-src.zip 71246 BLAKE2B 5172c2103bb2267bf819f36180e9cd7a9d57df6f7ddc29900e9063f97c4513972053bb0c3f1f69f7ddd12ec0cf4251e93e1b6920389a8246bfdd5650176a90d2 SHA512 ec9de6c755120480ccb72b34a0042aea7546ef923090ab04e420d5b189523b4504e29952a3d695d3c42c74348f5c3c9123ff090bcc671e43375711e085d67480
-EBUILD mp3gain-1.6.2.ebuild 683 BLAKE2B 0c38eb9b821c7514d02a9420035cd13d3edfc1cfb22883a2d408d37db2132c1f5dc98f3c9a33af7396e4e7919acf18b65f82d431f68cbfdb245d6ff24351e5bc SHA512 34cc9782ca9752e7fe9500d805277fc26bdf1293832d69c1fcb8b3db63f0aadd2f4ba2c9c7f03fb9569abb1038015a0b1bc206a8604c8e5b5d01dd67bf37499d
+EBUILD mp3gain-1.6.2.ebuild 672 BLAKE2B c870f64b39a698b7b46e4547108ddaa662292ef928a9fef21c5d6b3635421bb80e2084f5bf193301a31f09168f596ec2b31d6c29862c943c81aa5f6e8162d21d SHA512 7d34ba3237d51c7b55653d5f7f797d122c41992c176b5efdb7b8f72aef275bf371b14cc8ea4d684d749f7e29357aa9b2788129fc92fb5e67966371059df14f21
 MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119
diff --git a/media-sound/mp3gain/mp3gain-1.6.2.ebuild b/media-sound/mp3gain/mp3gain-1.6.2.ebuild
index 032698c2c633..71da3cd40b67 100644
--- a/media-sound/mp3gain/mp3gain-1.6.2.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="media-sound/mpg123"
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index 62744e64a0ce..a9fb4dc6b4ff 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -2,5 +2,5 @@ AUX mp3info-0.8.5a-format-security.patch 507 BLAKE2B e3a26ec3df15f24436d7c463f69
 AUX mp3info-0.8.5a-ldflags.patch 466 BLAKE2B 77cd382d37bd35cf4cb06996946cd61c98918395eb7cbba021a98084db90ae1024f8729413c1073e619e2de72de5b7f70706280e2d75b1f3eb100021c12b5ca8 SHA512 868b62dd4565e1f59a057bb4af06ba6618ba320f1a28104b936ae889ca851c344c3a221afedcb309bf11287079c86f44d5f92b6cfcdd8a6ef2e4a72508ed052c
 AUX mp3info-0.8.5a-tinfo.patch 195 BLAKE2B b8b25093c6b320d5f635d35b958699072d13498e93921dd7221aa0c5454deaf3ae77fb4a7d5fd7aeaea0a27b2d1737c22749c8a326fd8d9af52aeb5fb1584e92 SHA512 3e2deb03559afa3029c673a7c9bb165c6c3419b19a629f9b55e20f96e49b8132c2d454274a8f5c64e20330c148351c4ef51e92164d230124b9d3a6d90d2b2653
 DIST mp3info-0.8.5a.tgz 127482 BLAKE2B 303b7fb798604693c58e6412e5e282fbfb1ae126166a7c3d12c335953669c6e8482fb287313d6f44fb802545d728a58ae5f58c4e25bcea1d530879fe87910577 SHA512 30e0ef62deaa090fc115317f6c372f408077dfceed7e05faa6744b8516291e38d21f1742732f6532585f0c3d8c705d8c7026c2bed84c97e1f497d433637affd2
-EBUILD mp3info-0.8.5a-r1.ebuild 917 BLAKE2B 53d8c6ae848de8edb81054a2adebb9050523bc2cb74f582f4b5219832724fe3708e1663ae4ebb4cd35e6debcd8718ea3dd373a4e34a5b850cccce14e966d2263 SHA512 54777c0f8cf123c56ac7096f51895613de74a30fe536415a512ed3b993a65618a3ca4d3a50602857e1c834dfc91e03f0f756207114ca7f601a3a2c0cb73c7694
+EBUILD mp3info-0.8.5a-r1.ebuild 906 BLAKE2B 92c654567ef6b96ab9aa3f65d11ad16675de71eb3b4b17d662d786e1239d0bcd8810ac66e1cd9e0795a3d37adb36429e2daa86f1dbfbee2fcc7812bde1bf5b71 SHA512 611a6d094cb18aafff7e377fbc8344ee5cb95034384fb7894e018475417a14f29fec6d4e66102b41ee6d2eaebb4af709082fb88918266d4bfce98d8f630c7f30
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index becd6166d685..f59b6efb37a6 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="gtk"
 
 BDEPEND="
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 50dae6264ae3..f752c3032f77 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,10 +1,4 @@
 AUX mpc-0.31-nodoc.patch 403 BLAKE2B d829c6f40005531ec7657054549b5fa9acd32d15d41ca8685b4292aac804af52f2f4754b557b69663d4240e6690fe4ab19a15b72459cea321944afacf2a179f3 SHA512 2a028d57fbd76290bc300d0546b52571b6c7c29cf8d2f53cb859b5250c55ae631fe15c8589a1b11c5fef5dacff2ad8535dbfae6c8b2b72dc8a4dc795dfc658b6
-DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
-DIST mpc-0.31.tar.xz 43896 BLAKE2B 2b65307983dfd0bc2738b3e4b1379b43b6fec712352f25a6158adefd2065eb3ff8be194e482fc441c74b69feeb8fba277d7061fb80ee6d7d72432f3284f61fb2 SHA512 48df7d85df704ae901ee0a07193daf9738b682b71a24ebd5bf4458aa562acd11b582f83adcfca814faa9a014ef565cb6c23df837b83a569fd6050f9f3802e6fe
-DIST mpc-0.32.tar.xz 44716 BLAKE2B 66fbbfe886b16382d13eb9409746cd40ed9d01ea422c18d609f956fe9b1d1ae9434aa8ae65a60ce0cfc791141e3b9630adabc2fb0bd0b8bdc61b67b2e5b2e3b3 SHA512 1913249da8b29123005a9877ff2e68f9469f8fd48f5411ea0e651255c93fbe14ef6029dadc7d256a99b566085dc19f4c62bdcf55260b27de3d088b8e9c17fcde
 DIST mpc-0.33.tar.xz 45044 BLAKE2B 220848e088964297fbaddeedf61d5ddc90386df360a6af81b2d3753517f7ee36ff3d9462242f38b17c991996927a7d1fc253e1006253f2f875023ddb75a800c2 SHA512 d3247dfb54ac3c95caf5666088968a952b33eb7e8f941bca4f3715603839cf5a1bc5300488c78fdce6e38f612b243f2252ea682b8d0fec9f230acd760bf3560c
-EBUILD mpc-0.30.ebuild 848 BLAKE2B dfcbc54b6c767644c98e4c1f9cd876e3dccfb802fb113d522c0ca9196e4a65e7d692fb6cdbc68ce8dff23ed36e1c7b775a42c9cf91d65870b7309204dce33b1a SHA512 eba9f4939a527d5275a5ea771669bd67865642cb3c3a2996c2f6aef51a6aae0d3bfef74a8eb67c945443559cafe56df74be5f2d51db1d3d2b0f04817880ef935
-EBUILD mpc-0.31-r1.ebuild 1230 BLAKE2B 8d02b8ea0e981d176afef99720f01c41f6840a2a98c5a670abc88a3239bb0e16c71f33af1082736eeed5b2f524970921c83ae20ff8fec4eb3b4c1bffeefca089 SHA512 10ac37d0f8aae691029961586e8c42ee3ae39386fd823a91d26549efbb9b3ee82284764c5960b84fb22b394d5b16229f079db05e803e53953ef98e063f340653
-EBUILD mpc-0.32.ebuild 1241 BLAKE2B a430ac51b51bf35c99be8ec27e450ab2b5b241dba262a37c91167e40417c912a4f912aa899049f67b096ab3240185f53eb3613a0481d8acf13016540ecc8812b SHA512 a80b698e42d22744d481329024ef534d163d27352752ed266bc009535345ead3d633b97e2f89870e9b32b75bbe494b1303217f513a29a4bbf138905a7a2dbbe9
-EBUILD mpc-0.33.ebuild 1241 BLAKE2B a430ac51b51bf35c99be8ec27e450ab2b5b241dba262a37c91167e40417c912a4f912aa899049f67b096ab3240185f53eb3613a0481d8acf13016540ecc8812b SHA512 a80b698e42d22744d481329024ef534d163d27352752ed266bc009535345ead3d633b97e2f89870e9b32b75bbe494b1303217f513a29a4bbf138905a7a2dbbe9
+EBUILD mpc-0.33.ebuild 1236 BLAKE2B b609c095e6064cd7753fc7f9d2f9daeb0699e3eb44e7797f8e5e759be7c72bd358ceb5286f631073724eb6ef75a85766b2dcb84b5df7c09cc80bec56f1b8576d SHA512 b88d874f8bbcd568a7335dbdc3bdf613cf683ad510457fc8a2f38f088f79f09b886a2cae816491f14e0f4856779bc830821e9ed562cc174ce918ca2848b5f9c1
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.30.ebuild b/media-sound/mpc/mpc-0.30.ebuild
deleted file mode 100644
index 70cabfb92a48..000000000000
--- a/media-sound/mpc/mpc-0.30.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 meson
-
-DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-IUSE="iconv test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-libs/libmpdclient
-	iconv? ( virtual/libiconv )"
-
-DEPEND="${RDEPEND}
-	dev-python/sphinx
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-src_configure() {
-	local emesonargs=(
-		-Dtest=$(usex test true false)
-		-Diconv=$(usex iconv true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newbashcomp contrib/mpc-completion.bash mpc
-}
diff --git a/media-sound/mpc/mpc-0.31-r1.ebuild b/media-sound/mpc/mpc-0.31-r1.ebuild
deleted file mode 100644
index 40abf248a9e8..000000000000
--- a/media-sound/mpc/mpc-0.31-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 meson
-
-DESCRIPTION="Commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-IUSE="doc iconv test"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	iconv? ( virtual/libiconv )
-	test? ( dev-libs/check )
-"
-DEPEND="media-libs/libmpdclient"
-RDEPEND="${DEPEND}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${P}-nodoc.patch" )
-
-src_prepare() {
-	default
-
-	# use correct docdir
-	sed -e "/install_dir:.*contrib/s/meson.project_name()/'${PF}'/" \
-		-i meson.build || die
-
-	# use correct (html) docdir
-	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
-		-i doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Diconv=$(usex iconv enabled disabled)
-		-Dtest=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newbashcomp contrib/mpc-completion.bash mpc
-}
diff --git a/media-sound/mpc/mpc-0.32.ebuild b/media-sound/mpc/mpc-0.32.ebuild
deleted file mode 100644
index ef6640ae1878..000000000000
--- a/media-sound/mpc/mpc-0.32.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 meson
-
-DESCRIPTION="Commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc iconv test"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	iconv? ( virtual/libiconv )
-	test? ( dev-libs/check )
-"
-DEPEND="media-libs/libmpdclient"
-RDEPEND="${DEPEND}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.31-nodoc.patch" )
-
-src_prepare() {
-	default
-
-	# use correct docdir
-	sed -e "/install_dir:.*contrib/s/meson.project_name()/'${PF}'/" \
-		-i meson.build || die
-
-	# use correct (html) docdir
-	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
-		-i doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Diconv=$(usex iconv enabled disabled)
-		-Dtest=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newbashcomp contrib/mpc-completion.bash mpc
-}
diff --git a/media-sound/mpc/mpc-0.33.ebuild b/media-sound/mpc/mpc-0.33.ebuild
index ef6640ae1878..0cb9a5d01453 100644
--- a/media-sound/mpc/mpc-0.33.ebuild
+++ b/media-sound/mpc/mpc-0.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 IUSE="doc iconv test"
 
 BDEPEND="
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index e5734eed5206..02bc66655644 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,7 @@
 DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
 DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
 DIST mpg123-1.26.4.tar.bz2 1050563 BLAKE2B 1a057f8bf6171f78a2041637b8351ef124f58f160ca237f775ae1aeeee1eeb6e1898b113ca5958acb74d818e706b2825af0b1f93312073742a18134aacb6d5e9 SHA512 425162227aafb99b8723428fe9bd403739a2dd68828b86a2cff7f9928a9f0ab3f67420e56c0abe7c9deeb94bce6c6acd59acaa0606ce24c01716465640564785
-EBUILD mpg123-1.25.13.ebuild 2883 BLAKE2B a4ad4f83a516e57cf4181987fa4d59ca0680fe609b9477085e514a4227f82a819476489178db12e4caee26144416e6f73b3841f8741476a74135f61ff4e22e29 SHA512 1f9ded3f159a9bd6fbc85e1871d410d6919fde7c6cae3f069ec77c9dad3043f866cd74ab5ebd60868bbe2043f3e95f095154461821b7fb159a22125018f1bfde
-EBUILD mpg123-1.26.3.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
-EBUILD mpg123-1.26.4.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
+EBUILD mpg123-1.25.13.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
+EBUILD mpg123-1.26.3.ebuild 2771 BLAKE2B 7721bbdde0b129453bf1b378048c05bd30d1e263bf34e78b472c0108cd449a7e223e35faa21af2c8dc464b998fd6e27428ff0974928565bd7117b0c726c8bd1b SHA512 4db32918d1f4c44f8eecd88a31d137a049f10ee0445cff76c83c266964752d15e1a6880fb2cd39f8fadec8af160cda4e0a30dc2006a93fa5364c9b2d9ac1fb28
+EBUILD mpg123-1.26.4.ebuild 2771 BLAKE2B 7721bbdde0b129453bf1b378048c05bd30d1e263bf34e78b472c0108cd449a7e223e35faa21af2c8dc464b998fd6e27428ff0974928565bd7117b0c726c8bd1b SHA512 4db32918d1f4c44f8eecd88a31d137a049f10ee0445cff76c83c266964752d15e1a6880fb2cd39f8fadec8af160cda4e0a30dc2006a93fa5364c9b2d9ac1fb28
 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..634c8ef13f42 100644
--- a/media-sound/mpg123/mpg123-1.25.13.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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.
@@ -65,9 +65,6 @@ multilib_src_configure() {
 	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
diff --git a/media-sound/mpg123/mpg123-1.26.3.ebuild b/media-sound/mpg123/mpg123-1.26.3.ebuild
index 0b76cb7da365..0a9547accb74 100644
--- a/media-sound/mpg123/mpg123-1.26.3.ebuild
+++ b/media-sound/mpg123/mpg123-1.26.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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.
@@ -65,9 +65,6 @@ multilib_src_configure() {
 	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
diff --git a/media-sound/mpg123/mpg123-1.26.4.ebuild b/media-sound/mpg123/mpg123-1.26.4.ebuild
index 0b76cb7da365..0a9547accb74 100644
--- a/media-sound/mpg123/mpg123-1.26.4.ebuild
+++ b/media-sound/mpg123/mpg123-1.26.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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.
@@ -65,9 +65,6 @@ multilib_src_configure() {
 	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
diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest
index 47ad1857e3d2..b86a50f3ff94 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -3,5 +3,5 @@ AUX mpg321-0.3.2-CVE-2019-14247.patch 931 BLAKE2B 5ef376d165a61771241389a9c165be
 AUX mpg321-0.3.2-format-security.patch 1154 BLAKE2B be54674f59b5f98118573828b73942fc7f312e02058e358b3c853318021e30cd5062721c568e83317504770c9f44c052289c32007822a7d99a30df7cef20afc3 SHA512 4184e415f7338d35e2169d663ef24d2d4c0acfc7fac9dc40e184538aaf1c6aaaddd3adce6f54755043dc94b0ee90f74fe287abf6c010f677639dd58b814a4fd1
 AUX mpg321-0.3.2-gcc10.patch 2218 BLAKE2B b78e85d6ec04b6b76471bfe48df31ebd312d97c938f30b823f364dffcfa9101ac2033c4710173902fb42767d664f1bc89e0401b725084a062a35d89a01d14cbd SHA512 079cec28a4ce9aa54a7952e548d24804c266e397b2109eb7cbc42396b88a7f6e4ba5112219d645972d293e90ba12e5f696d606c803cff9225888cac1ba0cea79
 DIST mpg321-0.3.2.tar.gz 151139 BLAKE2B d1b043316aca07e61ab61698f1d9e56fd221c4024e69b5262906b280dcb4f67bd32f3ff72b1758ba26cc0fa7d1c5c4052fc6fc87ae9ceec9d0bf77b1d35a868f SHA512 f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234
-EBUILD mpg321-0.3.2.ebuild 1264 BLAKE2B a187afadd9d7f70861a0ba54a292abde14bd83770209b05c1dd83ff7d55c73c019d4d85d44c2e9b5d70566f54c866b6a9c5d340f5c2b244ffc409cc4139d59e8 SHA512 377a2899a5ffa451cf6df0d67808f2c301a958f90baa3ed8a6226b040f926fd046ca3f42c0ffa55741a38fa79193b9429999983ffdffa172c5ac096b5e27e678
+EBUILD mpg321-0.3.2.ebuild 1253 BLAKE2B a08297ea3a715fcecfeb1cb5b01e02c2ccc540ddc0b21f480f0b37e2474d1de6839010c9216c3eb2c44cf3e5f7c7ca648bced5bda3bf884bad4543e919778bc2 SHA512 80d5d5a5f8f661a2c5b92f54cb55899af76adb715237e6271e900ccbfaaf11144d57b767441ae0af1d1ceb62ea94c5c3023a76ae8063c9b7d82dd941e360329e
 MISC metadata.xml 329 BLAKE2B d54fd85110b067a080ba1be242f8ee2e5c76b503e7fd6852fba8b1af20873244666fe5d46a1cbdce2a555c44dd057e99801f7974ceac78076c0189976c125960 SHA512 7f66ba87cde258577f41f82b9056b613d1da1741a3dbefe2185562549cf53050d5073b24f07f2b7de25f06b55cdde55653cb8de03d97806a2c47224b8e100764
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2.ebuild
index a8fabc342582..cc2a3e240b6f 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="alsa ipv6"
 
 RDEPEND="app-eselect/eselect-mpg123
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 7c82863f908b..d8b160787a26 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 2982 BLAKE2B 0783de2ac04e77d8ff337e3ed52b09174e6268aaa9a1c2709b65343753880437b42af8fd17fbf1361811bdeb5caed625f78fa8440c7ccbddbdf80b827da3374e SHA512 5eee2985b4a3201e6d93d24e7cd9244d7e7f64208ae80656cdd6932d3adee2403e14e17ede45a83071a5c5bf21aa938e4786267a2c4b3118053c900aa18b2105
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 858 BLAKE2B 234eab95022baf50e4e2039da5238387be129f539dd8de3aa1176a49b6f70f695670303712a713f219af37387e8281f85a988b2d86fa62a36b44c6da32c6fa86 SHA512 681b899dc128a0c5433571673e7352a131bac6a28d16b1c2c7047cfbb41c28bee48d8c31808812c84e038b88281d710a532ab78b0cde860acb5ae8be11e87604
+EBUILD musepack-tools-465-r1.ebuild 847 BLAKE2B 923cb641dcbaf89184a6dceb21e58ad8121c4fe60f8631ecea7000c9d6c5ff7984ec6c65f8c161da6ec5f69a42d9d7915d5f47013c65da377ac1a75cdc9d641b SHA512 7f83b42c5bc2535b7e7931cb851950eb3c84c35efdbf2f56282f6788f023ee0194767fae9965e1099dab38d7fc0ffc03bf9488145b78303632efb49e9bd7af3c
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index 184c953698c0..1bf1cb8f8554 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index cd6c3756f9d9..786e586a3153 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,13 +1,7 @@
 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.2.tar.gz 2000571 BLAKE2B 70627741b41ca28489ab2e7813936d7b37fa521d3c9a81fa651ee5999d9b162e924db11fb780db7a9fe2b032b4d8596166336e59f754ffd1746f57b0ad41a34c SHA512 14fc30486568fd6729280bf1197b2e2292ddba188d984559c0ffe7faff1a9550e58e776d6d5aade12a6057aa608a58e0eb60830fdcb18d783c22d5f971e6d616
-DIST pulseeffects-4.8.3.tar.gz 2029631 BLAKE2B f70e4528859b2bd46d660a790f3c763ea2b7ecde4826a257c4d6fa4c76154532659d22d8d60053bfe1b2c03d5ce2986b08475dc85cede283070dc9b9d2e167eb SHA512 afcc1bc1df8b26ef0ff3ad932d3cc4efd963fac3b7ab49c98f8a6c91971702723a3fff5bcd2b0d6921545922e782787c8cc98ea5f54875cb17c5d9670e5ac520
 DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac706fc9eb535c78c06f32526d910dffb82bec36af4130490645c95b200562c51f59f19de8905c3c54bda5d8a4b68b5297a SHA512 4d68f5bd678c75f5b13519cddb2f46bd0a827516f1cc7431a8952204f51bd2691f701df869258092a93843bcdb4c61bac916291bade8c4428ed9a4d68b70c757
 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.2.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
-EBUILD pulseeffects-4.8.3.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
 EBUILD pulseeffects-4.8.4.ebuild 1809 BLAKE2B 5494b4f6321de6d23d53b03c53d4c13af32506bc8590cdf1a19f81686f25657e507a8e7d798927fb7bf0644524c207bfe987a7a8f6a3aa7051a722aebac0a774 SHA512 3753055c7e014dab2b9bf5584e859a55232382e9cb447f0ec1488e9d387c1ccce21ed1b0d4a59ad3eaea46419cee31fd77fffdcb44f0c425ddeb3b28e47a3958
 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.7.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.3.ebuild
deleted file mode 100644
index 4ebaa69f9547..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.7.3.ebuild
+++ /dev/null
@@ -1,72 +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 mda-lv2 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.20: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.7[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] )
-	mda-lv2? ( media-plugins/mda-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/pulseeffects/pulseeffects-4.8.2.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.2.ebuild
deleted file mode 100644
index cbfd497f5e76..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.8.2.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/pulseeffects/pulseeffects-4.8.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.3.ebuild
deleted file mode 100644
index cbfd497f5e76..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.8.3.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/strawberry/Manifest b/media-sound/strawberry/Manifest
index 41db40c4b11c..e231b67fd1cd 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,8 @@
 DIST strawberry-0.8.3.tar.xz 10280356 BLAKE2B 3c99193af3e753d48822567a3391900b1d4326ece49582718b949eb3753fd15d3cae2469ffdcc28334db95099a914c1065ed84c397b4ade53c624e7eab5cdfe5 SHA512 e64c49a6b479677486ae7868107e945a63a028cbaa6dcfb68c9c0784fe0ea8a1133264832367d092628fb1094ca90d87d6ab49199d4aab7f56f2620eb4e9b2f7
 DIST strawberry-0.8.4.tar.xz 10781080 BLAKE2B 395898e68117848613666edb545d15db22eea418c7dce553c442c52b459406c88640368da9a98c4f25e5cbff40369127ee4cec2dfadacdb79e4cef4c17e0f875 SHA512 a93308e6ba3450e8164f02c2b46bd5e785995d59963be7a896e769fa8312467fe29f1c7d48f5fbc290ccd6392293dc6af65e24001912a9f54292f25a023468b4
+DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8
 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
+EBUILD strawberry-0.8.5.ebuild 3038 BLAKE2B ff7e8e7505139bad178b42463b0d6949705d63496577c2d29fd5e0e2ba0f8c79eea4234305c5b903490803a92a1a6de464185c31d7fadc1dea541788524c6285 SHA512 9e189364e00e64d22771fee5bb4d8b3becb722d986e23be7bf601f90758698eaf95d6b3d2978ed2de4d6d2c42960caca5ab546e35bdcc8110f1b450b1f3be6b8
+EBUILD strawberry-9999.ebuild 3038 BLAKE2B ff7e8e7505139bad178b42463b0d6949705d63496577c2d29fd5e0e2ba0f8c79eea4234305c5b903490803a92a1a6de464185c31d7fadc1dea541788524c6285 SHA512 9e189364e00e64d22771fee5bb4d8b3becb722d986e23be7bf601f90758698eaf95d6b3d2978ed2de4d6d2c42960caca5ab546e35bdcc8110f1b450b1f3be6b8
+MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index 787d107c6034..135ead34eb68 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -9,6 +9,9 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<use>
+		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">jonaski/strawberry</remote-id>
 	</upstream>
diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
new file mode 100644
index 000000000000..0d5281b6b697
--- /dev/null
+++ b/media-sound/strawberry/strawberry-0.8.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic l10n virtualx xdg
+
+PLOCALES="cs de es fr hu id it ko nb pl ru sv"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/chromaprint:=
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	rm -r 3rdparty/taglib || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		-DUSE_SYSTEM_TAGLIB=ON
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 2e4b045125e9..0d5281b6b697 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake flag-o-matic l10n virtualx xdg
 
-PLOCALES="cs de es fr hu id it ko nb pl ru"
+PLOCALES="cs de es fr hu id it ko nb pl ru sv"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawbs.org/"
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
+IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -44,26 +44,29 @@ COMMON_DEPEND="
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
 	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
 	>=media-libs/taglib-1.11.1_p20181028
-	media-video/vlc
 	sys-libs/zlib
 	virtual/glu
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
 	ipod? ( >=media-libs/libgpod-0.8.0 )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
 RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
 	mtp? ( gnome-base/gvfs[mtp] )
 	udisks? ( sys-fs/udisks:2 )
 "
@@ -77,6 +80,10 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( Changelog README.md )
 
+REQUIRED_USE="
+	|| ( gstreamer vlc )
+"
+
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
@@ -94,10 +101,12 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
 		-DUSE_SYSTEM_TAGLIB=ON
 		-DWITH_QT6=OFF
 	)
@@ -110,7 +119,9 @@ src_configure() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
 }
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index d3fd851e8093..c9f08bd4a45e 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,4 +1,4 @@
 AUX streamripper-1.64.6-fix-autotools.patch 260 BLAKE2B b216a7a62c3c1ec53e98b85f47c7e3b07746dbb3483de7de0b1f9face420395abc10f1205624e92eede1247e4c75785b3797a6ec373ada26f876d6a8cb45acbb SHA512 49714d3ea1db143771a2ebcfd3ddd08a60e6eb63fd1e2a0b676b2d0c359b25ebd9dd40510c0137e24ef7c44c718cc83843535fae00325a098f4f1542e18e6f67
 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428
-EBUILD streamripper-1.64.6.ebuild 864 BLAKE2B c5288705cdd4884e047ca1d261430f901ecef1641cc1a8a72220f07120fdf0a9012054eec57f675fc7916de35c2a8e155c9d28a6806ca6efde8572c830414448 SHA512 103cf45878337898bb4e7b475c056377658ba1ed2b51273071e7e9b64aef56ed9b08dbd85d6e4551860a7d0d6fa1cf5d3ec4d5d2a7dfadb4de7a5ac69df681a2
+EBUILD streamripper-1.64.6.ebuild 853 BLAKE2B ff1a629553ec705f86633ec56c639983dab48dba3335b65529dada08e835854f31ee29264795d1d4a159103934fe64e9b1dffd7e1400c9ce39b3d27c8b280123 SHA512 3884f4ab38490d162679c9e3db0e9372a7d8eb4f0e7e7ec5bd1f030b87ff4ead3a321bea4876748d247c6869b4ac5c105969f979b7d391aebaaddccb47434625
 MISC metadata.xml 345 BLAKE2B caf6bf6724c60fd86ad8983db7d4a38472aae47ba7bcc0d50f2796d81ef2c1b38cda0a1cb048b7af88dcf82bbde900c289cc6c803dc121404a6f0c19cb97cfc1 SHA512 6830a4fe1eedf9577237eb166dd97594bfe9e19a5d95578992ba2f90de46ec62679dde5a60fb9abc5887e5e7374b0742676b63e25db0106ec4f84cdac85629f0
diff --git a/media-sound/streamripper/streamripper-1.64.6.ebuild b/media-sound/streamripper/streamripper-1.64.6.ebuild
index ac6875b44c8e..eeb00af1c86a 100644
--- a/media-sound/streamripper/streamripper-1.64.6.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="vorbis"
 
 RDEPEND="
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index b108a94c7796..6623986c824c 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -5,18 +5,12 @@ AUX timidity++-2.14.0-CVE-2017-11546.patch 1005 BLAKE2B e22fba2c36f8ff3dacbe6797
 AUX timidity++-2.14.0-CVE-2017-11547.patch 2480 BLAKE2B 6db9598d7f8c9b969163f8ceaab0832db0b2f1571ec3e23d276aa77464fad58c5db9de9a07507ecefed08840dc9ef6e9c5ce30b90188ae150536fc4fd3fdc8f3 SHA512 48083c7a59196c0cf4e82cf53ffd92edf995347a4e49e2450b2ea3ea2e6ad014d13b3881c54ca0c7ad312dd977c64d836cf543c66fc8367038271f3888c294c8
 AUX timidity++-2.14.0-ar.patch 822 BLAKE2B ecd76b6297cfc6fa04fdc1760dad9879a2835db79378df98a224e758d22aaa08fa7cd6f82c16b394e6d6b4bd103b9f69b7ff84b2c7ebb1b0c82c487cc8eb5dd5 SHA512 b0c26daa94361bc471034431c0632052ceb2a8e001caabfb7e08bd3f401932724981dc2c903132f9319d16038f7bac05843ca8da1112a5a3bab626c88244514b
 AUX timidity++-2.14.0-configure-flags.patch 4241 BLAKE2B d1d083ad5e397aa0e827cd21eb98b4143638559c31d38d9541f41a6d4dc12358a1c17c8115f956e177359f9ca122ee44e775abd7b6009777ca1eaaaeeadd59a1 SHA512 be9ca5a580a47af5eb29e180c81b141628692e2cb538113b3ec596e4b800fb6d4792fa4c72921414ba41a8e6932ae655e9b9a1428021333471e2929fdab07b17
-AUX timidity++-2.14.0-gcc5.patch 1575 BLAKE2B 553ea15356aa070583b270dde7bfa8b92d3522a8c28baf6fd6286c99522436f7bc0f84d53a90de6e7b553bc7ca22a9749c9f63c83b2bd93edb1cf03626e91a7b SHA512 e4df5f5176915a21675cb0e833b88f87c7b766fe6c32beb715b538174b7118e0a80a7e0059fd32c16a4bdeabb3ecab2b8d845df805394a2f84052a894908f7bd
 AUX timidity++-2.14.0-params.patch 716 BLAKE2B d4426e36db91fea9561a81bacb5337c8da3e385a598ebd61a38cb00ff2ab8be5b07c6259068ea31e11d0e755b28ba5769ee0cf9e6a7c31a272d1145d70e0521c SHA512 b35596de8ba6ffc4ff91a8ab7a2a0a25c658af97f8aa4e226737e910227e2a11bf4b227a5f8c61ddc1452cd614e03f75736787a2240cc530e90aba437371a09a
-AUX timidity++-2.14.0-pkg-config.patch 3836 BLAKE2B 64757187ff860fbd4359dca0f567e7b71ad11ffa060e736deccd4994e0409bcc86f1f5151414e532e22f07e4dc9a6b5d75b1617c21deab616a319622a3ced0c4 SHA512 2dba5ca948d31d4498f44f8b4c67d59294e7cf722652b62f9502222867f1c93fa491b9741c049bde7ac976c74e52639bfc359a88e2c7f3728b723e272e40692d
-AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 701 BLAKE2B 32fa47b354cc3d9aedd0b3466eb69de08757f731c39d4b11fd8377d607918eedaedb0747b63ab031479790460303e971ad153875b448166632e90cab2af95598 SHA512 096ec664e401446bebe2395309cbe57c61c711a1ce4c23984ba668cdc9aef1a23a1c5d4f9111c0a2bb4e634368b57093f2dfb0aa1c60e281098bac646b8b9214
-AUX timidity++-2.14.0-tcltk86.patch 312 BLAKE2B 040b5c96771398e41adf62354bd48caeadcf030398128c39212f6226abb996d4f086d0476799726d761e0c93b84165c71d7b05a1060c1244483bbae7df782e8b SHA512 e6fd991cf5a1d568dccc1a47629e5562721325668e498b7474382b3f53f3161f1e0f40144ec5e2bb5d6f2b83ddc46fd22a2998d17763e142362cb7419a0bc31e
 AUX timidity++-2.15.0-pkg-config.patch 4257 BLAKE2B f9e81fdc50ff485636aaab4b0c74e7a7caba49eb8884b5176b2a71a3a582542300872786ec56886d645f8b6ec23b5312908053c47c5b107d8ecf905dbdd27402 SHA512 e6ae48d17d0b7b9589df3e90e5923cd53c86b59b2730306c2ec76f8c20013e8befd70e36d4c2629bae906cb967c1404b3595334a6f208f8799d7fbd6e030fe08
 AUX timidity.cfg-r1 669 BLAKE2B 023edf8f503f23817c1941a0cb1a0341f0ff1475405fc906a9acf4adb36ca8769bc015df5c30af50a828dd522d214bf9d6c4feabe2db3419e8100ebd431fdbdb SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b
 AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6df3428e127c1eb7ea2b82750c86932239c8a6ceb507d06fce2bc5e5ee963d56fd0e8daf2ff7890a9e68a SHA512 34312594866d77244d0eb77b4111a8e7998bd20bcb3542b036b1626d73bf4672eef677a926badceaaee517f1d32752b3e3b1ea4d3f2cc0703d66c1c740e0dc2e
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
-DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.14.0-r3.ebuild 5315 BLAKE2B a1b395ebe1a733bd0eeebade1ee5e03a113c05d5afdcf5e5cb903a77f2e20fea730d5d4a989ef7d61dfee786af59fc46a3113f98fb8c6cea5e94b6875e2d644a SHA512 1fed33b633ce857bd813d404e3485efab67792404b99da7727e7c40014b5c658cbed887d3a222f633cc7f9423afcf642d01c7a38afb1da3f700cd4ae57c7d4ef
-EBUILD timidity++-2.15.0.ebuild 5202 BLAKE2B 21cc641ce89b10ccdbbe95e83570933e09fdf821bca230fa4fcf2f877f7949b4d01ff515600a3982bee96b3e54fc082b270f270f6a30437c5a2d950a9ff6e2ce SHA512 6a6f867216ab6ec240b1ea040bf6cb0a53049bd0541297dc706ef3edd1c4a5552d4f9b2e0c88ac408e69774d4dd2dfa98aec1b659651dd1e57db69f7bc6a3543
+EBUILD timidity++-2.15.0.ebuild 5199 BLAKE2B c18bd5a8f2af423325659a37db88cbd3382fe6e7644ee282d202646e72409ad3120fb54e858d0cd754bf3c27dc670e42d2d46621790069d91ab218a186b01174 SHA512 da54b66c4e9341d0be7f680e46fa82e32a9f0e21b1059449a2f2c413f15fa600900c2e810f49e8dde74cd83a355ef720ccbd3a81a0c169fd6b73d59a0b636157
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch b/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch
deleted file mode 100644
index 50d64e3bcbb5..000000000000
--- a/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream commit 6e189f6073e979ceccaf05c3bb5f495a1b9ed87e
-
-inline, defaults to "extern inline" with newer gcc versions
-
-With newer versions of gcc, "inline" defaults to extern, and not static if
-not specified. This causes linking problems at the end of the compile. Most
-of this occurences are fixed (or #ifdef'ed away) except these two small
-ones in timidity/mfi.c
-
-Signed-off-by: Stian Skjelstad <stian.skjelstad@...>
-
---- a/timidity/mfi.c   2004-02-17 17:02:18.000000000 +0100 
-+++ b/timidity/mfi.c   2017-02-14 04:41:24.000000000 +0100 
-@@ -344,7 +344,7 @@
- #define SEND_LASTNOTEINFO(lni, ch)				if (LASTNOTEINFO_HAS_DATA((lni)[ch])) SendLastNoteInfo(lni, ch);
- #define SEND_AND_CLEAR_LASTNOTEINFO(lni, ch)	if (LASTNOTEINFO_HAS_DATA((lni)[ch])) { SendLastNoteInfo(lni, ch); (lni)[ch].on = NO_LAST_NOTE_INFO; }
- 
--inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
-+static inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
- {
- 	info[channel].on = time;
- 	info[channel].off = time + duration;
-@@ -352,7 +352,7 @@
- 	info[channel].velocity = velocity;
- }
- 
--inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
-+static inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
- {
- 	NOTE_BUF_EV_DEBUGSTR(channel, info[channel].on, note_name[info[channel].note % 12], info[channel].note / 12, info[channel].velocity, info[channel].off);
- 	MIDIEVENT(info[channel].on, ME_NOTEON, channel, info[channel].note, info[channel].velocity);
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch b/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch
deleted file mode 100644
index 15d6a4ec43f4..000000000000
--- a/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-use $PKG_CONFIG rather than `pkg-config`
-
-https://bugs.gentoo.org/497362
-get ncurses info via pkg-config while we're at it
-
-patch by Mike Frysinger <vapier@gentoo.org>
-
---- a/configure.in
-+++ b/configure.in
-@@ -148,6 +148,7 @@ AC_SUBST(xawresdir)
- 
- # Checks for programs.
- AM_PATH_LISPDIR
-+PKG_PROG_PKG_CONFIG
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
- AC_PROG_INSTALL
-@@ -1318,8 +1319,8 @@ AC_MSG_CHECKING(enable_audio=jack)
- if test "x$au_enable_jack" = xyes; then
-   AC_MSG_RESULT(yes)
-   SYSEXTRAS="$SYSEXTRAS jack_a.c"
--  EXTRALIBS="$EXTRALIBS $(pkg-config --libs jack)"
--  EXTRADEFS="$EXTRADEFS -DAU_JACK $(pkg-config --cflags jack)"
-+  EXTRALIBS="$EXTRALIBS $(${PKG_CONFIG} --libs jack)"
-+  EXTRADEFS="$EXTRADEFS -DAU_JACK $(${PKG_CONFIG} --cflags jack)"
- else
-   AC_MSG_RESULT(no)
- fi
-@@ -1635,60 +1636,8 @@ dnl ncurses
- AM_CONDITIONAL(ENABLE_NCURSES, false)
- CONFIG_INTERFACE(ncurses,NCURSES,n,
-   AS_HELP_STRING([--enable-ncurses], [Enable ncurses interface        (default is no)]),
--  [ AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h)
--
--dnl #include <ncurses/curses.h> is failure on Plamo Linux 1.3/ncurses 1.9.9e
--dnl because <ncurses/curses.h> includes <unctrl.h>:
--dnl /usr/include/ncurses/curses.h:34: unctrl.h: No such file or directory
--dnl But surely there is unctl.h at /usr/include/ncurses/unctrl.h.
--dnl configure must check ncurses header with -I/usr/include/ncurses option.
--
--  case "$ac_cv_header_curses_h$ac_cv_header_ncurses_curses_h$ac_cv_header_ncurses_h" in
--    *yes*);;
--    *)	for i in /usr/include /usr/local/include; do
--	  if test -f "$i/ncurses/curses.h" -a -f "$i/ncurses/unctrl.h"; then
--	    AC_MSG_WARN(ncurses test is failure.  Please check config.h and common.makefile later)
--	    CPPFLAGS="$CPPFLAGS -I$i/ncurses"
--	    break
--	  fi
--	done
--	;;
--    esac
--
--    AC_CHECK_LIB(ncurses,initscr,lib_curses_opt=-lncurses,
--      [ dnl checking pdcurses
--	AC_CHECK_LIB(curses,PDC_set_ctrl_break,
--          [ lib_curses_opt=-lcurses
--	    AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
--	    lib_user32_opt="$lib_user32_test"
--	  ],
--	  [ dnl checking libpdcurses
--	    AC_CHECK_LIB(pdcurses,PDC_set_ctrl_break,
--	    [ lib_curses_opt=-lpdcurses
--	      AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
--	      lib_user32_opt="$lib_user32_test"
--	    ],
--	    [ dnl OpenBSD use -lcurses instead of -lncurses.
--	      case "$target" in
--		*openbsd*)
--		  AC_CHECK_LIB(curses,initscr,lib_curses_opt=-lcurses,
--		    [ AC_MSG_WARN(ncurses interface is not enabled)
--		      enable_ncurses=no ])
--		  ;;
--		*)
--		  if test "x$VCPP" = xyes || test "x$BORLANDC" = xyes || test "x$WATCOM_C" = xyes || test "x$DMC" = xyes || test "x$POCC" = xyes; then
--		    lib_curses_opt=libpdcurses.lib
--		    AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
--		  else
--		    AC_MSG_WARN(ncurses interface is not enabled)
--		    enable_ncurses=no
--		  fi
--		  ;;
--	      esac
--	    ])
--	],
--	$lib_user32_test)
--      ])
-+  [ CPPFLAGS="$CPPFLAGS $(${PKG_CONFIG} --cflags ncurses)"
-+    lib_curses_opt=$(${PKG_CONFIG} --libs ncurses)
-   ],
-   [ LIBS="$LIBS $lib_curses_opt"
-     case "$target" in
-@@ -1855,7 +1804,7 @@ CONFIG_INTERFACE(xaw,XAW,a,
-     lib_xmu_opt=-lXmu
-     lib_xt_opt=-lXt
-     if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then
--      XFT_CFLAGS="$(pkg-config --cflags xft)";
-+      XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)";
-       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS)
-       lib_xft_opt="-lXft";
-     fi
-@@ -1909,7 +1858,7 @@ CONFIG_INTERFACE(xaw,XAW,a,
- 	;;
-     esac
-     if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then
--      XFT_CFLAGS="$(pkg-config --cflags xft)";
-+      XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)";
-       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS)
-       a_so_libs="$a_so_libs -lXft";
-     fi
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch b/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
deleted file mode 100644
index 6f901eab8bc0..000000000000
--- a/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This will revert part of the commit from:
-
-http://timidity.git.sourceforge.net/git/gitweb.cgi?p=timidity/timidity;a=commit;h=e73b53437dbc1e57e61dd4d0c1407784797b08d9
-
-Because otherwise TiMidity++ simply won't build as per:
-
-../interface/libinterface.a(xskin_c.o): In function `ctl_event':
-xskin_c.c:(.text+0x17c): undefined reference to `ctl_speana_data'
-collect2: error: ld returned 1 exit status
-
---- a/interface/xskin_c.c
-+++ b/interface/xskin_c.c
-@@ -228,7 +228,6 @@
-     }
- }
- 
--#if 0
- static void ctl_speana_data(double *val, int size) {
- 
-   /* 0 <= val[n] <= (AMP*NCOLOR) */
-@@ -280,7 +279,6 @@
- 
-   return;
- }
--#endif
- 
- /*ARGSUSED*/
- static int ctl_open(int using_stdin, int using_stdout) {
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch b/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
deleted file mode 100644
index 23ef62aa03e5..000000000000
--- a/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/451296
-
---- a/interface/tk_c.c
-+++ b/interface/tk_c.c
-@@ -913,7 +913,7 @@
- 	vsnprintf(buf, sizeof(buf), fmt, ap);
- 	Tcl_Eval(my_interp, buf);
- 	va_end(ap);
--	return my_interp->result;
-+	return Tcl_GetStringResult(my_interp);
- }
- 
- static const char *v_get2(const char *v1, const char *v2)
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
deleted file mode 100644
index 647057fac1e7..000000000000
--- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop elisp-common systemd toolchain-funcs user xdg-utils
-
-MY_PV=${PV/_/-}
-MY_P=TiMidity++-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
-
-REQUIRED_USE="tk? ( X )"
-
-DEPEND="
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.5 )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	flac? ( media-libs/flac )
-	gtk? ( x11-libs/gtk+:2 )
-	jack? ( virtual/jack )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( >=media-libs/nas-1.4 )
-	ncurses? ( sys-libs/ncurses:0= )
-	slang? ( sys-libs/slang )
-	speex? ( media-libs/speex )
-	tk? ( dev-lang/tk:0= )
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		media-libs/libpng:0=
-		x11-libs/libXaw
-		x11-libs/libXext
-	)
-"
-RDEPEND="${DEPEND}
-	app-eselect/eselect-timidity
-	alsa? ( media-sound/alsa-utils )
-	selinux? ( sec-policy/selinux-timidity )
-"
-
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewuser timidity -1 -1 /var/lib/timidity audio
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-params.patch
-	"${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch
-	"${FILESDIR}"/${P}-tcltk86.patch
-	"${FILESDIR}"/${P}-ar.patch
-	"${FILESDIR}"/${P}-configure-flags.patch
-	"${FILESDIR}"/${P}-pkg-config.patch
-	"${FILESDIR}"/${P}-CVE-2017-1154{6,7}.patch
-	"${FILESDIR}"/${P}-gcc5.patch # bug 606894
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export EXTRACFLAGS="${CFLAGS}" #385817
-
-	local myconf=()
-	local audios
-
-	use flac && audios+=",flac"
-	use speex && audios+=",speex"
-	use vorbis && audios+=",vorbis"
-	use oss && audios+=",oss"
-	use jack && audios+=",jack"
-	use ao && audios+=",ao"
-
-	if use nas; then
-		audios+=",nas"
-		myconf+=( --with-nas-library="/usr/$(get_libdir)/libaudio.so" --with-x )
-		use X || ewarn "Basic X11 support will be enabled because required by nas."
-	fi
-
-	if use alsa; then
-		audios+=",alsa"
-		myconf+=( --with-default-output=alsa --enable-alsaseq )
-	fi
-
-	# We disable motif by default and then only enable it if it's requested.
-	if use motif; then
-		myconf+=( --enable-motif --with-x )
-		use X || ewarn "Basic X11 support will be enabled because required by motif."
-	fi
-
-	econf \
-		--localstatedir=/var/state/timidity++ \
-		--with-module-dir="${EPREFIX}/usr/share/timidity" \
-		--with-lispdir="${SITELISP}/${PN}" \
-		--with-elf \
-		--enable-audio=${audios} \
-		--enable-server \
-		--enable-network \
-		--enable-dynamic \
-		--enable-vt100 \
-		--enable-spline=cubic \
-		$(use_enable emacs) \
-		$(use_enable slang) \
-		$(use_enable ncurses) \
-		$(use_with X x) \
-		$(use_enable X spectrogram) \
-		$(use_enable X wrd) \
-		$(use_enable X xskin) \
-		$(use_enable X xaw) \
-		$(use_enable gtk) \
-		$(use_enable tk tcltk) \
-		--disable-motif \
-		"${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	# these are only for the ALSA sequencer mode
-	if use alsa; then
-		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
-		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
-
-		systemd_dounit "${FILESDIR}"/timidity.service
-	fi
-
-	insinto /etc
-	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
-
-	dodir /usr/share/timidity
-	dosym ../../../etc/timidity.cfg /usr/share/timidity/timidity.cfg
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	diropts -o timidity -g nobody -m 0700
-	keepdir /var/lib/timidity
-
-	doicon "${FILESDIR}"/timidity.xpm
-	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
-
-	# Order of preference: gtk, X (Xaw), ncurses, slang
-	# Do not create menu item for terminal ones
-	local interface="-id"
-	local terminal="true"
-	local nodisplay="true"
-	if use gtk || use X; then
-		interface="-ia"
-		terminal="false"
-		nodisplay="false"
-		use gtk && interface="-ig"
-	elif use ncurses || use slang; then
-		local interface="-is"
-		use ncurses && interface="-in"
-	fi
-	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
-		-e "s/Terminal=.*/Terminal=${terminal}/" \
-		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
-		-i "${D}"/usr/share/applications/timidity.desktop || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "A timidity config file has been installed in /etc/timidity.cfg."
-	elog "Do not edit this file as it will interfere with the eselect timidity tool."
-	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
-
-	if use alsa; then
-		elog "An init script for the alsa timidity sequencer has been installed."
-		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
-		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
-	fi
-
-	if use sparc; then
-		elog "Only saving to wave file and ALSA soundback has been tested working."
-	fi
-
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-}
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0.ebuild
index ad2957733f15..fdf335c638f8 100644
--- a/media-sound/timidity++/timidity++-2.15.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
 
 REQUIRED_USE="tk? ( X )"
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index f84e714b0995..144ce1b0bbea 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,6 +1,6 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
 DIST twolame-0.4.0.tar.gz 890908 BLAKE2B f61a49aed06dcd2a60744dd758b480670f14f0eece0586b62a0b21fe2d9ff8280f8f7324b7daf88e85675c6200a1c68815ddd6bafa308b503a52df4552031bb1 SHA512 cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03
-EBUILD twolame-0.3.13-r2.ebuild 1247 BLAKE2B 350aff37751d3974c0863debb9c6e90a783cfe7c12391d5feffbe60a553dbea37635dd6780e9374df5c8ad21519b80c36d2c5643784e92ef70513461e715b092 SHA512 78eea332e15a3d368be9ea6183afdc7a2945ba44e026a057febb7fc1ed9dd726216bf654559a326ef0a542d1fda43634354ef3cb61f09c2a49774ba0fb1e60b2
-EBUILD twolame-0.4.0.ebuild 1330 BLAKE2B f0ed068163f749f0a32bf5aab5b6006f785afba0715138c007892e63297a28a418848437a3f02081b696fde0d1d670a2f2d7473fc50b9f8cc87f8afc7983a044 SHA512 47d0de42790e9456387ad0efd5d50208d7e5d7a705f11f18308488f21d2f58a135011b9033b7a0ba3d2d5182f93922dccb69d3d3ba14508a09ca43ade1568219
+EBUILD twolame-0.3.13-r2.ebuild 1236 BLAKE2B 7a822ee5ccd3c84c4645905e70771128635df2a189a479ff8a7c4a0176899e420906023925627fe642eb4577fd3b6412220ab06e3dfed73f1e7fb88a0a49c173 SHA512 f8762240e6fba85f8be2f5819b622d2f43917272cf63ca4d91f8b5581acec7a7dc5b53b9c18ebe078995bd9c9face9bb7e512294bb3de901bb0c1f8093eaaee9
+EBUILD twolame-0.4.0.ebuild 1319 BLAKE2B df75ea15e3864d57f976274eac79d8a02fd85470a59c842182d60106d4c0d540a159a1d61d16c863f0467dc7b450d322d730b02b1362a58c572b315c6693afdf SHA512 af9c249e6710ca378d9d42c550b5b5ce8304ee13edd954f4c33e8711a15468f6c691c40a1170971c282335d4cedac9afb4644713654cb8dc8680fa1ef8158bd4
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index 1646cbb02f35..e1df62fc0a0f 100644
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild
index de159b95abd5..5de8a1adca08 100644
--- a/media-sound/twolame/twolame-0.4.0.ebuild
+++ b/media-sound/twolame/twolame-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~sparc-solaris ~x86-solaris"
 IUSE="+sndfile static-libs test"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index c20626cedf9c..db2512b59506 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -3,6 +3,8 @@ AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc450752837
 AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-EBUILD umurmur-0.2.17-r4.ebuild 2627 BLAKE2B 2639fc46de9a3aa7e088d5e907d19852097f242dc51cee53d1dfeaaf048bed056d1e9c6a163109ae0148655946a0ceb1814676366295fd4700bea99c3e9e29ad SHA512 49a20fa88def3399de9ecc3aa266bd76ce150fcefd9b2db7710678c9343c084fcca42d7c57a8e0528e9925047f8d3d11aac0209ac9728001ecf373e8fb5f9353
-EBUILD umurmur-9999.ebuild 2627 BLAKE2B 68faaf508f2c97cbe131e411a8197941b5cd63c488f9788946ea55362cef527107b102a9cfeab4d7be730d65a5e74682962c74ee2e48a75346b995d79ead4885 SHA512 21ec179a9000930e220a6a16f54a67bcf958342a87f303a703aa9e0cd38a9b7ec9b705751673962a6c82e9cbbd5040d69e1aaf47e311ae629f8e5b41738254f8
+DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2 SHA512 bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656
+EBUILD umurmur-0.2.17-r4.ebuild 2631 BLAKE2B d5ee8f085fcdc6721821fd8cdcc09170d4643779543e3b19645fe0b350ee351a2890bfc15e95518442d600ccf4c8426d5daa841ce55cf95993cab6f8d59759c7 SHA512 a4fd25d49c4d53d58d9ef17db266d428648d9cd77f9c5aeca1f4c857f90c5c975895401bf0b77eb6addc18cdb1073f994bce4ee816b5b2646c9279580d22c123
+EBUILD umurmur-0.2.18.ebuild 2634 BLAKE2B 439488afcd30893130a98e21e63ce862ce8c620cc284056fcbc8475657b4a104b6a3658d82b1f085557e568a3e40269779ff827905bcc866ca38b94245c45e18 SHA512 437aa84ae793e82073cb038a206ea19eaaef3749b8c4bf9c78b3db7bee8f9b55329224263f5456cf65c451c69bc23a69fb3cbf94c977f0587651f5350a5b7b27
+EBUILD umurmur-9999.ebuild 2634 BLAKE2B 439488afcd30893130a98e21e63ce862ce8c620cc284056fcbc8475657b4a104b6a3658d82b1f085557e568a3e40269779ff827905bcc866ca38b94245c45e18 SHA512 437aa84ae793e82073cb038a206ea19eaaef3749b8c4bf9c78b3db7bee8f9b55329224263f5456cf65c451c69bc23a69fb3cbf94c977f0587651f5350a5b7b27
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
index 9bc2d4e0ca0f..5f27975b77c8 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,11 +20,11 @@ IUSE="gnutls libressl mbedtls shm"
 
 # ssl-provider precendence: gnutls, mbedtls, libressl
 # and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 	dev-libs/libconfig:=
 	gnutls? (
 		dev-libs/nettle:=
-		>=net-libs/gnutls-3.0.0
+		>=net-libs/gnutls-3.0.0:=
 	)
 	!gnutls? (
 		mbedtls? ( net-libs/mbedtls:= )
diff --git a/media-sound/umurmur/umurmur-0.2.18.ebuild b/media-sound/umurmur/umurmur-0.2.18.ebuild
new file mode 100644
index 000000000000..2eaae13bc97a
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.18.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://github.com/umurmur/umurmur"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+LICENSE="BSD"
+SLOT="0"
+IUSE="gnutls libressl mbedtls shm"
+
+# ssl-provider precendence: gnutls, mbedtls, libressl
+# and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
+	dev-libs/libconfig:=
+	gnutls? (
+		dev-libs/nettle:=
+		>=net-libs/gnutls-3.0.0:=
+	)
+	!gnutls? (
+		mbedtls? ( net-libs/mbedtls:= )
+		!mbedtls? (
+			libressl? ( dev-libs/libressl:0= )
+			!libressl? ( dev-libs/openssl:0= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}
+	acct-group/murmur
+	acct-user/murmur
+"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
+	may want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+S="${WORKDIR}/${P/_}"
+
+get_ssl_impl() {
+	local ssl_provider=()
+
+	use gnutls && ssl_provider+=( gnutls )
+	use mbedtls && ssl_provider+=( mbedtls )
+	use libressl && ssl_provider+=( libressl )
+
+	if ! use gnutls && ! use mbedtls && ! use libressl ; then
+		ssl_provider+=( openssl )
+	fi
+	echo ${ssl_provider[@]}
+}
+
+pkg_pretend() {
+	local ssl_provider=( $(get_ssl_impl) )
+
+	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
+		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
+		ewarn "defaulting to ${ssl_provider[0]}."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+
+	local myeconfargs=(
+		--with-ssl="${ssl_provider[@]}"
+		$(use_enable shm shmapi)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local confdir
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
+	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
+	systemd_dounit "${FILESDIR}"/umurmurd.service
+
+	dodoc AUTHORS ChangeLog
+	newdoc README.md README
+
+	confdir="/etc/umurmur"
+	insinto "${confdir}"
+	doins "${FILESDIR}"/umurmur.conf
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the
+	# key used to sign it, which are read after priveleges are dropped.
+	fperms 0750 "${confdir}"
+	fowners -R root:murmur "${confdir}"
+	fperms 0640 "${confdir}"/umurmur.conf
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
index 36c6e284b8df..2eaae13bc97a 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools systemd readme.gentoo-r1
 
 DESCRIPTION="Minimalistic Murmur (Mumble server)"
 HOMEPAGE="https://github.com/umurmur/umurmur"
-if [[ "${PV}" == 9999 ]] ; then
+if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
 else
@@ -20,11 +20,11 @@ IUSE="gnutls libressl mbedtls shm"
 
 # ssl-provider precendence: gnutls, mbedtls, libressl
 # and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-	dev-libs/libconfig
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
+	dev-libs/libconfig:=
 	gnutls? (
 		dev-libs/nettle:=
-		>=net-libs/gnutls-3.0.0
+		>=net-libs/gnutls-3.0.0:=
 	)
 	!gnutls? (
 		mbedtls? ( net-libs/mbedtls:= )
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 
 DOC_CONTENTS="
 	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may	want to review it. See also\n
+	may want to review it. See also\n
 	https://github.com/umurmur/umurmur/wiki/Configuration "
 
 S="${WORKDIR}/${P/_}"
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index e11ecbf6aa3c..75d2a5ccbc02 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -2,6 +2,8 @@ AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
 DIST upmpdcli-1.5.2.tar.gz 550460 BLAKE2B e9905fb2f6c07d7374651fd0a9d7ec821d6ea25d4debe1b6e69bbf7def8b75d0b35b245a5e4ca2477832f71a9fe950f7f7635d1b6fc29add0e59405c0c69b338 SHA512 4d6cd44b64637c5a07996a416f0cf15e27e24b84aa04ee3ee9f6f5eda3164a5b964915587a4342cc0a8f95fa175dd106b99242de5c50d3cb603e48450694009e
 DIST upmpdcli-1.5.5.tar.gz 550726 BLAKE2B 1a32f5a3126e037f6663ab60244d7af3fd7aeb79c5878ba1ca4d8029b97917a70f5b06a82e6006fcf14642b96cb5539488b3bba03860a2dd23e6bce0efe54bdc SHA512 90ce69b4ef004e1b5db3229b3bc99637ecba0f5f7e82d0e9f567da163295b4a572d059accbeb679194d1846eb822d48378acc743ee334ffd9859f3e025f6a0f3
+DIST upmpdcli-1.5.7.tar.gz 552203 BLAKE2B fe8e8aa3f4c777925dce2a143aec201462cb2da9e33f604d48848f27acc51fad42e1c626c17b5325918f0d1de1b37c1c456240f811af118b83bc7ce3260e0687 SHA512 ce86b8f9b4e7614433ab542facbf7452426b66bf026bb21ea0e868cde9b492b09a86ee8aa259a9353f2ede6a22d1055987986747aa8e284714c5e60f73a3a55a
 EBUILD upmpdcli-1.5.2.ebuild 1266 BLAKE2B 544ab7167dbec8e99e5256895c697a80fae5799f22dc410524cd20a9717397fbc296b87602279693276f298739a49de07543d331a86612e141fe09b1fa806a53 SHA512 6c7287599db7529da5840a90cfe0ce4cbd17c20588ddc0a4aba343fed2f65448c70e1d053a53cfeb9d134adad9b40bbf9693c8545bc2e0be1acb79f957b9e008
 EBUILD upmpdcli-1.5.5.ebuild 1268 BLAKE2B 6458a9fb1875e490e8ee5fb45a748c176c9fac2812b46b4239da1e50ccd7383471a19fe761c40a29b37289c293e9047d26ef46a2feb9fb8a8f16b4043e25e6b9 SHA512 86c8c689450786448bfe7576601e50765b73d7e8c109c7a6377e9978951a110616d7cc5d060c6e55a4b1f4622e9f0e1ae3f909c906f152ef050c98c1a2c0157e
+EBUILD upmpdcli-1.5.7.ebuild 1268 BLAKE2B 9caeb9ba3faef04081a3177d35c651c4e72d083761d001761bd9f9e14a884a42e0edc19cfb6feaa663c9252caa3bce3d57518576bcbddfe2492f67e8606e2643 SHA512 7ef64f8f02d8601877ec933808fca11ce0b12b77fd28c57eba98842d5b2fb35c43c3d885a095a652b6337671c64ec31b124dd7391efd98d2dabe5d8a9a435b45
 MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
new file mode 100644
index 000000000000..90bdff1ab338
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 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/vmpk/Manifest b/media-sound/vmpk/Manifest
index 981763ff766c..57dacef12d4f 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,3 +1,5 @@
 DIST vmpk-0.7.2.tar.bz2 438006 BLAKE2B 78b1f50ce4ec6a430e4b82b500687261c448043d07fcd8e5a8fabcf0554f0488b7a87abf4a208a1d102a86c7b399c0637210c23f7d5b45a5166d6909aeb26b1f SHA512 69e31d6fd91a6604b7482b18840ed0b274723f380d7fe59827391e9031c3c670cb4e331c8bff01aacf6271973689f0bdb8c1dad4b749524095b398063634a477
-EBUILD vmpk-0.7.2.ebuild 846 BLAKE2B 9d420cf18445e2cf2c76384867fda6070e79068e598de67017a362b911733a26551f71106a7d71ee87e862e55767c4a8c6fe81942661ac02cae6a274e2eda3a4 SHA512 12871444e941d662ed1055301fc2983f15b46f04a3b1ce3879bb13b8a7abfd4e14720235d68186495552aa0a5c624c9ef78ad93ca6d93fcd5e8d7c0a53d459a0
+DIST vmpk-0.8.0.tar.bz2 466517 BLAKE2B 9fee766b71ad7f9cd96f9dfd859dc31434f14c913c75f5a8e76c66150522dbf04c6e28582269d1603c6d53d6db436e9e7f73cab1172c0d6b004cc71edccb21c8 SHA512 b3e1e40792661c1e4ce3a5274513b4b75742ca861a6233c2653d6df90b7a89e086d15a4196d59c7021c48e9e2aae83116ba29c3395960179d602f0cb06c1f608
+EBUILD vmpk-0.7.2-r1.ebuild 842 BLAKE2B d1acc38d1f501379bca06506c856ad34ca5d6c270854b466b3f776b842858a52d22457c1d776fafdf740e14f59edcc93c32f1ca93877cb87101cfdcf8016c7e6 SHA512 ebef89994a001d8cf2ed360944232f99764b28797c983e5812d14df6af234ecb33439cfc650b54f7429104346a78840158e19fc291e5596a5f1bb82f69035566
+EBUILD vmpk-0.8.0.ebuild 910 BLAKE2B d23822aaca63fb33088a1471c73715b99c54b623f2b6a881aa4f511d223c634db341d67f1f25e87e425b2c82766a19872d0a814918f289634963fad3aab95b44 SHA512 510b2b261d73ca878701f5a63a55723aace770127acf46098df2d2de3e0322b78718087ce97294a66f8789a6659a2478b50fc6d9d8be8b8120df0991bd7f1fab
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.7.2.ebuild b/media-sound/vmpk/vmpk-0.7.2-r1.ebuild
index 40112aac1424..227a4e14dd2e 100644
--- a/media-sound/vmpk/vmpk-0.7.2.ebuild
+++ b/media-sound/vmpk/vmpk-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg
 
 DESCRIPTION="Virtual MIDI Piano Keyboard"
-HOMEPAGE="http://vmpk.sourceforge.net/"
+HOMEPAGE="https://vmpk.sourceforge.io/"
 SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	>=media-sound/drumstick-1.0.0
+	=media-sound/drumstick-1*
 	x11-libs/libxcb
 	dbus? ( dev-qt/qtdbus:5 )"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/vmpk/vmpk-0.8.0.ebuild b/media-sound/vmpk/vmpk-0.8.0.ebuild
new file mode 100644
index 000000000000..cd6827e95032
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Virtual MIDI Piano Keyboard"
+HOMEPAGE="https://vmpk.sourceforge.io/"
+SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=media-sound/drumstick-2.0.0
+	x11-libs/libxcb
+	dbus? ( dev-qt/qtdbus:5 )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodir /usr/share/doc/${PF}/html
+	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
+}
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index f97d205de39a..487f78f9167a 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -4,5 +4,5 @@ AUX vorbis-tools-1.4.0-docdir.patch 340 BLAKE2B 147fa0212acd6a7df359d3eeb120465c
 AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743afe660ae1a741d8bb7b2790823936a089c4a8667a41160d6d1b79ec6027f4bf77dbbd8110bc65d2503bcd87c51f4f1e675566ff2dc6 SHA512 319451c4317e2224cb56c791528c8ba4722a142b5c85f63fd606e3a1acadc95904cfab3bee7ad4634fa982f59a92ebeb30d8698d8f697640d6579b6a80eadd93
 AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
 DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
-EBUILD vorbis-tools-1.4.0-r5.ebuild 1198 BLAKE2B 683d5a77e5316bb1be569a0d4f19a813e7ecffa9e44a1e673758cd95c6a72504c5dca49d5c5b7fa4a65e36c24f2218a6841360b050adc5c09a34e6fff2f6eefd SHA512 caa0b5ef2117e142924b9cfd88f28cb4ed41177d38f882caafe8106f5e4250bb101d41a3bb168a5cd797c13c30c874874988cac26f3c431d4bc908cbb251f16c
+EBUILD vorbis-tools-1.4.0-r5.ebuild 1187 BLAKE2B ff778c641c185df7262a9e7ff146d329c3a64eab774ad64f67b846e3e9c1ce35d618ce98d27b92e6ef390daa52168aacf63d0e3bd2eca1e0e5dde33fae4dc8d1 SHA512 8829796e494ab2e280b5d1cd028ce55b33c0f3c0bac84b5f4aecd005cd90bf036eaf1d4561ec9233f93be6dd0078936223dd46fc722b0e1314c26166decb03af
 MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
index b210303bcaaf..51e642dbe33a 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="flac kate nls +ogg123 speex"
 
 RDEPEND="
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 23a93a08223e..49a25106018d 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,3 +1,4 @@
+AUX wavpack-5.3.2-fix-overflows.patch 2094 BLAKE2B 8c2abe6d72109b108d1e8f4400f5c7bcb6173332ed0742a3336decc8d9a7f1c6636d36411087c477c5d33fc36947e0bf3dc278811e3ca2f6d980567bc70acd63 SHA512 d0310d6cd85250a1111d49defae800f99ba8eefadfb3b28c700a968d7f483b645ab86864200da616f85320a7ef113e19ec4633e96c7a3839fc53414aa6fbca47
 DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
-EBUILD wavpack-5.3.2.ebuild 1017 BLAKE2B c8effcd2e290fba0ae33eb1bdfa4a0db6ab7d9a4ffd66f08e6dfdda267ec867d3213188838b960f91fd9fb80608989cc1dd5d091c6b6620d6df8e8a0d0c0e046 SHA512 57ad228698c36bc29ac4a0569507b5893795dc45aa68c3775a3d8b72b8ed58be4259a3c50f5d4b0cf98bba8f9b93e6fb47031325c9f5a557e7b1360d5af439a5
+EBUILD wavpack-5.3.2-r1.ebuild 1070 BLAKE2B 44d32a09ddbc7ba87f4af8fb53d1f57fe21525e1b50563fbf8063ab362b9e06040409ab91068a225ee4e32748ca0401b6bbea28661ef89ec985ffdc6183841a6 SHA512 c21d4e74634e9cde5ae49be7becbe7ff02dc0872caef71ffd067e73c8db5e6b008a1b5cef7673002a3684bc72c1d491d682e39bb8b43574a8572281e471c2f1d
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch b/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
new file mode 100644
index 000000000000..fbbd40ba8bd9
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.3.2-fix-overflows.patch
@@ -0,0 +1,52 @@
+From 89df160596132e3bd666322e1c20b2ebd4b92cd0 Mon Sep 17 00:00:00 2001
+From: David Bryant <david@wavpack.com>
+Date: Tue, 29 Dec 2020 20:47:19 -0800
+Subject: [PATCH] issue #91: fix integer overflows resulting in buffer overruns
+ and sanitize a few more encoding parameters for clarity
+
+---
+ src/pack_utils.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/pack_utils.c b/src/pack_utils.c
+index 17d9381..480ab90 100644
+--- a/src/pack_utils.c
++++ b/src/pack_utils.c
+@@ -200,8 +200,13 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64
+         return FALSE;
+     }
+ 
+-    if (!num_chans) {
+-        strcpy (wpc->error_message, "channel count cannot be zero!");
++    if (num_chans <= 0 || num_chans > NEW_MAX_STREAMS * 2) {
++        strcpy (wpc->error_message, "invalid channel count!");
++        return FALSE;
++    }
++
++    if (config->block_samples && (config->block_samples < 16 || config->block_samples > 131072)) {
++        strcpy (wpc->error_message, "invalid custom block samples!");
+         return FALSE;
+     }
+ 
+@@ -523,7 +528,7 @@ int WavpackPackInit (WavpackContext *wpc)
+         if (wpc->config.num_channels == 1)
+             wpc->block_samples *= 2;
+ 
+-        while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 300000)
++        while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 300000)
+             wpc->block_samples /= 2;
+     }
+     else {
+@@ -534,10 +539,10 @@ int WavpackPackInit (WavpackContext *wpc)
+ 
+         wpc->block_samples = wpc->config.sample_rate / divisor;
+ 
+-        while (wpc->block_samples > 12000 && wpc->block_samples * wpc->config.num_channels > 75000)
++        while (wpc->block_samples > 12000 && (int64_t) wpc->block_samples * wpc->config.num_channels > 75000)
+             wpc->block_samples /= 2;
+ 
+-        while (wpc->block_samples * wpc->config.num_channels < 20000)
++        while ((int64_t) wpc->block_samples * wpc->config.num_channels < 20000)
+             wpc->block_samples *= 2;
+     }
+ 
diff --git a/media-sound/wavpack/wavpack-5.3.2.ebuild b/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
index 33880cc9703d..c34faa9eee4a 100644
--- a/media-sound/wavpack/wavpack-5.3.2.ebuild
+++ b/media-sound/wavpack/wavpack-5.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/WavPack-${COMMIT}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-overflows.patch"
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 5364b7e43532..6956c96e3eef 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,4 +1,5 @@
+AUX zynaddsubfx-3.0.5-cmake.patch 469 BLAKE2B 98d1d0fadd3aebab6b0336149f0aa897d99ab6939178c6af08a261ad5800dbfdf62693fd8f93575daaf05c02caa8d4ab63aa907b49df2e671548204aadad009a SHA512 bacc4916f4a3cdb11b492092e65fd935b28bb72a5097d7090adf8bec9a4a874a80e0fb0c62cb24daf5b98102a4bcbc1b4d6ff288472ea64b7a316f8c801714bf
 AUX zynaddsubfx-3.0.5-docs.patch 436 BLAKE2B 23724992b4ce5a58961984481bcf9782a7960ca033a6abe7f71f061e8c7e4026de470b71080e5eb58f67f882a6138824d893949acd44d95ed026df24eaf95e3a SHA512 958d4f7bbb6b267b4aae2295df99eaad5f41f574183c1bb03ed6499475cb8ac3a2c52edaae60fce5a552e8d53dbed9f6677fa6c67aec4ec4dfa4436e591eae84
 DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
-EBUILD zynaddsubfx-3.0.5.ebuild 1974 BLAKE2B 93b5a9d92ddb3a7d010c067182464fc5b028f9f5bd62ffc71b4ae28af791aeeed16b5b2a1eb7c75e6f7cd825e2ab9dd58c51570258187517da358ead0c1a64c7 SHA512 274f265467663cc27f6a4740726b06b4a1964bb3b23cb2690a8a899bcd382bb66d0038b374d6eba700c02bec1d7654fddde57d79301a1889088232353d89482c
+EBUILD zynaddsubfx-3.0.5.ebuild 2020 BLAKE2B 1d91b8f853875abcdfbc0e11bdfe29365b14479708d721aaf06450aadde4c6e5e601002a3fdb5b45ab874b8de70b515012e6876b584be9d59d8f956600d5e4e2 SHA512 a72b79d923b556ff0b9310ea90600a16dfbdf9e3494cbe1d662b775ccbbe6415711f1dcd2f59fb23672a3667d6ce09c0ecfa89100a7f2c4fb51397b2aac504a8
 MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
new file mode 100644
index 000000000000..8fbcf9aca56a
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
@@ -0,0 +1,15 @@
+Fix missing CMake include
+
+Authored by:  Simon van der Veldt 2020-09-30
+Committed by:  Mark McCurry 2020-10-03
+
+--- a/src/Nio/CMakeLists.txt
++++ b/src/Nio/CMakeLists.txt
+@@ -21,6 +21,7 @@
+ add_definitions(-DIN_DEFAULT="${DefaultInput}")
+ 
+ if(JackEnable)
++    include(CheckIncludeFiles)
+     include_directories(${JACK_INCLUDE_DIR})
+     list(APPEND zynaddsubfx_nio_SRCS JackEngine.cpp JackMultiEngine.cpp)
+     list(APPEND zynaddsubfx_nio_lib ${JACK_LIBRARIES})
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
index 72b005731674..36d58edcadf9 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${P}-cmake.patch # bug 761823
+)
 
 DOCS=( ChangeLog HISTORY.txt README.adoc )
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /media-sound
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)