gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-sound
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
218 files changed, 1591 insertions, 2790 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 46e77f144361..c553dca87d8a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 948a6a6ec792..7bb3cd48f0b3 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,7 +1,3 @@
 DIST abcm2ps-8.14.11.tar.gz 259453 BLAKE2B a5b2b4142b9d3190fdedd3b560f8baa582293badd90fd380ddb9991871b2e08050d07c3c97f908529be715bce62b9cda242487f3d6a7885ecf802318a64b7df8 SHA512 b156c84cfa929aa5999a42b23564af5bac399dccbf116342891b5e5ed2e34e81b4658fab9f3c51f5de084cc96d8ea0965a2bdf81de14de6eb324b8998dbb8b98
-DIST abcm2ps-8.14.4.tar.gz 258383 BLAKE2B 7f9163309cb7a31eaecf443b5bd754c7389b4717ed891e2082f618499b4491428ae0fff7b4804d2c21c8ff3d948557c9d649afb0c2a9ae9407aad39545ed66d5 SHA512 7ba5a25ef7ad18a46bdd45393836a0ede2838af2c24822ecf3c1759328619663fe600eaf607de900527f88fa4a9c21d1da8965cafa45f4aa6dc5754b37ae3722
-DIST abcm2ps-8.14.6.tar.gz 258520 BLAKE2B 99aba76df4ee0259d46924f5d37e707d2fcc1872502c475bca52c22353d4a6f7dcb3f52b0639b8d619f2414a6cb1d20b7b8bf6808218f0b99c71eb76b9766bf9 SHA512 f9863480bc757971eacb0a3bb30e046bcafe2f27bb15ac0e9c4d89afa568f23682fca4388523c429a72b01386e44c390efc8c487cae569b59eb6fcca8ad9a98a
 EBUILD abcm2ps-8.14.11.ebuild 878 BLAKE2B 36b88fa45779d165602ae5b5805d501e3dda59ebf6d0712e0201b6af0922a8e7cc7a3322d7b9ac0efbaee636f59079caf3fa14b83d28071efb3e50b931139901 SHA512 8d166545f746551422117be43d011fcab1efc2591065a8e599089537c098f39220de25354f7963040d462c6faf203ee13957993bc66d6ca1c7ee0daaec2404eb
-EBUILD abcm2ps-8.14.4.ebuild 878 BLAKE2B 5fcd6a249f5dd7ae3c476a61fc0c38da2d7490a2162c4e6f0dd1d1dea79e8478d10493e723ba296e3fbf7d9be61b3e7e45868f92182cdb3795641b8fbfe24a95 SHA512 059ad7c4a783a8127701eba3e09f45c770c1b535198a996060038d689f1bbf95b6eda4256962f54a64f7c8930bd614a9e54db518f2f65973940a7757038c2db6
-EBUILD abcm2ps-8.14.6.ebuild 880 BLAKE2B 615b9633bad0a6f8700613f22dd14d7966f799c2dc5ec7169212adc6a7d75f48681608e41ba6a2bc9140e6e7d4f2d2c01ccc7df1d72a5dfac9e37a5e6a3dd2e6 SHA512 b9fd72b73b362d2bfc3ff8aa44a3284ce01745584da9253274ea6bdf4ab8644df5c9d0191911a1b2eb49419b21e6f3ff2c9f8fb2cfd9d586b707eee17970b1e8
 MISC metadata.xml 442 BLAKE2B 1644918baf09ce3fbbdfb92858c155cd739f48f0d7b3c52827b900547cb065f93a645203250bc6cb9f40ae9086cd6dd1e92f5b23a06d4cd19139c9f0952626b9 SHA512 b73b1bb4b151438f0328d9371f636d172072ade500c8d055b749a53a10975174f7d4a3a6f61937206e0342202827f7fb968f3d073745bf62fa954f2ffc8c9d0f
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
deleted file mode 100644
index 644672be443e..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program to convert abc files to Postscript files"
-HOMEPAGE="https://github.com/leesavide/abcm2ps"
-SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="examples pango"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	pango? (
-		media-libs/freetype:2
-		x11-libs/pango
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc README.md
-
-	if use examples ; then
-		docinto examples
-		dodoc sample*.*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.6.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.6.ebuild
deleted file mode 100644
index db152444cf7d..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.14.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program to convert abc files to Postscript files"
-HOMEPAGE="https://github.com/leesavide/abcm2ps"
-SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	pango? (
-		media-libs/freetype:2
-		x11-libs/pango
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc README.md
-
-	if use examples ; then
-		docinto examples
-		dodoc sample*.*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 29760e4524eb..345582f5455d 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -3,5 +3,5 @@ AUX abcmidi-2016.05.05-fno-common.patch 745 BLAKE2B 8e6cb17df225b21261e42abda4f8
 DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de
 DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969
 EBUILD abcmidi-2020.01.22.ebuild 836 BLAKE2B 40f9d16d5c10a2897d1395ca2334e8ec58ea32a8e126ce5bf9e570c3e0fe8a5081737e3c83d71d522abaae6e7b7eaa2a3a3c875690e62e8bf88cc9351af9d4e6 SHA512 a64b2ce08d7968f332b9d617274ff0c08af97f554f375808608baa7c7687ff8a1ffcf1f4e264fa55346863aa853955e652f9243c5aca4536360bbea7068ae892
-EBUILD abcmidi-2020.06.07.ebuild 676 BLAKE2B 8f4a55416063df0b72cf37ef4ce66325801481eaaf1563a7c65da2b5e16b65f06d8bbdf10353eb9530a17beb1b40b1dec657857bb0487af7cf2be7b4ebf59161 SHA512 a2f3af1a21ae8dd2bc1713d2d840ffd56b8cd948fa68702a7c7c93b25f748c17666ef618be8cc9abc4eba36971411ed9a6c4b404676f02b4e08807a488ce5bae
+EBUILD abcmidi-2020.06.07.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild b/media-sound/abcmidi/abcmidi-2020.06.07.ebuild
index cec3c72c3b03..10c98f2d31f4 100644
--- a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild
+++ b/media-sound/abcmidi/abcmidi-2020.06.07.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
@@ -9,15 +9,14 @@ MY_P="abcMIDI-${PV}"
 DESCRIPTION="Programs for processing ABC music notation files"
 HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
 SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
 	default
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 04d5920b80c6..c2fb7159d743 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,6 +1,5 @@
-DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
 DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
-EBUILD ardour-6.5-r2.ebuild 4776 BLAKE2B 957265c747d35808bca1f4bb55e8aea7228bb5f4f2cc36d2516a990114924f2fb48160af3343125ad241d4d7796aabe0ae22e1da12933ee35d7362330d3dc331 SHA512 f8d58d2858d18860cfd129f617dc730ffa64491a3f4c3eafced05015e15720602b362c7e100c29d7514b0c47cf3d1419bee87ddd14fb5ab224a530c6dc3b6a04
-EBUILD ardour-6.6.ebuild 4785 BLAKE2B ebdc896f8ab0e98223af0f0f7c838007eaf25406b6ef069ee3a983bc3d5fe929eca6cc3a7801dafef783d8579a791fd4f4096b34240cdd044d734ff10c2cb5e4 SHA512 0f85bbe81ffd388716ea4683e6f3377894076109305927d28570eab765c6084695cb1c85917eed34ee1007c9e4d67c13ba4af1b203491551f7c71ace7c856d69
-EBUILD ardour-9999.ebuild 4786 BLAKE2B 01ecb43a3cb8ebe2cdcc25af1e880b118f7d64d5884bbb3397514816f33076c20d15e4b798a6fc8d8781900f8775154056930b87b5a13d588dde261f5a383af1 SHA512 81ab09a2043ca58cb8c01d7d6d07df49e9c7adfed9107a669e437c8555f69e39171aab389fb1dbe78dbc3ccf09e80602158f9473675836288e18039d762bc4c8
+DIST ardour-6.6-volatile-atomic-glib-2.68.patch.gz 22322 BLAKE2B cd113f721d0c6c63c85372873cd43782e3a43b8963c4f9222e771039c4b397585582ffd4cb77d4928bcdc656ef533e4a4b40799ff0c32355985c592589766466 SHA512 3fa2ede8b943881b9c77b233892f146e354c4722265f6599417d55fdf69961d65f6d54ed2c74f53f1f835d006ee99e44adcb03ee117ba44a7be3bedbae2c8efc
+EBUILD ardour-6.6-r1.ebuild 4945 BLAKE2B dda6893230c2d51602a747fb457112a7936bf9a2e2a655704e4f63ebc8dfa9733b432350a2ae68aabc4b16332777d35eebc0ac802e2239a1e90c39bfa795b3da SHA512 7e1e73686843a064bfcf6721e833f149b1fed9e31db00e67da6408bb2c9b8839c2bd909c22dccbc89043769deadb843bfbcdf4273857c5f40bc0dde4683a9414
+EBUILD ardour-9999.ebuild 4792 BLAKE2B ecb861308230b9cedd58ee98920a3e5c0c72a725ec51b3a8fe8fc55365835a072ff5a038b7891151c10b4f62e6a1138f984063190560cfc7ac4d033a53b10c36 SHA512 fe12fe655495d6ca027de5348e88dff7a41d1c1361e667cd35aa8d7e506acecc955db62d8f4ec786e231e6d26f4c5ac809e84e16114c95e65d9ef907d1f6d3e1
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.5-r2.ebuild b/media-sound/ardour/ardour-6.5-r2.ebuild
deleted file mode 100644
index 8db68c8d6a82..000000000000
--- a/media-sound/ardour/ardour-6.5-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/raptor:2
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	media-libs/suil
-	media-libs/lv2"
-#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_src_prepare
-
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	l10n_for_each_disabled_locale_do my_lcmsg
-}
-
-src_configure() {
-	local backends="alsa"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	mkdir -p "${D}"
-	local myconf=(
-		--configdir=/etc
-		--freedesktop
-		--noconfirm
-		--optimize
-		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
-		# not possible right now  --use-external-libs
-	)
-
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
-	local s
-
-	waf-utils_src_install
-
-	mv ${PN}.1 ${PN}${SLOT}.1 || die
-	doman ${PN}${SLOT}.1
-
-	for s in 16 22 32 48 256 512; do
-		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
-	done
-
-	sed -i \
-		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
-		-e 's/;AudioEditing;/;X-AudioEditing;/' \
-		build/gtk2_ardour/ardour${SLOT}.desktop || die
-	domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
-	insinto /usr/share/mime/packages
-	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
-	insinto /usr/share/metainfo
-	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-6.6.ebuild b/media-sound/ardour/ardour-6.6-r1.ebuild
index 94b4609a1c39..fd67dc625453 100644
--- a/media-sound/ardour/ardour-6.6.ebuild
+++ b/media-sound/ardour/ardour-6.6-r1.ebuild
@@ -14,8 +14,9 @@ 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"
+	SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-volatile-atomic-glib-2.68.patch.gz"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -87,6 +88,8 @@ src_prepare() {
 	default
 	xdg_src_prepare
 
+	eapply "${WORKDIR}/${P}-volatile-atomic-glib-2.68.patch"
+
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
@@ -119,7 +122,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local backends="alsa"
+	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
 
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index ceeb6768060f..a2199b8d3d87 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -119,7 +119,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local backends="alsa"
+	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
 
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 50cd7b2cdb8b..7c60ebd59c50 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,7 +1,5 @@
-DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
-DIST asunder-2.9.5.tar.bz2 273141 BLAKE2B 895f067bb867d5e82350cdb334551fcf2f408a0ceeaf02a453262661434b05813e184a325e6b27cdb3d3e47486e1395b539e07c4304eb5ec0940eff48649f96b SHA512 40e27877c8fa17465b13a7fa08df6f94dbcb893bd6d8d46a389ca18bce4f574e04e894f9ca19f52bc22e7d1ec0db67a79f236ae4037be459bc24fe95739771dc
 DIST asunder-2.9.6.tar.bz2 283568 BLAKE2B 320fe6984f23dd3998c29eea88d7adbb9f8201c5cb16b706fa272cd7c9dc97c3129c8a6357b61e9e0d6d3b60f130f5fe1664e7acab6fbe624fd2f90b44c18247 SHA512 336514c964c2b46bf93aea050d771b6954c0761c4d9ebd63627a97945ac0c6eb8389e49abb5b42fffe8c646adc281785c7fc3b937b8dbd97e65d6b5834477633
-EBUILD asunder-2.9.3-r1.ebuild 914 BLAKE2B c45c833d0f76953116802aab8c345209843fa28362fd321b7e643b2d726ab8febdef70fb6795a49f1433ffc514e86dff90a09c9775c323c430ab18bfcc5a29ee SHA512 50dd1394d95d7b441fd5a128e66155b312b5d5438ce568e660248bd5e732300154826e0abfcfa073f355eac44eccbfb785b9ca57cd711948816607948ead7de3
-EBUILD asunder-2.9.5.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
-EBUILD asunder-2.9.6.ebuild 916 BLAKE2B 80271d3d3fe3810df8dc2ad7f87251b8f931f31817f3740ab407a8840b26c588d15a163fdd6feb959d6d45f6b969813af61360b518a412ca7a274010878fd70d SHA512 4be367eec9e08b2d8cc5000eadf2a380d26479dce45fd27543172de9ad7cc3d29368330bd6cf50244715029788e803da279daa59906dc47554f12fcf5102d41e
+DIST asunder-2.9.7.tar.bz2 283805 BLAKE2B 6c92d02586e7d0781ac0d698047d588ef7aa5e0c1544cdd8ffb4fd7c00d0066f61c01aa82502b4a4417ba6b70fb3da2c537e5d1e715ea992831f7d618724b949 SHA512 ef5e998b3e3e552ac23696619742caff9c30e52cb2b11f75395cc6e4b2134c58df1c4a97e930db0e8c61dfc31e77b3d9a99a4c9ab6c07ae59b9e91f723401e23
+EBUILD asunder-2.9.6.ebuild 914 BLAKE2B 4696b509ff0f3dc1dba4234a6cb1e2cff994049a0ebe9f54dbaa937669f40353d05889c799bd4f3e1d45b905d853ff5403d3bc54a34e1c6ad9d74cb8c11b2b63 SHA512 233b659bd573629c8ea7dec44e78fd5c5e30c79833091d26fdd1d2e42de0b8ad0f64d15ef02716208560067d2cd250a3f72e6a36844d0ccec04bdd6650f62bc2
+EBUILD asunder-2.9.7.ebuild 908 BLAKE2B 2f28178c9ef945a7ab12dfe3e0a6fe2d4acd6dfd7459a21f063a44588ef1821ec723f40efcb62875485f12f05c0ed7a695b4db8d7e0a4ce976763ca20ea52f88 SHA512 b9c053a1762cac558a886f962048206d70e278e133045419d6ce1ed655bdb0ef8557cc04eef1967074d2bd9c9943252f59fa620b466fdab991a56147b168842d
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.3-r1.ebuild b/media-sound/asunder/asunder-2.9.3-r1.ebuild
deleted file mode 100644
index 971ae6837692..000000000000
--- a/media-sound/asunder/asunder-2.9.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Graphical Audio CD ripper and encoder with support for many output formats"
-HOMEPAGE="http://littlesvr.ca/asunder/"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="flac mac mp3 musepack opus vorbis wavpack"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-DEPEND=">=media-libs/libcddb-0.9.5
-	media-sound/cdparanoia
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
-	mp3? ( media-sound/lame )
-	musepack? ( media-sound/musepack-tools )
-	opus? ( media-sound/opus-tools )
-	vorbis? ( media-sound/vorbis-tools )
-	wavpack? ( media-sound/wavpack )"
-
-src_prepare() {
-	default
-	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
-}
diff --git a/media-sound/asunder/asunder-2.9.6.ebuild b/media-sound/asunder/asunder-2.9.6.ebuild
index 011da5958768..47c5b5d9426f 100644
--- a/media-sound/asunder/asunder-2.9.6.ebuild
+++ b/media-sound/asunder/asunder-2.9.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="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="flac mac mp3 musepack opus vorbis wavpack"
 
 BDEPEND="
diff --git a/media-sound/asunder/asunder-2.9.5.ebuild b/media-sound/asunder/asunder-2.9.7.ebuild
index df537f03bf42..cb49e4fc026e 100644
--- a/media-sound/asunder/asunder-2.9.5.ebuild
+++ b/media-sound/asunder/asunder-2.9.7.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
@@ -18,7 +18,7 @@ BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
-DEPEND=">=media-libs/libcddb-0.9.5
+DEPEND="media-libs/libcddb
 	media-sound/cdparanoia
 	x11-libs/gtk+:2"
 RDEPEND="${DEPEND}
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 2a1cb8d5f583..447dfc399d0d 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -2,6 +2,6 @@ AUX 1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch 2123 B
 AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4c3146b0e6fe343d4a437dfdb13aa60e0bbbf59f2959fee39f4d5bdb620fe57670e01a0963ad9eea3cf0309b3ea516e0931e9383c19 SHA512 2f6b5636ad3a16e70438fd2c1b62952416225dcc9acca686b1dc19ba4c2c5dbed4807f3f597e212d23ddf12de0fb0f315729da9ca86fbbc6766f4840dc83a524
 AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db51e53d70b6d30332c3f6e039873461931c5e4052136675013728792fbc98f561f6fcf62432f58bc7702e54f34d04c43586d9a07ecdc789019aec040 SHA512 3e3af6d760596a08fac6130912ed5780795975e0ade8c4f27f577453b82cbc588de9d23d9d2c1672841913d5627fe684cd8373670851e59b6fe1e0a57b138009
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r5.ebuild 4478 BLAKE2B f0342eed66d624e5c03585bbeabf1223343b5fc58c8623b9b61e084018224582d4fb47a813cc7a2e4643a018ad66ef36d02e99b27e8a321fc545e89d4cc86f87 SHA512 c44c784bb9dda1d1072fd1061e4eee51f7c6caeb8dcdeb1d5fdf071991d27a4b189e9a8075b3ea6b002a0219f17d4bfc5164dd2f735ad9011e92271000b04440
-EBUILD beets-9999.ebuild 4478 BLAKE2B f0342eed66d624e5c03585bbeabf1223343b5fc58c8623b9b61e084018224582d4fb47a813cc7a2e4643a018ad66ef36d02e99b27e8a321fc545e89d4cc86f87 SHA512 c44c784bb9dda1d1072fd1061e4eee51f7c6caeb8dcdeb1d5fdf071991d27a4b189e9a8075b3ea6b002a0219f17d4bfc5164dd2f735ad9011e92271000b04440
+EBUILD beets-1.4.9-r5.ebuild 4447 BLAKE2B 154a780256c187e77082600c7376a61ceae67aa6f33fa910475261bc69daf66931814a0688f92525b4689ef0b0850bb01b75add8aa56d7073436c53d211a4b38 SHA512 e1825d5c0c77feefb341a5f9f5bcd1b066b475b04aa95d6b02b4fa9bbc80202e8b9498e4f1eece841457c5c93f79f7581c16f6728f7f409c836b72642e46277c
+EBUILD beets-9999.ebuild 4447 BLAKE2B 154a780256c187e77082600c7376a61ceae67aa6f33fa910475261bc69daf66931814a0688f92525b4689ef0b0850bb01b75add8aa56d7073436c53d211a4b38 SHA512 e1825d5c0c77feefb341a5f9f5bcd1b066b475b04aa95d6b02b4fa9bbc80202e8b9498e4f1eece841457c5c93f79f7581c16f6728f7f409c836b72642e46277c
 MISC metadata.xml 1781 BLAKE2B 25306614dd6eec756d4d593f72b27ad19a2809553642db7c836162c76d7086f29ddd50019dd5160c0ac67e448ce7ededa358d06e5ae91a13c96b9e25e6871e10 SHA512 fb2ca0157b42b86a7065320a14dade86dba95fbb55a3f24d0ca8b40cc5a31fdb5013f9d369e3220d8eaacd994f879c02f419769bf9a1b56d38156b7cc2f7f588
diff --git a/media-sound/beets/beets-1.4.9-r5.ebuild b/media-sound/beets/beets-1.4.9-r5.ebuild
index 8b374ff092bd..77bfe8273657 100644
--- a/media-sound/beets/beets-1.4.9-r5.ebuild
+++ b/media-sound/beets/beets-1.4.9-r5.ebuild
@@ -118,7 +118,6 @@ python_install_all() {
 	insinto /usr/share/zsh/site-functions
 	newins "${WORKDIR}/${P}/extra/_beet" _beet
 
-	elog "Optional dependencies:"
 	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
 	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
 	optfeature "discogs support" dev-python/discogs-client
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 8b374ff092bd..77bfe8273657 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -118,7 +118,6 @@ python_install_all() {
 	insinto /usr/share/zsh/site-functions
 	newins "${WORKDIR}/${P}/extra/_beet" _beet
 
-	elog "Optional dependencies:"
 	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
 	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
 	optfeature "discogs support" dev-python/discogs-client
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index 4f3710472dae..c0d0715b8816 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -1,7 +1,7 @@
-AUX bristol-0.60.11-cflags.patch 7046 BLAKE2B 1b51164828f40f722afeafd955efae25f11cd913bb223f670ea65368a56e8aad1c12480b3d5ec4b0787bebd5425ebc291d71bdc6f74ef1efdcc726d5d388606b SHA512 92881949eeeabd3afa6253f4830bcc3925bd8889ac8335c08b86a3d9c7e53ca097527a51a341d5f7bcb2fd81eda5e038a33eff92af381d8d6b6e0f03e5bcbe1e
-AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6fc485acddf12051a5be33ccde597ba20b8064dc8d597d6e93424c56eacd2ce8cb32bcce7c42bb9530b308136747cf21bbc5b SHA512 dd2fa1859af1e071784138af701caf65d9a076e287d767d64d70cba56462e6ce5c62aea2c50dd617598059372ef1cbe5d9571e3d18110bd64e7789fdb5d9edad
-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
+AUX bristol-0.60.11-cflags.patch 6738 BLAKE2B 18d7245f7c7bbd13177bd48d076bde9350128b1959a723de6f6946ea7aad2c526c5cf2c9f818d3214f788d111d2b955d0f89ad4c7731c83b212b7890ff9f8d61 SHA512 d5bc27d1747f04f187f6774004ff983a26420f2290e04d3d234a6c359cf0c80c5e8cc065e5ac25b42814016576124f94ca490a585885953f4399fffe444c097c
+AUX bristol-0.60.11-dontcompress.patch 504 BLAKE2B 387cc99241f4d39bf64dca83ddb7474758f4425fad51e6e518a6a99386cca008fe4a574458617b771a54182c5238915fed3fea00d5f82fe737c8afa2a417fb55 SHA512 3a0d56b83308ae3e555956ef930943420241e0951ca71d6d6d6e1ae98eafb9dc350a97873faf6b44fccb0cf1c58ccea6bb8923e8d9ada3349f2b0fa90e10d803
+AUX bristol-0.60.11-implicit-dec.patch 292 BLAKE2B 6d9f900f00e7ca1642fe80d7cdfcf929954d9ef4948ca7d3037fc26f80ab1505ab33ab74ee6a0ff40e460f5305b2f2f2eb093c209d8900825e82637a6b0ae8df SHA512 88b528fd5a492bf77d87fc629e542315948a08cbec0abc8b4cbddc113bcb2f36ed6ed52f1f98c1083ba99adf8febc143736352817d5e2f21ec484cc689e59e5b
+AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 899 BLAKE2B 98fb23ca63f58099e06704d1cfb24c543b6e41cc8a37cab82097a526e66056006263ef8125b696e35572bc8b4646b96620c77415df6fcad38e13f61c6723a076 SHA512 3c7a9642f21fc21437468968ff54aeb958bec6251ef318ad6e27a689aebfde19c73a1c420d9a92bae0f6d63bbbb202106dad4a8199e14c066273ad2b6768008b
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-EBUILD bristol-0.60.11-r2.ebuild 1174 BLAKE2B 93f1e15dc42aff36b40d2d10d6e9b143a4efff9ce5b40d92ee4a90339a396b01756152e2735b7f05d5c6976be98e6fc147d04a27056c0980332389e27fe468a2 SHA512 a85e2434d5c7b42f1d8fd34286c5eec3ce000b5687320726f602786bb2871953125ab03144f87a38dcbe644e7601da643cd15613ebd16845dd57f02edcbc9e09
+EBUILD bristol-0.60.11-r2.ebuild 1197 BLAKE2B 880c8ab7d9de0830d221c803eea631404591310353b2e0650e56bb4ed9f258f6a7e19cb677aedb7386fc22d64a76c3cbaf5e6137ea378373f8f798bdec1f0f7e SHA512 4b0f8945bbf36824411176e918fe3f5f5cd4f1682930af298145ea6f82631a52091c5c97f1e7528bf25235564b9b8e854f3c6aca639b65f3d1bb9386ffee69e0
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11-r2.ebuild b/media-sound/bristol/bristol-0.60.11-r2.ebuild
index e5481dc9adb8..b23ac9b3f46b 100644
--- a/media-sound/bristol/bristol-0.60.11-r2.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r2.ebuild
@@ -40,6 +40,8 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export PKG_CONFIG
+
 	append-cflags -fcommon
 	econf \
 		--disable-static \
diff --git a/media-sound/bristol/files/bristol-0.60.11-cflags.patch b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
index ebce6f444fbe..86bedd6c7993 100644
--- a/media-sound/bristol/files/bristol-0.60.11-cflags.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
@@ -1,5 +1,5 @@
---- bristol-0.60.11/bin/Makefile.am
-+++ bristol-0.60.11/bin/Makefile.am
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
 @@ -1,7 +1,7 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -9,8 +9,8 @@
  
  #bin_PROGRAMS = bristoljackstats bristolnotegen bristolNRPgen
  bin_PROGRAMS = bristoljackstats
---- bristol-0.60.11/brighton/Makefile.am
-+++ bristol-0.60.11/brighton/Makefile.am
+--- a/brighton/Makefile.am
++++ b/brighton/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -19,8 +19,8 @@
  
  bin_PROGRAMS = brighton
  brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg
---- bristol-0.60.11/bristol/Makefile.am
-+++ bristol-0.60.11/bristol/Makefile.am
+--- a/bristol/Makefile.am
++++ b/bristol/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -29,8 +29,8 @@
  
  bin_PROGRAMS = bristol
  #bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol -L../libbristolic
---- bristol-0.60.11/libbrighton/Makefile.am
-+++ bristol-0.60.11/libbrighton/Makefile.am
+--- a/libbrighton/Makefile.am
++++ b/libbrighton/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -39,8 +39,8 @@
  
  noinst_LIBRARIES = libbrighton.a
  #libbrighton_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@
---- bristol-0.60.11/libbrightonC11/Makefile.am
-+++ bristol-0.60.11/libbrightonC11/Makefile.am
+--- a/libbrightonC11/Makefile.am
++++ b/libbrightonC11/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -49,8 +49,8 @@
  
  #libC11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libC11_la_LIBADD=
---- bristol-0.60.11/libbrightonX11/Makefile.am
-+++ bristol-0.60.11/libbrightonX11/Makefile.am
+--- a/libbrightonX11/Makefile.am
++++ b/libbrightonX11/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -59,8 +59,8 @@
  
  #libB11_a_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libB11_a_LIBADD= -L/usr/X11R6/lib -lX11
---- bristol-0.60.11/libbristol/Makefile.am
-+++ bristol-0.60.11/libbristol/Makefile.am
+--- a/libbristol/Makefile.am
++++ b/libbristol/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -69,8 +69,8 @@
  #libbristol_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3
  #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la
  
---- bristol-0.60.11/libbristolaudio/Makefile.am
-+++ bristol-0.60.11/libbristolaudio/Makefile.am
+--- a/libbristolaudio/Makefile.am
++++ b/libbristolaudio/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -79,8 +79,8 @@
  
  #libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@
---- bristol-0.60.11/libbristolic/Makefile.am
-+++ bristol-0.60.11/libbristolic/Makefile.am
+--- a/libbristolic/Makefile.am
++++ b/libbristolic/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -89,8 +89,8 @@
  #libbristolic_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  
  noinst_LIBRARIES = libbristolic.a
---- bristol-0.60.11/libbristolmidi/Makefile.am
-+++ bristol-0.60.11/libbristolmidi/Makefile.am
+--- a/libbristolmidi/Makefile.am
++++ b/libbristolmidi/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -99,8 +99,8 @@
  libbristolmidi_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ -lm
  
---- bristol-0.60.11/libbvg/Makefile.am
-+++ bristol-0.60.11/libbvg/Makefile.am
+--- a/libbvg/Makefile.am
++++ b/libbvg/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
index 0b7cedc9e29d..dddcb4a45aea 100644
--- a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
@@ -1,5 +1,5 @@
---- a/Makefile.am	2012-01-12 18:23:23.000000000 +0100
-+++ b/Makefile.am	2018-10-04 01:22:03.656483227 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -9,9 +9,6 @@
  	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
  	$(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/
diff --git a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
index 4f3ba054cd9b..93b329f4b5a9 100644
--- a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
@@ -1,5 +1,5 @@
---- bristol-0.60.11/bristol/bristolmemorymoog.c
-+++ bristol-0.60.11/bristol/bristolmemorymoog.c
+--- a/bristol/bristolmemorymoog.c
++++ b/bristol/bristolmemorymoog.c
 @@ -33,6 +33,7 @@
  #include "bristolmemorymoog.h"
  
diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
index 9d11b4f7d99b..3ac88b13ab29 100644
--- a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
@@ -11,7 +11,6 @@ Reviewed-by: James Cowgill <jcowgill@debian.org>
 Bug-Debian: https://bugs.debian.org/834180
 Forwarded: no
 Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c
-===================================================================
 --- a/libbristolaudio/audioEngineJack.c
 +++ b/libbristolaudio/audioEngineJack.c
 @@ -38,9 +38,6 @@
diff --git a/media-sound/cdcd/Manifest b/media-sound/cdcd/Manifest
index e195a0813410..cb9f7ad0cec1 100644
--- a/media-sound/cdcd/Manifest
+++ b/media-sound/cdcd/Manifest
@@ -1,5 +1,5 @@
 AUX cdcd-0.6.6-acinclude.m4 17866 BLAKE2B d7bbcd33769cf44324b7f29580b9967b6f0a2ff16ecac9a6eaaa1946d82912116a75f80c31fe071fc7a2e179bf6d276216de8f24ea735ed1ded19eccaec9ceba SHA512 c2011160ac6db7b73c495fd35f5bdd5284026a7d615a0706185cb0547b5f0ddd5107fee7e99e5026e7481b39f8440518e5ca8762580332b246a3410e960d4de3
 AUX cdcd-0.6.6-configure.patch 2032 BLAKE2B 4f18da07a483da2a197888f28813a347a8b003d30855d8aeec4506027897b22f22f6ec97eab01d33fb5f9791d35e6d2e7fceff2ea9981fda6ad56ad5c383b805 SHA512 2029f39b924473a33417fe4bf24419be010e1bd508e2544fc612b7db2aceedb4575534b69030d25e471118be6df4272121ddaa6e29b2ac93eda3dadb8189ecba
 DIST cdcd-0.6.6.tar.gz 246286 BLAKE2B 7f2f4ecbc0d50c441dc3933f222d5bda74246b1fd2e7716564adfb73fb373665bc175b2a501c67b6af6e01c881785f1736843845917d8c1c8e19b9929f457284 SHA512 841f2d7f85c81a8cc9e88bc13515959a911e22fe9cff7fd272bab63fccb3e6bbf44e9d66fc2524f1670da20568d6e10434de8143a5e94fc576c7193b4a68f418
-EBUILD cdcd-0.6.6-r2.ebuild 637 BLAKE2B f40154d0d30e35c7d6fa5a1260bed86039197d7ec30ec1e8a50f91292e8286d9977798e002c3f6a2daa59fe025db7ae78debbff2529c9d0f9ed97110db8f3635 SHA512 99813a966aeaa4793070de78a4cebb10c4ad98e4f0710ec99298ff446489cc4d7af9ff174f0ad3a32d84d7ec9597c00413de030a5b30bbb519dfd056174fd3c0
+EBUILD cdcd-0.6.6-r2.ebuild 634 BLAKE2B a27a2f259ed4f000ae0d071f69ce225a19c51079f34971c567b54b24b755cd082b3785974a4c8e665e9c71aa2db917e9eb3fa50ae6ead409057a49b2351bcd06 SHA512 444b6389ebca3f886146c6e574f5cc4d35b6334d7ceb6d48eb2d40fc5932b80ccfd2ace49c2cea72918838a6760b8dae861398a961f5b77107a56058f8d8d612
 MISC metadata.xml 333 BLAKE2B f6d68462d464a5a381a3a09aa96646ecc510b0e0ddf855588b94ca2662caa4bf17112d57741d5e4b013b43ea621d856bc000c62477cc9c3273f23a6ffe2de7e8 SHA512 5ac86238b0db4069b133127f007fec468f87847cb219dc0c5dab8df5544a5e515057b4c44f44dfa843b5b81a62141a21352dec9e9a0fec98c300e9e9509cd034
diff --git a/media-sound/cdcd/cdcd-0.6.6-r2.ebuild b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
index 6f47ecb006f0..e25183b173ae 100644
--- a/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
+++ b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="a simple yet powerful command line cd player"
 HOMEPAGE="http://libcdaudio.sourceforge.net"
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index d85cb27f0f04..65fea4bf7e12 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,9 +1,10 @@
 AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e734750c1b8a6591459bbebe582fa5a6e632c17d45a6d05e0f58a18ed20432efcceb36e9c3f057e79770eb5db0 SHA512 6333c5d5700985f4a9b0996848409a4f149a70d2e32ce0b0132ac4044e46ca763c037c26e2a886f30c1a439b60619a21a398583d184f513dbca581a878bd0754
 AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4
 AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
+AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
 DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
 DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
 EBUILD cmus-2.8.0.ebuild 3784 BLAKE2B edbbfe140b7c6adce8ae96a5e6d53db118ca7492f37388201fff09cfe0fd0acd56ec6e8adc90b3455a722c731dd0e7b301a4f975be60168928fbd427fb7f0620 SHA512 2357fdfe2a83b2f70bbfcb1debdd3ded1de6e4d0bafd28f414e241a54ff9dda3661c2c775c11bf76b05b129cb2b3d3cc72a6d17e1777dffcd22b6a47c59a5202
-EBUILD cmus-2.9.1.ebuild 3665 BLAKE2B 7d943436e815db5cfc4f8aefd1183220f92f002f294392e6b6edaa58398bc9e6742435fac718f15cb6fe3a5b2d42fe9f2af2cbf0b8b3debe6aa2d36811e6d199 SHA512 82d8caabb8c593351c3c86018a5ddfd236f3d402d024c77b9554372d695426ab1bafda00e4768237806b60c9455fbca14e6fc76c84470c823f2bafe23486705f
+EBUILD cmus-2.9.1.ebuild 3707 BLAKE2B 9869337af55de189c81ab7feac24a85b7cd26490f4001cf0c85252c273daa1892ba2430eba8575222e2557d6ef1393fd6f3b7ac534566df24af489eb910961ea SHA512 d300b346f2a1cfe78cf1e4d620b11542fdfe80214005b78b06a3805cafe4ac38e2b0d6820c01af1323422ad0267a3d6fa97c740627fdd1e381927f078f9aa431
 EBUILD cmus-9999.ebuild 3665 BLAKE2B 89772a1e4c3881e11d82700c5b5db08f50dad18e45a9e1f3107b6b56ea76cef167313dc3b16175bdd50574725d5c902d5b0ea28f0cb61bca14da5096261eaa6e SHA512 0de2bc5ccd53eebba4576a7679a40f8afba4089768663477a6f5448fb2efd3cfb208c94fdbbe776c6273b93f2b87d9325f22f7e32dc5d5f6bdb33b638b870ade
 MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962
diff --git a/media-sound/cmus/cmus-2.9.1.ebuild b/media-sound/cmus/cmus-2.9.1.ebuild
index cdf68feabd80..92687b137803 100644
--- a/media-sound/cmus/cmus-2.9.1.ebuild
+++ b/media-sound/cmus/cmus-2.9.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
@@ -67,6 +67,10 @@ DOCS=( AUTHORS README.md )
 
 S="${WORKDIR}/${P/_/-}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-atomic.patch"
+)
+
 src_configure() {
 	my_config() {
 		local value
diff --git a/media-sound/cmus/files/cmus-2.9.1-atomic.patch b/media-sound/cmus/files/cmus-2.9.1-atomic.patch
new file mode 100644
index 000000000000..41941a31b785
--- /dev/null
+++ b/media-sound/cmus/files/cmus-2.9.1-atomic.patch
@@ -0,0 +1,11 @@
+--- cmus-2.8.0/Makefile	2019-01-29 09:09:08.000000000 +0000
++++ cmus-2.8.0.new/Makefile	2019-06-12 14:34:13.000000000 +0000
+@@ -21,7 +21,7 @@
+ FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample)
+ FFMPEG_LIBS += $(shell pkg-config --libs libswresample)
+ 
+-CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
++CMUS_LIBS = -latomic $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
+ 			-lm $(COMPAT_LIBS) $(LIBSYSTEMD_LIBS)
+ 
+ command_mode.o input.o main.o ui_curses.o op/pulse.lo: .version
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
index 1dce0789c603..9ede07f8f9f9 100644
--- a/media-sound/cmusfm/Manifest
+++ b/media-sound/cmusfm/Manifest
@@ -1,3 +1,3 @@
 DIST cmusfm-0.3.3.tar.gz 37553 BLAKE2B f266d83edbed960d8c466cba80ce57d645c5c9cdfceac27c29d0ef424c8135f22377dc0490462d3107dfcfd32ac9d15fa6142269b453c8a80818da9bd10a28fd SHA512 6537905bdf09d04f09783237997536a1ee231ee4e589826d87f435c0dd7542dbd7d97167990bf949d2a9eb73c4a9a4da1bab17888de0aecedb2a63deaa873f39
-EBUILD cmusfm-0.3.3.ebuild 840 BLAKE2B e8f63cc66e0c89d19fe660b9b8dd9219262bc8fdd2540b65ff65ebdb4dffffe2f87293d4cb4752e50bd2056eeba3bce444bee134aaf3c5f92a2da98f5ecf7e9d SHA512 a5f8add218d22e8a95b4bac4fd2fba6edcfd0f6e1ab6c647f1701671c3ee0ec6984905160dc4a8ee2833149022224cc7cb1fcf20b7b594f9c69889f301e87d1a
+EBUILD cmusfm-0.3.3.ebuild 832 BLAKE2B 355c8cb22b1627e5dfe44e6296902ba06cc934ee7efa0433d9c784960d3a1149fd965ad8d1e1c7812183f9e7812459244ce7479196d888d5d9b5c36d5498b8f0 SHA512 4f3e1e873c7cac0ec11a4fa2387e6bb10bc443e6fc1c54a600e90ba820f08f43343f11aff5d726271aed21af171ebbe36edd1cd66376e48ab428b5087ef04084
 MISC metadata.xml 339 BLAKE2B 6a18cee3e017ee1e67fc035e63bcf5248a175a2e116964467f8f021e5b3f49606dbff1cc7aeb472e81d4f44c767e077b24fcd9f533868f0c4332f8d6465ec961 SHA512 78c63eceb28e387d635e34fe4800d0af9e30fd5ba4687955bb5383bd8ff4c9e3573d200ddcb36f3efd16d732cc6d7ca48c59381826ea80f6791a0c31da91d08b
diff --git a/media-sound/cmusfm/cmusfm-0.3.3.ebuild b/media-sound/cmusfm/cmusfm-0.3.3.ebuild
index 3a2f2d2e87bf..83f80380a2a0 100644
--- a/media-sound/cmusfm/cmusfm-0.3.3.ebuild
+++ b/media-sound/cmusfm/cmusfm-0.3.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools readme.gentoo-r1
 
 DESCRIPTION="Last.fm scrobbler for cmus music player"
@@ -13,18 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libnotify"
 
-CDEPEND="net-misc/curl
+DEPEND="
+	net-misc/curl
 	dev-libs/openssl:0=
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	media-sound/cmus"
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+"
+RDEPEND="
+	${DEPEND}
+	media-sound/cmus
+"
+BDEPEND="virtual/pkgconfig"
+
+DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
 
 src_prepare() {
 	default
+
 	eautoreconf
-	DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
 }
 
 src_configure() {
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index e16819218fc7..ecdd2e74a789 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,9 +1,11 @@
 AUX csound-6.13.0-xdg-open.patch 982 BLAKE2B e6643fc554feb8b0fd4cbb4d96e6ca727bf04da998b61df515e090fc0784ce9c2fbe0b67ce45da83d36838cc57de6de5f176d38c322b1586264a527b1b44fe09 SHA512 e141beafdd2a93bbd7bd0a12c71e1dc3ffd2c67558c3e7e47a24298aefe6197bbde179d2bfc7e82e78bdffac1c889d43789a17e364785e9892bd35306fa07c6a
+AUX csound-6.15.0-fix-soname.patch 814 BLAKE2B b288dbb48eff8691ff5a35ca3cb9afff0a7b8213c163055081c46e1c190cebdbab9cd1c9d25763d0ee2ba9d283fa02c7e8a72c09abda127af1c1109e11aaebc5 SHA512 5ca3234911fd59a512047c966ef3478e70df3cd10846ec9f297d4112109563b79f1862ab602a7a1b17a6ddba880cdc240f97ae578889d731d2bf8dcd1f09117b
 AUX csound-6.15.0-lame.patch 737 BLAKE2B 5febfbd58a9f4591f2ac06fbdc311552d18153cec7d3f5923d14319eea02ad69d75277aaa75a06ad02bd23d2d24a9913f7bb9719456ef98c487e93091b841278 SHA512 2e71e5c46b78e8867257ee86e70072f3c2e7f6021e67d0a3381cbc8226cb7deb023b8ffc1d047628ec527da6fc383a55ce310402c5ecc2696ff36250ecf7081d
 AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
 EBUILD csound-6.15.0-r100.ebuild 7242 BLAKE2B 1bd143e32a403c31a56a60418a081494538ffe642ec17674ecac1f0f9bc88bf21152a1c37e2072cbe658b0e7797e9d4bc2c7ed07c40b69b2b10b9345543cafcd SHA512 fc4835b16a97ba2a78666389361322cfb8b494fd6b992824a6a5e7ca6450ce9ea0a3d56c4460c29831b574689e67eacb5c070dd07667cc180faeddf9aabf2eb9
-EBUILD csound-9999.ebuild 7006 BLAKE2B e04db3e22b004426fe8978a751d81aaac3d25e2930eb1f48e3335801f84afd8a31b7a2f6afe6d63bce836d7e0c1f36ba2164853c6ee92199425c603c5eb9b2d2 SHA512 5312299ffbfc9971c55b479041d5ae2ffdef6138cffcf79e72a7713f1bad11a1ade280118993bd0733770986500c9b03848bdabce9f934e069cd07ad7d2c86ff
+EBUILD csound-6.15.0-r101.ebuild 7402 BLAKE2B cb961c72b5876d8894b30fac74ee3bd42b3f023e8b9319be963adb2e1fa0a7bf6fddc820404330f7fa2c1bc59c642814b18c6535b7cf0a9f5fc62513867be28e SHA512 74820618ce311412b7a17b5b842f0b7624d8f5dd410ff07f689c0abcd567475ebbf3ef0f10afd5599189221ce5adf9cee41c27f5d4872aaf3fa8860c93e9b2d3
+EBUILD csound-9999.ebuild 7114 BLAKE2B 881fa5a0828fe1374c706f0a1cbdc02f711512e009c4628a171a5630bd50f2e1a49db924034d7b5a607ecda027417790a9e881b1b62d14f7b1392779c0530a60 SHA512 f02323ac78b0a30a7a0e6048036085ee5a1dfb97b4cc70c99507e55197917c43ffb0367ccd52922eb286b629acda342e499ec5f0a874b5dcb4f1234d17bedae4
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.15.0-r101.ebuild b/media-sound/csound/csound-6.15.0-r101.ebuild
new file mode 100644
index 000000000000..6705f7c34293
--- /dev/null
+++ b/media-sound/csound/csound-6.15.0-r101.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound${PV}"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+	alsa? ( threads )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( ${LUA_REQUIRED_USE} cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+CDEPEND="
+	dev-cpp/eigen:3
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	hdf5? ( sci-libs/hdf5 )
+	image? ( media-libs/libpng:0= )
+	jack? ( virtual/jack )
+	java? ( >=virtual/jdk-1.8:* )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( =sci-mathematics/gmm-5.1* )
+	lua? ( ${LUA_DEPS} )
+	mp3? ( >=media-sound/lame-3.100-r3 )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	stk? ( media-libs/stk )
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets:= )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+	"${FILESDIR}/${PN}-6.15.0-lame.patch"
+	"${FILESDIR}/${PN}-6.15.0-fix-soname.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use doc; then
+		local png="${WORKDIR}/html/images/delayk.png"
+		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_COUNTER_OPCODES=ON
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CUDA_OPCODES=OFF
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FAUST_OPCODES=OFF
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
+		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DBUILD_INSTALLER=OFF
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_OPENCL_OPCODES=OFF
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		-DBUILD_PADSYNTH_OPCODES=ON
+		-DBUILD_PLATEREV_OPCODES=ON
+		-DBUILD_PVSGENDY_OPCODE=OFF
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_RELEASE=ON
+		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
+		-DBUILD_SELECT_OPCODE=ON
+		-DBUILD_SERIAL_OPCODES=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STACK_OPCODES=ON
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_VST4CS_OPCODES=OFF
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DBUILD_WIIMOTE_OPCODES=OFF
+		-DBUILD_WINSOUND=OFF
+
+		-DFAIL_MISSING=ON
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DREQUIRE_PTHREADS=$(usex threads)
+
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_AUDIOUNIT=OFF # Apple specific
+		-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COREMIDI=OFF # Apple specific
+		-DUSE_CURL=$(usex curl)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DUSE_FLTK=$(usex fltk)
+		-DUSE_GETTEXT=$(usex nls)
+		-DUSE_GIT_COMMIT=ON
+		-DUSE_IPMIDI=ON
+		-DUSE_JACK=$(usex jack)
+		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
+		-DUSE_LRINT=ON
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+
+	)
+
+	use java && mycmakeargs+=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
+
+	use lua && mycmakeargs+=(
+		-DLUA_H_PATH="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
+		# so it must NOT be installed into cmod_dir.
+	)
+
+	use python && mycmakeargs+=(
+		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r Release_Notes/.
+
+	# generate env.d file
+	cat > "${T}"/62${PN} <<-_EOF_ || die
+		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+		CSSTRNGS="${EPREFIX}/usr/share/locale"
+	_EOF_
+	if use stk ; then
+		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+	fi
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED}"/usr/bin/{,csound_}extract || die
+
+	use python && python_optimize
+
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index cdc5d7cf5933..f0b572659996 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -244,6 +244,8 @@ src_install() {
 
 	use python && python_optimize
 
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
+
 	# install docs
 	if [[ ${PV} != "9999" ]] && use doc ; then
 		dodoc "${WORKDIR}"/*.pdf
diff --git a/media-sound/csound/files/csound-6.15.0-fix-soname.patch b/media-sound/csound/files/csound-6.15.0-fix-soname.patch
new file mode 100644
index 000000000000..7bac87082565
--- /dev/null
+++ b/media-sound/csound/files/csound-6.15.0-fix-soname.patch
@@ -0,0 +1,21 @@
+From 20daf5f4edbbf7291ad32dd623a335be1de0c54f Mon Sep 17 00:00:00 2001
+From: vlazzarini <victor.lazzarini@mu.ie>
+Date: Tue, 13 Apr 2021 21:04:05 +0100
+Subject: [PATCH] issue #1449
+
+---
+ interfaces/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
+index d72c4ffdc6..3da25b627a 100644
+--- a/interfaces/CMakeLists.txt
++++ b/interfaces/CMakeLists.txt
+@@ -216,6 +216,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
+             ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR})
+         if(${CMAKE_COMPILER_IS_GNUCC})
+             target_compile_options(_jcsound6 PRIVATE "-Wno-error")
++             target_link_options(_jcsound6 PRIVATE "-Wl,-soname,lib_jcsound.so.1")
+         endif()
+ 
+         install(TARGETS _jcsound6
diff --git a/media-sound/daudio/Manifest b/media-sound/daudio/Manifest
index 6d31da7a90c2..bf40b18acbe4 100644
--- a/media-sound/daudio/Manifest
+++ b/media-sound/daudio/Manifest
@@ -2,5 +2,5 @@ AUX daudio-0.3-makefile.patch 1683 BLAKE2B a1b54557e238fbe0d727948a0594e1e142d85
 AUX daudio-0.3-qa-implicit-declarations.patch 1980 BLAKE2B d31a67d6234c667e726907cdf41f18b2ea0e7dbf88d0a13fedae9690327fa6450f3bd2d3f46b5f387997e1dbdf0c40a910026b2260b0c1dcda9cd1c74ef3602d SHA512 0da091005e36825ef0f35e4029e48781a23d2c8ab00af33528de4999dcb7d2e98006b2623852ab7cadd6e129d1847a6a85f8f60b7340c755939d9fa45d094a5e
 AUX daudio.rc 425 BLAKE2B 6859ce9adb4668ce7528f9371272dfab206f2bb4880819995634b88c1c3902edbd49c3e84ceb8c4abbec84be5cadb547ee44e9ed462cc27ee928060d2c738a6b SHA512 c6f816faeac497e31365d9bf7b2c37c4c8688d88820c0dbc9e4819be13119e477cc3aea2fe3ca249d82b8d84ebb485d9516f0b93180a7c756d573dcb5f1e1900
 DIST daudio-0.3.tar.gz 76683 BLAKE2B da8c674be38224153af26b6a690a0fe23c4d24e90422260799657ff80242d2c8baaa2de85603d68e8daf6e880335fe84dc7467f10571590814b647aa65f88e9b SHA512 63266348c8235b09efb6958646b003a5e7ae1cfd7d97aeff928ed8e7b9ffc71666c0bcd93ee89db6c28cae5019056748631e9fef850ebf6ead7aefecc3037e3c
-EBUILD daudio-0.3-r1.ebuild 946 BLAKE2B 001e0764f96e459eedf70039a71023c97fafe6b685bc723b758ee6d71ee8cea9c263fd16075b3e53b92061fadc785a354bf7aa360f89ec8cddb666838e8a041c SHA512 ccf77eef1f59b3661bb9443c55ba426e4ef99ef2c5272af479e0db2bddffe17f4cb1ed8880fd84573b57a8254712d4baf024c720f4143b3bf883aab3a77eb9d1
+EBUILD daudio-0.3-r1.ebuild 936 BLAKE2B 754573797a29b6ad8eb510e2e77ac1ba9f2ebb0c1a6a39a6ad60a67e54882e5d10a3cc2fc604abaa5865f06f44adac377681e1d7ec64d77c1663749561f24e78 SHA512 47c7d41b0acc85ea817bdad219f94566718e6b27c4a1f955d825868692962f23d52c441d12e897c5007b7c9302ae3967fd373233b9403239b0ab7f5608f4bdd3
 MISC metadata.xml 329 BLAKE2B 9a26b25b40d8702df3be285a8e3c2fa668929c66427e1a5e7d2c76d95dd9a2c178ad12b0edb56139ba36e6aa58ebb80eb4c87069b88faab69b045d0cdfa4e4f9 SHA512 d17c82265b7361ea26bca0ac2c07221502942ca5c90386ded0b208f54d8f98f326075ef2624c0be275187f2e54778094de123be64705d85e9f8c6b589b962054
diff --git a/media-sound/daudio/daudio-0.3-r1.ebuild b/media-sound/daudio/daudio-0.3-r1.ebuild
index 9acf3de2df18..88cd0bcb1e04 100644
--- a/media-sound/daudio/daudio-0.3-r1.ebuild
+++ b/media-sound/daudio/daudio-0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Distributed audio on the local network"
 HOMEPAGE="http://daudio.sourceforge.net/"
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index bc679a76a089..682f8358b475 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -2,5 +2,5 @@ AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7e
 DIST deadbeef-1.8.4.tar.gz 13049446 BLAKE2B a6c052b3b0aa1f74b49cf29be94e235d3dfd3d3f07ed9e1d05a4fc32036e591633eaff4ab59329cf6895828c9a674eec86b62e4818784db5f8e47eed089c80eb SHA512 18c54ae2c7931419ea06f3eb581cc8e704fa6eb87d330fc09f7295f4a8ef6e88b6f8c314223c34c321cd2a54f14cb6911add41602250c39c1b1c1edbf64d63b7
 DIST deadbeef-1.8.7.tar.bz2 5029039 BLAKE2B f6ae0d664553435fca566593d715f8f9fab13711bb0e0488c80b9c7ff88a28425d1e3de2ee4c57b87722705c5ede53e0390b81cdbe6ce804d781dfe934dc21e9 SHA512 49a9610f8aa8d9853cd4f9a38d103f9a902993a5ae1990937a3ac5a14a4f8533f4233002893875aedf45f737d1a95c7cea189c61d6387bd8be7f3535d60c96eb
 EBUILD deadbeef-1.8.4.ebuild 3646 BLAKE2B c2c4363e5e6f3e319bb6c69a7d94abdedf4a18edad70a7a0c537184715193f81670ad9e82df87429a7b7a90061f7b639f90447a182da1a231cd6029de57e6c46 SHA512 2abd44b486596e15ca79fcd7b6f7c9fbe1b6f037d5fdfa49afe0e6af771c7d26e36d3d2190b6bf63d6101fc38e21d787a76e9832c3df7d704a051a47cef31662
-EBUILD deadbeef-1.8.7-r1.ebuild 3986 BLAKE2B a11b7425de25d40fd4245d16fb1ad2c98586736c62dad67141b242619724582b63c94b3da03a22acab7f228255abd47b686879007747cb4a9467343d23cb2f73 SHA512 df1b8647ad68e47ece5176ba0238190e0cab779b07709664068244f504a1aab68d49a8267e6d296e217bc1418a9aebed7b6b084b07a18734294c2f922eaec6ad
+EBUILD deadbeef-1.8.7-r1.ebuild 4005 BLAKE2B 113c03c9486d6d1d6090870aefe2921f97ec7e40a8821796171b8641214ce7489f6a3bc36a019a11b236dfc23d0e09a13509fc07a2573af9cc6918ab3d5dabf7 SHA512 711ba2d4eaa6e2828bd56f9a4ecd5b35697397cf6e0f5960d86e86885d5681a978cb51869742222c66ebbf8baec3e119f124309bc7b3b11876f4081d9d623082
 MISC metadata.xml 832 BLAKE2B c3eaa58304b47d9b0f5b5c4fa4acae25059168b8fe701c6d6026b29308c83701c48fe94af352143cb0c6f395345bb603aeb0e4caa1dfda0569b15596c983f2e9 SHA512 233a07eb726d61324a0794d4a2dbff75c99b33a9b57e10fc6ebc46fa0e029ebf7191d2241b2f45cdb8fc95fdb0d8046e1420a98c7263b57561e5055472b032cd
diff --git a/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild b/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild
index 57149d1c35bf..0129a5cc488d 100644
--- a/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild
@@ -60,6 +60,7 @@ BDEPEND="
 	sys-devel/gettext
 	sys-devel/clang
 	sys-devel/llvm
+	virtual/pkgconfig
 "
 
 PATCHES=(
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 7d5fb4509627..4e91eb389b94 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,5 +1,7 @@
 AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d29bf9a7792a4b212124985367c8cf1c6ae5d71682e4474a3ebe1c8c9602565ba4b908156d4bdd4db2b2745c627903034a5f7f74cdecfad4b106b4685e8bddef SHA512 6fc4ece49940d0f4beaecd0c2f218516e0bac14979fbce1ad25454b5075fc5eb29873c93ff3930c7e6214643a47bbe55408ad258859f973a0b5717b67456340f
 AUX denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch 2103 BLAKE2B ebb91ff4df71ec412ff881cc2443c7a071ef105ba180ec72dcf61cdd5d5fb97070deb9b9a73e49a133e746a9c159a6ff8c93640784047a5792a97ceae674aed1 SHA512 74f02aa8801ded5bf1c33f7bfeb38db258ba924241e72be05c5e7784538f0eb4d72a88e0b810b5b8b1c96e95d27b135b6fcf3fea8f7a9ebcd9ee0652e3b6560f
 DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
-EBUILD denemo-2.3.0-r1.ebuild 2979 BLAKE2B ef184232adff0cc1119acc79244b8637a8ccc39953bb93018078595a286618e88f787c9e2ca69da31c81af9c310a602d12843b44cc04486e0a9c905106f64d99 SHA512 7ed1ef229552d8d279bee4207563446ab6915f7033565c6149ed92e9097ec81d89afcf0db6dfb77fc7372bd7eb9517126d8b0ed97c8e61ac82eae3d4352ae6f2
+DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e
+EBUILD denemo-2.3.0-r1.ebuild 2977 BLAKE2B 636fe2171f0047f4377ea349059e5222b47da692e18b10aab44ffa7f8c37218136f0b4654304284cb2e8f2de3d6234ba7a4ee626cc7afe277fb0b22880d209a3 SHA512 ba1f78313cf50f77cab4923dd11b160aae49d15de9295db7c185d2bab070a20e26ab48b6379aaaf6d121339d165edba9a7cb5c17d2032b43737e2c614221e4f6
+EBUILD denemo-2.5.0.ebuild 2878 BLAKE2B ca4fcff445b067bcd7aaefe778452077561a3668b337f065cd9e9eec4fa570a92c7fcef16983007f1b5c03912f30a485f48e4c65dd952b7f26717e941a511069 SHA512 388671d79d87fdea16da2760d71bfdf727178fdf3907c627aa8b52c39176017f4a042eea4f5fe3dd48760ef77049afa66e3b8d249578f62335b745bfbe71e4be
 MISC metadata.xml 1304 BLAKE2B c2d8fec0a0692500d9ca52e8380a3e0c81a3ee31505c06d648521a78d1bcdc2066d251f972c0e12c893439d0d3b093766c1954f2cc7c127edaf4dcfade79408b SHA512 67fecffa9ac7a3078447c7dd32a8caae6eb531e9c9c6b29d42802d72c2f2e5ca3de3bfd0d5a23eac3aff720b366377c1cff355da02672ddca448842b5aff8fe0
diff --git a/media-sound/denemo/denemo-2.3.0-r1.ebuild b/media-sound/denemo/denemo-2.3.0-r1.ebuild
index 4924eed28572..8c30d94ce54e 100644
--- a/media-sound/denemo/denemo-2.3.0-r1.ebuild
+++ b/media-sound/denemo/denemo-2.3.0-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://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # configure options currently not used:
 # --enable-mem(no) memory debugging: needs Electric fence (efence), which
diff --git a/media-sound/denemo/denemo-2.5.0.ebuild b/media-sound/denemo/denemo-2.5.0.ebuild
new file mode 100644
index 000000000000..12395aa35c66
--- /dev/null
+++ b/media-sound/denemo/denemo-2.5.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# configure options currently not used:
+# --enable-mem(no) memory debugging: needs Electric fence (efence), which
+#		is not available in portage. See https://github.com/boundarydevices/efence
+# --enable-gtk-doc-pdf(no) doesn't work
+IUSE="alsa +aubio debug jack +fluidsynth gtk-doc nls +portaudio +portmidi
+	+rubberband test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/evince-3.22.1-r1:=
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-2:12=
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	>=media-libs/libsndfile-1.0.28-r1
+	>=media-sound/lilypond-2.19.54
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0=
+	alsa? ( >=media-libs/alsa-lib-1.1.2 )
+	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= )
+	jack? ( virtual/jack )
+	portaudio? (
+		>=media-libs/portaudio-19_pre20140130
+		sci-libs/fftw:3.0=
+	)
+	portmidi? ( >=media-libs/portmidi-217-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.25-r1
+	>=dev-util/intltool-0.51.0-r1
+	>=sys-devel/flex-2.6.1
+	virtual/pkgconfig
+	virtual/yacc
+	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	nls? ( >=sys-devel/gettext-0.19.8.1 )
+"
+
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die
+	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
+		-i Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--disable-gtk-doc-pdf
+		--disable-gtk2
+		--disable-installed-tests
+		--disable-mem
+		--disable-rpath
+		--disable-static
+		--enable-evince
+		--enable-gtk3
+		--enable-x11
+		$(use_enable alsa)
+		$(use_enable aubio)
+		$(use_enable debug)
+		# --enable-doc does nothing for itself
+		# basic html documentation is always being installed in the
+		# /usr/share/denemo/manual directory
+		$(use_enable gtk-doc doc)
+		$(use_enable gtk-doc gtk-doc)
+		$(use_enable gtk-doc gtk-doc-html)
+		$(use_enable fluidsynth)
+		$(use_enable jack)
+		$(use_enable nls)
+		$(use_enable portaudio)
+		$(use_enable portmidi)
+		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# make check fails if used with parallel builds
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	# link html documentation installed in /usr/share/denemo/manual
+	dodir /usr/share/doc/${PF}/html
+	local f
+	for f in denemo-manual.html denemo.css images; do
+		dosym ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+	done
+}
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 8325c14e987c..a82d277a5586 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,7 +1,9 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
-DIST din-49.1.tar.gz 3677087 BLAKE2B 7b696597327493d354c5efd31df243c70f23ec8d68514892c79212b9d3d398c7debb28ad95b6ccb04dc76ac0a9b01ee57d8245260dd4af99cd3f3b27bc2ecbcf SHA512 8f72fd1dce7197135e174bc8c4fb5325e7755e656d7817bbd82c964083ca48b0b5cc939472acf3464fd0404631767bbea1f20b7dea073b6829582e76d2879e04
+DIST din-50.1.tar.gz 3684686 BLAKE2B 3d73f31f91a57188b63f1f5fc9a68923c4fb6d9a14cbfd602510d0006ff4079ab60865e49118a02e46381aebd4cc4ee9415172bac724f8491655326147b6466b SHA512 c860c70bb9f3c3db66e05dd9f9048daecab1b0c9d0588fde901ce26723e291b56d23086f792180fb5fc688165e4ed7efdc302d0d3d02efa913be5f2d4a90f5eb
+DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498
 DIST din-50.tar.gz 3684789 BLAKE2B 31efae8f031e41b04d0e1cb9dea011572b9516ed9962687d863b5cd2f77ec409a9dc6b449a299869a89abc554e673aa05bae1350a06cc850b898b878c02e8daa SHA512 58796353df9180dc6b12bfe71579fb3dd2d7ab029dc5f8d09b4f8a3cb6938db054702dc4c7344b8d8852926e052f9bdf304b9a71e3d8faa9c6a209ef0b94ff4d
-EBUILD din-49.1.ebuild 1080 BLAKE2B 36e9fa12d77c754afe7bc74ba7ded2e2b30b6cda8dc2181b2348268499be0b015d3508420248918f80ddfbf4f6075eb54b39d574aff5f3c897073bafa27a5a2e SHA512 67bf71cc6c1ba1529173e992d79889627473163f74649fe694171fe3fd064d14aea4d17c78272e8409692299f4cc8f138dde535ca537f5b42e41d38a3cd8a369
-EBUILD din-50.ebuild 1088 BLAKE2B 65769a94489db13d04bef01362d880a26001cef3d710984bba9296ae87864e7c513fe1d5cde9d9e688b339f9f67911c411f0dd308199058051b8ef7c3c98728b SHA512 628f076dac522c08477b053f4a9b9df62b9593e4ae8cd0b25425ff1854d56a2cab20dc2c17d91366f519e8747a25a4968218689239eb3b198460c7bcaaff34d2
+EBUILD din-50.1.ebuild 1091 BLAKE2B c2792343dcaac7ea57369e6fe6034473d52564d63a48cdb4bc6a70e04cf049656151a8d51243ad781ff1d750395c83d2b20b337bfe2deeeb35353d5752adea35 SHA512 56a9fde6a578462cd93c2bff23fc0f0ea1a1aa80faf0aeff5c48201588c7e17988817eef39717eb3ef5dff10b0673ec135698ed556b08761ffe35361c55e36ba
+EBUILD din-50.2.ebuild 1091 BLAKE2B c2792343dcaac7ea57369e6fe6034473d52564d63a48cdb4bc6a70e04cf049656151a8d51243ad781ff1d750395c83d2b20b337bfe2deeeb35353d5752adea35 SHA512 56a9fde6a578462cd93c2bff23fc0f0ea1a1aa80faf0aeff5c48201588c7e17988817eef39717eb3ef5dff10b0673ec135698ed556b08761ffe35361c55e36ba
+EBUILD din-50.ebuild 1089 BLAKE2B 7a526c3bdf99968fc2f4a252ce75e5d5010a40692eaa82aec6496ecd456b27386ac79e5bd99c0d17ce346eb98b4ebcb3ed74e3a89f475ef5b0ed1e0d30e38ad8 SHA512 bf941efa5b4983f111814938ec3f0e7bf3520f2b5efad146bbadfb8be3d69db873d476e1781d87ebd8f75da94eed2ebbbff2e94c055e69358f6eb4c8c2350f36
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-49.1.ebuild b/media-sound/din/din-50.1.ebuild
index 6872627e7dcb..4d68ab765afb 100644
--- a/media-sound/din/din-49.1.ebuild
+++ b/media-sound/din/din-50.1.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 eutils xdg
+inherit autotools edos2unix xdg
 
 DESCRIPTION="a software musical instrument and audio synthesizer"
 HOMEPAGE="https://dinisnoise.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+alsa jack"
 
 RDEPEND="
@@ -33,7 +33,7 @@ BDEPEND="
 REQUIRED_USE="|| ( alsa jack )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${PN}-49.1-makefile.patch"
 	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
 )
 
diff --git a/media-sound/din/din-50.2.ebuild b/media-sound/din/din-50.2.ebuild
new file mode 100644
index 000000000000..4d68ab765afb
--- /dev/null
+++ b/media-sound/din/din-50.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools edos2unix xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="https://dinisnoise.org/"
+SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	media-libs/libsdl:=
+	virtual/glu
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-49.1-makefile.patch"
+	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
+)
+
+src_prepare() {
+	default
+
+	edos2unix pixmaps/${PN}.desktop
+
+	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
+
+	eautoreconf
+}
+
+src_configure() {
+	# Jack takes over alsa.
+	local sound_engine
+
+	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
+
+	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
+}
diff --git a/media-sound/din/din-50.ebuild b/media-sound/din/din-50.ebuild
index 4bb7444159e3..f2a1cb085d4b 100644
--- a/media-sound/din/din-50.ebuild
+++ b/media-sound/din/din-50.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils xdg
+inherit autotools edos2unix xdg
 
 DESCRIPTION="a software musical instrument and audio synthesizer"
 HOMEPAGE="https://dinisnoise.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index eb6851ed972c..f561406bd289 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-2.0.0.tar.gz 1865424 BLAKE2B ee87dd222add121c8a6faaac5b8a755e2d6f7b257db890f6bbdbf5380d9771dc5b65a73d716f0cfd343a46c4227adcd2d85e4a359fcaa445b2291dc1ac188cfe SHA512 aacb4ca5a3354da6380ba146ee7ba57e646d19fe6a5d083e00b795221453a87d1baf25965784e7c8a97b9b00a3dda643bce144f62b6a27118f081c681089381a
+DIST drumstick-2.1.1.tar.gz 1959938 BLAKE2B 010072faac3819d326659421d7c2c32345f8f5cf3fdcf390b80f57f942e786d569feb19319eca21ca5346ea1f990f54353afc52ecad4fbc6b631065e7b3ed751 SHA512 764b2db79f49f1ab428f472a2f4715c1ab5a9d948af43c77befc2e758b43c604673c7c0c39779a63240a31d6169f648a8c67680c1a42891c6a6cdbd2a481f557
 EBUILD drumstick-2.0.0.ebuild 1557 BLAKE2B 9c5e9e54433e49d8af60c992c3779ade767b5ba65176f324ba6639709687af037a4ae2107c1d1fc769d1df9c04c03065fa50187afa73fe4faec2b97b94a22f23 SHA512 fa95c6d86aeecfc4d2f895c5d671776d304481d7c3a96c256a39475ae03446e65a4d18f78ee8bcecb7d629cfb323092bc606236c944f3af9922bbe561c622a35
+EBUILD drumstick-2.1.1.ebuild 1476 BLAKE2B bd05362b139984277adfd03d982c2cb61bf95d34b2e85291c92ae42b0220c74066b8adcf0cd88287b7fda2a18a69783c4409684956e3b09a852023008c0bd438 SHA512 624cb7035c87f78c225d282bec57887d6bea741732d7b758f5f4a8e8781ada342ae4d0599fcea1476c66fe27b59befd98f0c0a7916ca2ab5ebb3d8283e68c9eb
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-2.1.1.ebuild b/media-sound/drumstick/drumstick-2.1.1.ebuild
new file mode 100644
index 000000000000..1459d1b265ae
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.1.1.ebuild
@@ -0,0 +1,76 @@
+# 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.md TODO )
+
+RESTRICT="test"
+
+src_prepare() {
+	cmake_src_prepare
+
+	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
+		-DBUILD_DOCS=$(usex doc)
+	)
+	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/ecasound/Manifest b/media-sound/ecasound/Manifest
index c43be0d5224b..2c8c80ea3890 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 2347 BLAKE2B 18a71bd48ce0eb370c138e6330c5410db2955ee0d46bb8fad594b41b11eef186656223d2713b84527e54568caf6ae075968a1512ecc957bab6e9f749abd1f44f SHA512 5a44615114b0ed443036abe1e7912027d55c51e7db7396225d19e849a783928fa5e6c4ab704232b5fe87560576f7ca5e62163a00b446a2d3b8e350c266e3de4e
+EBUILD ecasound-2.9.3.ebuild 2340 BLAKE2B be16599cff4b41652b65b9b9f37b7b7d9fbc625740f87004df93730a5afc3b64a4901f10d7816a57caf8144ac22a5a464258fcbaa2ddd0663f884f0307985f48 SHA512 d08dc25457937861a8d21ba0ab16a5c3500bbf15407a64ab4c019054e6908f7fa458a64de0ec2420cedc7c1fa4b6cb6a73512a128861f4f46317e2d66f03464a
 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 c195b01a8d1b..7cdadd6983e4 100644
--- a/media-sound/ecasound/ecasound-2.9.3.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools eutils python-single-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="a package for multitrack audio processing"
 HOMEPAGE="https://ecasound.seul.org/ecasound/"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 81160c57faa8..b509c34166f9 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.3.tar.xz 1661968 BLAKE2B 17f7bf9bf589f19d010fa644c54d941647b3ed267c84ffb60b47ffcba27f28f0e639df3211d92ca27556e8887a9e83db3efa92739959c38e2051db79de6b2f4f SHA512 8fcf91c5421596a90e52329ab9d0f47cd5d4432f28ed1cede9f5e0e46f77124dd2cf6e2485fd184437034d3fb0820daeda3f8ad488e24637b97482ac3586c4ee
-EBUILD elisa-20.08.3.ebuild 1660 BLAKE2B 0f2f97fb2a63060c6b2de73204577be1a798be207188e261789a517e75054989ab25af613ed58c24b828b1035944a3a7494aac5c9bd2c35f9dd7279f21f2eb53 SHA512 a8b51c1155cfc602f3e69bbfe176ada35229bfe38c553f794a96946205405dabb428aeadaaea402acedb021b0ed546fbcc8c730a735da83d0cc34d202f636d0c
-EBUILD elisa-20.12.3.ebuild 1663 BLAKE2B 71bc53de9b63943fdfdd31538b40afe4d489a1b3bab54eb737d827da6f5d2fee36f06b0d683551b5a68f4775e5b7f1f4be637e24a4cd09484cb951fdb866f231 SHA512 cd65c68137af031a4f03c76a043b7bedfac599df7786f1b2be41dfcf70bbe0d31ca3c92cdfcb40b04d68c331d90967901072892a44595f6cec993a0c49f51ff9
+DIST elisa-21.04.0.tar.xz 1718428 BLAKE2B a7331a75ed1986babbb6c4385bd45cb7f6e0b0e6fa97e3c747bbfaea8e7e7e5839bf28528b494b893700ce92a808c4decf0667c1388ce671e893bbce90f75ff3 SHA512 97aabe4f08b45a22217b44cddff808a27f76340f429e19d9b46ad316983399235baedc836b6ceb5264d95c3ce0b8a9b45bf33538dbb70f0cf03b4d571d5f7ffc
+EBUILD elisa-20.12.3.ebuild 1660 BLAKE2B 9d162f7d0e730215d80f90b7b70d48f6402fc23fc5e3cad20f4fb06e69999ac199791e7c2b1e33c7adb3968406622b6e6f2fb634bbfb04d8f1cefc59cab61dcf SHA512 74c6c0347bebfaff5a7570902d86d926f98788d88c72a54f8d561a33b6658ea3b5625e182c2d207e5994cd25c2db8e96f69dd15da9abb99cb4eec0d7bf2a9f60
+EBUILD elisa-21.04.0.ebuild 1652 BLAKE2B 66d4462d895aa40155bb3bac978328f0175e8ed4b29a32eef210e532ab2c0da56baa59180ad559e91508a45e4eef79cdce11044d25b636391bb99367f0e11b44 SHA512 2e579e5f6d226834829cd497a8099cbc7cd470f2ea18d7c0cee9ed3967545ac858dd508129ca8eff9b13f61bb37c9117af20565efe77d0af0049029d44885ca6
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.12.3.ebuild b/media-sound/elisa/elisa-20.12.3.ebuild
index 265311b6fddd..0a08080cf434 100644
--- a/media-sound/elisa/elisa-20.12.3.ebuild
+++ b/media-sound/elisa/elisa-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/en/elisa"
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="mpris semantic-desktop +vlc"
 
 BDEPEND="sys-devel/gettext"
diff --git a/media-sound/elisa/elisa-20.08.3.ebuild b/media-sound/elisa/elisa-21.04.0.ebuild
index 9d44e8467a23..e4e94b55b120 100644
--- a/media-sound/elisa/elisa-20.08.3.ebuild
+++ b/media-sound/elisa/elisa-21.04.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KDE_RELEASE_SERVICE="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KDE_GEAR="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
@@ -15,9 +15,11 @@ HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/en/elisa"
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="mpris semantic-desktop +vlc"
 
+RESTRICT+=" test"
+
 BDEPEND="sys-devel/gettext"
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
@@ -50,8 +52,6 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
-RESTRICT+=" test"
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package mpris KF5DBusAddons)
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
index 71f8ce719dc3..c69603372500 100644
--- a/media-sound/fapg/Manifest
+++ b/media-sound/fapg/Manifest
@@ -1,5 +1,3 @@
-DIST fapg-0.42.tar.gz 94920 BLAKE2B b7da3a9df4b3f61022d237fe2b94238d56ceee456de54843062a887710f8faea17cfc6198487317797d9b16b006ccf311eb8e0f9e9e55a2e5d0aed173758457f SHA512 e3bbef35b9c845d80bcd1ee1116e4eb99b98e9d84cff034f2a49bbfcaa7664ab48b9453fb680fe7274fa74e9e0126950fbb15deb793eb95362f74c11151f8731
 DIST fapg-0.43.tar.gz 95025 BLAKE2B 33ef8e895ad998fc2d6a1f13c377805d0fdaf55b74adb78e4396f6084be531dc228da59f1a97329cb27cd5eafaad91822b27ad97f72f2f9c75deee7454bd22a8 SHA512 e290db42437a6345b6b1ee5348e95fc611c29ceffdc32baafb2e7aecde87b41e4584e9a06c1cf4c2ca938b3fe2359ba2f8bc4ad7c42923cfb3eef8e9737da64a
-EBUILD fapg-0.42.ebuild 553 BLAKE2B b7251066be27d942369bc8d582b1eac3d7017829b316a2e183c19ae5d31fd51b5f7932d75005fed268c87d9e88d220eb81380700cc4e8c48cf293228a50c66bf SHA512 b57ffe49958596ac8a7f41e1d699c13fd0600aefd5626cd72f94e066d126d3748eb1df1152bca8c57923b5542902de1ea92b8a21f797d26acd86dd33a68f3e92
-EBUILD fapg-0.43.ebuild 556 BLAKE2B a662aa0252ea7119c96e31c9f0da67f241e7ac5b3f0066585a69e3047883cbdcc1f002b86c82a6c25498e3b3bc36fefc5bf80bf56b11585c0628c096f2ba97cd SHA512 21afbd5e20b7da8a23fb42062f3ebe5777e2be345b58a3c026e59bc36cdb932fc09c35a1c83c1582a3a9945db9ce168c0470b12eed01c1d748de892d7aedbfb2
+EBUILD fapg-0.43.ebuild 553 BLAKE2B 71eb5d4c7f6c954184424cb8af909b77805fef39d94c9df45b569ba619d2b64c4df804ca29b147eba0dbe3c5199b669b346fa7aee91b9bcfb33bacdfd6c0e0ea SHA512 a5aa42b21c614b8d8737cad3c7384985105d0669cdd4ddd0259b4add717a455476e689e9fba9876f2c05e2937486851f8656ea5deb126805d8b2101f8a925c8e
 MISC metadata.xml 345 BLAKE2B e790a1276e74a87344d475c26e041546981c9d72b52c87f4a059d455db310fa4bcf6423d46e44971fe0776cc3ef52163235d6ebf7dca68aae20d2339c1e946fb SHA512 d8286400b18dfe0d38bd49478c84c5d7bebb24a734a74cbdf60a9e91c51f4ecafa476868351a7f09c064887da841f79e0449910df1f3b2a49f460d74cbebccb6
diff --git a/media-sound/fapg/fapg-0.42.ebuild b/media-sound/fapg/fapg-0.42.ebuild
deleted file mode 100644
index b6e485692da9..000000000000
--- a/media-sound/fapg/fapg-0.42.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast Audio Playlist Generator"
-HOMEPAGE="http://royale.zerezo.com/fapg/"
-SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="xspf"
-
-DEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf=""
-	use xspf || myconf="${myconf} --disable-xspf"
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/media-sound/fapg/fapg-0.43.ebuild b/media-sound/fapg/fapg-0.43.ebuild
index e50690223847..4a9a2b3dbe5c 100644
--- a/media-sound/fapg/fapg-0.43.ebuild
+++ b/media-sound/fapg/fapg-0.43.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
@@ -9,7 +9,7 @@ SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="xspf"
 
 DEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index f288924e75cc..e1064beb431a 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,5 +1,5 @@
 AUX flacon-5.5.1-ninja-warning.patch 2227 BLAKE2B 07957a0d79d3c6d8c228ba00f1232c5e2071f6868097ff891ee00473ade0f01f32ec8a9ea8fdf55ea7681d82e9c023382dcf978d828a7a0c0a2b05053b36d070 SHA512 77755301347b562f1f0003d13cd933f98e3bd9041ec9e1f8c6d4daf6e4185197cbec7f7c9ee584ef3948594c98eba13ddc509350f3329c5753430d12090b1d31
 AUX flacon-5.5.1-no-man-compress.patch 1089 BLAKE2B e4757b39f3ccbfb60e0298ed091718c809fa224d53d4cc0e15ae1f65e11d8698a5434bd3099bae3932b4931a7624ce9c00334e8503c2131a0d61d075642dc730 SHA512 a975329808a5642d4684d03c9261073633f394d789ac5b28dd30e0028a7ee8503a447644d5911a1bcd24c89fbab6279e3228dc21462f277aec9ef040b784703f
 DIST flacon-5.5.1.tar.gz 2336502 BLAKE2B 524fe5fa28126f56452515ca1ce1572343dad8b06c28fc8e3a22a11e9ad8f3a51a25b3c19ddd29a7e3c658f1d7fb3316a2554a12a4ba3dd22370fc1394d38022 SHA512 36900b011135b61cf3cc1f05d94f852fc7e127972f3fed09e0fb7e66fec944ed1c3bfc61307494aff87c2fe24e16479605043a79e0634bc23940d01fc337c6c1
-EBUILD flacon-5.5.1.ebuild 2054 BLAKE2B ef3d11a1597614da229233d9d4e4a1392d30c2256595da59ae3aeaff3b778dda71647b82bf959fec2ae254936fcb469387756be4089efec98c59a98cdc14a0ed SHA512 600151bd572a377631447c31d3b765b9ad12ff1c5b3d8951c232f2563a24183f2b3b45e3213d004bb7a763e36dc69136bc99655f595f6f818c7dde2a7cd80087
+EBUILD flacon-5.5.1.ebuild 1937 BLAKE2B 2e69e1da1f7a82eea0695d4f1aade3ec4ad7dfe10d02d6d9ea824acaecb479500b117e195f08b549b926a109dabc04e315b3c66d43c7fce06e73eb5c862669ec SHA512 7fb874f8f243d14095f9a613f648315b347342f177ea7890c31dee0fbf59c25e4fb10dd44e1980d3eec620ef2f6b85107482b3843514f037c18e2f7b4c979442
 MISC metadata.xml 245 BLAKE2B 0d00b7e6c2866c40032e69e85f13d048eae85c3f76432a991964d9a29767afa3d57272ac0b99c1ba51d9ae1aeba9472866e1b2a8f5995c7bac30137b8b3195d1 SHA512 ed40120cdd2c935c574c273f3a6a3940d7c4dd9d8ee73e8e6d7d22cb04cdaecdbddf75e88cbb7e93057364d2307459fec0821309806240f6d0531264b6439bf4
diff --git a/media-sound/flacon/flacon-5.5.1.ebuild b/media-sound/flacon/flacon-5.5.1.ebuild
index 30810280078e..ffc3d5f7fc6e 100644
--- a/media-sound/flacon/flacon-5.5.1.ebuild
+++ b/media-sound/flacon/flacon-5.5.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
@@ -66,9 +66,7 @@ src_test() {
 }
 
 pkg_postinst() {
-	elog "${PN} optionally supports formats listed below."
-	elog "(List will be empty if all extra packages are installed.)"
-	elog "Please install the required packages and restart ${PN}."
+	optfeature_header "${PN} optionally supports formats listed below."
 	optfeature 'FLAC input and output support' media-libs/flac
 	optfeature 'WavPack input and output support' media-sound/wavpack
 	optfeature 'APE input support' media-sound/mac
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index e29eb3035946..e93ef6f2b5f4 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,3 @@
-DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
-DIST fluidsynth-2.1.4.tar.gz 1363975 BLAKE2B 068a8a1722036a5a409331b1bdcf566cb9a1e7b4a27c78adec51c6d82f7c53cba9178c87013f1a9c0ef62d26b1ba876fad567e4c8bb41b8d478632699876e41d SHA512 22e8d2f8b144f96a334aff1f7d183b91e6c5418482bd61553028ff571836b0ca13fff89e7e3cc1c2d08e106a430331d179e607d78b00e218baec433b6d140190
-DIST fluidsynth-2.1.5.tar.gz 1364924 BLAKE2B f5669f49db481ded6d953ee2cdaa8c59bb751f79210d993b69967cca1b71dce12b50fbf258512c144b1578441e78cc5299d96004da5fed44a40fc33858254bc0 SHA512 171ee6b1983ab9636086fb414ae464508f7a9a412cd2c1e7800a19a84d3dff21bbd86d1971f9bb5985e977f808b60e0d0cfbde4551b85fcc4aae4928a1abadbc
-EBUILD fluidsynth-2.1.0.ebuild 3305 BLAKE2B 7a8a2c5109ba689ec1357618732255ebf80154e2e615cfdba59b3c9f4575f4877ae4b9d5c93ca66fb22fd1648f45f5897ef782c89ec695da6dc53113257ed75c SHA512 966ea80eaadb1cabe36066a5202ffc499f0015a8968035865fe8e3418ba2210ef858a9ff6a35f5be5d25be24761457ad49e6fee730577e818d00437a95015f0c
-EBUILD fluidsynth-2.1.4.ebuild 3312 BLAKE2B f123f57cc9ebe5296841bcc0cb68610ecc67a8e48146a638b2afcc78ef8365adb9f133483f55fd1ae26819ccd84c9914af94e1ebc3867bfc595ac62a6205b7b2 SHA512 babbc1609f66e34b8eff8d206f4b7bbdc0b037e60de748262b050031eb3da59e86e3b9ed3704a3746a06e5db4ad0e0142eb00acbdca16375d486b97321bc7945
-EBUILD fluidsynth-2.1.5.ebuild 3305 BLAKE2B 7a8a2c5109ba689ec1357618732255ebf80154e2e615cfdba59b3c9f4575f4877ae4b9d5c93ca66fb22fd1648f45f5897ef782c89ec695da6dc53113257ed75c SHA512 966ea80eaadb1cabe36066a5202ffc499f0015a8968035865fe8e3418ba2210ef858a9ff6a35f5be5d25be24761457ad49e6fee730577e818d00437a95015f0c
+DIST fluidsynth-2.2.0.tar.gz 1507709 BLAKE2B 4ec162ecf461f3fbc80d1b5c1a4bc0624d8274dedcfa32addfd79d7270811e532bccee46b90181bca504183e092176652f6c9d0ae8eccfb5617b9176b8bc511e SHA512 fa08c6d6914accbb5a99bb912066d97ded26ab3c706e663e76a4f1b024f610f676d2e1f7c30872d00e0fe86b5c494dcea581ecd0770977d235962a845c074bd6
+EBUILD fluidsynth-2.2.0-r1.ebuild 3314 BLAKE2B 1170bc2979a36dcbe5b84ca2ef8e4c34256c9da3514833bd23d1e0edd7753f876a943be534630a8ec0637024ca0a4a34ec06bcf83a42ee4f3f0948cd716cf29b SHA512 6de4ee1f429768af858bc9bedf365e4977ef8f2d04a815ba0fb6c5649b2989c56bb56951cd1647e3c6f3a1a93d1daf99783532aa4e32512db4273df4091b235f
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
deleted file mode 100644
index 8da1679f5162..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild
deleted file mode 100644
index 98db025980dc..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.0-r1.ebuild
index 8da1679f5162..509ab5037c3d 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fluidsynth.org"
 SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-SLOT="0/2"
+SLOT="0/3"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
@@ -102,7 +102,7 @@ src_install() {
 
 	if use examples; then
 		docinto examples
-		dodoc doc/*.c
+		dodoc doc/examples/*.c
 	fi
 
 	if use systemd; then
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 0dcf0e50b0ac..3b21f68bf369 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,4 +1,4 @@
 DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964
-EBUILD gigedit-1.1.1-r1.ebuild 1116 BLAKE2B 274572fed4429f566a2c4ab27bab6820ae18b5235debe07980939c6b13a4e546cac316e79c3431fd1182a2af18e2ceb95f7eed6767ccc1418486027a590b2084 SHA512 52824350b02d5d3ac6f63148a18db5ecd8cb2426c4ff869fd00a8f76bc5624503b2dffd56776e776fe0f8858e52c9bb9782a77754d88c9362144b9518d02202b
-EBUILD gigedit-9999.ebuild 1115 BLAKE2B 0d6810d5be6f9fd11a455ead8309fe8162e60b65248bdf65e54c5dc8102cb19a6ab8e46cbeda46f076990fcfbc2e0fbc2225671e363a0b83195d11f2c648c8de SHA512 3473db34c63055bfde0fae8c713117a9334a08b4a683673217d482fc13896701d8c546b16b3f42f2b1c64a6ea94ff96fe8d79eb36cf37679e0bfb0eaadac3529
+EBUILD gigedit-1.1.1-r1.ebuild 1109 BLAKE2B 211338b2f7fcfda81fbb1b5e0a387da6eb770a012904545a3ac40a2b1289e479aed65e225d65ca4149d765f6ae5dbd01da2fbf0f3c004312bc06424083d45014 SHA512 252d012c3e22d00c208858c61fded2e0699e502b5dd78d023e5e65b8247f587e6823a2e5de70adea00573a814aeadf937dc103af403212b57209f19f6cd1a769
+EBUILD gigedit-9999.ebuild 1108 BLAKE2B 9ccd9104a94171f655b9a8063b522586d8c946875b38fd367a2436d2e6b0ef271ca54c2f733f1abd3f7e23312afdd052a294e58dd39b1d9de797c2cd4411cbc0 SHA512 5262aaf1758b25adf5a5e18307bf2f2eaaf537be384d44c707620e04245a31ec01a7ce529f17041ada2e8786f260a7a09b137aeaffea6bab30ae1b7147962b7c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
index 966ad8a9da59..e8c0ba9adca2 100644
--- a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
+++ b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils desktop xdg
+inherit autotools desktop xdg
 
 DESCRIPTION="An instrument editor for gig files"
 HOMEPAGE="http://www.linuxsampler.org/"
diff --git a/media-sound/gigedit/gigedit-9999.ebuild b/media-sound/gigedit/gigedit-9999.ebuild
index cba33cb715bb..6aee05e17e9a 100644
--- a/media-sound/gigedit/gigedit-9999.ebuild
+++ b/media-sound/gigedit/gigedit-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils desktop xdg subversion
+inherit autotools desktop xdg subversion
 
 DESCRIPTION="An instrument editor for gig files"
 HOMEPAGE="http://www.linuxsampler.org/"
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 8cdb0050b706..6b9d511137d4 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,6 +1,4 @@
-DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e
 DIST gmusicbrowser-1.1.16.tar.gz 2369434 BLAKE2B 952c4a75d8018b890a787e69cdde06f1c1d588384e220950ab46d0ddcd785cd30d477c52926421b72c7cae4078342e6f5f07fa0b41fe6d0ef2a0b4ec4e15c8ce SHA512 76213a6634208c66cff33ab947450553e656d121e8aff99e47bc983f752f6095019aa67bef834681594a81f6f5fdb241bb98d374027622704d961c1d816bd12a
-EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1438 BLAKE2B 42055af696aefcdcfe264353563f87544e52c041383954d0f90b0546a5efd82b88059961dfab2d4e39eda855d3e9fc1bfda803d372ac65273c0d814527bdfec6 SHA512 a1c8bd62631f1e28c8e6511a8a63a919d15845cfb35beb5ac4da32e787b44b169e5d92df1b1b18f533b6801fb3301d48e39eda6342692b6dfb4c5930076c933a
-EBUILD gmusicbrowser-1.1.16.ebuild 1174 BLAKE2B 08c9f2a8e8c051d7140fe001f7264c2fbe5e2c54e03edb2fe2ee896f505ed43cf6a6288843ae18141d01984cf128192fa849774a319214522c696c45c13d2887 SHA512 2e53db37a8a08d3acfa1e6ebdc9596bf65b31c8da5458ed77a9b73e5f0295b39f521509ace1296f8f9e8da9517930c7a630d3d15de1638ae310a3643a886f97d
+EBUILD gmusicbrowser-1.1.16.ebuild 1172 BLAKE2B 1e9ffce36766183ab4bfb3a261e527e15db218f708462e4b9086ad151eca408584b6c9e2f45de1fe6a7478fed02d8ef1b94a2cf6969647f41da8abb36e5f25ec SHA512 bce9ae6096616ba55f1cd7847ba87c8a166720d8518551c3cd8e8f18817c1abcbf9650c671998319e8e76517ece04ea1ce363d5324f7c1c18a74bc93a1a24156
 EBUILD gmusicbrowser-9999.ebuild 1292 BLAKE2B b4afccbea10450521e079aa4b69373a454b177baaea7c7f95cacd217cec81b8a66e69487e80ea257d55c3502a4436b0837667e973761d681d20b449aca0f0219 SHA512 a37a9f3c65866cd0586fa3f6470500dbf452bf7b70f152e1f993301a639bf5c4dfdb3c44a971cbf7a2dee73686872c73f5121a037474738db9c92789bb19a383
 MISC metadata.xml 479 BLAKE2B 920ff946c66abe6386665a9d8d4546359c4bc3d77fcc8bf6cc293f5e79dfe4b5259481ebc4d54b595c6a693e06de39c7eff63acef17b47149eab7903442ec772 SHA512 62897e2c761749f2587bccf4408060a2c7a8d07eb5122849d4d5f8d20445fbfc3debf6d336a38c54b2b472847ec25a9a3cabebdc879200b0738772cf39b5d222
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
deleted file mode 100644
index 000cfbc2d608..000000000000
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils gnome2-utils xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
-	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-fi
-
-DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
-HOMEPAGE="https://gmusicbrowser.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus doc extras gstreamer libnotify mplayer"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Gtk2
-	virtual/perl-MIME-Base64
-	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? ( dev-perl/Glib-Object-Introspection )
-	mplayer? ( || ( media-video/mplayer media-video/mpv ) )
-	!gstreamer? ( !mplayer? (
-			media-sound/alsa-utils
-			media-sound/flac123
-			|| ( media-sound/mpg123 media-sound/mpg321 )
-			media-sound/vorbis-tools
-		)
-	)
-	extras? ( dev-perl/gnome2-wnck )
-	libnotify? ( dev-perl/Gtk2-Notify )"
-DEPEND="sys-devel/gettext
-	doc? ( dev-perl/Text-Markdown )"
-
-src_compile() {
-	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		iconsdir="${D}/usr/share/icons/hicolor" \
-		install
-
-	use doc && local HTML_DOCS=( layout_doc.html )
-	einstalldocs
-}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild
index ea8fe1e9691b..e30e0d369d9d 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus doc extras gstreamer libnotify mplayer"
 
 RDEPEND="dev-lang/perl
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 184a152f03a4..0e88c7837647 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-music-3.36.4.1.tar.xz 979064 BLAKE2B e744bee915a48a5d2366350cda7ebb0c43382f46de07d9203d95675cad45d825f2d93cc07be7865eceb5be3554ab478ecf84c52d9b8f5defc198b4f1b6638926 SHA512 8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca
 DIST gnome-music-3.36.7.tar.xz 971980 BLAKE2B f27d0eb49a1728873ef6d439eead83cc34fb6802afdba3b4e0ef8d15c88d2012634ec0a18a4df4ba18079915d4227f526a93ac7989ce6ea4a807b620722fad1e SHA512 3470563621c17004d0b92451950ebfca203e830cb9ffe481fef7fe4d5187afa36ccb33130695226d4db95a89af9fac592910d2a19e715af4dd0c0ffba081c3a4
-EBUILD gnome-music-3.36.4.1.ebuild 2043 BLAKE2B 2367e9f659fd16175956bca41740517872958137055db48368f139b1cd873ff724a2826a7f991afff24640e7e04df74c98a46ba5052cc13fb23d6976b53bc2ee SHA512 7f1e484112f62e1327e2982aaf230a8d457a24cbab234b6899c5c52607c5df4837a2985c8c79593bdf021c2a077fa35fbfef9f1e2ec929d7360e2c7d9f99d0cb
-EBUILD gnome-music-3.36.7.ebuild 2044 BLAKE2B 9b348bad9a91b1d1e1f9b01807181a7158a27725d603051def2f6efae054508f8c73dc7a85164c13679539fc868ac0bca6f67836c946cd675ce2249a7e742256 SHA512 109f5eb0dc6857aa34867efb385b828f8c1e7d4efbcf1c3ceb9b177ecf634287a7ab1c178138b2328bfaa62d4e01fb65e0e5397a17823f9ac93dd28c7bab54a4
+DIST gnome-music-40.0.tar.xz 977412 BLAKE2B acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7 SHA512 7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
+EBUILD gnome-music-3.36.7-r1.ebuild 2048 BLAKE2B deffac9822c4e1e1cbd7763c1232e2ead11e75f85be8eb83ba47d64908f94c0a12ba39124c55ebab873d8aa36f946d249895aa9d32a7649e8755ed5ccbb49de2 SHA512 e35d55d9ebdffd199e1cb33e4e939ff6d086bf681db5de8a6f411ba0f23967c23a66bf045a270ad0ac962c1b47709566c66666aa6c168debb523531f7511d03c
+EBUILD gnome-music-40.0.ebuild 1924 BLAKE2B 773b2de156bd6f7ba259474f5238a75f512eb71e6a12c5f4cc46e81d6a8ef36c7b97e60e4052048e5710a7d5c18130f2b527c17408b714e537c45b7c53eca2a1 SHA512 2df4ac444137043ed57c452c4f7b15ebf2d7f6a4026d6ece952b4743eecb35c5654a00487e531885a821e2d7339e3ca1dfe33332f5f5ca7688634439ab3c7c99
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.36.7.ebuild b/media-sound/gnome-music/gnome-music-3.36.7-r1.ebuild
index b845b8cc36ea..53a0cd867dfc 100644
--- a/media-sound/gnome-music/gnome-music-3.36.7.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.36.7-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
@@ -24,7 +24,7 @@ DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libdazzle-3.28.0[introspection]
 	>=media-libs/libmediaart-1.9.1:2.0[introspection]
 	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-2.3.0:=[introspection(+)]
+	>=app-misc/tracker-2.3.0:0=[introspection(+)]
 	$(python_gen_cond_dep '
 		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
 		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
@@ -36,8 +36,8 @@ DEPEND="${PYTHON_DEPS}
 # https://bugzilla.gnome.org/show_bug.cgi?id=731613
 RDEPEND="${DEPEND}
 	|| (
-		>=app-misc/tracker-miners-2.2.0[gstreamer]
-		>=app-misc/tracker-miners-2.2.0[ffmpeg]
+		>=app-misc/tracker-miners-2.2.0:0[gstreamer]
+		>=app-misc/tracker-miners-2.2.0:0[ffmpeg]
 	)
 	x11-libs/libnotify[introspection]
 	media-libs/gstreamer:1.0[introspection]
diff --git a/media-sound/gnome-music/gnome-music-3.36.4.1.ebuild b/media-sound/gnome-music/gnome-music-40.0.ebuild
index 83b9bb51f252..2a208528839d 100644
--- a/media-sound/gnome-music/gnome-music-3.36.4.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.0.ebuild
@@ -1,8 +1,8 @@
-# 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_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -11,10 +11,9 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Music"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
@@ -24,20 +23,21 @@ DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libdazzle-3.28.0[introspection]
 	>=media-libs/libmediaart-1.9.1:2.0[introspection]
 	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-2.3.0:=[introspection(+)]
+	app-misc/tracker:3=[introspection(+)]
+	>=x11-libs/pango-1.44:=
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_MULTI_USEDEP}]
 		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
 	')
-	>=media-libs/grilo-0.3.12:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.10:0.3
+	>=media-libs/grilo-0.3.13:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.13:0.3
 "
 # xdg-user-dirs-update needs to be there to create needed dirs
 # https://bugzilla.gnome.org/show_bug.cgi?id=731613
 RDEPEND="${DEPEND}
 	|| (
-		>=app-misc/tracker-miners-2.2.0[gstreamer]
-		>=app-misc/tracker-miners-2.2.0[ffmpeg]
+		app-misc/tracker-miners:3[gstreamer]
+		app-misc/tracker-miners:3[ffmpeg]
 	)
 	x11-libs/libnotify[introspection]
 	media-libs/gstreamer:1.0[introspection]
@@ -53,8 +53,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
 pkg_setup() {
 	python_setup
 }
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 7dbe47129ab4..4d63ded1ac4e 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-sound-recorder-3.34.0.tar.xz 133808 BLAKE2B 2e8b83eb58776324717fcbeb8e0383ef3370e394f26978b1367bff22eaef3d9143eef65cd5c678bc25a67b32ed8d1c9e838ce63b0e2868f2ddb88805a5c43c5c SHA512 cb28f1f93f78cae5cc98750f937f60abb326065cdbbb1ee48146daceb9e34f03bc9bf4d78b7a149e579654673b9879fb249fd5a370a19764f01961c565b901ee
 DIST gnome-sound-recorder-3.38.1.tar.xz 198328 BLAKE2B 80fc581a9aad2d1ee944982f9b0c93eb4de75711d7242a25fdbcdbd6edcf71af337bf6c49806b2265f4d099ac58fb5619964f6d473f291827f026d01fe497461 SHA512 e725b8c0d899680eff767f61360645a4adc2df29db8813d6e799b4affa3d05cffc5a7de4c8ee8eafafbc34314655831d7524963f974a23f472fdbb6f292e6c2c
-EBUILD gnome-sound-recorder-3.34.0.ebuild 910 BLAKE2B ce3df51e9fddb710d0aadc855b5fcb8616f533b3d5d09c0279c70e306dce3314f874cf1b62588b7dafec0c3720aba3eb9e90ac47ecf156d4b1cec8572f5633f3 SHA512 dfe6bcb55c39c6af5f42c88eb0989899b1df6d61d7357635f80d75d5eabe54669efa5d1312f41d72553cca37c0ad0cd442bab7ac835643b9da397fb2b0cc68fd
-EBUILD gnome-sound-recorder-3.38.1.ebuild 943 BLAKE2B 4a2c0d34d4638882b37ed30a971382737e2cb555654b142372183d5f0e13b9fb53a93d4aad0c9ee6c69f666dd6ff9976b771721fda1b7bb4857719ec0c0e8d84 SHA512 67d78110c5778456ae88a468ac0bacf1165ae4e3e1dc554d175706a5f1044c2c9ccfbfc5cde2179a5c2bfb75d217f8bae1df9ae7cdbc6377a4c30cb04d8c7d34
+DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
+EBUILD gnome-sound-recorder-3.38.1.ebuild 942 BLAKE2B 25e245b4a3c5c267f72c5353ee607e36d861b59c4a686dba7771af5877b71ba51f2bffd236a9c4795362045eb57d651890442fa231b11f0bf1480a1db1f83c7c SHA512 94a443923a75ad085423f0482f3ee140ffb7b06042202c23b19acde8a53c23a369b3f5793a9eab227422d071895cea6d7c6f35e2a83be956d0df78e48f058028
+EBUILD gnome-sound-recorder-40.0.ebuild 1043 BLAKE2B da35fdf71b8d098cf0986a3c38d25e7388a3a4e1c7306982215634611def580441509d768902fe01380a860e02f1dc3fef684a76ebaa686930de584862cfcd81 SHA512 cad44d02ad711e170f42f08a6e0bfde3e16b9ba2b0000155eb6d5fc068dd6bbbc46651e4bfbfa9c7769c1e568c7de0a64a142259112da71469990b4e1d6d0a04
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild
index 67d8506e4821..f2d2d8c87a56 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
index 4ada7e52cb73..0ec0b46892dc 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
@@ -1,37 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Simple sound recorder"
 HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	>=dev-libs/gjs-1.50
+	>=dev-libs/gjs-1.54.0
 	>=dev-libs/glib-2.46:2
 	>=x11-libs/gtk+-3.12:3[introspection]
+	media-libs/gst-plugins-bad:1.0
+	>=gui-libs/libhandy-1.1.90:1=
 	>=dev-libs/gobject-introspection-1.31.6
 	x11-libs/gdk-pixbuf:2[introspection]
 "
 RDEPEND="${DEPEND}
 	media-libs/gstreamer:1.0[introspection]
 	media-libs/gst-plugins-base:1.0[introspection,ogg]
-	media-libs/gst-plugins-bad:1.0
 	media-libs/gst-plugins-good:1.0
 	media-plugins/gst-plugins-flac:1.0
 	media-plugins/gst-plugins-pulse:1.0
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 90626597acb5..9ca4741ba56e 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,5 +1,5 @@
 AUX gnump3d.conf.d 159 BLAKE2B d03de16b977c8c892be3dcd6ec7b45414dac9694a777fde5775f30ad94552349263563316c7e48517c60947e5751ef1f7d9eff4648c7a0cc720b845df32ee8cf SHA512 33c87ac067be3ae4f3dac690e38eecf8400ac393e47cea8f6b5b1238cc41b08dfe684ee33a7bf3bcb24cd6f9a8ff3861caed12c0d9d7f0df61a757cee5910e33
 AUX gnump3d.init.d 724 BLAKE2B 734bfb5daddea0894aff9254874d7135ad7a01bb46d2b6a2515ee359e98ada5ec328c31342dde936fdfeb051a8a8731b4a4a07f356b3566398dd7e0cc833bc53 SHA512 86f43db016e4dd1d2cb75b68ed1a11ea7b7f9ab1d78d18d0e6cf47c3380c466251f733d7aa73ef0354c3f63b78f18b966f583ea0aa328773442270c2aa0867d0
 DIST gnump3d-3.0.tar.bz2 633215 BLAKE2B aec3e2e95ebcbf2b9465f8f7e5cf579fe64e9e48d3b1757f78d3102f3a02f92970cbccc5986741013505e1b2f0e54e0d7a7c3871837c6169898e763f23e7fcca SHA512 23778604b557346e42f5cd2045cc394c7d6f7044479c74cd635dfdbbfd6835c8e3ad761d54c5cba239cc5e020b049ac11d64eb463272fc4134b7645226e2524b
-EBUILD gnump3d-3.0-r2.ebuild 1995 BLAKE2B 909156fe08c073315a88463bd303f22da52adfcbc952e5dcdccbfdb51bec0139bd89a53492e840d572d31dd01db92b818dfa3ca564584fa822e9086ce962176e SHA512 81df5ecabd077ed6bbfde6b8f4152a5273a4d7e1e2fbc0fc4d04b8db3346511b1d2ba993ee1b0be36c46563b66e56b632abeb58778ec4c7531d018682470bb76
+EBUILD gnump3d-3.0-r2.ebuild 1966 BLAKE2B b390a0ca69dec14cf56720913ba3b848a46466288048f05c7c5b3246f6b249a6460fd4d245ca03b972ab8b3eff001d7b23cbeb430be08df56cb198c25e6616e6 SHA512 322875a08047fdf344a2c92efb957af4c6b70b2d9ee2c50a873fcf011df1debb2f56b16ab089234be2fd1c983422f87b16ea937c59c7aa9d3b3e85688e7ab7ad
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
index 8cb6bc9c4d0b..63c211a36959 100644
--- a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
+++ b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils multilib user perl-module
+inherit multilib user perl-module
 
 DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
 HOMEPAGE="https://www.gnu.org/software/gnump3d/"
@@ -16,7 +16,6 @@ KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
 IUSE="sox"
 
 RDEPEND="sox? ( media-sound/sox )"
-DEPEND="sys-apps/sed"
 
 RESTRICT="test"
 
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index f00bb9f0eacc..2b17ecbcffbf 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,5 +1,6 @@
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
+AUX guitarix-0.42.1-fix-build-with-glib-2.68.patch 535 BLAKE2B 0281b89eca6dc32051226c09ddb6255e5c8bfd4a278aced69f995954d2dcc5c7d7ad9299d6827afa37cdb857f8b236976663fa63165b94fb5029a473ae07bb09 SHA512 05d66714c72e1c2a647d3d769f4d81f6a48d653f9bd3094a5306343b3838fe34d137d6c34b0955a3889a6feb7f1b2a9ac237ca2ec42190dffff0822b3ac706b2
 DIST guitarix2-0.42.1.tar.xz 71825372 BLAKE2B 06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43 SHA512 66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0
-EBUILD guitarix-0.42.1.ebuild 1828 BLAKE2B 6d247803d4c1a6efa833ac58309e7ff3c0fcb9b164d19e62a38edac0aed13fa9c5228f350ac4a4e9e5036c63607b58e970cee8691807f6e87db65c471f274700 SHA512 8461dc20dbf0c332ee6786f4425c80abc8a9c2e219140c80104f88b05b7107a092939dfb8f0b6335ab753b98e05dac8550e334ac55d5be80f393a75628f361fa
+EBUILD guitarix-0.42.1.ebuild 1879 BLAKE2B 36d5b345407d6d6de9f5b0e8682c4c2c7a818a82099d966fa7b105fbad4d83d2de4d178aa53e5226547c607a84ecc05ccfbf54e037d1ff9465064dc6c3bd41a3 SHA512 6d7c320981ad12ec0f8a6b380c564a27c6097c69bba1f101af511faebd2777d2ff7d519bc34df63be82ee7e33d28e69e64d1ef3198b78a309d43786f24531980
 EBUILD guitarix-9999.ebuild 1792 BLAKE2B 0bd201b1b4ead9e31efa6e6055326d99e71176d7dd7a10ac03ab93f9d0cbcae929c434eaf126c9f93ed6823256956301a5381f0afd082bcbb8d6fcddc0b9ff28 SHA512 6b86ab87643212ee1a37753755b409ba73c9fc1501e6d478760988cbad75615265dca629be68e9bfc718b821b43ea9eceb13ebf743647d15e3993296df0380ce
 MISC metadata.xml 691 BLAKE2B a152f7233be0d10e41c9202b118f26fb4ab3b8c60b7ef57e7f2cc45753d72b54c3bf63fcb871c908ffdc58745c889bd8a3bd7108f5177c24af2803f6f9ce32c0 SHA512 77dd24f6db6a79fb12136b4e1d5055f4799a75a02f7bdbf14fbae6532b7187f40506db39c2fcf14b5852ce3418119b3583130fc3c5459d0c5b42444a83f75ace
diff --git a/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch b/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch
new file mode 100644
index 000000000000..345f5e9a0aab
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch
@@ -0,0 +1,13 @@
+diff --git a/src/headers/gx_system.h b/src/headers/gx_system.h
+index d334ecfc..88d97567 100644
+--- a/src/headers/gx_system.h
++++ b/src/headers/gx_system.h
+@@ -132,7 +132,7 @@ inline T *atomic_get(T*& p) {
+ 
+ template <class T>
+ inline bool atomic_compare_and_exchange(T **p, T *oldv, T *newv) {
+-    return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void* volatile*>(p), static_cast<void*>(oldv), newv);
++    return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void**>(p), static_cast<void*>(oldv), newv);
+ }
+ 
+ 
diff --git a/media-sound/guitarix/guitarix-0.42.1.ebuild b/media-sound/guitarix/guitarix-0.42.1.ebuild
index 3a9ca22629b1..19a6df94df79 100644
--- a/media-sound/guitarix/guitarix-0.42.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.42.1.ebuild
@@ -65,6 +65,7 @@ DOCS=( changelog README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+	"${FILESDIR}"/${P}-fix-build-with-glib-2.68.patch
 )
 
 src_configure() {
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index c32387b398ad..78c7fffbca17 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -1,6 +1,6 @@
-AUX herrie-2.2-fix-buildsystem.patch 1183 BLAKE2B fc3752e625b75d50f0aa3c72bcf73879c57eb9caa929b68520475eb7d0dedb5217badf5c3ead7cc41be9001864c6a3916de1afbbdddbd7c125319322d8c26c13 SHA512 474d9ed85589e6bb6f640389d76d035e506434a7ae8ce8e11fe620e4b27cbe124edae797ed34e0e06c80b3ad594f7420103e9e73ce1d3ac9297b7982c8144738
+AUX herrie-2.2-fix-buildsystem.patch 1132 BLAKE2B af945efc12c6ab5604fada1e7d123d7fcfdd0c319b36a73a04ba90c574c895bb4caaff8d78b9fe0deb5b1ba0a440eee977a7fbe446b6ab5d9fa30be68ec5b0be SHA512 250d5f75a48a3fc5a0ece1f7a33d2b066f9ceb16d96a98b3b6cdf28168561ae221a2ab3c13501f4dcd0a7d169ed325c27dd78799c459458da1be121677c84937
 AUX herrie-2.2-libxspf.patch 3025 BLAKE2B 22deefb9b02e26b184e5801ac9543a66e4cf4e140368ec34bfa2bee36c99d72899abfac7c62489f3b2efeb121ec478734952054e9626fbe11644050c37ff30e2 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192
 AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0efbf03a3eae4010c2a3ff1e3d62107e001bdb012a166ae84fe9cb9ab3f08b59d3c737e2bca03e3e2d9a53d5e2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150
 DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213
-EBUILD herrie-2.2-r1.ebuild 1832 BLAKE2B 2b43836390c97a1415f11268e9b0f08a38549a4596cac0f65a8b7042f2977c8a8408c75ddb0da320de1cae177f76c2962ead87a70dbf536470742c98d16ade03 SHA512 e08c98b79cb238770b4fa37acebffe41298034e36b4e54e0c8746c918ac13514fa91c346ac557ec2fdae32342f367c29c7053aa18855698e0ce81031991a7352
+EBUILD herrie-2.2-r1.ebuild 1845 BLAKE2B dcdb0be2847093b640388237398fabb82fb78be71be1b9346ae69eff613a931232a5d65cc5e972fc977ac529c28704d16c7e4829fecea5d829731ba45fc9103c SHA512 7bf9151d124a66e005dd58b65c1523b58ad6c3a5a5a4dea71b455f1b4adae4f9658bb5fafd493de02acd94d9abef885640c6d960c6dbba4cc969a7bfdfb9024c
 MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3
diff --git a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
index 03a2c7397da8..ce01e5c0c6ed 100644
--- a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
+++ b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
@@ -3,19 +3,19 @@ Fix ncurses underlinking by using the pkg-config output instead of assuming
 directive. See also:
 https://bugs.gentoo.org/show_bug.cgi?id=573522
 
---- herrie-2.2/configure
-+++ herrie-2.2/configure
+--- a/configure
++++ b/configure
 @@ -215,7 +215,7 @@
  	exit 1
  fi
  CFLAGS_main="-DAUDIO_OUTPUT=\\\"$CFG_AO\\\" -DCONFFILE=\\\"$CONFFILE\\\""
 -LDFLAGS="$LDFLAGS -L$PREFIX/lib -l$CFG_CURSES_LIB"
-+LDFLAGS="$LDFLAGS -L$PREFIX/lib `pkg-config --libs $CFG_CURSES_LIB`"
++LDFLAGS="$LDFLAGS -L$PREFIX/lib `${PKG_CONFIG} --libs $CFG_CURSES_LIB`"
  SRCS="audio_file audio_output_$CFG_AO config gui_browser gui_draw \
      gui_input gui_msgbar gui_playq gui_vfslist main playq playq_party \
      playq_xmms vfs vfs_playlist vfs_regular"
---- herrie-2.2/src/audio_format_modplug.c
-+++ herrie-2.2/src/audio_format_modplug.c
+--- a/src/audio_format_modplug.c
++++ b/src/audio_format_modplug.c
 @@ -31,7 +31,7 @@
  #include "stdinc.h"
  
@@ -25,8 +25,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=573522
  
  #include "audio_file.h"
  #include "audio_format.h"
---- herrie-2.2/src/main.c
-+++ herrie-2.2/src/main.c
+--- a/src/main.c
++++ b/src/main.c
 @@ -165,7 +165,7 @@
  #endif /* CLOSE_STDERR */
  	if ((errmsg = vfs_lockup()) != NULL) {
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild
index b54555ffc4fc..d50e37ef8671 100644
--- a/media-sound/herrie/herrie-2.2-r1.ebuild
+++ b/media-sound/herrie/herrie-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Herrie is a command line music player"
 HOMEPAGE="http://herrie.info/"
@@ -52,6 +52,8 @@ src_configure() {
 	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
 	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
 
+	tc-export PKG_CONFIG
+
 	einfo "./configure ${EXTRA_CONF}"
 	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
 		./configure ${EXTRA_CONF} || die "configure failed"
diff --git a/media-sound/horgand/Manifest b/media-sound/horgand/Manifest
index 79eb11647de9..6c38e4e940d5 100644
--- a/media-sound/horgand/Manifest
+++ b/media-sound/horgand/Manifest
@@ -1,4 +1,4 @@
 AUX horgand-1.14-overflow.patch 235 BLAKE2B 95be6c62891707f79026b7066adbf8ef52cf79f2f19ff8de771f3e7cb6515c6703aa524e82e515bc38fd41c836eb5a4efad4d54f8c8a99a2fb49bf4d3ecf0458 SHA512 d7506c99e01a3f82d3424f368764208e3bd9638c1ffe493cdc9c69a7037164ff9c3a8787fb151fa6395001bdbfd0fabcd9c46118e10b14fe4e2d542894de6807
 DIST horgand-1.14.tar.gz 2531734 BLAKE2B 3b461a070e2716e1fb359b83edf2fa9db41bf24c1feff70fd80245964eaacb41861f7c43257dafadf25be096e02c78125a6987b0954b658cbefd44c798319c19 SHA512 d67a51972d2ddf3044cadfd40e298da6282c05de23faed98589602110a142728c45dd9d0f8cbc9c9a3b488a4e32d08a69ae36e7d94ea287e0880682eee066360
-EBUILD horgand-1.14-r2.ebuild 878 BLAKE2B 6b540892426d02a8ed76dd9a91e1621961adfb1bfa6098c2b15a1b65abd60de418b9d0813325a34b6424e37bb9b52492a1a9325cfce609d062993fff2fbe9d16 SHA512 bdc40eefed32585d5a9169fa53ac9b081932f1cd21f4ed42942b296c99c15cfbe091e497d18e1456c7bc67644089b3fae5b0f708b375f89108ef1cf902240816
+EBUILD horgand-1.14-r2.ebuild 896 BLAKE2B daf4567ebb240c48216f1217dd1b23a82a58f9a853e42aed8a6a78753a4cbaf04494294a40557e28ac0bd1f42f97827eda4062e9a65c1ad45df55a8b0825ea2d SHA512 5cb1c20a542f2f5319dd4da6cc5bd50265496d83e5409e1da69bcf9aaea268f4334c2a511d4e143d2704e0b08806d9fda1ea98ea0354348fac777d5acfe83455
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/horgand/horgand-1.14-r2.ebuild b/media-sound/horgand/horgand-1.14-r2.ebuild
index 2de59fda12c2..6506e49d4be4 100644
--- a/media-sound/horgand/horgand-1.14-r2.ebuild
+++ b/media-sound/horgand/horgand-1.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ PATCHES=( "${FILESDIR}/${P}-overflow.patch" )
 
 src_compile() {
 	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \
-		$(pkg-config --cflags jack) $(pkg-config --cflags sndfile)"
+		$($(tc-getPKG_CONFIG) --cflags jack) $($(tc-getPKG_CONFIG) --cflags sndfile)"
 }
 
 src_install() {
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 1d2fd87a8d92..c5ac9af03735 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,8 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
 AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
+DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
 EBUILD hydrogen-1.0.1.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
+EBUILD hydrogen-1.0.2.ebuild 2083 BLAKE2B b36cdff0452c3ec66d1c9fd82c4034453e32d20579a457d80c4100d949bfb1808a5c36e691c3fc25219ea6d9a2015b47469be09b8b86d7ecc9f0e313435951fc SHA512 f3ee351abc26d81433111860f3b2c256c4b0dfae180fc8987ce4327994604a81c09b810b4ca23a981c1dbc2be4d63f3d38ec75d218423da23c92461a6dd57fa9
 EBUILD hydrogen-9999.ebuild 2077 BLAKE2B d44f7d81977b4b8a755c0aca634bd6c6da2f7199c59f21928efd606bf3c12912fc2f1861e06725e80ee2bd849a6a366c78e039629cd25ef9e7454799f663f893 SHA512 8e8eea2232f41416685151de940dbdf634491ea3c36315816430a75b38a92c2a05fc4f4e12f8d8d4454d50a2ea37c3d88b6f059e0c4c256faff457d04a669f4e
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
new file mode 100644
index 000000000000..69b4555df1e5
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+fi
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+CDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="
+	${CDEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JACKSESSION=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index f9d9756272e1..a84678bb8394 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -1,4 +1,4 @@
-AUX jaaa-0.9.2-Makefile.patch 536 BLAKE2B caafbb1842016a295787cf9682427c02ea68613b2445606f7550e7d7e8498eac3e07fa323f55f6ae242533deb54f61530a3a4049f8138bb4222cc32403e41cd0 SHA512 92bf2c8aa8e49eebdc5c379275d7c8a3a0a355e9b4990503735f6043fc7bf704a80c706a3afacd72583a7e83beb56a232935dab81b22c900dec4ce7939cfaa39
+AUX jaaa-0.9.2-Makefile.patch 462 BLAKE2B e03ec250230d485b33d2f22242b709f4a1ad2f18dd81cdc49efa5bafdd05efc6c53eef505823046f75cec53e1a825782b759fb915f5fe2a19bd730836aa39f08 SHA512 baa06fb567d032809c8dba4cf9dbde11bdd4cea0203e3cf9e6636d48295886322c640e34126e5d1e73644d4b6283e2fa8c0b1fc7548d18154eb338fbbe8ac535
 DIST jaaa-0.9.2.tar.bz2 23839 BLAKE2B bccf8fd7e4d25c0cc32ea999bd997c98cc57be01dd1f098b22c09310e29e38da2eb411f252ab1b1da41ce35aa57ec75d10984c3fbd2addca05d9a0b48f4d490a SHA512 bddc08774891e7cfda11a58b87b4150131577c8a4a200b7420e20937cb9fea264b9d3c335e56456d0040ec0d4ff0324821606dca85c96e43b4e3b0afe50ac83b
-EBUILD jaaa-0.9.2.ebuild 831 BLAKE2B 1b09bbe4ec852e993dd30c5db500127c445606b5012e5361c03e13b203319fed59cddeccfbb8602d647e3c1163d49503f29769d72b0c1003d145892ddf84837e SHA512 ceb79376d24dc1bda8842c139261943250de9194f7d8bac2848b33e0c91e3631f2b562c12d4e9743d965fbbd6a7bdb2f7f080fcac89d4e450900064ebc14b15e
+EBUILD jaaa-0.9.2.ebuild 841 BLAKE2B 46b95a7c208579ec4f0cddf2adcdf15f141f937d7b39e3bc0eea44cb6cc83e8978876d356a0c89b694e38d4668c7125d4a43febb5b33848e3b5706b57a4d4186 SHA512 4ea2d35d1ca86c83e6e6976e892619163149ca9d50dff2725223e7272c589f25565861e99807eeeff3d9aae16a409dd7209a60a11e712723166877283a71eac0
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/jaaa/files/jaaa-0.9.2-Makefile.patch b/media-sound/jaaa/files/jaaa-0.9.2-Makefile.patch
index c4f472acd636..c76c6cf520f1 100644
--- a/media-sound/jaaa/files/jaaa-0.9.2-Makefile.patch
+++ b/media-sound/jaaa/files/jaaa-0.9.2-Makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/source/Makefile b/source/Makefile
-index fec867e..0c769f6 100644
 --- a/source/Makefile
 +++ b/source/Makefile
 @@ -23,9 +23,8 @@ BINDIR ?= $(PREFIX)/bin
@@ -9,7 +7,7 @@ index fec867e..0c769f6 100644
 -CPPFLAGS += $(shell pkgconf --cflags freetype2)
 -CXXFLAGS += -O2 -Wall
 -CXXFLAGS += -march=native
-+CPPFLAGS += $(shell pkg-config --cflags freetype2)
++CPPFLAGS += $(shell ${PKG_CONFIG} --cflags freetype2)
 +CXXFLAGS += -Wall
  LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lasound -lpthread \
  	-lfftw3f -ljack -lXft -lX11 -lrt
diff --git a/media-sound/jaaa/jaaa-0.9.2.ebuild b/media-sound/jaaa/jaaa-0.9.2.ebuild
index b6575ea56713..11b227292172 100644
--- a/media-sound/jaaa/jaaa-0.9.2.ebuild
+++ b/media-sound/jaaa/jaaa-0.9.2.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
@@ -12,9 +12,8 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
-CDEPEND="
+RDEPEND="
 	dev-libs/libclthreads
 	>=media-libs/zita-alsa-pcmi-0.3
 	sci-libs/fftw:3.0=
@@ -22,15 +21,15 @@ CDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/libclxclient
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch
 )
 
 src_compile() {
-	tc-export CXX
+	tc-export CXX PKG_CONFIG
 	emake -C source PREFIX="${EPREFIX}"/usr
 }
 
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 91a3148d324b..941a66859b75 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2170 BLAKE2B 74ce1268c6c37e705aba8bc4934d8a434761a38aa3bea2acd133666ab8182acee1dda5dc52ad0b05f033e95ab30e33b749b9b3870b74b1a7e14955f9232bef9a SHA512 237ded91cebae386ca8f697bc6bf08675d3c000b37916882e37fda77ee3f3b335dda2217a4a4581fae9c6b4ae6f3045da8fef94e018ed4593b9e8fb128fb5b0c
+EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2163 BLAKE2B 1d2ce2457aaf7ddf40f5f11f12bc9e6bb695954b0f0431abd8d05f696e5d74aa0dc2ebeddad11b467574e3cf26ca2a853fa79f0137088d1b83e3f22a2e66e42b SHA512 ac6a878e69c96210f792727aab52d7618d0f1cc17461503f1fcc955667370a450a145fabedf8ff689474b2df6fd5705798800ebd78f2e52367de34ddaf1a46f4
 MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
index b53cf5201545..1da39212bd01 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
@@ -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 flag-o-matic eutils multilib-minimal
+inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://www.jackaudio.org"
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 80469f4a5abc..3a3906160ea8 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,7 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
 DIST jack2-1.9.17.tar.gz 975827 BLAKE2B 7841f2714dd2fe72d7f5d72fd93a24a63b75143d81bed5166d8b2b29af4acc487157f78b26290aacb45fb2a2c82c18156d8fb45f49bda8780cb6938ae72ffedb SHA512 dff611273e23cea6fe258114c65e193f01dfa0366ddd4e6a026a3d676a32002ee744bc70085fb8568cb85395399072beec2c7f7eed8d9ec912332a2a56623521
+DIST jack2-1.9.18.tar.gz 987166 BLAKE2B e1684d50c26ce45b36133b5e9632e916cd5bdf2a2ffba9257d7d6018d9fab8ade87f2de4c837d3cc3cb37bdda296fbcd8c2da6468676a3a4c74563fb42397879 SHA512 7b9116b8002db88d9df746acf99e523cf9103c1a7955e8174912c8538b2c53bc8e7c34a64d0df4dc1f212e35035392814fdfcfe78597e26bd08ec028876bcb98
 EBUILD jack2-1.9.17.ebuild 2452 BLAKE2B 63f95828a08f855d195c9923a71e2cd5a292b24c791f9a6681bfc3794cb4ffdfa80cbfc7e1ef3d05afc845a2ba06cf63d0fa3f699e4f5ad6b5d5f8213246db49 SHA512 0e2241fa26abb4ab1f0bd163bea7e445d71c33adf3c79537a553534ed80e55b65a1a9c6baebdef597fe4a6793ab15e2fc46d9665df95ed1ec8c88d5f2efd43d2
+EBUILD jack2-1.9.18.ebuild 2458 BLAKE2B 64ffbe6a0a75249ecd490a6b2c7725a47b5f7cf6e3899f79f8d53e2150071ff843e1c7fc3948f85e6dd2cd71727875f49bb7395c935eb60ada95c549a3920ec9 SHA512 a229b00cfea8ef17c46a7871cff59624cbe96a3516ef1bb7dbb958a3a42ed2ebead98629cc67392d2e7bbeec5264d8587f8c00359ed07e980463fa7e4ea0c889
 EBUILD jack2-9999.ebuild 2458 BLAKE2B 64ffbe6a0a75249ecd490a6b2c7725a47b5f7cf6e3899f79f8d53e2150071ff843e1c7fc3948f85e6dd2cd71727875f49bb7395c935eb60ada95c549a3920ec9 SHA512 a229b00cfea8ef17c46a7871cff59624cbe96a3516ef1bb7dbb958a3a42ed2ebead98629cc67392d2e7bbeec5264d8587f8c00359ed07e980463fa7e4ea0c889
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/jack2-1.9.18.ebuild b/media-sound/jack2/jack2-1.9.18.ebuild
new file mode 100644
index 000000000000..3001f60267b3
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.18.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="${PYTHON_DEPS}
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:* )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	dbus? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.14-fix-doc.patch"
+)
+
+src_prepare() {
+	default
+	python_fix_shebang waf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=no
+		--db=$(usex metadata yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=$(usex ieee1394 yes no)
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack_capture/Manifest b/media-sound/jack_capture/Manifest
index 9e09e65ca505..c59fb28641f8 100644
--- a/media-sound/jack_capture/Manifest
+++ b/media-sound/jack_capture/Manifest
@@ -1,6 +1,6 @@
-AUX jack_capture-0.9.73-Makefile.patch 1148 BLAKE2B d9ce171dacfb69077ae46e70c6649b4b6938ffdb928506c7c45fe84928b6464a6ee29640ac02a181bb0dd36a7171314c7bb1c5961736feef30687b931183ad35 SHA512 5d158f05a491fa97b7aa62b63c98ce1429682f81c0e8f77043dc75fe93bd1adda5d11125033e25187c23cb259c089249b4d2e3a672c29f21f659b358833cbd1b
-AUX jack_capture-0.9.73-r1-Makefile.patch 1253 BLAKE2B fc7093960cf9bf4a0a960dbbb7c54e93cc715e230d73891df1f22e82ddf73a38369b5eb6b240913d2d89ace0b240af6421c0622bb781ae46cc142bc00451d905 SHA512 1725f4033a33730f2367e8f0bac0afedcbd223c0f8cd38e3c512624be207bf46d1221514a61eb7ca2b9f2abe0859729e85604050e4ea56dd13d30e48a9a069fe
+AUX jack_capture-0.9.73-Makefile.patch 1046 BLAKE2B 5a87ea22918f46c625b23715b3bccabec6380e68374d877f6b1c3b9bb838fc3b5805c84c8a3acce3eb0cc2b7de6374a9a0124fad040c31ed8ac776972c43b7ec SHA512 8cfd1322299d314021ce58b7500ae538a43073fcc1df6514fd879d3b47db53069870846f450fb097a5a738f92dcac14e052821aa07ee1364cca648d94a47c754
+AUX jack_capture-0.9.73-r1-Makefile.patch 1193 BLAKE2B be2301633901dc63853292c014adf76e0999184bf331983036116a4591e83233f05a1ff6299691c2a3409bff7223acfacffe36aca643e26e2c689ffbb4b2ec67 SHA512 b7ac7d9c040358309c3652b9c620b805b303852d6c978042790200555013077455caaa63a0c877c863b968500396ec2d3cac08b6b7cb4d7694e0344926b6a9c5
 DIST jack_capture-0.9.73.tar.gz 63676 BLAKE2B 0ea944dc544f237501485c5d89299c2d1e202da2d1e3c4ef7922f4d2d49af7f0c871f077613da63ee3cb1a457a2a4edf4c1ab4b6b0625b4cb455db56d880e6f5 SHA512 eecab2e26d5e83b65adf386d6fb38f2d9169cf1574e462ec455367f7d98f4f4d5a9d0766b9c572cfdcb43c55ae914bb8a2222267842c9912e2afe13c1f7b0038
-EBUILD jack_capture-0.9.73.ebuild 1072 BLAKE2B 43eb497975a4f4eaee689a86f0dd1f05faece3e6bb1b15db8bf90a2cf62aa067bb5de9017bff97264a28024536b7419b9bf95f84a116284a518ae28d38f9935f SHA512 88348bd76396947a17e5f9cd9ea91b57c717794e4f33caeda6d61b9951a1924d94155e1ee40020af9bd5738e59dab19d27cdd20558067f5df74611c702e1d6a8
-EBUILD jack_capture-9999.ebuild 1066 BLAKE2B 61274af4f511e6e1c0f24beef6de933d8a7aac0babc4ac124c421e1220589711de83206a7cbb5e30a34033c6f10933f5cb8717eeb95e9165c50a30d20d222734 SHA512 f3885589993025f176c293f5b5c61e4bd7a0bc7448549a9a52e0398dce2ea46a8144172da985c4d062cb279f6f65ef2b756810d350260d9b2bf44ce99d02b843
+EBUILD jack_capture-0.9.73.ebuild 1104 BLAKE2B 279ec392329e04c58fe6fdc0177b1874458be89a7cfa65aca511fcc76a005cb9306663c6d11c2a967326e5c8ca3e9af6c9674d3682999ae91717caf4d563537f SHA512 b0c070ec3964ba1386a5719f5b60c7c4842492cc0326e9c030d528f8d11b48b22518ecc6171f4a68a4535450c475beef73f67bef8b2cc7ab8fb4630e65ecd780
+EBUILD jack_capture-9999.ebuild 1087 BLAKE2B ceb60e4476202319d11924b209c7858973e584590eade242d1508979335c9cd6723135f6d1a6da4cb70699c998cdf9429bcdee39aac7a390876e01fa5a4186e1 SHA512 39102ee68e3cff459954b469e4d38dce3382b39dd73d9b7eda0d152eaa2a46add6c28c22518f2ec8cd24540b4ffd52547e105a5fbd95fb0d25e6813d76d4b5b0
 MISC metadata.xml 361 BLAKE2B 87172f0c67cc6e071e287d233f2fcb91be1d7207fb7c321b002145cf0812a3b44cf317c0797aa281d199639d1a57670e5a1eb16d50160997882beece3e2539af SHA512 b410a8813b1a48dfc920e97401bd31f38349ef588e9fa770da53ed541b87a7da895465712d679bca09c4e27b2caf9ed84a553c330e48f6307fa91471de514513
diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch
index ef69ed5d810c..8b5bb15d1f6c 100644
--- a/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch
+++ b/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch
@@ -1,6 +1,5 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2017-07-07 17:42:49.613728707 -0400
-+++ b/Makefile	2017-07-07 17:44:39.393726882 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -3,16 +3,13 @@
  
  VERSION=0.9.73
@@ -35,7 +34,7 @@ diff -Naur a/Makefile b/Makefile
  
  jack_capture_gui2: jack_capture_gui2.cpp
 -	$(CPP) $(CPPFLAGS) $(OPTIMIZE) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
-+	$(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
++	$(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `${PKG_CONFIG} --libs --cflags gtk+-2.0` -o jack_capture_gui2
  
  config_flags: Makefile das_config.h
  	cat das_config.h |grep COMPILEFLAGS|sed s/\\/\\/COMPILEFLAGS//|tr '\n' ' ' >config_flags
diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch
index c4909fbde8e3..b9c3386e330a 100644
--- a/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch
+++ b/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 6e1fef9..d75ebfb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -3,16 +3,16 @@ bindir = $(PREFIX)/bin
@@ -37,7 +35,7 @@ index 6e1fef9..d75ebfb 100644
  
  jack_capture_gui2: jack_capture_gui2.cpp
 -	$(CPP) $(CPPFLAGS) $(OPTIMIZE) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
-+	$(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
++	$(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `${PKG_CONFIG} --libs --cflags gtk+-2.0` -o jack_capture_gui2
  
  config_flags: Makefile das_config.h
  	cat das_config.h |grep COMPILEFLAGS|sed s/\\/\\/COMPILEFLAGS//|tr '\n' ' ' >config_flags
diff --git a/media-sound/jack_capture/jack_capture-0.9.73.ebuild b/media-sound/jack_capture/jack_capture-0.9.73.ebuild
index 6131ce16cd9c..d44b0de8f15d 100644
--- a/media-sound/jack_capture/jack_capture-0.9.73.ebuild
+++ b/media-sound/jack_capture/jack_capture-0.9.73.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="JACK Recording utility"
 HOMEPAGE="https://github.com/kmatheussen/jack_capture"
@@ -14,18 +14,18 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="mp3 ogg osc"
 
-CDEPEND="
+RDEPEND="
 	media-libs/libsndfile
 	virtual/jack
 	mp3? ( media-sound/lame )
 	ogg? ( media-libs/libogg )
 	osc? ( media-libs/liblo )
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}"/${P}-Makefile.patch
 )
 
 DOCS=( README config )
@@ -38,15 +38,13 @@ src_prepare() {
 	use osc || sed -i -e 's/HAVE_LIBLO 1/HAVE_LIBLO 0/' -e '/COMPILEFLAGS .* liblo/d' gen_das_config_h.sh
 }
 
-src_compile()
-{
+src_compile() {
 	tc-export CC CXX
 
-	emake PREFIX="${EPREFIX}/usr" jack_capture
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${EPREFIX}/usr" jack_capture
 }
 
-src_install()
-{
+src_install() {
 	dobin jack_capture
 
 	dodoc "${DOCS[@]}"
diff --git a/media-sound/jack_capture/jack_capture-9999.ebuild b/media-sound/jack_capture/jack_capture-9999.ebuild
index f0073414466d..15a6a0cbbd2f 100644
--- a/media-sound/jack_capture/jack_capture-9999.ebuild
+++ b/media-sound/jack_capture/jack_capture-9999.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 eutils toolchain-funcs git-r3
+inherit toolchain-funcs git-r3
 
 DESCRIPTION="JACK Recording utility"
 HOMEPAGE="https://github.com/kmatheussen/jack_capture"
@@ -11,21 +11,20 @@ EGIT_REPO_URI="https://github.com/kmatheussen/jack_capture.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="mp3 ogg osc"
 
-CDEPEND="
+RDEPEND="
 	media-libs/libsndfile
 	virtual/jack
 	mp3? ( media-sound/lame )
 	ogg? ( media-libs/libogg )
 	osc? ( media-libs/liblo )
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.73-r1-Makefile.patch"
+	"${FILESDIR}"/${PN}-0.9.73-r1-Makefile.patch
 )
 
 DOCS=( README config )
@@ -38,15 +37,13 @@ src_prepare() {
 	use osc || sed -i -e 's/HAVE_LIBLO 1/HAVE_LIBLO 0/' -e '/COMPILEFLAGS .* liblo/d' gen_das_config_h.sh
 }
 
-src_compile()
-{
+src_compile() {
 	tc-export CC CXX
 
-	emake PREFIX="${EPREFIX}/usr" jack_capture
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${EPREFIX}/usr" jack_capture
 }
 
-src_install()
-{
+src_install() {
 	dobin jack_capture
 
 	dodoc "${DOCS[@]}"
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 5149b422420d..dd4e0a018b9f 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,8 +1,3 @@
-AUX kid3-3.8.5-tests-optional.patch 2531 BLAKE2B 47764202cbfdeb7f4d55619f883a6aa5af1d0ef5034280a80cbf668eb0770cc80568e69d5e46b4ea20cf97eec217b4558082441fde0912325decfcda35ebce3c SHA512 d42e4a1e1a56ce3caef480a8fe08155d21d89b5e869f4411776b61373c6900f14073b8803001b1a70bd89532da48553bb8cca4bf45fd34ec589d695c434bb220
-DIST kid3-3.8.4.tar.gz 3161673 BLAKE2B 0055805bd0470bd000549c970c69cf911eb12d0ca291985759d0ebc2b6aa7394c65a72193606a4730136eeafef7a3d7a21822e998f2d841caa0a23c424a1f906 SHA512 c5abef6b0b7b4cfe606aa547563efff77f70b06770ea8423ed2cb25099a5c015e5de4badf5e87e080b05926459423584bd747aa3e475393026d92f6d73c9782a
-DIST kid3-3.8.5.tar.gz 3181228 BLAKE2B 8e409c0697cc6045c0a1da4b19a8eae952bc63fa824e21aca19e6ad2130ef71a3fff2c25fa34078ea72e3cbd84459c77bbb616b1d1fb62d0f1023aa2fd6cfccd SHA512 d1f0bc91d50538c29807ddca2a039e758c58850d1224675a1674e3e1d89936bf80db34ffd3cf3678e1008eb600476ebb722ca78796eba2537defcc57664ff00c
 DIST kid3-3.8.6.tar.gz 3183673 BLAKE2B c862c1da05ed85ecce8b0c666ddb9e18bdcabafe569f62f3264ebf1e0b7b16c11d25a10e1b1e6cd395442500275f9ee73ef1f6225e049790a09eac68b811df06 SHA512 11613ea72b23a80473699c61141ae2eb9a76b47da87704cd673b70a65bb334bd8232d3a66a7ff2b7f552751145613dbcfb8dcf0746eebb9fa2bd45979f4ba5d4
-EBUILD kid3-3.8.4.ebuild 1782 BLAKE2B 6d0bab38a20dbd1c35869368f0f3ee9cc92489db759e2dd789cdd48ec176f06b3dcca310c7744c2c14fcbbe9992d21b815d34e99b8a57149207167e3068acb97 SHA512 2d5745d314c1977b4fa63e7211c68fb0960e6d51f9154eeac52796621c0bf1ed4a87c6f4d2a2b827b334167577f0d5641a6392d90df8b2ae4090ff7efcff4414
-EBUILD kid3-3.8.5.ebuild 2120 BLAKE2B 95486d3a308e69ccc39820cc07f3f0ddfdf97bffcdd2413c4456d56972d2b0ece0a7b04134121e8d32faf64e9d55fb58cddab90b603f56b293975800d45891a2 SHA512 c8071d090083209a70d461e7934ffa73cd3c3e5fdfe2275271df776ad989d068cea37ee1a1342f113ef63953b2d4ede33ba08711e1900ffd5c33f4c96c445ba1
-EBUILD kid3-3.8.6.ebuild 2006 BLAKE2B e62ef6dad5abb717ce4afb25b0d32f9414115d236bb7d39b0ff164f94a87fb87a0acf30ea9a5a7586a4817881d505bf07e5f4b2731217fb84aa679b23f41cd62 SHA512 c9d344709c60c736b0621fb1e248229d9a7844a4b4207ab804255ee03126e85c255f607bb5c05dfabcbd2848de9600709be6d7a4160f30228c51c5bf838af879
+EBUILD kid3-3.8.6.ebuild 2004 BLAKE2B 74400619f98177629513157b8daae32eed7eb73969dbc5bd6142e7403866cc75c881dd95a035fa9bbb2ca970ccd52150f57b72ed0146552a78f3fe2b92be2055 SHA512 7d7e8c90105b77b4ff7f5aa5b7c732be150e4bdadc9dac4d2aa7b423949e3bdcedb89e01545b371051c37a8979c34d85e3e470caf7161d4d9d4245d234bff4ee
 MISC metadata.xml 581 BLAKE2B aaf7af21490a043596d92081040312887a687778836e126b6057db01eaf8bae1bb677ebdf2513bf5ab36f7ad95a7327315de3e42384915b7575d45ef1959e148 SHA512 6f4f92be39dd0099d1f762a07407e1fb6a75b9f0a7b01f0b60f7273eb1c04716e999633720b4535a7d42ea0ca447f8080377f00f93686c019baebfbce2cc25d8
diff --git a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
deleted file mode 100644
index 44af299f13ce..000000000000
--- a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From fe096c5d05c95bfdcfae6a5976e242e324f4152d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Fri, 5 Feb 2021 06:17:42 +0000
-Subject: [PATCH] Use include(CTest) and BUILD_TESTING to make tests optional
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt     | 29 ++++++++++++++++++++---------
- src/CMakeLists.txt |  2 +-
- 2 files changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 92d50265..ee476ac5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -211,8 +211,15 @@ endif()
- set(CFG_QMLSRCDIR "${kid3_SOURCE_DIR}/src/qml")
- 
- find_package(Threads)
--set(Python_ADDITIONAL_VERSIONS 3)
--find_package(PythonInterp REQUIRED)
-+include(CTest)
-+if(CMAKE_VERSION VERSION_LESS 3.12.0)
-+  set(Python_ADDITIONAL_VERSIONS 3)
-+  find_package(PythonInterp REQUIRED)
-+  # PythonInterp sets PYTHON_EXECUTABLE
-+else()
-+  find_package(Python3 COMPONENTS Interpreter REQUIRED)
-+  set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
-+endif()
- include (CheckCXXSourceCompiles)
- include (CheckCXXCompilerFlag)
- include (CheckLibraryExists)
-@@ -256,7 +263,10 @@ else()
-   find_package(Qt5Core)
- endif()
- if(Qt5Core_FOUND)
--  set(_qtComponents Core Gui Widgets Network Xml Multimedia LinguistTools Test)
-+  set(_qtComponents Core Gui Widgets Network Xml Multimedia LinguistTools)
-+  if(BUILD_TESTING)
-+    set(_qtComponents ${_qtComponents} Test)
-+  endif()
-   if(WITH_DBUS)
-     set(_qtComponents ${_qtComponents} DBus)
-   endif()
-@@ -472,12 +482,13 @@ if(ANDROID)
- endif()
- 
- 
--enable_testing()
--add_test(NAME test_cli_functions
--         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/test/test_cli_functions.py)
--add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure)
--if(NOT CMAKE_VERSION VERSION_LESS "3.17")
--  list(APPEND CMAKE_CTEST_ARGUMENTS --output-on-failure)
-+if(BUILD_TESTING)
-+  add_test(NAME test_cli_functions
-+           COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/test/test_cli_functions.py)
-+  add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure)
-+  if(NOT CMAKE_VERSION VERSION_LESS "3.17")
-+    list(APPEND CMAKE_CTEST_ARGUMENTS --output-on-failure)
-+  endif()
- endif()
- 
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c6c703ac..db067265 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,6 +8,6 @@ if(WITH_QML)
-   add_subdirectory(qml)
- endif()
- 
--if(BUILD_TEST_APP)
-+if(BUILD_TESTING AND BUILD_TEST_APP)
-   add_subdirectory(test)
- endif()
--- 
-GitLab
-
diff --git a/media-sound/kid3/kid3-3.8.4.ebuild b/media-sound/kid3/kid3-3.8.4.ebuild
deleted file mode 100644
index ff949e076256..000000000000
--- a/media-sound/kid3/kid3-3.8.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org cmake xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		media-video/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	mpris? ( dev-qt/qtdbus:5 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}
-	!media-sound/kid3:4
-"
-
-src_prepare() {
-	# overengineered upstream build system
-	cmake_src_prepare
-	# applies broken python hacks, bug #614950
-	cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_DBUS=$(usex mpris)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.8.5.ebuild b/media-sound/kid3/kid3-3.8.5.ebuild
deleted file mode 100644
index 8ed70dc49ede..000000000000
--- a/media-sound/kid3/kid3-3.8.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake kde.org python-any-r1 xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		media-video/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	mpris? ( dev-qt/qtdbus:5 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# overengineered upstream build system
-	cmake_src_prepare
-	# applies broken python hacks, bug #614950
-	cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_DBUS=$(usex mpris)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.8.6.ebuild b/media-sound/kid3/kid3-3.8.6.ebuild
index d68ab97e4739..d91a129de142 100644
--- a/media-sound/kid3/kid3-3.8.6.ebuild
+++ b/media-sound/kid3/kid3-3.8.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://kid3.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index d94200b5723c..b1fdec094503 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -4,5 +4,5 @@ AUX lash-0.5.4-strcmp.patch 252 BLAKE2B f2b002772df6dab5c2942039d36e681697894cc5
 AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434b823740c1cdd1bddd3c7a52ed505bc1acea64ddc145e1e7f9ffe7da31b7fd500f296b26c64d07c2a59149c49d18e0e4e0dc4e9e1a2 SHA512 39c3d82372592d6864a2c1e0de94ee150a434e107357ab549cf406cd58b7eb2f79cded6e97775f50e2e602906315aaf167869a53adb1b143eb3b5bb7147705bc
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
-EBUILD lash-0.5.4-r4.ebuild 2587 BLAKE2B edcfc41f2295c9f768129beaccf05ef5359ec07981c6f383e7685202049dbec7bf20e5349398f41d68ca86ab121212f61ef1dfc86f3072109dca2b9ee5164640 SHA512 abfd1ef0e0cc9d849b2991f267c97a91e1cf7fba8a16f796910e55eb9771958dc86e5e955fcdae41be740c275d1962941f46cd0b71fa93e85a2212fd55c3de56
+EBUILD lash-0.5.4-r4.ebuild 2580 BLAKE2B 408ec03f2104c620517538ccef4a001200dc11dfc4ef34885507ec7addcbb370769899f27a05d5a83c965efce89a4ab0f34e98c7560e54f9c19677f7ea84f5a6 SHA512 60d35cea30553a4b1a2fd8a2fdca0602f44de2dfb52000367b6d48fe81693f9b9c0c598194b0d176a341cb1f8391a502e102f44f69f50ccdbde9f7bdf9f5ae92
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
index f4ee7eb6d736..c7ac96d2f9a2 100644
--- a/media-sound/lash/lash-0.5.4-r4.ebuild
+++ b/media-sound/lash/lash-0.5.4-r4.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
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools eutils multilib-minimal python-single-r1
+inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="LASH Audio Session Handler"
 HOMEPAGE="http://www.nongnu.org/lash/"
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 88bbedc9cb3f..34dcf85ee10d 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,5 +1,5 @@
 AUX lmms-1.2.2-no_compress_man.patch 1290 BLAKE2B 8d88782f2b17a1b2399e98559820e00e706d7f328eb140babde11ca239fd516b133e698c366fa34bf72c2047b64aa14108cc82a09d0869fffd5e3bea8c1936a5 SHA512 4a414e513a3257b5eb3f472ca321504e7037c314e3d218b612b9aa9391dd0d1b038b77467f112a069479abec1b1ab3372126e27db34ec22c2a89b902a66878bd
 DIST lmms-1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
 EBUILD lmms-1.2.2.ebuild 2389 BLAKE2B ff3dddfb8a47dc565f7c82514f954a124c72b3a6dccd3e8d0f276bdc33bc0b5164e79631de8c55096653d5b9b56004d3516f1543f4e35179964f0e429b94f2b2 SHA512 532fef9e5ee73d37ec81bbabb81782885c03f45c6c01c94c66e5c6e01f901c3f7cf138219898de50c7a9a3ad35514247c1c9b5a9f9aa9269f49635114c3e6cec
-EBUILD lmms-9999.ebuild 2292 BLAKE2B 84696bb30d8b1b156e7740b2f7a1c30e750538df9139dcd363f579965899c79a4fd220686491e85045bf1b73a8099d5fb506d69adf5e3c0eb3ea79ff986cf7ce SHA512 860d4674357662dbd4f3ff0a31a8b70a6deeee6d91eaf2861f745834c7fdfb6a708d850c713c78bac77d21e8200b7eb84a90dcb0dc54a41b2fea0b9a162bd1a5
+EBUILD lmms-9999.ebuild 2246 BLAKE2B 88f22a3d435705010d70888a8799a0f00a1cb16d352b64509b2893485be1ad7cda4d9876c4840d198a376b3ebc7c4e3b6adf2675e03605037bba3f86bf6a1456 SHA512 2c0ec0790a17939aedd079c9ddada1e08407c5ea0b52748445690f8554e1c80dd1daa3c2598dfdbe07d2f050e55e391b1308a1a3d7ce1b44253d794da1b1f8b6
 MISC metadata.xml 956 BLAKE2B 9bda57bcbb5b4f6c0831ca465ed48bb27f0c86f8de7908369140b0e7865dc4b44cf0c7b9225bdd8ba786dd4ef22af4a338134e89b23163e0f872519f2e0becfc SHA512 4a3c3bb120894acf50733e003dfdf3132201ad9d9cab21fbde39aca76c38d1e4784d70f2f01c9b889378fc8156271e0e216100dee85d028caef1eaa6dc49a3e0
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index a92a923b07b8..2650aa8061a8 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # The order is important here! Both, cmake and xdg define src_prepare.
 # We need the one from cmake
-inherit xdg cmake
+inherit bash-completion-r1 xdg cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -70,6 +70,7 @@ DOCS=( README.md doc/AUTHORS )
 
 src_configure() {
 	local mycmakeargs+=(
+		-DBASHCOMP_PKG_PATH="$(get_bashcompdir)"
 		-DUSE_WERROR=FALSE
 		-DWANT_CAPS=FALSE
 		-DWANT_TAP=FALSE
@@ -92,15 +93,3 @@ src_configure() {
 	)
 	cmake_src_configure
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/mangler/Manifest b/media-sound/mangler/Manifest
index f04cb043514d..2d9675124ac0 100644
--- a/media-sound/mangler/Manifest
+++ b/media-sound/mangler/Manifest
@@ -1,3 +1,5 @@
+AUX fix_ftbfs_narrowing_conversion.patch 709 BLAKE2B d58fcc3a241a0d35e73509ac01922035f47ca9b13791c90decef9f0e7c52214d2bfbd11fb713eaadb441e4d629ce3f07b8162d8bd633672c180dbabf965b8d0c SHA512 7c83c998db7523a8704ae98c14c8f62a2804b6b60caddc9aa01fd3c2b9c07c69f028d4debb306c784f8c4eeeb076afca8fa19dfef40379384d1ef7709130dfbd
+AUX mangler-version-info.patch 610 BLAKE2B 2ecee647ca16da9a807cbc5aac964f1495a5519c6d70213a4aade73ac073e0e6d3e82959f155250efd442221a56fa96af770d9f96b1c8182f3634da769eff83d SHA512 877822f936ed7f1aeca17cf02a105c15195b77ec3fa73df63928d7449eee7306719d10b5592bdd17823285bc72ae3950bc6b748755df91b7ed9bee37787b4d4e
 DIST mangler-1.2.5.tar.bz2 5390985 BLAKE2B b2b61d49683b356be5bcaf111d0e75cc0ff30cbb131b0de360128e2973a415eb87736b55a965fb30651e5d3580a2274754ddb8a44b345c55fc6ba0caa26de0a5 SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38
-EBUILD mangler-1.2.5-r1.ebuild 1273 BLAKE2B c1ebb869c10de4ebe45bb1bf6e64ab3a14820ba3e901e4fa081b29c955c072756ded5f74c63939c80d1c626f709b35ed70d8d0446ad84590fc206e76f5e28bd5 SHA512 97602659cd9ad37e2a7f9a23578a784d8d09676ad5c30c7860ceb217dab590bd663c064f810e995df30179d9fbeeb5bd9170eafd152e9b98a51413be4ef0b1b9
-MISC metadata.xml 470 BLAKE2B dba7ffdefd9ed484e5397a60c4b13f051879ffd760fc32cf423f51343242cca71578ab6d3d87471250f9b223d0247bd92ba3ee2ff1b5b2d05f92dd4ee89b72f1 SHA512 dec3e027307afb3b5589f56e595371026232d5f328fe9520b6d21282eba626b736dbefa7768cb06c4821e75b45340a04a7252e0a1b1380b618ef1f9d54b1692c
+EBUILD mangler-1.2.5-r2.ebuild 1380 BLAKE2B 3fdd53a0092910b46833990b49fbbc352c13822c6d800db6af6532b128238d5031cb1dfc16d3bd5ad358b731ea35b1caede0d6782ba652c6a7f6d58c3b5f2e2f SHA512 623097a18c82fd2a62d9fcb3dd1e77586528de6ff3e9fb73e51dd3a6aeff09f54a87835b64649e0186774687b49d04ab97c070c7910cb96de7dc56b0e5198ae5
+MISC metadata.xml 472 BLAKE2B 4fe3d0cd01024a5d02e189adf6e42bd15180c39734db8b5e1cae8f9369e4df9834c7eabaa80c8b9945624f3a5877e7a9cb1f3f4a8bb01157aeae76cbf736cee5 SHA512 e527083dd60ac548ee6e1acadddcf7de55c7b8d6b58d10c4c34750c7bfee839d8b4a1c4a65dc732b1d3587f058b2a037de212ab583f240993223990608546f23
diff --git a/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch b/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch
new file mode 100644
index 000000000000..feec08089421
--- /dev/null
+++ b/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch
@@ -0,0 +1,18 @@
+Description: Declare byte array as unsigned char rather than char to avoid narrowing
+ A step up in pedantics in C++11 has identified a byte array that was not
+ declared as unsigned.
+Author: William Panlener <wpanlener@gmail.com>
+Bug-Debian: https://bugs.debian.org/805160
+Forwarded: no
+
+--- a/src/manglerg15.h
++++ b/src/manglerg15.h
+@@ -52,7 +52,7 @@
+         std::vector<Glib::ustring> events;
+ };
+ 
+-const char g15_blank[] = {
++const unsigned char g15_blank[] = {
+     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/media-sound/mangler/files/mangler-version-info.patch b/media-sound/mangler/files/mangler-version-info.patch
new file mode 100644
index 000000000000..200c8e7ecab9
--- /dev/null
+++ b/media-sound/mangler/files/mangler-version-info.patch
@@ -0,0 +1,19 @@
+commit 2581fbd54434df6dc4babd48bb41eaf7f5d6d06a
+Author: orbea <orbea@riseup.net>
+Date:   Wed Apr 7 10:01:31 2021 -0700
+
+    libventrilo3: Fix -version-info typo.
+
+diff --git a/libventrilo3/Makefile.am b/libventrilo3/Makefile.am
+index a934acf..c2fea99 100644
+--- a/libventrilo3/Makefile.am
++++ b/libventrilo3/Makefile.am
+@@ -7,7 +7,7 @@ libventrilo3_la_SOURCES = libventrilo3.c  libventrilo3_message.c  ventrilo3_hand
+ 
+ libventrilo3_la_LIBADD = $(speex_LIBS) $(opus_LIBS) $(LIBS) -lm
+ 
+-libventrilo3_la_LDFLAGS = -version 0:0:0
++libventrilo3_la_LDFLAGS = -version-info 0:0:0
+ 
+ include_HEADERS = ventrilo3.h
+ 
diff --git a/media-sound/mangler/mangler-1.2.5-r1.ebuild b/media-sound/mangler/mangler-1.2.5-r2.ebuild
index 8f58aefd5e7c..38b754f7ff44 100644
--- a/media-sound/mangler/mangler-1.2.5-r1.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/mangler-version-info.patch"
+	"${FILESDIR}/fix_ftbfs_narrowing_conversion.patch"
+)
+
 src_configure() {
 	tc-export CC
 
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index 1ca96e6372cb..cd29bd7d1973 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -8,7 +8,7 @@
   <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 0a1752cb25fd..7aab9b20b774 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,11 +1,3 @@
-AUX milkytracker-1.02.00-CVE-2019-14464.patch 926 BLAKE2B 632af971c55cd80d1a8aa2b8d2dd2fdc5c471feaa0bbe8fff0b980de8a1db2f2281a816381a08a064f105146839fa63194e770190ca77ec79a14d9c2ff1839b0 SHA512 c37d11fd83831199075205ae9631bb6a2ac05458c63155a8a65a093fa8ce851ce7b9d8efb35d7db785760dc126c225aa292c4b11f3de5d2f87d7fa9c0bda6c76
-AUX milkytracker-1.02.00-CVE-2019-1449x.patch 3121 BLAKE2B 8b863ed8a9c78942c303e06ed8f8089d4602a9b8765a38ae9974f3871441f9b10cde4cc8a297a45cd66da567c94234c4ca9f7eed1505ba2ced92fb2407cf5fed SHA512 4805e831e6ae3934fdab2045e76eb1bfd750e3efb4df58b374ac69d7bdc6d5f88241b4a8d87a6b681cfdf11c1b0316f7c6691d505b6cfd28dd6324dc0de7bff8
-AUX milkytracker-1.02.00-CVE-2020-15569.patch 972 BLAKE2B 34dfbe0690fefce4cbcfeabe571d811092bba6c72e2bfe8db5e087d21774563bd79108e88c66b490999553587ab755fce16d53f4822e23149b86c5585aa46c00 SHA512 358b5e1709a634f2e51c6bda53684c903f57e328d73a364c5b7feac4c278288838cfde3f1afc087b2f52259f1cbcacda022dc92f3a621c7d772a9be8d248c220
-AUX milkytracker-1.02.00-clang.patch 2346 BLAKE2B 4e957fbc69e4b5aa9ee5f93292df62e04f577e26dbc2b16464c338761330a95247a5f908d471f000964c8960878d673293f71ddb6289bf386923cebbdbc335c1 SHA512 3dcac9b8d889f761e016f7fedfb2670392982f74438bf4ed83bbdfb89f424f583ea9c16ac13c3c9a99e3453e9ed6f460866563fde3318eaba49218181fa1ebf0
-AUX milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch 2570 BLAKE2B fe0a454e34c9b7b88125ccdfb6f77e1cc014013a8f054f00c6330e733ba54154bc1d96ef256cf5befc8329c169e57f29062652f0ff84dc55201572d0201111fc SHA512 0112a805d61204ff31ad0b1b31cbc9ff60f91f5ada275a839f0c258c3f5302239fd9b00ba7d8387b5865ad2ea86abedc32630ff2f1b58c0a74bfa67895a5676a
-DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
-DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
 DIST milkytracker-1.03.00.tar.gz 3705395 BLAKE2B f14a7112de39748121933d242d89dc6efb71a73c3591fedb92785814e2edc788edfb6608e9237cdfed19ee7337d5920d0232eed5d85f692dbef5d4cb43a27cd0 SHA512 d5489994d9c5d24552073afcbd787c20720096dd81d640356fc13b2e2b8a49713b798066d54f2b589f3819c14279142e295e4d6317ed325537069faad47abbe6
-EBUILD milkytracker-1.02.00-r1.ebuild 1527 BLAKE2B ad59c3aec2f8c6875131d84463a76a586af11f2222a073728ec26f7117362d1e0f8447b7b41d5fb56cf9f03816f1e10e9ad0430a26529ef0c0cdeabd67f83557 SHA512 cf999b71b395b7d42575f374ac4e5b21d3e18db0c749cba2811d63c16a926e3c1103bbcc96c46faa3c91bc18bb056fafd66ed96a2a774b39facac3bc80828c23
 EBUILD milkytracker-1.03.00.ebuild 976 BLAKE2B 32834e351f8b0321b8fcd8967a93dbda9226a764e52d1ee9987f0fca9354e1a3b51ea45109e17da01e53deefbfada7455e745a5704e88fb49933b889b29aedee SHA512 15d34b6e27b4c2d9fd17effc22eb2c896ce63decce1412cc87b643e26cc174888e95b1956431988fe29685f4fed9dbe0633817fbc1fd7fa888ab92db71f7dadf
 MISC metadata.xml 336 BLAKE2B 25e72a4e6699474f9a932ab2f4a7a360165e399b59086d719d4edcbedf4d5a1c08f2b8e790fd7eacddf4e0c3a444fbe640df7fd14b50169b8c92ecc8e0d78410 SHA512 0490c225b35946c04189594aa9d1855b9391ace1ac83914536317df7d7615a33dd1467a45dfb1b3e75a6a677fcd8c460bb6be197ff5d8010f9bf6e4c1ee4e916
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch
deleted file mode 100644
index d59522d6d1d0..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/fd607a3439fcdd0992e5efded3c16fc79c804e34
-
-commit fd607a3439fcdd0992e5efded3c16fc79c804e34
-Author: Christopher O'Neill <code@chrisoneill.co.uk>
-Date:   Tue Jul 30 19:11:58 2019 +0100
-
-    Fix #184: Heap overflow in S3M loader
-
-diff --git a/src/milkyplay/LoaderS3M.cpp b/src/milkyplay/LoaderS3M.cpp
-index 5abf211..edf0fd5 100644
---- a/src/milkyplay/LoaderS3M.cpp
-+++ b/src/milkyplay/LoaderS3M.cpp
-@@ -340,7 +340,11 @@ mp_sint32 LoaderS3M::load(XMFileBase& f, XModule* module)
- 		return MP_OUT_OF_MEMORY;
- 	
- 	header->insnum = f.readWord(); // number of instruments
--	header->patnum = f.readWord(); // number of patterns	
-+	if (header->insnum > MP_MAXINS)
-+		return MP_LOADER_FAILED;
-+	header->patnum = f.readWord(); // number of patterns
-+	if (header->patnum > 256)
-+		return MP_LOADER_FAILED;
- 	
- 	mp_sint32 flags = f.readWord(); // st3 flags	
- 
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch
deleted file mode 100644
index 0560cd2b825b..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-This patch is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/ea7772a3fae0a9dd0a322e8fec441d15843703b7
-
-commit ea7772a3fae0a9dd0a322e8fec441d15843703b7
-Author: Christopher O'Neill <code@chrisoneill.co.uk>
-Date:   Tue Jul 30 18:40:03 2019 +0100
-
-    Fixes for buffer overflow issues #182 & #183
-
-diff --git a/src/milkyplay/LoaderXM.cpp b/src/milkyplay/LoaderXM.cpp
-index 108d915..f87f5c1 100644
---- a/src/milkyplay/LoaderXM.cpp
-+++ b/src/milkyplay/LoaderXM.cpp
-@@ -63,8 +63,8 @@ const char* LoaderXM::identifyModule(const mp_ubyte* buffer)
- mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- {
- 	mp_ubyte insData[230];		
--	mp_sint32 smpReloc[96];
--	mp_ubyte nbu[96];
-+	mp_sint32 smpReloc[MP_MAXINSSAMPS];
-+	mp_ubyte nbu[MP_MAXINSSAMPS];
- 	mp_uint32 fileSize = 0;
- 			
- 	module->cleanUp();
-@@ -117,6 +117,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 	memcpy(header->ord, hdrBuff+16, 256);
- 	if(header->ordnum > MP_MAXORDERS)
- 		header->ordnum = MP_MAXORDERS;
-+	if(header->insnum > MP_MAXINS)
-+		return MP_LOADER_FAILED;
- 
- 	delete[] hdrBuff;
- 	
-@@ -143,7 +145,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 			f.read(&instr[y].type,1,1);
- 			mp_uword numSamples = 0;
- 			f.readWords(&numSamples,1);
--			if(numSamples > 96)
-+			if(numSamples > MP_MAXINSSAMPS)
- 				return MP_LOADER_FAILED;
- 			instr[y].samp = numSamples;
- 
-@@ -169,8 +171,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 			if (instr[y].samp) {
- 				mp_ubyte* insDataPtr = insData;
- 				
--				memcpy(nbu, insDataPtr, 96);
--				insDataPtr+=96;
-+				memcpy(nbu, insDataPtr, MP_MAXINSSAMPS);
-+				insDataPtr+=MP_MAXINSSAMPS;
- 				
- 				TEnvelope venv;
- 				TEnvelope penv;
-@@ -285,7 +287,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 
- 				instr[y].samp = g;
- 
--				for (sc = 0; sc < 96; sc++) {
-+				for (sc = 0; sc < MP_MAXINSSAMPS; sc++) {
- 					if (smpReloc[nbu[sc]] == -1)
- 						instr[y].snum[sc] = -1;
- 					else
-@@ -491,6 +493,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 				f.read(&instr[y].type,1,1);
- 				f.readWords(&instr[y].samp,1);
- 			}
-+			if (instr[y].samp > MP_MAXINSSAMPS)
-+				return MP_LOADER_FAILED;
- 
- 			//printf("%i, %i\n", instr[y].size, instr[y].samp);
- 
-@@ -532,8 +536,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 				
- 				//f.read(&nbu,1,96);
- 				
--				memcpy(nbu, insDataPtr, 96);
--				insDataPtr+=96;
-+				memcpy(nbu, insDataPtr, MP_MAXINSSAMPS);
-+				insDataPtr+=MP_MAXINSSAMPS;
- 				
- 				TEnvelope venv;
- 				TEnvelope penv;
-@@ -650,7 +654,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- 
- 				instr[y].samp = g;
- 
--				for (sc = 0; sc < 96; sc++) {					
-+				for (sc = 0; sc < MP_MAXINSSAMPS; sc++) {					
- 					if (smpReloc[nbu[sc]] == -1)
- 						instr[y].snum[sc] = -1;
- 					else
-diff --git a/src/milkyplay/XModule.h b/src/milkyplay/XModule.h
-index f42d04b..4f04a2d 100644
---- a/src/milkyplay/XModule.h
-+++ b/src/milkyplay/XModule.h
-@@ -40,6 +40,8 @@
- 
- #define MP_MAXTEXT 32
- #define MP_MAXORDERS 256
-+#define MP_MAXINS 255
-+#define MP_MAXINSSAMPS 96
- 
- struct TXMHeader 
- {
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch
deleted file mode 100644
index 59c2f9942ae6..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/7afd55c42ad80d01a339197a2d8b5461d214edaf
-
-Gentoo Bug: https://bugs.gentoo.org/711280
-
-commit 7afd55c42ad80d01a339197a2d8b5461d214edaf
-Author: Jeremy Clarke <geckojsc@gmail.com>
-Date:   Mon Apr 13 23:53:51 2020 +0100
-
-    Fix use-after-free in PlayerGeneric destructor
-
-diff --git a/src/milkyplay/PlayerGeneric.cpp b/src/milkyplay/PlayerGeneric.cpp
-index 8df2c13..59f7cba 100644
---- a/src/milkyplay/PlayerGeneric.cpp
-+++ b/src/milkyplay/PlayerGeneric.cpp
-@@ -202,15 +202,16 @@ PlayerGeneric::PlayerGeneric(mp_sint32 frequency, AudioDriverInterface* audioDri
- 	
- PlayerGeneric::~PlayerGeneric()
- {
--	if (mixer)
--		delete mixer;
- 
- 	if (player)
- 	{
--		if (mixer->isActive() && !mixer->isDeviceRemoved(player))
-+		if (mixer && mixer->isActive() && !mixer->isDeviceRemoved(player))
- 			mixer->removeDevice(player);
- 		delete player;
- 	}
-+	
-+	if (mixer)
-+		delete mixer;
- 
- 	delete[] audioDriverName;
- 	
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
deleted file mode 100644
index 48e6dc39cb5a..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/src/tracker/EQConstants.cpp b/src/tracker/EQConstants.cpp
-index ffbf6ea..fa6fdce 100644
---- a/src/tracker/EQConstants.cpp
-+++ b/src/tracker/EQConstants.cpp
-@@ -27,9 +27,9 @@
- 
- const float EQConstants::EQ3bands[3] = 
- {
--	p(5),  // 32     Hz
--	p(9),  // 522    Hz
--	p(12), // 4181.5 Hz
-+	(float) p(5),  // 32     Hz
-+	(float) p(9),  // 522    Hz
-+	(float) p(12), // 4181.5 Hz
- };
- 
- const float EQConstants::EQ3bandwidths[3] = 
-@@ -41,28 +41,28 @@ const float EQConstants::EQ3bandwidths[3] =
- 
- const float EQConstants::EQ10bands[10] = 
- {
--	p(3),  // 8      Hz
--	p(4),  // 16     Hz
--	p(5),  // 32     Hz
--	p(6),  // 65     Hz
--	p(7),  // 130    Hz
--	p(8),  // 261    Hz
--	p(9),  // 522    Hz
--	p(10), // 1     kHz
--	p(11), // 2     kHz
--	p(12), // 4181.5 Hz
-+	(float) p(3),  // 8      Hz
-+	(float) p(4),  // 16     Hz
-+	(float) p(5),  // 32     Hz
-+	(float) p(6),  // 65     Hz
-+	(float) p(7),  // 130    Hz
-+	(float) p(8),  // 261    Hz
-+	(float) p(9),  // 522    Hz
-+	(float) p(10), // 1     kHz
-+	(float) p(11), // 2     kHz
-+	(float) p(12), // 4181.5 Hz
- };
- 
- const float EQConstants::EQ10bandwidths[10] = 
- {
- 	16,
--	p(3)*1.5f,
--	p(4)*1.5f,
--	p(5)*1.5f,
--	p(6)*1.5f,
--	p(7)*1.5f,
--	p(8)*1.0f,
--	p(9)*1.0f,
-+	(float) p(3)*1.5f,
-+	(float) p(4)*1.5f,
-+	(float) p(5)*1.5f,
-+	(float) p(6)*1.5f,
-+	(float) p(7)*1.5f,
-+	(float) p(8)*1.0f,
-+	(float) p(9)*1.0f,
- 	600.0f,
- 	800.0f
- };
-diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
-index 420b4d9..d404f08 100644
---- a/src/tracker/sdl/SDL_Main.cpp
-+++ b/src/tracker/sdl/SDL_Main.cpp
-@@ -609,7 +609,7 @@ void translateKeyDownEvent(const SDL_Event& event)
- 	printf ("DEBUG: Key pressed: VK: %d, SC: %d, Scancode: %d\n", toVK(keysym), toSC(keysym), keysym.sym);
- #endif
- 
--	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
-+	pp_uint16 chr[3] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
- 
- 	PPEvent myEvent(eKeyDown, &chr, sizeof(chr));
- 	RaiseEventSerialized(&myEvent);
-@@ -621,7 +621,7 @@ void translateKeyUpEvent(const SDL_Event& event)
- 
- 	preTranslateKey(keysym);
- 
--	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
-+	pp_uint16 chr[3] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
- 
- 	PPEvent myEvent(eKeyUp, &chr, sizeof(chr));
- 	RaiseEventSerialized(&myEvent);
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch
deleted file mode 100644
index 090e433b5fdc..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From f85f5336df72dc44e407ae756ed20a8f8422cb76 Mon Sep 17 00:00:00 2001
-From: Dale Whinham <daleyo@gmail.com>
-Date: Sat, 11 Apr 2020 16:51:31 +0100
-Subject: [PATCH] Fix hard dependency on RtMidi
-
-It is perfectly reasonable for libasound to be installed, but not
-librtmidi, and so we should only enable the MIDI code if both are
-present.
-
-Fixes #207.
----
- src/tracker/CMakeLists.txt   |  1 +
- src/tracker/sdl/SDL_Main.cpp | 12 ++++++------
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
-index 0a935330..f4243a0f 100644
---- a/src/tracker/CMakeLists.txt
-+++ b/src/tracker/CMakeLists.txt
-@@ -348,6 +348,7 @@ elseif(WIN32)
-     target_link_libraries(tracker midi)
- else()
-     if(ALSA_FOUND AND RTMIDI_FOUND)
-+        target_compile_definitions(tracker PRIVATE -DHAVE_LIBRTMIDI)
-         target_link_libraries(tracker midi)
-     endif()
- endif()
-diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
-index 1a49fc12..75ffa1df 100644
---- a/src/tracker/sdl/SDL_Main.cpp
-+++ b/src/tracker/sdl/SDL_Main.cpp
-@@ -78,7 +78,7 @@
- #include "PPSystem_POSIX.h"
- #include "PPPath_POSIX.h"
- 
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- #include "../midi/posix/MidiReceiver_pthread.h"
- #endif
- // --------------------------------------------------------------------------
-@@ -89,7 +89,7 @@ static SDL_TimerID			timer;
- static PPScreen*			myTrackerScreen		= NULL;
- static Tracker*				myTracker			= NULL;
- static PPDisplayDevice*		myDisplayDevice		= NULL;
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- static MidiReceiver*		myMidiReceiver		= NULL;
- #endif
- 
-@@ -223,7 +223,7 @@ static Uint32 SDLCALL timerCallback(Uint32 interval, void* param)
- 	return interval;
- }
- 
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- class MidiEventHandler : public MidiReceiver::MidiEventHandler
- {
- public:
-@@ -829,7 +829,7 @@ myDisplayDevice = new PPDisplayDeviceFB(windowSize.width, windowSize.height, sca
- 	// Startup procedure
- 	myTracker->startUp(noSplash);
- 
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- 	InitMidi();
- #endif
- 
-@@ -962,7 +962,7 @@ int main(int argc, char *argv[])
- 	initTracker(defaultBPP, orientation, swapRedBlue, noSplash);
- 	globalMutex->unlock();
- 
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- 	if (myMidiReceiver && recVelocity)
- 	{
- 		myMidiReceiver->setRecordVelocity(true);
-@@ -1036,7 +1036,7 @@ int main(int argc, char *argv[])
- 	SDL_RemoveTimer(timer);
- 
- 	globalMutex->lock();
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- 	delete myMidiReceiver;
- #endif
- 	delete myTracker;
diff --git a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
deleted file mode 100644
index ca410696e6b8..000000000000
--- a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-# This commit is needed so the milkytrace binary is linked properly, bug 711564
-# It is also ~40kb so it is better to fetch it rather than ship it in-tree
-COMMIT="2b145b074581ddf3b4ad78a402cdf5fab500b125"
-
-DESCRIPTION="FastTracker 2 inspired music tracker"
-HOMEPAGE="https://milkytracker.titandemo.org/"
-SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/milkytracker/MilkyTracker/commit/${COMMIT}.patch -> ${P}-cmake.patch"
-
-LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa jack"
-
-RDEPEND="
-	dev-libs/zziplib
-	media-libs/libsdl2[X]
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${DISTDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-CVE-2019-14464.patch"
-	"${FILESDIR}/${P}-CVE-2019-1449x.patch"
-	"${FILESDIR}/${P}-CVE-2020-15569.patch"
-	"${FILESDIR}/${P}-fix-hard-dependency-on-rtmidi.patch"
-	"${FILESDIR}/${P}-clang.patch"
-)
-
-S="${WORKDIR}/MilkyTracker-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-		$(cmake_use_find_package jack JACK)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newicon resources/pictures/carton.png ${PN}.png
-	make_desktop_entry ${PN} MilkyTracker ${PN} \
-		"AudioVideo;Audio;Sequencer"
-}
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index a9fb4dc6b4ff..297c579c9653 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -1,6 +1,6 @@
 AUX mp3info-0.8.5a-format-security.patch 507 BLAKE2B e3a26ec3df15f24436d7c463f69ff0854b69174235771e0a0e9531cf629ac283125b17b1216d55c762c313bf5340d7a5a36dd5f60614fc67bb4b75d0c0eecb47 SHA512 340ccb62464028730bbb528ff85537794081fc57b3abb009b63831ed7daa4e313479a9e32da8a7fca5478ba3b74598e0df996e481499f8115d402b640ca9b3bf
-AUX mp3info-0.8.5a-ldflags.patch 466 BLAKE2B 77cd382d37bd35cf4cb06996946cd61c98918395eb7cbba021a98084db90ae1024f8729413c1073e619e2de72de5b7f70706280e2d75b1f3eb100021c12b5ca8 SHA512 868b62dd4565e1f59a057bb4af06ba6618ba320f1a28104b936ae889ca851c344c3a221afedcb309bf11287079c86f44d5f92b6cfcdd8a6ef2e4a72508ed052c
+AUX mp3info-0.8.5a-ldflags.patch 469 BLAKE2B 9aee6ad9982c5171c9d08e6f3b87ec237e7329087e1590afecea8ba97245d4ddc2e9a7c6f18f3a9caaadb17f1e83ee3d7f3b91ecf1300059a79132552cb55d78 SHA512 d158857f737ad11810aed02ab5ab5519ecb1155821dd8caf2600e256902689b776d66bec393280f56923967a26080f0d7924a663dff69843c31f0445457c73cc
 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 906 BLAKE2B 92c654567ef6b96ab9aa3f65d11ad16675de71eb3b4b17d662d786e1239d0bcd8810ac66e1cd9e0795a3d37adb36429e2daa86f1dbfbee2fcc7812bde1bf5b71 SHA512 611a6d094cb18aafff7e377fbc8344ee5cb95034384fb7894e018475417a14f29fec6d4e66102b41ee6d2eaebb4af709082fb88918266d4bfce98d8f630c7f30
+EBUILD mp3info-0.8.5a-r1.ebuild 937 BLAKE2B b27e6a39618bab820a57437a481e0db7bbd1e443e239ca9ecd6d8b7d9a1e7bcfd1fb43e5f6b96b266cb675a8b41c87b4480936d48d118d70df0be0df694653f7 SHA512 2286dae2302dd34685b2796b283f9657066462f5c600dbdf735880d3cc44108156a3f7cc2ca8b914839b81959b3cc79c12f7f54c4671ea2602e4c1909b0bd79e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch b/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
index 4881b91eb29f..61b520f5aa73 100644
--- a/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
+++ b/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
@@ -9,7 +9,7 @@
  
  gmp3info: $(XSRC) $(XOBJ) 
 -	$(CC) $(XSRC) $(CFLAGS) -o $@ $(XOBJ) `pkg-config --cflags --libs gtk+-2.0`
-+	$(CC) $(XSRC) $(CFLAGS) $(LDFLAGS) -o $@ $(XOBJ) `pkg-config --cflags --libs gtk+-2.0`
++	$(CC) $(XSRC) $(CFLAGS) $(LDFLAGS) -o $@ $(XOBJ) `${PKG_CONFIG} --cflags --libs gtk+-2.0`
  
  mp3info.txt: mp3info.1
  	groff -t -e -mandoc -Tascii mp3info.1 | col -bx > mp3info.txt
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index f59b6efb37a6..11ba9807f0ff 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -30,8 +30,12 @@ PATCHES=(
 )
 
 src_compile() {
-	tc-export PKG_CONFIG
-	emake mp3info $(usex gtk gmp3info '') CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		mp3info \
+		$(usex gtk gmp3info '')
 }
 
 src_install() {
diff --git a/media-sound/mp3val/Manifest b/media-sound/mp3val/Manifest
index 7b74a756bbbf..5a21d9c5c7f2 100644
--- a/media-sound/mp3val/Manifest
+++ b/media-sound/mp3val/Manifest
@@ -1,4 +1,4 @@
 AUX mp3val-0.1.8-open.patch 477 BLAKE2B 8478e14f62b66b104de26e002a6f04271d96ee45c587ccb62ba808597531d8aa9878477443efeb62e2dcda534a9f213c11084634c9f0006301f330a0a420d29d SHA512 cbb11127ddecf808b41948220937078c96c87410b29676037ebb0187705f1c2f53d48c87924f9feb138ac33546d389f233940b6251d58bfc9975df7557a2aa22
 DIST mp3val-0.1.8-src.tar.gz 21406 BLAKE2B 5b2a3697db40fb9c450c6f3c23834e137b01b5a0e5787079e8b50a2b0c4e98e988077680e54541a3022601a81aee86950eded02e526c41ea0f11804613852de6 SHA512 62371453be53840fb0f0d87c9fcf9cbd6f5c8ae107e529f0cb6b8190ef9e7ebf564bb080c9d0a6adc3b5450673e70b5f4343dee82c1e6400750935cccebc2604
-EBUILD mp3val-0.1.8.ebuild 658 BLAKE2B d7da95024eb81c221fefd318bd2b107087b06ee51416c175139259acbc784420004d63ed7d35689d8320cef5243519e241323eb48685866ba46dbb8a1921ab84 SHA512 cb456c94947d4094f38a52e6eda4db07303e9faa5bbf238f4ec4594697b086c8d91be82ee440d266404cd116ba59ed66f956eddb32a47e8ff8ef23fde1b58602
+EBUILD mp3val-0.1.8.ebuild 658 BLAKE2B cbe7c0b29423dc6b68d36a8ea9591701e252db3f8bbcfcc1575924d6744d29fded4d31eab462fbd35855a7937e4e55b2de671dc58c614abe40be4f7cda34d305 SHA512 635bc246f03a21354a28f260203b94a721b0c18d92aade3707567e283e83a135ee29b90a82346ddad8c30f2e57d893227bab151cb376e06110a53f43ff230da0
 MISC metadata.xml 356 BLAKE2B d78183bde56e737fd0ec71b6ddd4874f4c9cc3f3ac5a5f35b2c43b620d072a0bae5742dd817bef544fd922f8d8cec6999f811514d5347dba08c9e43296a90e0c SHA512 2a204f56617098d2d2c59a5f5ce2e6cfe8043b00131a352f6f67eaad3334ff3c96068e33e0be1c4d08b0a71a4cd8a826e978af520b90ea2b113c3926ef5cad0f
diff --git a/media-sound/mp3val/mp3val-0.1.8.ebuild b/media-sound/mp3val/mp3val-0.1.8.ebuild
index ed2f5fc906a3..f4b74ed3c030 100644
--- a/media-sound/mp3val/mp3val-0.1.8.ebuild
+++ b/media-sound/mp3val/mp3val-0.1.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
+inherit edos2unix
 
 DESCRIPTION="Validate and fix MPEG audio files"
 HOMEPAGE="http://mp3val.sourceforge.net/"
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 63ced1894da8..ce7f5da81ada 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,3 @@
-DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
-DIST mpg123-1.26.4.tar.bz2 1050563 BLAKE2B 1a057f8bf6171f78a2041637b8351ef124f58f160ca237f775ae1aeeee1eeb6e1898b113ca5958acb74d818e706b2825af0b1f93312073742a18134aacb6d5e9 SHA512 425162227aafb99b8723428fe9bd403739a2dd68828b86a2cff7f9928a9f0ab3f67420e56c0abe7c9deeb94bce6c6acd59acaa0606ce24c01716465640564785
 DIST mpg123-1.26.5.tar.bz2 1051356 BLAKE2B c58ccb78b406bd9405c803d4d203a75ae981e3493fab84e15da49290d2d1b87912292838aa48c50cf192b8bcee4ea1bf18d89bbfc6df14452cb350356e6cbba0 SHA512 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a
-EBUILD mpg123-1.26.3.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
-EBUILD mpg123-1.26.4.ebuild 2771 BLAKE2B 7721bbdde0b129453bf1b378048c05bd30d1e263bf34e78b472c0108cd449a7e223e35faa21af2c8dc464b998fd6e27428ff0974928565bd7117b0c726c8bd1b SHA512 4db32918d1f4c44f8eecd88a31d137a049f10ee0445cff76c83c266964752d15e1a6880fb2cd39f8fadec8af160cda4e0a30dc2006a93fa5364c9b2d9ac1fb28
-EBUILD mpg123-1.26.5.ebuild 2771 BLAKE2B 7721bbdde0b129453bf1b378048c05bd30d1e263bf34e78b472c0108cd449a7e223e35faa21af2c8dc464b998fd6e27428ff0974928565bd7117b0c726c8bd1b SHA512 4db32918d1f4c44f8eecd88a31d137a049f10ee0445cff76c83c266964752d15e1a6880fb2cd39f8fadec8af160cda4e0a30dc2006a93fa5364c9b2d9ac1fb28
+EBUILD mpg123-1.26.5.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.26.3.ebuild b/media-sound/mpg123/mpg123-1.26.3.ebuild
deleted file mode 100644
index 634c8ef13f42..000000000000
--- a/media-sound/mpg123/mpg123-1.26.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="
-	app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.26.4.ebuild b/media-sound/mpg123/mpg123-1.26.4.ebuild
deleted file mode 100644
index 0a9547accb74..000000000000
--- a/media-sound/mpg123/mpg123-1.26.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="
-	app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.26.5.ebuild b/media-sound/mpg123/mpg123-1.26.5.ebuild
index 0a9547accb74..634c8ef13f42 100644
--- a/media-sound/mpg123/mpg123-1.26.5.ebuild
+++ b/media-sound/mpg123/mpg123-1.26.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.
diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest
index b86a50f3ff94..7e2395f99db5 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 1253 BLAKE2B a08297ea3a715fcecfeb1cb5b01e02c2ccc540ddc0b21f480f0b37e2474d1de6839010c9216c3eb2c44cf3e5f7c7ca648bced5bda3bf884bad4543e919778bc2 SHA512 80d5d5a5f8f661a2c5b92f54cb55899af76adb715237e6271e900ccbfaaf11144d57b767441ae0af1d1ceb62ea94c5c3023a76ae8063c9b7d82dd941e360329e
+EBUILD mpg321-0.3.2.ebuild 1246 BLAKE2B db6df4d455150a7265c58f432332711c65231a851424694b6fa3aff09c1bcc6d27cc3209137ae6db0f98dc52097794901b0f86821455353ca0832628e6888672 SHA512 ed3a3fc84e59ac86c06e5fbf673906765868a60aab2f87d0a9b0440a068dfda6ef6cbb492e7dee95866cfc9def27922df0d11edae1ade24ca14e91a9256018dd
 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 cc2a3e240b6f..9d050bcc5dc0 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
 HOMEPAGE="http://mpg321.sourceforge.net/"
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 8d0b0db8b03e..11bb663320fc 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,4 +1,4 @@
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
 EBUILD mumble-1.3.4.ebuild 3814 BLAKE2B 56c5fc62d9117dd41d82de5b027f1e5250ff117813dbb745f84e4f4d4327d9ee4c6d1bc0f377f16e9939750de877c3ab11ec19b3f55797efa025e04da8a12ca8 SHA512 2019d8ccaa70a7d9a3979d52b794e7ab6b8a9dc14a8efc88e4a79b1bd1fb14e0458efd3a7dcf5a8d1b6c13b2e5770304c70d120c5e413f0782612b234c127c61
-EBUILD mumble-9999.ebuild 3043 BLAKE2B f6e699e41a172ce1b816cde9b30e021b0ea15579a29bed4037d272c65d0859dce1dfa4a2e14275c85a47cc6e2b11e39d62302df993bb48d85983fc20205c98b0 SHA512 5a643584e6202916ed620a899d77fb59088026ef96a0420e4bde721a68ee68174827b29dd776ea35274a89af6bb0645e9792fa1e8a39acf5efb3363f7bced9b6
+EBUILD mumble-9999.ebuild 3058 BLAKE2B 3c342709bca6b9251c06b74f584de50e9b030944f2f25b3ee09b76812fe9fa3fd7c780faca8ccf7bc48d00f1866069409d5df4db0a9479c8aab73f12aef8d986 SHA512 2f10be66c24aa4577c41ed06bab6d408b80f5ad442517029d5c79a28101cdcc066662d74a8612e8616b7db6e247712afd8ad5b619547d6dffc665caa9a20c7e9
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index a20c5f8b4064..f5a5c2e3edd1 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
+	dev-libs/poco
 	>=dev-libs/protobuf-2.2.0:=
 	>=media-libs/libsndfile-1.0.20[-minimal]
 	>=media-libs/opus-1.3.1
diff --git a/media-sound/music-file-organizer/Manifest b/media-sound/music-file-organizer/Manifest
index d911bc8e6158..d2e2cb7bcfde 100644
--- a/media-sound/music-file-organizer/Manifest
+++ b/media-sound/music-file-organizer/Manifest
@@ -1,3 +1,3 @@
 DIST music-file-organizer-1.0.3.tar.xz 501856 BLAKE2B 17ceda10c7afa7902272d76b7fa547c13da6aa21d106d2de8c125a48746da310e40d315854874fa182b22318574905199d0b2143e7cd5e9bb9fa64aa4a5ac498 SHA512 9a219af094475c93b0a156c1ba01643c603a598283bf12d7d05c6ee2da96ee8055d0bd7d1ae047651a72e347a4e5580f324acc6466df13495e3c3ab2e6baceef
-EBUILD music-file-organizer-1.0.3.ebuild 845 BLAKE2B bc08f03607ee9294b57bb2a5388e6a603db33bf3253a23cc062b8c1f97f2caa91426bfcfe3988876d810c348fd80a4d9bbb84641533c5224ada6f0e992291446 SHA512 1ce321db4198abaa8d128e6e32278b0162ccd562d36e4b14ec56ecee94f229f497d01beb73dbf2e8f69606e367c34bffcb3832c9abaa90cabc9f876d8c4d63e5
+EBUILD music-file-organizer-1.0.3.ebuild 851 BLAKE2B 5f29bc520e73b0305d4b0640381a52c169db051451c6fe98b39d038eddb5c5569b42a6b61811787828387f56ce1f2387ee106cc68284db4dd42c58522c62c6dc SHA512 63637c58c0e527517612ad8f0dd38da87b9c5c0cb3762c8b541bc1eb8dc0c2f5b15c392692902115d209cbbfa41f71136ecbfc19a5f134a82c5035b0f189f36f
 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
index 8dc5c9a5cd75..e06a380cc914 100644
--- a/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
+++ b/media-sound/music-file-organizer/music-file-organizer-1.0.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
@@ -10,10 +10,13 @@ SRC_URI="https://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="media-libs/taglib dev-libs/icu:="
-DEPEND="${RDEPEND} virtual/pkgconfig"
+RDEPEND="
+	dev-libs/icu:=
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_postinst() {
 	einfo
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index d5467ba5c850..e8249dd856da 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,5 +1,3 @@
-DIST ncmpc-0.34.tar.xz 227892 BLAKE2B 19d9d9abe3d85cb2567a222c8ce108889d4517272e2bb82f4064ef76af68d610ff4c7516102b976f66380e0e3d3ee7ed00023116cb6b2d1628e3d38796705a09 SHA512 e206cc2d61799a97edf1182de4cee1c0fa447bd1fac136dc48670cb624a7efc903c693b0c541fbc00fcb94e055c83be1ca6370386c99131a1b571f47b67c35f4
 DIST ncmpc-0.39.tar.xz 242968 BLAKE2B 1b270ed52aa884cecd3e1ce60bb2ed628ef79480697f388b48a09e0f22068dbbb7623b01171e5cfae9556446e404530f93c84ca3c3d5cc481c8431f37786c2f4 SHA512 bfadc58bf8b66bff08608f561f689a50fd412b87975998ce23751fd312fa009eeba4b48b4afe96391b2ecb184c00c366262e9b96e24d2ce2ab2af6a4002721d9
-EBUILD ncmpc-0.34.ebuild 2019 BLAKE2B ee88c9f5ad907768299060708e08e40a8dbaa89e53216bb250baf8b576a107af68aa13e27d7e7c16a6ae537d62dc9bbd6149cf40590bf45369cf4498bfe9ccd6 SHA512 a573e412cbfc51bbbe3b1f1a38b95521cc22e151247c2f78cf67e63b3aa46e1a19926954b68fbdcdda8fad441b224e9a67100885c2f183e6ba2101fd2757d76d
-EBUILD ncmpc-0.39.ebuild 2023 BLAKE2B e59c9883bab2ea245c4ffea0c1b714ac914fc91af2840762d99994e8e175c0c577153eef3e447dc8f5aa0d3635d39c98e0c7b26d318e8216e1ef6dae9111d814 SHA512 b78020dc31e6edf60c8ee017b406bd61ce6985a2067dfe01de15a66dd84e153f2fea76e6e0cc492bfddd97d5a3afc4b03372419d3bf2320d05e1617b8c3fc8c6
+EBUILD ncmpc-0.39.ebuild 2019 BLAKE2B 1a942892c29244a1ac0fa6122410f37627b49db4e34f82d1822851edb75878c90ec084f082692051c9db4941881975142c123c8daa849a641869d4c327c22774 SHA512 8e62f13dbf38b8c50fe10e6d27a35871e703f6ffbb386d6213d1802516e153223c2cd4269792d61d2d4271fc6dc71d853b8e2448a9a154ac27aa33dfde523b86
 MISC metadata.xml 947 BLAKE2B 5f5c24100750fd5a31a9728bebfee746e2a928ba1b5282de5d22775f3e29d882ed326f052898d3d30589eea298ec8160570486b90d3538b3cc5a582c55653d74 SHA512 c06d78db424871c5f3ad42afc476b1c3ccb9cc6621edfe5d496b7e259a973452b9695b07bd52352093d9e315bad95c556be05d2996d761e27ebddad3e43fba67
diff --git a/media-sound/ncmpc/ncmpc-0.34.ebuild b/media-sound/ncmpc/ncmpc-0.34.ebuild
deleted file mode 100644
index 94de1e83a067..000000000000
--- a/media-sound/ncmpc/ncmpc-0.34.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-RDEPEND="
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
-	lirc? ( app-misc/lirc )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
-"
-
-src_prepare() {
-	default
-
-	# use correct docdir and don't install license file
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "s/'COPYING', //" \
-		-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=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dasync_connect=$(usex async-connect true false)
-		-Dchat_screen=$(usex chat-screen true false)
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dhelp_screen=$(usex help-screen true false)
-		-Dkey_screen=$(usex key-screen true false)
-		-Dlibrary_screen=$(usex library-screen true false)
-		-Dlirc=$(usex lirc enabled disabled)
-		-Dlocale=$(usex nls enabled disabled)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Dmouse=$(usex mouse enabled disabled)
-		-Dmultibyte=$(usex nls true false)
-		-Dnls=$(usex nls enabled disabled)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dregex=$(usex pcre enabled disabled)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/ncmpc/ncmpc-0.39.ebuild b/media-sound/ncmpc/ncmpc-0.39.ebuild
index cad4074e5d6f..41a4ef29b2bf 100644
--- a/media-sound/ncmpc/ncmpc-0.39.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.39.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.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
 
 BDEPEND="
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 0b3fb5d46185..fee1281013ea 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.5+release.autotools.tar.gz 1471537 BLAKE2B f79c27a376cb6dd01957f7c53e4844a08936c6fc34b26bb582367bbb745ac82e5e51f93769f668661532e7518173d2e4797c2f9ac20bc81052e0f923cf1cefa8 SHA512 8a56fdd0994b6db3567ea81d6cbd6ab69caceb82e7b0eb1dde017eb5c001c291384e7ab4a5a8a3ddbed3df4ac6b073a4d26e66f493926f582d198fb6810f9890
-EBUILD openmpt123-0.5.5.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
+DIST libopenmpt-0.5.8+release.autotools.tar.gz 1474083 BLAKE2B 5519f2c8d9d4e02e32bf1ccd28a89fe547b1a4ec79a0be209a872db5c7e2eb9ca3e1a9fec820a13492bb14d1413c217654a5cbafc79bb0e041dbf2f6d27d9ca5 SHA512 29a5b97495c2fa9898cb806cbdc1bac3263b30ecb9c02860e9f7147dc1186d7600589b5f44c9b1aede9c9d44add3521e28e1ff6a9299227e8b19361fe9cd7cc2
+EBUILD openmpt123-0.5.8.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.5.5.ebuild b/media-sound/openmpt123/openmpt123-0.5.8.ebuild
index 386c068f1a59..386c068f1a59 100644
--- a/media-sound/openmpt123/openmpt123-0.5.5.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.8.ebuild
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 22ac70d55a95..52c081fd9d96 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -3,7 +3,6 @@ AUX pamix-1.6-fix-output-scrolling.patch 742 BLAKE2B 23d14840500c9f535a68e5f4391
 AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd2509fc9236cfdc898084434c378c3b1b78db941f05e9634de3ab585322371af89c3d47f98942f8cab1a4f8a462a544ad0e3 SHA512 b910fb3cd2f5c82f50dedd06f076d93b78fc9008b884434bda6854e3340ac357144bd75207f5ba490d1752d5dd013a413d3510570e47f60fd667ff6a1bda4bb0
 AUX pamix-1.6-xdgconfigdir.patch 1390 BLAKE2B f64950f335b03aaeed20298ee66bc769d575cbe1fd4b17682742d6d87cf8f5ad06432dd23147ebdd3f0c35d815a296f9cbbc1ddac7a33a8706cb0074b8aea0ec SHA512 e90c2ea1b02b4b74fe231740d09a266c4e91128b67353ffbc92e66897c8b08a8b131d43e01b1462542f289b0f1e2633851681d6a5ec514f29e266d8868849281
 DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
-EBUILD pamix-1.6-r1.ebuild 1117 BLAKE2B 7b6a3c08fc6ceee40ef1c30cb91764baba293724115aeeebf45be272b57962cc727b522f6fa684bf6e3547bff0f07394fdc55ec03124da2a8b8e08094922e4b3 SHA512 90e206ee4b2d5de6d908952d95a819b57d2cdb624fc35b0470807d1c33ce4416c98af42e1ef871920c3aec3345d4e49be232f39f4d798cab759ff58810476947
-EBUILD pamix-1.6.ebuild 845 BLAKE2B 177ff961b13d3008f5a45ad81aac87ed31e256e4114a07a3402e88034424c8c72295a41422ef8fd9d956a6f652a8466a785b4bed54dfec9dc6b1e6f442bbad42 SHA512 e063b58c9bd13b3640cd29aa2d5f3d9eed262a031aaf791b96aac88d9847836ad42509043fdf1489d9ae1348a98bd07ef06181d324636724e3bfa237bc5671b2
+EBUILD pamix-1.6-r1.ebuild 1115 BLAKE2B 73596bfae44aa4e79d48800c20e314f02a0cad69ebaf585443956cde44a6434a9c37b655befe52e1560e351e6f141d93842a17bbe6acd2121bbfda8db1e7788e SHA512 79e244a374f346f5496321eba4ce35a7f244f6b8190b68e87631b2b4da8cac4819fd10f49ae80672ab98281a98e1692f679e9123a483ebe6eb550c859d7f8af4
 EBUILD pamix-9999.ebuild 927 BLAKE2B d8d49375ae2f78a08d47bb82656da43d2d7922bb3aaed738871142d26a15dee6149be0d1b21bb45c4bba145e38573ca0f9bd9cd765dfdb3372a811a119b2b1cf SHA512 f083f2a75297e6b9e7f344404f2d8b1d7233fe029dd89066568593343d5c73e403af732c03141ed1dea7c8ff952f47fbe44064c4723e3ccba48810e2bed939c5
 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/pamix-1.6-r1.ebuild b/media-sound/pamix/pamix-1.6-r1.ebuild
index e3fa9ceb8f79..1d436b930237 100644
--- a/media-sound/pamix/pamix-1.6-r1.ebuild
+++ b/media-sound/pamix/pamix-1.6-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/PAmix-${PV}"
 fi
 
diff --git a/media-sound/pamix/pamix-1.6.ebuild b/media-sound/pamix/pamix-1.6.ebuild
deleted file mode 100644
index f77264e2b207..000000000000
--- a/media-sound/pamix/pamix-1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit cmake-utils ${SCM}
-unset SCM
-
-DESCRIPTION="A PulseAudio NCurses mixer"
-HOMEPAGE="https://github.com/patroclos/PAmix"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+unicode"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-else
-	SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/PAmix-${PV}"
-fi
-
-RDEPEND="media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]"
-DEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ncurses_pkgconfig.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_UNICODE="$(usex unicode)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 2debe3c1195f..33aef41a7858 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,3 +1,5 @@
 DIST pavucontrol-qt-0.16.0.tar.xz 99952 BLAKE2B 926e248f61b1652af04f772c09bc000d0f368ba6449cade308275473e970068a58ca25cccea5e4bea289424b507e3d24f30d54d76c13096e0e8047c5ea996950 SHA512 781122b57321cf1e3eff2210e7cb949c819d0148050897d3a9673e846c28fae7a926b4d840c603dac9dace8126bfc49179a737101f4d5b6ad4fe5946d82bd0d5
+DIST pavucontrol-qt-0.17.0.tar.xz 104120 BLAKE2B 13cfd361d134a8fb79eb6bf20ab2e2755b998e4c46105efb0e7d29a171262d795b6f77629c4b066b0d786cf1bd60784d0d7155c4b77d23ff2a0a148f3f7764a5 SHA512 b6c77fc78c62051c8c0484edb09d1e2a347fc30ae8b65f1e4b3d279499abd47aeaf19c2cb3037871ef8885a5bc787f3d0307d7c0aa0699deaba3129501fb9a3a
 EBUILD pavucontrol-qt-0.16.0.ebuild 704 BLAKE2B 75fa0c724518984b4cc80a3f8caacfcd4eb134a45accd83ac1e1b4e4f1829af9937667c358361a58882d2d8731accf530f492142bf337ee14c5896fd8964d6f4 SHA512 1e563090713059c44963b63e05293d836f363e931185c1b32b8863ec09c04129f666b1df3f810d3a974de43d3e61535c9ebcceea7fa2624ba2729e4ae05679e9
+EBUILD pavucontrol-qt-0.17.0.ebuild 666 BLAKE2B f782977b9e8c42dad2810ebce7d07c594c87de77c681898e21d5f2f326374e727762a3cdf44320ff72b03d4b07730bff9863062f15a937e8d4cf81c20e60b845 SHA512 dce2cdd4224fd9723146f2d33a348b7ce0c56423c842926a603e1592df70c363013361cf64183fa8634eba4d88135fc9c98586a26e61f87d332c439ae8ae7539
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.17.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.17.0.ebuild
new file mode 100644
index 000000000000..44c2b5627977
--- /dev/null
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.17.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt GUI Pulseaudio Mixer"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.9.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	media-sound/pulseaudio[glib]
+"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index c5262c612811..89a9d33f2f72 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -2,6 +2,5 @@ AUX pnmixer-0.7.2-fix-assert-if-volume-gt-100.patch 925 BLAKE2B 81012218ae38650e
 AUX pnmixer-0.7.2-fix-possible-garbage-value.patch 1173 BLAKE2B e4a874f9ffcaaa6d5586eac4f6ffb8d291703fd83f92546a2d06503060e6f2698470e67922487253c141796eb3baef70e10aaeee8b7457d72c05287b0386050b SHA512 bc5262610fdaca06c0c8fc4a767d2f2f6b50877f03699d30838ab60b018a061cc41853598d5b438dd5a343dda5e66b973a087e1773463757d550132cc62f9d2b
 AUX pnmixer-0.7.2-fix-possible-memleak.patch 620 BLAKE2B 1eb39431bdb5d7597575687c03175b8b0b41a4a64a2fd9fc704775154f048f6400ce7a38e7611484314d643caf2422660442bb0e38a631e8689c1816ba46900d SHA512 df1b824a5219d299ab69c83064156d425ee257594f49d632c745647be4497d70f071d3ba7ac5256749461d5f04a82d1a5faff32e9198e5e2246f35bf537f91f9
 DIST pnmixer-v0.7.2.tar.gz 237972 BLAKE2B 368d149d9e803b52c7b0edac9ba8996312da7122f10f536095cffcdf31d319159494fa3aab0005e6dedb4e7e0b46d58bc73dd89285c7bddca4750d29539fa489 SHA512 9f43a56d17f4c16465113d4355a546ba71ca4d208e384812cf84625a51bd9bb6fa0e93f3e40fd0a2d157c4ee2b27f64082a47bbd4135c168a95b3fcbeebf6186
-EBUILD pnmixer-0.7.2-r1.ebuild 1152 BLAKE2B 50469e88f8e4851b6f47c17eedd0620a2d0f9e91cd4fe0deea92d9ef18792d9dde160887b141dee78e81a75ae5eb92b33d5dc389048660c1981cdc789e423967 SHA512 b9dac5065a4c566c682dc6c082006bb5844a393b1889b76ccdef00dfcb15091e1ea87c47742f05365100b80c35feac571146b011b66d2c9dcf89ccdf9758ab0e
-EBUILD pnmixer-0.7.2.ebuild 1010 BLAKE2B 38e73b4665b30b1401f44b5f8257b2b37dc6ba39c401e45f26558f5943718574efb90f470c26a3fdd550b3d5246bf1cc986829e0c94c4360b9c5ca33ce3259a8 SHA512 762319ccacd5e8e08921603bfa85cd147c2455cd53c8739be709bbad966f580d41ae307f353b04ac8d8b37b9f7c5ddb0bc9b4d69c976331afb539c157cc7e34d
+EBUILD pnmixer-0.7.2-r1.ebuild 1150 BLAKE2B 5a48be6d3eeb7efe1255db69f206da64d78104529a052949afbc583be20aa1666132221b564178bbd372860acede18e5c392c27942f6f7bafd94723d7c2bf0e0 SHA512 0bcbbe319368f9467156434af65ed9716dfb9d8d32c8fcb5d69c45c8080ab146be24d7ef166f725759c738cc07e219f1e21b2e0e5cef29412127ab724487ff7a
 MISC metadata.xml 2341 BLAKE2B 3e14fa1e6d7cf81cd1d61370d955171fdbf1dfd624d164a839db2450cf3b96351bc939ebc30f206d01a4ff6895b2e1ce54da772c0f8ec8af14304b73ee02f7d5 SHA512 fa5350d5ef3ea5cae858ea0f5aaa5619e1d7f861df7d99b189e0e8eafe485d1692b37871a906a8cb7478191e5b108c4fed5ba2515f1e13288f4b0eb71167238e
diff --git a/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild b/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild
index 4930d96eb601..a76a058cd96f 100644
--- a/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild
+++ b/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nicklan/${PN}/releases/download/v${PV}/${MY_P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc libnotify nls"
 
 RDEPEND="
diff --git a/media-sound/pnmixer/pnmixer-0.7.2.ebuild b/media-sound/pnmixer/pnmixer-0.7.2.ebuild
deleted file mode 100644
index ed3446af74c8..000000000000
--- a/media-sound/pnmixer/pnmixer-0.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-MY_PV="v${PV}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Volume mixer for the system tray"
-HOMEPAGE="https://github.com/nicklan/pnmixer"
-SRC_URI="https://github.com/nicklan/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc libnotify nls"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/alsa-lib
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LIBNOTIFY="$(usex libnotify)"
-		-DENABLE_NLS="$(usex nls)"
-		-DBUILD_DOCUMENTATION="$(usex doc)"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index 0c67af948fab..ccf6510f99a2 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,3 +1,3 @@
 DIST pragha-1.3.99.1.tar.bz2 804701 BLAKE2B ae68c01706d593defc4ee357e1bdd1e832fb6d6720f723149c752c98f16502e1254553b404f53b40a4e126b647e6de478e7929b7715c0f9815d23b2e62e5475b SHA512 1c92bf7b2d1d1d6b3f8616b1980b60c6c688844d0bf9f80bc86185035a05971f3b8f5aa73d230b01fa5d14e54db38b356df41781e4a5da73b0adae82829c8c31
-EBUILD pragha-1.3.99.1.ebuild 2554 BLAKE2B e12a0290f7b4c4cf10961de3db7f7fff677e941ef46364971c972c10807ec6f23f464438a91bc6e2310202287a7a0ca38106f5b31d73a5d03bc32ca8b8fb200e SHA512 a84e6a4715f4ba541824d7919448ef1e5f8e81582d81aa0ba9fcb9c5b1d16d9acf4eb8fbd5774b851776db2052dd5fe9ce093d263c4a12552f116a496603d1df
+EBUILD pragha-1.3.99.1.ebuild 2557 BLAKE2B da1e1e0721cb3965437795ae514dd4e644faa7e472972abe6e9587c875d2e33908fdcd4bcd2ce903ca95c1e8e21515e8324b7efe116894da06d6f9d0e308829f SHA512 59d5dd7185daeb23c964de290656e3684eaec11855c1a8c24720e0c0bd390f0716fca695c2f6640f8e8e56a6d4cef4de02f372d698cc11faa81b4a95e39f712b
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.99.1.ebuild b/media-sound/pragha/pragha-1.3.99.1.ebuild
index b9bca3f47fd0..2667de64c421 100644
--- a/media-sound/pragha/pragha-1.3.99.1.ebuild
+++ b/media-sound/pragha/pragha-1.3.99.1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
 		>=dev-libs/libcdio-paranoia-0.90:=
 		>=media-libs/libcddb-1.3.0:= )
 	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( media-libs/grilo:0.3[network] )
+	grilo? ( media-libs/grilo:0.3[network(+)] )
 	keybinder? ( >=dev-libs/keybinder-0.2.0:3 )
 	koel? ( dev-libs/json-glib )
 	lastfm? ( >=media-libs/libclastfm-0.5:= )
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
index fb215b8977cc..9b4579369c3c 100644
--- a/media-sound/puddletag/Manifest
+++ b/media-sound/puddletag/Manifest
@@ -1,3 +1,4 @@
 DIST puddletag-2.0.1.tar.gz 1227152 BLAKE2B 804e9ca9629a9d78114d6f4b6afbe9032cb414678ea6325679c21ac18867bafed8f1b16aae5fbea18995ecc800d35594c478a5164b377f3b4e5dd75148fd3246 SHA512 d84ba360a6cd8c3ddb6628e30276df58d059d9e8cbb2d1255320ca273436c69f05584059c2e768a15871d3f56dc08d7ac96fef9a9c7c077811bb9fdfde444610
+EBUILD puddletag-2.0.1-r1.ebuild 1105 BLAKE2B 9b277a5fb9e50e6a99331163fa9af09a6c4aac183b89033d1c863afe144a00b0654659dc4de3eefc394a7199454335d04f57ca70010cd29e4a5976dc0331ecc8 SHA512 c0ca5c12e32c1d83b4aef1548aff0467f18a32c1bc6b43810b674e332bd4d8f8b2948fb310750e3320da5fcd1ca217ab4ecb313dfc88310add397f2ad2da3b3c
 EBUILD puddletag-2.0.1.ebuild 1103 BLAKE2B 76ef61af662c7c3f37f761685a45fb9798d76b033fde5bb412b4e4f0cdb50c4f618b4e5f895c5258d54226ee43a70f3fd1cb39ab2c76cbfe9f99f7aaee38c898 SHA512 7a2f73d4f1ac110ba613da7c7fb1e39af9018691ac86b4fdb455daed8d85e8b53586aefe9da89e50b8406e8720b189eb63f65e491e4896987010bb0ebd3fa099
-MISC metadata.xml 624 BLAKE2B 43e4b655ee24f979d87e5cb9ff36660e61134be2387ba11bb7ce8f3e1d89506be280f3ee5281609c70e3a40fea7826911e565fcb46bfa3d335723addcc2d87ac SHA512 bc1964b64da168e51908436b1a358ba37c9443795bb838a0cdaa0a8a423db4d926c39a7a3582f6fd84367fae027c1930cb4818eca71606d21e4780078165c3f7
+MISC metadata.xml 624 BLAKE2B bc8237ab00339c3efe294b8eece3514e830c5bfcbaaf568a910ca0263501a84ba8cddf0b1fd44b73be41cf023fa93b8abaa7d6b9abfe598b2a98406f146bcc9c SHA512 29c54f7f6c97c58e954f971c7ff906a3b8582a09d24dcd6d55b468cc72973da44a1d885a1aebd7d677e8e1be153d197ec58cad8016bbbd81f8498a34678fedee
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
index 805e3cbf7030..b5ea32a47b0b 100644
--- a/media-sound/puddletag/metadata.xml
+++ b/media-sound/puddletag/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-sound/puddletag/puddletag-2.0.1-r1.ebuild b/media-sound/puddletag/puddletag-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..8f7ebe2388fd
--- /dev/null
+++ b/media-sound/puddletag/puddletag-2.0.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="Audio tag editor"
+HOMEPAGE="http://docs.puddletag.net/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid quodlibet"
+
+DEPEND=""
+RDEPEND="
+	>=dev-python/configobj-5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.15.2[${PYTHON_USEDEP},svg]
+	>=media-libs/mutagen-1.45.1[${PYTHON_USEDEP}]
+	acoustid? ( >=media-libs/chromaprint-1.4.3 )
+	quodlibet? ( >=media-sound/quodlibet-4.4.0[${PYTHON_USEDEP}] )
+	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
+"
+# docs
+#	>=dev-python/wheel-0.35.1[${PYTHON_USEDEP}]
+#	>=dev-python/markdown-3.1.1[${PYTHON_USEDEP}]
+#	>=dev-python/sphinx-1.4.8[${PYTHON_USEDEP}]
+#	>=dev-python/sphinx-bootstrap-theme-0.4.13[${PYTHON_USEDEP}]
+#	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+
+DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index 790a609edc97..2d2d8ff3bcd4 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,5 +1,4 @@
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
-EBUILD pulseaudio-modules-bt-1.4.ebuild 2194 BLAKE2B 389cd211299f30b3fa4634bcdec0eb6f1b7152bede7558bcd516b1a80d05a8cdebddfc0904cfffd233eccae54292bf75d5a85ddc7ba335c87bdd1f932390e32f SHA512 a34e4f1956670b72b80712c49dfab5325cb916594e71a9f7c4fc0eedbe8a318a427f12947a771ed83ec065dbbd1deb69b49e366ead93c5f3e817de92e564e550
-EBUILD pulseaudio-modules-bt-9999.ebuild 2063 BLAKE2B b45bfc09796b5c9614ec159ab0f79481009b850aecfe840c94789ac32fd8eac21e9143e2959bfbe1f6e099cf106e4edbbc2dac1f8137ff80d6dbbfc016f8b8fb SHA512 1003a535a6a01464f85ca06cfe9eb20519ed78e0855bc86afc16634f4e3582976738b4d333bf41efcfacde7c8733b363f8cd42dd314468dfa7a0f9ac9cf2c993
+EBUILD pulseaudio-modules-bt-1.4.ebuild 2170 BLAKE2B 9e09eaf4e2ba634bb05c48a8db1a813a201589c7dc41a44653de6d630e03571f5d73c6071ff03dc292218b47881eb9cab717ee71ee61ea1941777021e5d58e56 SHA512 af3d8e0303cd3eec86155cf390fdca9d0ea68000bd6c84f91a772be354a630fc20e06cf4c172ac9a702ec2bef5884f532c78cd2c9fb5c1243f3bc40c03628546
 MISC metadata.xml 766 BLAKE2B 3fc16e24b2ecb5212c32ada629f2e8c19c91921333db4de169f0848b6bc63b2001c8e68d7c82765e064f8ecbed10e25bc926ea7c598c09d88d5e474df63ab9bb SHA512 c14a460ddba2b09ecddd6a5f12ca8a888b22bac2b9f606249d466473bde3e6ae5c64ee899e74c5ca10c3708d9a39874dfcbbce84c3ccc383c274ac8cfbde43bc
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
index 56a66ff8e9e3..4b41f381f58c 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils readme.gentoo-r1
+inherit cmake readme.gentoo-r1
 
 DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
 HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
@@ -51,6 +51,14 @@ load-module module-bluetooth-discover
 .endif
 "
 
+src_prepare() {
+	cmake_src_prepare
+
+	# pulseaudio headers needed to build
+	rmdir pa/ || die
+	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
@@ -60,19 +68,11 @@ src_configure() {
 		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
 		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
 	)
-	cmake-utils_src_configure
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# pulseaudio headers needed to build
-	rmdir pa/ || die
-	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	readme.gentoo_create_doc
 }
 
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
deleted file mode 100644
index 5363d6d475a6..000000000000
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 cmake-utils readme.gentoo-r1
-
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
-HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/EHfive/${PN}"
-
-# Ensure it is synced with major pulseaudio version
-# https://github.com/EHfive/pulseaudio-modules-bt/issues/83
-EGIT_OVERRIDE_COMMIT_PULSEAUDIO_PULSEAUDIO="v13.0"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
-
-DEPEND="
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/sbc
-	ldac? ( media-libs/libldac )
-	>=net-wireless/bluez-5
-	>=sys-apps/dbus-1.0.0
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	>=media-sound/pulseaudio-13[-bluetooth]
-"
-# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-DISABLE_AUTOFORMATTING="no"
-DOC_CONTENTS="
-After getting media-sound/pulseaudio merged without its bluetooth
-support (to not collide with this) you may have removed the loading
-of bluetooth modules in default.pa config file, leading to failure
-to use your bluetooth device (see
-https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
-Please ensure you have this lines present in your /etc/pulse/default.pa
-file:
-
-.ifexists module-bluetooth-policy.so
-load-module module-bluetooth-policy
-.endif
-
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
-		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
-		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
-		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 4c9f4f71c535..7b9f6c40d735 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0-r1.ebuild 11355 BLAKE2B 956d1444afef24dbc8b796e300d3cc8306dacea009a656c3b05ab00072faf6dd5465a0cfa28bff7b906ac180ac9e28036483e82de5e1d939068b70602482f84b SHA512 b881a2195abca5bcaa914188eaec1f8ac6b449a4001596a7c7c5b2087e8319d64d7ce0bb0d19d3865cbae3289486ad669a8259abd6d14d42d5705e571326d83d
+EBUILD pulseaudio-13.0-r1.ebuild 11449 BLAKE2B 96dabfdf47e90309ca9e52f3d80f7938603288b0b4f9904462d1cebb88d2057003f4a4d14686321945bb00e118e27031ef445de5966f098a6f12cd7db17ad8a4 SHA512 340f07b118a82872ae0774b5d5665813bddcd4a8a01535684c41efb528df0552369c2fc0ac9f29fdae864f3df25128ac0549771e846ddee44be44e6b5e688464
 EBUILD pulseaudio-13.0.ebuild 11572 BLAKE2B ac733b5f99c2895692df59cf66c6835b4b586193470086652ff77952ac7292f9118e51df7e1ed1ffb10802033687184b34a15c3ce28fc5441b44372b2a9059dc SHA512 94497da344670a0d77109b6a85072ef3d379fdf52d9b6d08115bd44d041b6c807ddd36176369db49ea144e1ada5a2686b8599cd0b5afd0dd20f4386621268c04
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 3c5267c13a03..6dc8380381bf 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -114,6 +114,7 @@ RDEPEND="${RDEPEND}
 
 BDEPEND="
 	doc? ( app-doc/doxygen )
+	orc? ( >=dev-lang/orc-0.4.15 )
 	system-wide? ( dev-util/unifdef )
 	test? ( >=dev-libs/check-0.9.10 )
 	sys-devel/gettext
@@ -182,6 +183,7 @@ multilib_src_configure() {
 		$(multilib_native_use_with equalizer fftw)
 		$(multilib_native_use_with sox soxr)
 		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
+		$(multilib_native_usex orc "ORCC=${BROOT}/usr/bin/orcc" '')
 		$(use_enable glib glib2)
 		$(use_enable asyncns)
 		$(use_enable cpu_flags_arm_neon neon-opt)
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index d7e408027d8f..33636e779455 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,9 +1,9 @@
 AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d5404aab1af91fe5c88af916ab91a16c9c527053beac018de0e1e2231b7df26e7d2271baf7be33db8f6af6955af1b SHA512 07c95e025e43f2c0a2bef0a5b1ca6eb7977bfb5a34c70f7c4d99a9a4d18d3192383ed82784a7548d6fe263b2860a361128c2cae008e41737d383f30fd324a581
 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
-DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac706fc9eb535c78c06f32526d910dffb82bec36af4130490645c95b200562c51f59f19de8905c3c54bda5d8a4b68b5297a SHA512 4d68f5bd678c75f5b13519cddb2f46bd0a827516f1cc7431a8952204f51bd2691f701df869258092a93843bcdb4c61bac916291bade8c4428ed9a4d68b70c757
-DIST pulseeffects-5.0.2.tar.gz 2051616 BLAKE2B 13df099b5f49c1a7be89fe9b684c68c03c750fb89854dc4a5c94cb8dfa04bfbb5e7ce0f70529db0c3b2706cca3918be1a93f70d558494316a2d577b3c68c53b5 SHA512 3cbfcc82c4ed052301d3f700e897a99bacc1a1c66000d2c837ebdb0516c914071fed9334bba917956aeb2b37784ea06054461aef5da95688ea74247311d09300
+DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
+DIST pulseeffects-5.0.3.tar.gz 2052473 BLAKE2B f313abae0f432f767ea4c91350207c97c261845fe64dbb32b0aebab4792b33a993c5ee4084f8b14116058bc989965380c8acb393d10f59a3243ad676c9916f33 SHA512 e9a969b7661e8daca84f5406dafba59a3cbf036f3b8a8893320574ed56465537454d2c854a7053c7f425728342776e9156ebcae8fa2b07bc5bfca04d04356dfd
 EBUILD pulseeffects-4.7.2-r2.ebuild 1905 BLAKE2B 61eaf56d327b9f99b1e337cbbb316e8c191ac6d316929a9ac4049985a421ecbdba229ccd61d773412be3f5eebdcb39fbe121f64e268a4aab0157ec61b9eaa669 SHA512 3fd3c448f9716f943e4c1f5a679f2a0b242e725ec2a8ee11efaa3d98e396d7e7d0bf9d0954eec0276d0df38f781230cafba3d7b34cd9272c6e0d0a67341c2a36
-EBUILD pulseeffects-4.8.4-r1.ebuild 1811 BLAKE2B 58e33cd0dfc818d9ec00fc9b9bb6a48b4eec41262a3904282d770a5d8ed4649a08d9103778e4ebfa6c90e890fe9159dacd0b44634d9024226bb807d63f990607 SHA512 9c7721f01c43a462d9a152423e247f76fe9fd0cffdbbabb4990cfb04436f62369fd490dcf5f41a7e0f2bea83015ebf01fda36303eae5caa8c43e8b2bb037e42d
-EBUILD pulseeffects-5.0.2.ebuild 2156 BLAKE2B 64b331cc21021145fee479356978a95bff6de0e2935ec6802f36518c4ed66f7cc6385fde09e4f63b3da8766cbd7839bd96235e83851fdb29171db7cabdf7d27a SHA512 3d9eea5372e4da48e56256361c34ae24c65f2f11195a58fc73daabffc2a6e71c00a88e50fb1768fc135a43d61912c5e2c178398d3f6a6d3091ecf74769ce93ef
-EBUILD pulseeffects-9999.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
+EBUILD pulseeffects-4.8.5.ebuild 1812 BLAKE2B 8993a53c15218aea86a546d78285e12d236377a6a5cdebd7370ef16ee55b1842455705fbeff4b9ce67c234c544496ce83e8c7bd5aebea00081ede8a99282449d SHA512 ef5d2c3af4a3168db6cb85119af7a9ab9b773c78170261dace79cd0bc52f1c963dae5fe0d718974efa4adab5705926a8d76aa0978c5b662b04f3adca45c45c42
+EBUILD pulseeffects-5.0.3.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
+EBUILD pulseeffects-9999.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.4-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
index 42ea432b44db..47bbfaf9b5fe 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.4-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]];then
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
 else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.2.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.3.ebuild
index 2e8da24b5479..e9dde9ba03b9 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.2.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.3.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
-	media-video/pipewire[gstreamer]
+	>=media-video/pipewire-0.3.24[gstreamer]
 	sys-apps/dbus"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 8915be106aa2..e9dde9ba03b9 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -41,7 +41,7 @@ RDEPEND="
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
-	media-video/pipewire[gstreamer]
+	>=media-video/pipewire-0.3.24[gstreamer]
 	sys-apps/dbus"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 99e366027244..8f9a25aa1e94 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,7 +1,5 @@
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
-DIST qjackctl-0.9.1.tar.gz 1092787 BLAKE2B 1ae68d3b61591bb31f7c8c31f35f8a42f0048cf34c49ff0eadca9155c1a770d9880728582f6b7abdaf27a28ccb3d6a20ca87e3a6178b090579b6ead811f091f0 SHA512 7d3a6efdeedff9335897f9d943dd51d13bf7c48d55ee2bf31d53fe685cef88e281133c164cf6cdb95669b9fe394eb06d3544a78b9d760f4420a9acb3c800c612
 DIST qjackctl-0.9.2.tar.gz 1093486 BLAKE2B 43e3f3d48295727d7a3848ed6c59c72fb6c2947476720af802d53d152848a355aac79448d88fce78c2b12fbae54d64b4a1582f334b2a416f0b235cdf8d557e40 SHA512 87e5cbf241139b1e225ea2e2cc45b6f44f19fddf866560e5b9e690ef3a2f7a358ff6a28065841c9599b321568a85d5b4767907aff071c4a768608fc273a7e8fb
-EBUILD qjackctl-0.9.1.ebuild 969 BLAKE2B ea4a22964f1f02fd692be5e8ead07bc08b624a9d3605705df84090b8707fa9e602efea6c2216c8630ba51df8211d5aece717055ca1b7b2ca42bd1bac0e7452ab SHA512 8d1c56fb6f13cd30bfd54b05575c0467c3002bd38c852facbc7576c4d4fef7da41f6e08cc48a8a0261e6df31a928ce153e5731ca0a85a781f9517a2af1e0a0c9
-EBUILD qjackctl-0.9.2.ebuild 978 BLAKE2B 3e2107aef51bac45a53f2a5701a08f32c385626e93ac22b7f5b5657e2a62305b4eea241ae8a8afda524f7b5a339929924da74d79a5f2b6f5cb0a079126f63832 SHA512 e9c90266c949e5edd0b37ce436ae870cbc193aafd96b55658b44084c404243a8e5e7f782bf74900d48e225e1a6af6745a75651e98cd0ab4cd844d854a04d9e3c
+EBUILD qjackctl-0.9.2.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.9.1.ebuild b/media-sound/qjackctl/qjackctl-0.9.1.ebuild
deleted file mode 100644
index fde4a1552331..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qjackctl/qjackctl-0.9.2.ebuild b/media-sound/qjackctl/qjackctl-0.9.2.ebuild
index 15137741a070..200a042d00bc 100644
--- a/media-sound/qjackctl/qjackctl-0.9.2.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index e37dfec4bb81..8dac75abfa18 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,5 +1,7 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
 DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d
+DIST qsampler-0.9.2.tar.gz 283494 BLAKE2B fcc5a39e5f8069ae79e6e7f1df27c49f5c27573dbd8f937fe699e1cfd7149600eaa1e697cb86fa446a795d949267c92340b4f40868c9847eb493409126a94cbf SHA512 dcc06fbb66f9f7caf04359ef2f75510666214452251a005605a5235709f2846b3d58ee8cbb82f18f676d079d1484b91b7c3efc397fdc99e84ffaa1c95ccafb4c
 EBUILD qsampler-0.9.1.ebuild 1142 BLAKE2B 300be269a1d3a1f7fe9de4f005f4e4ad5da41e389785e3ae4f7f9e37d28d4a8e86e87b63670e53b51b43121fc96dbbe8915b54fbff8d1e7187a2cf952894ae2e SHA512 6ec6ea3673602e1c02cc12fab0db591c12519a012503646205369df95ce37bcf5fc8d95cc210524da871f1e7a9a8be7e3c4268ef25f4d11322daeec0a6256d36
+EBUILD qsampler-0.9.2.ebuild 1150 BLAKE2B 7eef5a0385db52a6a8ecf942bfa8b18adf797c9c62c45b3dd53e7901a8dcedfa33a9ef51c9f75fc3e3a979f9efff59a3e9815562b907392dbeaeb8af03214295 SHA512 96fddbb2518d4c28d14ec7bdc37490110d3399f0160154a170e9671d71245ccd9a5bd1cc9a92df9d0e04716a454579c13ca18a417996a0cca0624845b1b12675
 EBUILD qsampler-9999.ebuild 1091 BLAKE2B 0e70c9b8c857bcffd4619e31f8610a4a6d7728ea06319cbf0d25fdf9e6ed7b6b9707f2fe61d73a3d04ea24ea567695137da8f62c0c908c6e1378c336bcb7523e SHA512 0afda6467ac557df22f6988d7150d6eca07e51f98848f7188b1fbcb78bb87c2e02bfad01f1e96a4961904f66ad1f950c20d8529c8882da7cdc9622325ac28220
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/qsampler-0.9.2.ebuild b/media-sound/qsampler/qsampler-0.9.2.ebuild
new file mode 100644
index 000000000000..d948252e61b9
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake qmake-utils xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +libgig"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/liblscp:=
+	x11-libs/libX11
+	libgig? ( media-libs/libgig:= )
+"
+RDEPEND="${DEPEND}
+	media-sound/linuxsampler
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-cmake-no-git.patch"
+)
+
+DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 7df24f3cc8bc..1ddb7aea1081 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,5 +1,7 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
 DIST qsynth-0.9.1.tar.gz 393897 BLAKE2B f63766614d821409cd12e418e36b8dbd739da8e2cd7deae91c2b00dd4f5ba2f447a3ca19c3829de3282e368baa37567333be051641221300d13dd7948d762008 SHA512 70bba332b90963d1c1da18fb3de8f05544fed3406c2144b6ed78cf93720cbcb684ff367d7ef4bc80be94ebea060b38753ae0cb183e85f96f127014c08de701b0
+DIST qsynth-0.9.2.tar.gz 394009 BLAKE2B 9560efe95992fc6e992871c8057898e1acac46718534c7e79060dde4d1519f9fd4798385812f384c97a764676e3e1005ebe24708545db3dfb9f8e08973f07441 SHA512 ab9a2268e3926439e4784c8dc2511d7c39aa2bfb97ffb7bb34f6761f1e859d1ea53f9f6da4d5c31395c6c03dc250b74c8c250b5d71321f2a151b75ec636be3d6
 EBUILD qsynth-0.9.1.ebuild 1404 BLAKE2B de7309360b92eb8003cd2f875acdf499a9d03e0f89f6761443fc23ad0a0ce9f04d05d70f4813c46be61703e795a8c1c3b7ee435e8d644d6f2e0a72ac9fb9aaef SHA512 b86b7c6e5411ed28ce4795a37df8111d289c27ad2cf0fbcce2de54f6fd6fbd709b1a4e47eaed4be1ed9e466649c72fe730df1ee437f7b75ad6b0a76389666329
+EBUILD qsynth-0.9.2.ebuild 1415 BLAKE2B e06b98fe3d4580b90d17488772c0e389df21de7c79a563df10fce3ca7685d6f0f1896cca5ad463f4ba2385417d9088c3ef21f83dc9e15debc5adefa0c3f7503b SHA512 70f46a7a6b807aac1e56c2f3f864b27e4eddb6330c24f73e3a975268790d27b66048cc983075748514b6bbb7c8878aa207a09370b4755cc6e8a38f57c9e1ce5c
 EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.9.2.ebuild b/media-sound/qsynth/qsynth-0.9.2.ebuild
new file mode 100644
index 000000000000..59c6e5666ca2
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop qmake-utils xdg
+
+DESCRIPTION="Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.1-cmake-no-git-version.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${D}/usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index a25659bfa201..a2e05773c8b8 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,6 +1,3 @@
-AUX qtractor-0.9.20-include-QWindow.patch 732 BLAKE2B 0bf5114a1e0a3ef2fa320a421fb3b23287f2d98b78b54a42378ee39cc06d4139e4d19b26fe1c22de5533a98f478a4d93c8eafdbb79587bc836183e203aab9f76 SHA512 3553f36025412f896d5521952f68dbf566651b1379fe2ebdf2d503ee1a5e38353cddb02ee4e70edece9814ed8234634823d8f5a6621d8fa08345b712312e19ad
-DIST qtractor-0.9.20.tar.gz 1944885 BLAKE2B 7989e827bdfb72cf8402a87a2e219fc2767fa971ce8f958cd8fb5aa0536aa12d486fc854b2d3a407de9e2b0ac3d6737420163d39b194bcd1d08e831f26cfab0c SHA512 663d43f0ca2a2ee8deb260c29c7dc39ac36d2a4f4f3b1b6e3074e66fe5bb60c37a93fde89c09ceedfd6848ba1519de8d38d613d68b2693356fbda97a5d1c2c00
 DIST qtractor-0.9.21.tar.gz 1945423 BLAKE2B 8c76966695e6054cd0d3743313f50de1bf4f741dfaad0d60f41ae87bd531ce394d11c7fc719c75ee159bf0bf7dd3037679cb93d7d4295132a7dc2fa6d89a786e SHA512 12d823c4efd557709d83e0e5ace6cb84ac066a0eddbfdbac0dbaf6b75e6bbe37c0e3548270e80fb89f318c58db4b0ebad95daac989eb7d6b8f82b8cc7ccc3a3c
-EBUILD qtractor-0.9.20.ebuild 2479 BLAKE2B c7f668f97089e930a4696337b6047311bb036c6e8540c4757a078918a5af292ef14fc7beb187ec9b98cb6522f5e407df75c7c73678e4604b684ba2c452973201 SHA512 5eab625b2868eb37856b3dba7b7d51e6aa93a5a9b7f1e7da7adf05ec78f03efb51608cda940cefac9377d220859e62ed5469ea633d5b4e294b7b8b2e45efbc3e
-EBUILD qtractor-0.9.21.ebuild 2426 BLAKE2B 2caa11ef0be835eade433bcc2548537cecc65eef249fe57d440a87225d66b58984100ef5fb4a405a081b75d34ecdd39c4ef39590aad1fa5737c6627857d475ae SHA512 ee635717edb53514ef53141c83027925b2920611a6d138e9caf1494a313f4c4e8db3a8004bac4d563a924f7d3ed9987928f1c9c0a99c44150f8c9ae60b4fefa1
+EBUILD qtractor-0.9.21.ebuild 2456 BLAKE2B 36c9e63143b085897618b492a94a7539281959d12ae8618192e915dbd28c368409fb6f5460b5856404b25505080b72b10d6b6fc0747a3e0bfb60003d81fa3d27 SHA512 c34b4164cb5a367caf9fd2e7e5ab7743b11b4e5c517ab30b0b4844c39bbd1212e8a09394b8984c09bab05de31405f6f871a5f32c2cc183746e26f497e4d0b879
 MISC metadata.xml 890 BLAKE2B 449553d45029499af8d185e9e524674f035841e5e36fc7acb8781c82b4cd8f804c87075dae592481294835cddef2a40dbbbd7f9ca7e507e6191680b25d19eef9 SHA512 bf1fc12e5da4b1106ee3a84d510c255fc9b4ab9f1a59c1827b1f81df3ede0cbd0916f5cb95d04872b7771ddc03058ea6d7a16c826e4bb5afe42438f0347b8486
diff --git a/media-sound/qtractor/files/qtractor-0.9.20-include-QWindow.patch b/media-sound/qtractor/files/qtractor-0.9.20-include-QWindow.patch
deleted file mode 100644
index 8809311b1c54..000000000000
--- a/media-sound/qtractor/files/qtractor-0.9.20-include-QWindow.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f6f6742e8318dfaa678734b3c3d00da510aeb017 Mon Sep 17 00:00:00 2001
-From: rncbc <rncbc@rncbc.org>
-Date: Sat, 13 Feb 2021 00:06:31 +0000
-Subject: [PATCH] - Fixed FTBFS when native LV2 UI GTK2 support is disabled.
-
----
- src/qtractorLv2Plugin.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/qtractorLv2Plugin.h b/src/qtractorLv2Plugin.h
-index 36d37c62a..ea2c37d1c 100644
---- a/src/qtractorLv2Plugin.h
-+++ b/src/qtractorLv2Plugin.h
-@@ -65,9 +65,7 @@ class qtractorLv2Worker;
- #include "lv2_external_ui.h"
- #endif
- #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
--#ifdef CONFIG_LV2_UI_GTK2
- #include <QWindow>
--#endif	// CONFIG_LV2_UI_GTK2
- #endif
- // LV2 UI Request-value support (FAKE).
- #ifdef  CONFIG_LV2_UI_REQ_VALUE_FAKE
diff --git a/media-sound/qtractor/qtractor-0.9.20.ebuild b/media-sound/qtractor/qtractor-0.9.20.ebuild
deleted file mode 100644
index caf7388cadaf..000000000000
--- a/media-sound/qtractor/qtractor-0.9.20.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic cmake xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	ladspa? ( media-libs/ladspa-sdk )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-include-QWindow.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DSSI=$(usex dssi 1 0)
-		-DCONFIG_GRADIENT=1
-		-DCONFIG_JACK_LATENCY=1
-		-DCONFIG_JACK_METADATA=1
-		-DCONFIG_JACK_SESSION=1
-		-DCONFIG_LADSPA=$(usex ladspa 1 0)
-		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
-		-DCONFIG_LIBLILV=1
-		-DCONFIG_LIBLO=$(usex osc 1 0)
-		-DCONFIG_LIBMAD=$(usex mad 1 0)
-		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
-		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
-		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
-		-DCONFIG_LIBZ=$(usex zlib 1 0)
-		-DCONFIG_LV2=1
-		-DCONFIG_LV2_UI_GTK2=0
-		-DCONFIG_NSM=0
-		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
-		-DCONFIG_STACKTRACE=$(usex debug 1 0)
-		-DCONFIG_VESTIGE=0
-		-DCONFIG_VST=0
-		-DCONFIG_VST3=0
-		-DCONFIG_XUNIQUE=0
-	)
-	# Following options are left to the default
-	# CONFIG_LV2_ATOM
-	# CONFIG_LV2_BUF_SIZE
-	# CONFIG_LV2_CVPORT
-	# CONFIG_LV2_EVENT
-	# CONFIG_LV2_EXTERNAL_UI
-	# CONFIG_LV2_MIDNAM
-	# CONFIG_LV2_OPTIONS
-	# CONFIG_LV2_PARAMETERS
-	# CONFIG_LV2_PATCH
-	# CONFIG_LV2_PORT_EVENT
-	# CONFIG_LV2_PRESETS
-	# CONFIG_LV2_PROGRAMS
-	# CONFIG_LV2_STATE
-	# CONFIG_LV2_STATE_FILES
-	# CONFIG_LV2_STATE_MAKE_PATH
-	# CONFIG_LV2_TIME
-	# CONFIG_LV2_TIME_POSITION
-	# CONFIG_LV2_UI
-	# CONFIG_LV2_UI_IDLE
-	# CONFIG_LV2_UI_REQ_VALUE
-	# CONFIG_LV2_UI_SHOW
-	# CONFIG_LV2_UI_TOUCH
-	# CONFIG_LV2_WORKER
-	# CONFIG_LV2_UI_X11
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/qtractor-0.9.21.ebuild b/media-sound/qtractor/qtractor-0.9.21.ebuild
index 881edc87fb8b..77a9466a3449 100644
--- a/media-sound/qtractor/qtractor-0.9.21.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.21.ebuild
@@ -11,9 +11,10 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index bf3533fac29f..fd0c0578ce82 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,6 +1,3 @@
-DIST quodlibet-4.3.0.tar.gz 5061542 BLAKE2B 31ec24f43a1750d065e14fe69d90a1646382ead13362633c08c9c44b17cb1dca02da37612bd30e1737212098fd26947cf637501ed79b34f03167b85cc11cbdc8 SHA512 6e3cd8bebb8abeb6acde6effb08a439479e293fed18633240a1508a015c083c814fb98722c36d3970917970259095499efeb27e323ab788252940714cae2fddc
 DIST quodlibet-4.4.0.tar.gz 5126584 BLAKE2B b0d69ccacd009709148580619bdbafafb0c76acef791ab0025eda687cab4886b90f2d44fb6c37de80481e976ef4af466d209f7a7c6c53fc6794c26baa25d7bc0 SHA512 3a3c88c9283c3e14ee8b3504a9be9616a7773ce6819e832a76e1f926f9a1f86bbc68ae2dd98a2cf292ebc48216aca6e8a29e32f10d26b176effb62377183d13e
-EBUILD quodlibet-4.3.0-r1.ebuild 1512 BLAKE2B b4d5fb4b224f32deb88d4f26f133001db18d74d80b47840aefd4e92602a94fc4804972a45a6aea2fee9bf810c7846eae943789bad921d10431e742e3756ea3d5 SHA512 6d20200807bf0ec8302286857c0089bef6090733429bbe3837de134cb546e1ed49ee6024c161e4b44b1619982b6d505e64581a132dd12603bd9bb9ed6e011cf5
-EBUILD quodlibet-4.3.0.ebuild 1498 BLAKE2B eb239e5a594006f861f69634eabb47b2dd9193aa2baa64d851fd505ec94b09d41d38822844161367974eea821136bf1e3531ce0756254ff18b1a611e1b7b2404 SHA512 e4032482dc7f5191fada586e799e2f162e5d17acf2cb2038670fd3f16447c82dd96c07bdff0dd4f82c933cd0b535be8cbd98bb1eb6e47ee0c3ad047506b1db23
-EBUILD quodlibet-4.4.0.ebuild 1530 BLAKE2B 50aec9348cfdab672b738813ce49adb9df704e10c912fd7f6220d63cf543ce92672399e1c242567799f9f4be8f977f6096be0874664d78030f7be884ec757c38 SHA512 6ca094393337c8d3449d35d5761bf6285473dfe584878f2449188fffd7a4841d81f318f79f7d9cafed7806919e969fdc18e7e7052cfc5835c86b98b246d47f69
+EBUILD quodlibet-4.4.0.ebuild 1526 BLAKE2B 36997e9d350253bb1dcd968d65f3638f1d572803954a9b4cf69e656b61a094637e460507d738a40e4b34d30489dec1fd16ce7a2e20ce14028efa7d24bf9634fe SHA512 542c25920c985a31d34ad7408db33c14fa6318361666ff186b17df4e4c2e872e46e70658214259612341f31e600bbbc3f5848f4acee720b8388c7ec4e7c06982
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.3.0-r1.ebuild b/media-sound/quodlibet/quodlibet-4.3.0-r1.ebuild
deleted file mode 100644
index d95533f3a8d3..000000000000
--- a/media-sound/quodlibet/quodlibet-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="https://quodlibet.readthedocs.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+dbus gstreamer +udev"
-
-RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
-	net-libs/libsoup[introspection]
-	x11-libs/gtk+[introspection]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-meta:1.0
-		)
-	!gstreamer? ( media-libs/xine-lib )
-	dbus? (
-		app-misc/media-player-info
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		)
-	udev? ( virtual/udev )"
-DEPEND="dev-util/intltool"
-
-S="${WORKDIR}/${PN}-release-${PV}/${PN}"
-
-src_prepare() {
-	local qlconfig=${PN}/config.py
-
-	if ! use gstreamer; then
-		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
-	fi
-
-	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/quodlibet/quodlibet-4.3.0.ebuild b/media-sound/quodlibet/quodlibet-4.3.0.ebuild
deleted file mode 100644
index 9445a4feb412..000000000000
--- a/media-sound/quodlibet/quodlibet-4.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="https://quodlibet.readthedocs.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+dbus gstreamer +udev"
-
-RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
-	net-libs/libsoup[introspection]
-	x11-libs/gtk+[introspection]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-meta:1.0
-		)
-	!gstreamer? ( media-libs/xine-lib )
-	dbus? (
-		app-misc/media-player-info
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		)
-	udev? ( virtual/udev )"
-DEPEND="dev-util/intltool"
-
-S="${WORKDIR}/${PN}-release-${PV}/${PN}"
-
-src_prepare() {
-	local qlconfig=${PN}/config.py
-
-	if ! use gstreamer; then
-		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
-	fi
-
-	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/quodlibet/quodlibet-4.4.0.ebuild b/media-sound/quodlibet/quodlibet-4.4.0.ebuild
index 0e19b6bf95dd..18f568ac9c8a 100644
--- a/media-sound/quodlibet/quodlibet-4.4.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+dbus gstreamer +udev"
 
 RDEPEND="dev-libs/keybinder:3[introspection]
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 5834d9d1bbbd..8829f812a9e7 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
-EBUILD rhythmbox-3.4.4.ebuild 3334 BLAKE2B 48b9c1b0f7072ab871867da9caacf02c23e35607a7d66204a611caa8b77a92b2f02efa0936c485a6e8e182b67af09d4243c97cee0aedfb7ce770c57bfd7fcc79 SHA512 3f712d28643a2963edd9e51c58b80dbc577f500a0b9abd65b294fee916ac60d0971b6c1d8f81789b22c530896931c923ff42c718ef0aedad77b1baf175d4ea77
+EBUILD rhythmbox-3.4.4.ebuild 3327 BLAKE2B 6207bb34869d278d59434842bf3f85894565b7623476b88094a420e5543da230b5c853efcc30aed75e89eb2328c6e2b23b578d9f2f03dde6f611f190de2998c5 SHA512 619d2a931a7684eaab49de35fd83d030940e7e6a2f6e2cbafd3c45488430e7c7c69b6f1e94c26fbe90044412e50d01ce1287ee8f024ea9e5102c07b46fb7f069
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
index 29a40a2ec703..4739e55d0540 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.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=6
@@ -6,7 +6,7 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils gnome2 python-single-r1 multilib virtualx
+inherit gnome2 python-single-r1 multilib virtualx
 
 DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index cbc55da5e021..375ba6a0a4c9 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,5 +1,5 @@
 AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
 DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2-r3.ebuild 1256 BLAKE2B 5ab61ff8403c869a0d24480d85b1d0fdc0868979b4abe870d4de26d95e5ed09b6d9a9edb2116446bd753f5c000ef7805bcdcdaf88ebb739687c62be424af8e56 SHA512 9c5f1ed7f5dbc96185d740d10aea279fef3eedcb496b2da2bf340307217493707665e253b58dbb35d0fa2d736a737b206f390e48158a7ef4626a9e0f9e5ffc2a
+EBUILD rplay-3.3.2-r3.ebuild 1257 BLAKE2B 14f2171510d46e77fa291aa516a8e5c53238831f19f413533907bc34caf7c32697c97aacb41f27a53b6baeb9b91dcaa3664ee36412b0c09df7754f208f724cdd SHA512 4ccd8861af5760ebd0a9067a38f924deaa019ae79ccb8dc7f5ae7b01703a0df25159e9ab0b33d76e3ead9b5ca6e628dda0e5f785356a28596d27f9d3178028a8
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index 0daa2f8a38d4..b0daba33d9a6 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-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
@@ -11,7 +11,7 @@ SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="media-sound/gsm"
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index f61729420c24..2a7c8e94b5ba 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -2,5 +2,5 @@ AUX sc2mpd-1.1.7-python.patch 4186 BLAKE2B 8037ab9b33d25a65ec4b72b616de23c8ab12f
 AUX sc2mpd-1.1.7-werror.patch 4237 BLAKE2B f3922de425df679e9b9e7c5249994a39e9fcda6a539f1b3d084ece8f44c8e81546b975375ca3fd8d0e81504bb712791bc99e1aa139d422805ef7dd16d79d8f16 SHA512 28d6ca71fc41ed11fab780f48861f04b28d853240107db2eed6911f3e58710e50e31bbc3f3d5c047599c1d1e544a921bc4ea4bc37e5900a02a4092c7de520fe5
 DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
 DIST sc2mpd-1.1.7.tar.gz 238674 BLAKE2B 35fd57797612e3883ad5cc04be3f5328dbf4ec9aedb0461a801fe79566ef20de4026ad653eec6e7d932ffcd0385bb618331a519ec54838fd856d09c20f1971b8 SHA512 0b39e200f013602c851bec1ba41210c40d1a984638c86bd8dd5d61286aff19b315f282182753426e4470c8e6ccb60265b16dc6ba2e5117f59a3d40194464b4b3
-EBUILD sc2mpd-1.1.7.ebuild 3258 BLAKE2B 96b1a25e430ba86f2e0ff6c62c3d346958455f193d9150a0191b7c9b02a14bdf3a57c00e6a76e0e79417bfaa686c7b87daebfe1a50a8651a8cf642602737dcab SHA512 87eb0922ce245f8524f2f3b3587c28ae9c4506c17ab8323e705a8104748e2c5f0bb80b4a09a636a967f42702d7c784f0bb2ae2c88c9a8160ce24a29b23f2f1ff
+EBUILD sc2mpd-1.1.7.ebuild 3242 BLAKE2B 4a77568b4e07680e93b5e6acde2e076c1b3620942c2d9ae672e823c1f1f65b018b27b510ebe9a1dc420d89bcac79ddaa3adb662834fd3220f88c1c1c6fbbb763 SHA512 abba0c2c796c308eb1c52433e6d234c0622050bb1bd74b27405dcab27cbce2ff358ae8c50eae9b66a495bdb5ae90e3587e3fbf48d7d86de8fc36b1e9321dd53b
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
index e8dba6b2c3a3..6c6cbd7a893b 100644
--- a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
+++ b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit eutils
-
 DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
 HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
 
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index effa22fe463b..0e2503b4ddc7 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,4 +1,5 @@
 AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e844e5b1cce7be92c6198ebf57e733e40261f767921d9678957b633a903c2bd659266c4d SHA512 80f2fc6eb775889ac9ba6257651a18bf030668d577727a8f78dc864717e90251757eb779a6ac97ae5468629da59a399c9df013d470744b6d480c1aa09a602323
 DIST sndio-1.7.0.tar.gz 147989 BLAKE2B 20f5969cfd6d6a62d9c04e493eda7648f686ad394db18e43ae574db235f31a025705f40f9c6ea821e04449bc1cdbc35c23dbeff9575b71fccc92c24140341d7e SHA512 f9db7bad5f30e8790488c4d20198c8a5a51f04f94e4b1067eadd7fe0fcc6f6ced3250173a627439d661dcf6faabc7bc4786b30af013788a5c88d972f1c9dc1f8
-EBUILD sndio-1.7.0-r1.ebuild 904 BLAKE2B 4dd22571d5ac249b4217c02db8d5651630b473dea1401416f36533d8412ced895dfc023462a3a48e1837cf82cbdb7bdc8ffb830f30832bda16441909b00d12e9 SHA512 642123ceb5d9c2688bf8aa3dd0c839fd168c03106400d33e63a4d53aa98e02644e753da9d8a2ec8d8888a3c723183af10aa42460ae74ff3218ae952395df4d45
+EBUILD sndio-1.7.0-r1.ebuild 1042 BLAKE2B dec9d99b4875b58581a6f15ec73bb10ec7cf52611869e06cef594f1b0280f253489d343c7cb26554b572e58f730f37858d87ca4d9994be046cf8b330ec77f7e2 SHA512 883db34be9c592cd2528f7ff108868d541d823907b4e1a96327751bbe837680e9612a4b80d34a46b69d39e55916ff04b33a93299d6c14b631fdf2d3f81c9473c
+EBUILD sndio-9999.ebuild 1049 BLAKE2B 55f1786cacbae3e9e3706cb9d23ff2879d224a6a5929cc0bc3f9ba9dec6728c81017023e6c2b859f3816af09663b1d87a43a789afb0d26f98965dfc16d6f1d4b SHA512 afbfa868aaaddffad8c066e3840cd85b9ba272894c3f31b56608c1953659e4c3fea7eef59d5ba2f70e2fd63f4bb4490b5062f6cf940bc784a581f42d315e713e
 MISC metadata.xml 409 BLAKE2B 61d1ac0ebe8ac2bbd208fe98e5f7f32e208315ddf71e19faf0d1b5c39f5b93fe9896ff0b9738d607d7baef54c8b026d55bc83a0d27813be65a5404f507ef2754 SHA512 3e1d53e71543488d3e9308a6b8a4ee454a69ffb26e542e0218029fe19c2eeba07aaef2167d4c9280ede9ef7d0901514d7ff82656b798a947e469b730a9e4cf85
diff --git a/media-sound/sndio/sndio-1.7.0-r1.ebuild b/media-sound/sndio/sndio-1.7.0-r1.ebuild
index d68b89b4b8b7..f7fa4e0c4498 100644
--- a/media-sound/sndio/sndio-1.7.0-r1.ebuild
+++ b/media-sound/sndio/sndio-1.7.0-r1.ebuild
@@ -7,11 +7,17 @@ inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="small audio and MIDI framework part of the OpenBSD project"
 HOMEPAGE="http://www.sndio.org/"
-SRC_URI="http://www.sndio.org/${P}.tar.gz"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://caoua.org/git/sndio"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="http://www.sndio.org/${P}.tar.gz"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+fi
 
 LICENSE="ISC"
 SLOT="0/7.0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/media-sound/sndio/sndio-9999.ebuild b/media-sound/sndio/sndio-9999.ebuild
new file mode 100644
index 000000000000..16b9e5b69d36
--- /dev/null
+++ b/media-sound/sndio/sndio-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="small audio and MIDI framework part of the OpenBSD project"
+HOMEPAGE="http://www.sndio.org/"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://caoua.org/git/sndio"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="http://www.sndio.org/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0/7.1"
+IUSE="alsa"
+
+DEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/sndiod
+"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export CC
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--privsep-user=sndiod \
+		--with-libbsd \
+		$(use_enable alsa) \
+	|| die "Configure failed"
+}
+
+src_install() {
+	multilib-minimal_src_install
+
+	doinitd "${FILESDIR}/sndiod"
+}
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index 739fdf4e44e5..65e21fc6bbf9 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -1,5 +1,5 @@
 AUX sndpeek-1.4-gcc.patch 315 BLAKE2B 782db101136b691904424dea1d72c02a4308ce99018868d6831be978029be4a51ace611f41e36e91b2f70add83c3269722e1a5061e7fb267a63cce5772f3b1b1 SHA512 184f4e39b033aed7f7ce49e5e15ee2bda016bc56b0f5fba05ab52a13f40e0c957a0a8c2754f0437b782556de9d0a5bb2a3694bb107261b4c80fda07a4b228d18
 AUX sndpeek-1.41-makefile.patch 8410 BLAKE2B 13df444073c55efac49ea862957375b2284567134bf1313069e4b41254232440b6e7f83c25e79cfc62611caa0a215cc56d14f130a5bfa2d8b4ded307860ba3cb SHA512 9999454775686174bb9561eefb0150cd7031ed2faad26c5830a367e21a844aee62dd0ced65cb17a7cd063f45cc05c6824f3abc5d427ad3ba2c8b5c0efb5de71a
 DIST sndpeek-1.41.tgz 312196 BLAKE2B a86f9bca8930bb555614a19ae63d8336e8718aef2a9b1ad297b4a16282a37f6b7608e6cec889719915a0fccdf0e9b26d7c9703585f820599f121905a2e85f28a SHA512 b0d352332d80d89412cb9aa3507f1505e9c4bf29b327106ec758e71eb23db59395f41ecdbf5a55b3bcd4b1f6cf18766bdb294d78da9499717e65e48cff710465
-EBUILD sndpeek-1.41-r1.ebuild 1599 BLAKE2B 187ce2f3860f4346b93b8733e4fff6fb0e88de0f35c29256ffda7a49a80928b6c608cd6fd05c6c17653b954a15aa4ba4031ecd844b5f8a2725bb73f5e0ae7074 SHA512 f330b9951dafa25fda881bdf1e9bf64c57672e1d39d80f12039c7960b61ea152803939f356b9a96f23d992ea42cd720602db4f708b4400c01716399065a1e993
+EBUILD sndpeek-1.41-r1.ebuild 1592 BLAKE2B 9d230702e58edaae082bda750ab036b5af17984392abbb26750eee3dc89d9cb455e7e950145d5e93ce57845b7f19158e6e154df0bdc0d0806c16d1ba47bdcee6 SHA512 ee6b6652ad7c5d774869fc44f6a1398bf9991fd49a91dff25b166c91608c62565f2e5d0749a7f695d49d1b5e54baa798870d2c4080b290fa33059e2d684711f7
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/sndpeek/sndpeek-1.41-r1.ebuild b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
index ce8567bae371..8d5d56db8675 100644
--- a/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
+++ b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="real-time audio visualization"
 HOMEPAGE="http://soundlab.cs.princeton.edu/software/sndpeek/"
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 95675dd6eb71..b8f8ac169ef8 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -4,5 +4,5 @@ AUX solfege-3.23.4-itstool.patch 6767 BLAKE2B 0f0fe564fea7ab8396fb597257bccf90ca
 AUX solfege-3.23.4-no-xmllint.patch 448 BLAKE2B bbc9b1247f68f36ab2a426972255dee4fa6c2531919df090133c9daf59e964eb6be93bac04f99e88c0d1184f10429b2b3d63b8b7a6eeb8acb089628f25295832 SHA512 3eda0a2c845d6f4e82b79542835a9a20658a522c86b162821b0b0a61187505c811710660ee1fa5395709f14607fbd8e95b542263c155284e47950b5178a1854d
 AUX solfege-3.23.4-topdocs-encodings.patch 1347 BLAKE2B 40211d4dada0e2d3d9185f299ab2ad7e8b4e3afeab24a6c35d9c5bdd8685f35bea157d3f6ab916aa6a347c96f5a35495c7e61682b118513e3a2a35833334a712 SHA512 550f1ad9a01fb27e3d3a5e6b8b99a2126b8607cf72bcaef2d8f039c28c77e0f11e0e41da3f01907f4fdc430cb97b114135b9c1a64317fdbff106d9377cfeed8d
 DIST solfege-3.23.4.tar.gz 5148412 BLAKE2B 8543aaa659f753af87f7b911401ee38713aa51afcf3dc33d4bfacbc880c8088aff78a81ce03369ba0b58d14a4b6965d78d97486ac2c3481f066591db0f29743d SHA512 e489dec514b4f387ebac7627d83d1a7766718d10a26c3ec6257d3f4b27a082501df16a27c8a16023b34a06cd4832fabaa1c73bcded52c502fc68ab57b303eeea
-EBUILD solfege-3.23.4.ebuild 1733 BLAKE2B 7c2d898b5cc9068cdc9d6a2a47d3c5959fbfe2ccc542ac0478946c74c9704408e674d1faf03f30fffd45409cd3cd31e2167faf38271704d7ca812c96b2a00398 SHA512 bc1d05d4591a0a66d9e2fc2e0f9f63da7726175821a6476c07ff4ef58b0cdbb6968329b36a9b03bd0f7fed5fb0a5ae9aef456eab7e92cc88645d9b115edf193f
+EBUILD solfege-3.23.4.ebuild 1742 BLAKE2B 442cda2f54c37e30d268c3af8799820eb5a4dea0e37016be1de43aac0c69ea46b7dd22e2acc389327450bc465a414503737c797cb068a582104b8c06c6a5c336 SHA512 8fd1a9bd6fb0935a698b154d47706c571080a7db29d144a044a1f67afe1ce3892e46f7ebead2a530f521a507d388297d2daf2629a2ff4f87b5b4b1be310473f2
 MISC metadata.xml 330 BLAKE2B 7b72c052aeabd90cb225ca7ccc8ba50caceacccc2d2265dfbcc9c99e535753c5413cc6428b159c62b7bc7aeae0107e8f583371a8f813190f7085c16a43936bb4 SHA512 8b9ec04258e5d3437339d00e9ce5e565b865b7f80230d78bd39cafcea569a4d5f413d0f251899842adbfc7583c77041aaa50e9ee101f2a0496b01393b0740c86
diff --git a/media-sound/solfege/solfege-3.23.4.ebuild b/media-sound/solfege/solfege-3.23.4.ebuild
index 69f8fc9e7090..c79448880de0 100644
--- a/media-sound/solfege/solfege-3.23.4.ebuild
+++ b/media-sound/solfege/solfege-3.23.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
@@ -57,7 +57,7 @@ src_prepare() {
 	sed -i 's/charset=iso-8859-2/charset=utf-8/' po/hu.po.new || die
 	mv po/hu.po.new po/hu.po || die
 
-	sed -E 's|(PYTHON_INCLUDES=).+|\1"$(pkg-config --cflags-only-I python3)"|g' \
+	sed -E 's|(PYTHON_INCLUDES=).+|\1"$($(tc-getPKG_CONFIG) --cflags-only-I python3)"|g' \
 		-i acinclude.m4 || die
 
 	eautoreconf
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 1c601913f12c..711613337595 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,5 @@
 DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
+DIST sound-juicer-3.38.0.tar.xz 1775916 BLAKE2B d811f91256197cb6575f491e3c692a60ccfaa78ae28d5a489c27e835dec07a16c19b5bae6cae774e6efe3bc7ae10cffc3c03f652f9e60263325167cb1b348743 SHA512 d76d38839c1f5a997a900d0ba4f43d59e38d9a1d547f51bdf15d1aa9ee0a2b24210a876bfccb7b221feb1adab5882ac1d884da6131a0f259dd985326222eff9f
 EBUILD sound-juicer-3.24.0.ebuild 1512 BLAKE2B 933447422932c677b7801e909f88fb34f50682d247e808db05675555144efde242eebe25c88e9d1d4faef25214c7a18787bc986fbd41c26988d0b3072cfc00ae SHA512 bc2e44b3b21b2c032c932d959157a7ead461e78119bc60d97aa694d9fb22a8d2a7161b0f484ccce9d3c63cd5be39070df1f2e9a7791e8470a904d5a2c6143ad9
+EBUILD sound-juicer-3.38.0.ebuild 1259 BLAKE2B eb83a83b4c2fae0016797331fbbd7bb4bfcb35b92d93a04dfeb095d6f2e1b6d9a715f2b8e74228d8a4007ba8c99c7aef73d4f46f0004bd2a75c4ef3f464cf6b0 SHA512 7a29cfa79603398b478f9970a79528e771e37be2d732e82396c389cf90306322f39db8b5e650e0049972d756d17d4de7fb70b30f06e3fd1c45eebaafb2a70691
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
new file mode 100644
index 000000000000..3951abd8a3b9
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 meson
+
+DESCRIPTION="CD ripper for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="flac test vorbis"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.49.5:2[dbus]
+	>=x11-libs/gtk+-3.21.6:3
+	media-libs/libcanberra[gtk3]
+	gnome-base/gsettings-desktop-schemas
+	>=app-cdr/brasero-2.90
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[vorbis?]
+	>=media-libs/musicbrainz-5.0.1:5=
+	app-text/iso-codes
+	>=media-libs/libdiscid-0.4.0
+
+	sys-apps/dbus
+
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs[cdda,udev]
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0
+	)
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.3 )
+"
+
+src_prepare() {
+	# Avoid sandbox failures
+	sed -i -e '/gst_inspect/d' meson.build || die
+	default
+}
+
+src_install() {
+	meson_src_install
+
+	# Don't put files in deprecated directory
+	rm -rf "${ED}"/usr/doc
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 0e6978f7e7bd..e05ece8bfec1 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,10 +1,8 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4
 DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
-DIST spotify-client_1.1.42.622.gbd112320-37_amd64.deb 126293582 BLAKE2B 909d2cba7a2d2686a4e278e315658d8011d83f3eca3b5381fcd1df574d8e4223c3fb8508f417ec9f66b37740ac8b221a6d8cf753fc2cee47700b45a867556302 SHA512 a3fe98d69460ffd641df3219c2a3d164a33e2b52c86a56276e473dd5c3a43d6304df3b77fefcf0ca6c09cb6e2c8dacab65573cf7543725b6c8d402832149e122
+DIST spotify-client_1.1.55.498.gf9a83c60_amd64.deb 133771326 BLAKE2B b4f17f3008e23cfc9b1cd7ecd806ae97b846f22b39be5ee25515111e6641b31b1cd6525f0cc6b5540d3bce03adbcc23940db26992642ec3884b46f919f499179 SHA512 395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599
 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422
-EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db
 EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553
 EBUILD spotify-1.1.26-r2.ebuild 3449 BLAKE2B 28e9a400ad3bf321efb845b7ad396bc399bda2aeb1c1a3acfdc0dbd1b747c971eb8b59c2c073b8126a0ae056e937cea6c32b4ebd648f0e753cc0a98db0e84618 SHA512 f9e16593cf0c5d8ea6c7f35f984e1a23cda928ec2ea7f2140c6635ee1e46aa80e7f1b0e6bcbd031416f92e8e60504dc07df0a8fd85b85552303086e1ed2f56b1
-EBUILD spotify-1.1.42.ebuild 3449 BLAKE2B d63ce19c0e4279cd79d325110b4d343d2e1f9b8fd8bbda2ebebf76ef67d3fe8c366895e5efb2de35821a00b1cffc96896521a04c8463abd596b905654c6c655a SHA512 270cb9da8ee5eb4b427bc472cc1972efee50449fff30c3ac524dea57d4a313603e3642900cedfb6b6204bfef08112fff53fbb2b3c9279c2bd14ae303312ca83a
-MISC metadata.xml 542 BLAKE2B 112c082ca9d2775e0225eadf3ec24260438db4ec3122be340395edae3096f378ddb349275fe5c31435c5196d606d099812fea831d06ce2ac913ddc777e65d66d SHA512 a414c96da5c9c5af23491937a86edf26ca5207f4cd9277a187059f2196b8ce9b28cab80f0ee5a326911a9aa5945d2604bea310608bc5270e507fb8052e1bd2ef
+EBUILD spotify-1.1.55.ebuild 3512 BLAKE2B 0dfe4606a03e8e91885f5e110e9735a455007a7722853829eac7aacdaea2cccd2030a35abe0bd5aadc2e66264f679bcbaff63f56b61a8fc034f70f6c3b533213 SHA512 3f1e1c6a2df70e8ed29f48f702c9bc663e695284f7f1c2bdc985c0a18b98ae492f7061537806735c4b9651e214609a140e1763db40a873b6d7b796106b1dcd12
+MISC metadata.xml 632 BLAKE2B 4c68e175f8bfe81df9c89a76d97ea02c71cdb7a7fe1737d95ae20a49840f734372953fbcfaa8af5ecd918ee1444fabacff223487707e9d0e76993d94f6878b8d SHA512 2947ed146739cec0abed1142356d5fc2d8d32251fe117cb7f999b1e83e65223b93700106913db90a41718ca7a88f3a42661af3617ae1bde2e695907e746638ae
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 6e853bb00209..5f4cc456b934 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <use>
+    <flag name="local-playback">Allows playing local files with the Spotify client</flag>
     <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
     <flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
     <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
diff --git a/media-sound/spotify/spotify-1.1.10-r1.ebuild b/media-sound/spotify/spotify-1.1.10-r1.ebuild
deleted file mode 100644
index 8267b9da0b39..000000000000
--- a/media-sound/spotify/spotify-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="546.ge08ef575-19"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	|| ( media-sound/pulseaudio media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-1.1.42.ebuild b/media-sound/spotify/spotify-1.1.55.ebuild
index 4b9dc6ccaf58..544835629b0a 100644
--- a/media-sound/spotify/spotify-1.1.42.ebuild
+++ b/media-sound/spotify/spotify-1.1.55.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,12 +7,12 @@ inherit desktop pax-utils unpacker xdg
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="622.gbd112320-37"
+BUILD_ID_AMD64="498.gf9a83c60"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel pulseaudio"
+IUSE="libnotify libressl local-playback pax_kernel pulseaudio systray"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -31,6 +31,7 @@ RDEPEND="
 	net-print/cups[ssl]
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-sound/apulse )
+	local-playback? ( media-video/ffmpeg:0/56.58.58 )
 	systray? ( gnome-extra/gnome-integration-spotify )
 	x11-libs/gtk+:2
 	app-accessibility/at-spi2-atk
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index eaba85fd4207..7d65a803c35e 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,8 +1,6 @@
-DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8
-DIST strawberry-0.9.1.tar.xz 9937164 BLAKE2B 64d988f3d5030a3145bc8310b4c44c12d075c584fbc4705af833953fe9dfe29ac2fe9a374ffd8a0494b58d3379e89cf8a9abf3a35de315b0dcce732c96071508 SHA512 6b8ef30e9e1d2349c02f254e775de4f0eed0f365c315e9471c7274e74ddb4e29b92e3da2a04d40df57450971f5656430ef94339cf246d0c1ed336963a9f9afe3
 DIST strawberry-0.9.2.tar.xz 9956324 BLAKE2B 0b5ccfa76aa98c0d7cf5ca0f79465948c34d6c7e7f51264b1fb8623099a4de2d0548464f51d813a4b75b8e524c653a32e8682410741a3c3fbc604ccaa4816204 SHA512 2ce22e7bed5832dc33191f5ff6f0f656861f4e574ad5ae2d2987a0c75274490dad2723579fcc5766f398654600a0819c5d0fa956dce12a54d5aab505a2f1ea30
-EBUILD strawberry-0.8.5.ebuild 3043 BLAKE2B 8989c13d89c0513cf77ea672b3aa3a7fa9677946722bdb27d1d967106a53001a3cf45dcfedab0c9a76dcf2d2d6f75ddb111479ec884177b4edb3df289fc1cbbb SHA512 c14726be6bc9e0ed00fe1652a5ea4d9621d26abebe18ff83e76abeb0225acd2e3b6dd32a7419883c4558d60d85a4b228108346d8986b70ff8f5ac0e2516849b0
-EBUILD strawberry-0.9.1.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
-EBUILD strawberry-0.9.2.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
-EBUILD strawberry-9999.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
+DIST strawberry-0.9.3.tar.xz 10928116 BLAKE2B 3edb80065876d63b79292c6b75660aaaeaa6ea294bb84011124fa8aee3163717b8ab4f0e8d6e7aff321466d3cfbc214b5e8b987c9ae9b0823f8d3c681aae6e9e SHA512 d253ffaa6cf0412eb135bc792c31458816fc0a1ae7070d6885487da4fb4855ffeeeeddd285b853fd10220c797c3beb73a91059514d76b1b1638350fdff17107c
+EBUILD strawberry-0.9.2.ebuild 2936 BLAKE2B 696328255c443ede4eb118a09edb84f8818307cc2c4288ab5513d01377af86a5e9a1ef452550e328a471ce61b87a9326d7417f92efcfb08a8627bfc80378a63a SHA512 58357aa926039d93c1bacbe435350fee3cf23287024ad89a5cf08c9f5b1e8eb0c296edff64add7beec37529c3fa7ea2f7bb67dc1fdd76b3bb68308bb8e37e427
+EBUILD strawberry-0.9.3.ebuild 2938 BLAKE2B b0c616bf39d4161c62a8e6cdf268976a9c2c76e6d36bb159807dcc9accbc01b4e6cb87cd06df4b29ea212f2b75819d21952684664ecaf2333f150d2663815dc4 SHA512 19c81894d095c42d63554f8290160d9ddde1eeab99b06d3d99c82c699839983c91c4157e3fca024a158613983a6a88c11c7e5fcd8420746d9c3c0d367809871a
+EBUILD strawberry-9999.ebuild 2938 BLAKE2B b0c616bf39d4161c62a8e6cdf268976a9c2c76e6d36bb159807dcc9accbc01b4e6cb87cd06df4b29ea212f2b75819d21952684664ecaf2333f150d2663815dc4 SHA512 19c81894d095c42d63554f8290160d9ddde1eeab99b06d3d99c82c699839983c91c4157e3fca024a158613983a6a88c11c7e5fcd8420746d9c3c0d367809871a
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
deleted file mode 100644
index 103a1e6068f2..000000000000
--- a/media-sound/strawberry/strawberry-0.8.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic 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 ~ppc64 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-0.9.2.ebuild b/media-sound/strawberry/strawberry-0.9.2.ebuild
index be8135080fd1..d3fdeec4bd47 100644
--- a/media-sound/strawberry/strawberry-0.9.2.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.2.ebuild
@@ -14,12 +14,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
@@ -50,7 +51,6 @@ COMMON_DEPEND="
 	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
@@ -100,7 +100,6 @@ src_configure() {
 		-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)"
diff --git a/media-sound/strawberry/strawberry-0.9.1.ebuild b/media-sound/strawberry/strawberry-0.9.3.ebuild
index be8135080fd1..9735f0e9a08f 100644
--- a/media-sound/strawberry/strawberry-0.9.1.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.3.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
@@ -50,7 +51,6 @@ COMMON_DEPEND="
 	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
@@ -100,7 +100,6 @@ src_configure() {
 		-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)"
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index be8135080fd1..9735f0e9a08f 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
@@ -50,7 +51,6 @@ COMMON_DEPEND="
 	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
@@ -100,7 +100,6 @@ src_configure() {
 		-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)"
diff --git a/media-sound/subsonic-bin/Manifest b/media-sound/subsonic-bin/Manifest
index e52bc2a37330..3f4eed5e3081 100644
--- a/media-sound/subsonic-bin/Manifest
+++ b/media-sound/subsonic-bin/Manifest
@@ -1,5 +1,5 @@
 AUX subsonic.confd 420 BLAKE2B e7e1b0b6bd33ec62924a015036f3197581749ed74e07359f8ceca68fb6aceb8c63b80e0d195e28345f1f22ff84c826cc5ed362dec75c5c6c36f97fb6de036279 SHA512 2e79c5a6fb12d0b8d4c5107175da8ca65bcc10e42c385b056ba5c5bb4c98c7d9995c391a5bddd726237a1f13bf37d1cbdc48f7fa7b9d3dd1e3aab20a212b00be
 AUX subsonic.initd 1194 BLAKE2B 018257ead2e8c620715404b3ba91ecce53913b7aa554670d1af495b2e1d17abf4ef5b140c62ada2eba0f01589bb43d08320c81c6c93f55f5510b8bcefb02dcff SHA512 7e99eaf2663d346d42e883f3501017e4da565f7b07ef390e370e097d13f4fd039ddccaa761562c2f43c28dbf3ad5c355dbfcef7b4e67ecccf3cd31819c86b14b
 DIST subsonic-5.2.1-standalone.tar.gz 43671795 BLAKE2B 2cf2ff67aaac7dd2ce405d832bfbd1f7dd0a87f4e5698092048891778ebbcac35e70c535a1e2af012655bc49e555ffdcbcfaffea62ad16cd987458e0d30a0135 SHA512 1251b77cfbee80224d3e332945fecec981c79b27c129cb47f5880a82344db15d1f8d17b11dd272a4ad3d9794f4e3055d4a59826623d543b676de73fe1c83b936
-EBUILD subsonic-bin-5.2.1-r2.ebuild 1423 BLAKE2B c4014dbe92e4c03815d734770798f8062f60663e0d17eb01db6fb9dde7009681108f18b4fa17c9b17a7f92ff7d48515b060a44f057ed13ccaf2c065b3a73bde9 SHA512 c40cbe615fbe1a79624dc2ab4fcc26cd1b85b6be446b7132c3f473421a4affb6cbe182d300e71702ebb1b74cadc24a00110c2b63f59af32de982afde2206f8ce
+EBUILD subsonic-bin-5.2.1-r2.ebuild 1424 BLAKE2B 0894f8cd433ed48a9b69e72fec36de291b570bb85089396b24bfcbacff54106613ba0aac76172dc43948c4aa5f75100cdd594506d446bcf2bd763fc81551ede9 SHA512 2a45bb020927858a549d76d8ff798dc4c500cd0b6783a01c403abbaf0212a153c5d457d4d0fa3dd706a4cf36c47783189476a4d92b20161ab30911b9da100f9a
 MISC metadata.xml 325 BLAKE2B 031eefbb5a58dcfdeca52016a4db3ffee06a097db0604cf95079f00e5897f13f25b12d6e9d5cb7d6e25bda3a41a230fa98d40d18c6a4acc5eaffe69423d25529 SHA512 f6fe0547df26e6c4f94b6b1e915a51731fa3d6f565c71adc64f2fc3d858dc67d4664e46fbb654fa982bf0ba5915d673e0891f20aabfaadc84c0df2c44df46865
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
index 522f0e8ef95f..8aee2ef491d5 100644
--- a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
@@ -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=5
 
-inherit eutils user
+inherit wrapper user
 
 MY_PN="${PN//-bin}"
 
diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
index f9589b229102..31b6328b85e0 100644
--- a/media-sound/tapestrea/Manifest
+++ b/media-sound/tapestrea/Manifest
@@ -1,5 +1,5 @@
 AUX tapestrea-0.1.0.5-gcc44.patch 1301 BLAKE2B 09c05cdfef6860013d84a2833a77b3b693871770caad7e450191fd32c08039397a66b2e8891919d88fb57daa26e8413d47cd3d7145f49769a76c444450bf886a SHA512 d55c5fec518fc79686720a1c5b9fa01483aaaf22141e2a10de541a1cbf63daf37bebf8b653172990f34bc188f4064af9d3e266e0d103e0fef4fbd557c406b5a7
 AUX tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch 1280 BLAKE2B 3910c1de8ad0fe14c80b9e347350924e71d1f2c10068287474a0262060d26d5f24558c51483af912dbd8fef4c0436e84af7108379955458d5b50619a9a8a8616 SHA512 de4ff80ba5ca256d794ceff80fe956459e16261b1d786a87691d2736835839e177056ab9e4732c78ec0381c01324c483b27de310f8168269ebc04dd6e39af344
 DIST tapestrea-0.1.0.5.tgz 21987831 BLAKE2B 30ee2574acbb1a4577b0e952f9c474304ce6248bb6c4329c2788c0e640c6d82b35f3898e293a1e91ec38ca332bb4f910fd35278edf5c703dde456a6c006d14f4 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656
-EBUILD tapestrea-0.1.0.5-r1.ebuild 2757 BLAKE2B 864dc8a0f04d5dc6c1f8e273c4adb554bd80b70282642f6bdfbe464fe5bb7dd372b6ebf8fddd1407795fed7b81d6b31712c04b2a58825566fe27fca603fe1675 SHA512 950b9cad047bcd047ec4a2e8d210aaacc0cba55e9b542f1ad1272f293e94cb1b3c5b08550fb3260faa77995644530393cec6fa4a3ec959dc8c356ff5c25d8204
+EBUILD tapestrea-0.1.0.5-r1.ebuild 2876 BLAKE2B 9b508a79875f6365ce9fdb5c76712001917ea2411339e3f0f411ebbc72e4794755fdc7b6d3c9b68454276a3bbaaafa9a954fdeb959c6fc6a06a9ff306bbe57cf SHA512 b0bd0f0e354c00908aab7fd56d775267e7cebf6d0e5cb19c35a11f3541b07d0df9730ad2f330b90f11401d53503f348667bcbfe94096fe9ee857fd5042b9e181
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
index 10909861c095..63f2f3cd3774 100644
--- a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
+++ b/media-sound/tapestrea/tapestrea-0.1.0.5-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="5"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Expressive Synthesis, Transformation, Rendering of Environmental Audio"
 HOMEPAGE="http://taps.cs.princeton.edu/"
@@ -26,6 +26,11 @@ DEPEND="${RDEPEND}
 	sys-devel/bison:0
 	sys-devel/flex:0"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
+)
+
 pkg_setup() {
 	if ! use alsa && ! use jack && ! use oss; then
 		eerror "One of the following USE flags is needed: jack, alsa or oss"
@@ -34,8 +39,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-
 	# Respect LDFLAGS/CC
 	for bend in alsa jack oss; do
 		sed -i -e "s:gcc -o:\$(CC) \$(LDFLAGS) -o :" \
@@ -51,20 +54,21 @@ src_prepare() {
 	sed -i -e "s:-make:\$(MAKE):g" \
 		"${S}/scripting/chuck-1.2.1.2/src/makefile" || die
 
-	epatch "${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
+	default
 }
 
 compile_backend() {
-	backend=$1
+	backend=${1}
 	einfo "Compiling against ${backend}"
 
-	cd "${S}/scripting/chuck-1.2.1.2/src"
+	cd "${S}/scripting/chuck-1.2.1.2/src" || die
+
 	emake -f "makefile.${backend}" \
-		CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+		PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 	cd "${S}/src"
 	emake -f "makefile.${backend}" \
-		CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+		PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 	mv taps{,-${backend}} || die
 	emake -f makefile clean
@@ -92,12 +96,15 @@ src_install() {
 	dodoc AUTHORS BUGS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
 
 	if use doc ; then
-		for tapedir in `find examples/* -type d -maxdepth 0`; do
-			docinto $tapedir
-			dodoc `find $tapedir/* -type f -maxdepth 0`
-			for tapedir2 in `find $tapedir/* -type d -maxdepth 0`; do
-				docinto $tapedir2
-				dodoc `find $tapedir2/* -type f -maxdepth 0`
+		local tapedir
+		for tapedir in $(find examples/* -type d -maxdepth 0); do
+			docinto ${tapedir}
+			dodoc $(find ${tapedir}/* -type f -maxdepth 0)
+
+			local tapedir2
+			for tapedir2 in $(find ${tapedir}/* -type d -maxdepth 0); do
+				docinto ${tapedir2}
+				dodoc $(find ${tapedir2}/* -type f -maxdepth 0)
 			done
 		done
 		docinto doc
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index 144ce1b0bbea..3a440aad8f51 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,6 +1,3 @@
-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 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/files/0.3.13-perl-tests.patch b/media-sound/twolame/files/0.3.13-perl-tests.patch
deleted file mode 100644
index 5ec5b6601770..000000000000
--- a/media-sound/twolame/files/0.3.13-perl-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 11a5ecb89de1e61b016f3d7f358b09a4e611f1ad Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Tue, 17 Jan 2017 12:18:10 +1300
-Subject: [PATCH] tests/test.pl: stat the right file
-
-stat(@_) is effectively stat scalar @_
-
-becasue "stat" has a signature of "$" which coerces arrays to
-scalars, which here, returns the length of the array.
-
-This is going to be number 1, instead of the desired argument,
-     the filename.
----
- tests/test.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test.pl b/tests/test.pl
-index 658eadf..5513d6e 100755
---- a/tests/test.pl
-+++ b/tests/test.pl
-@@ -185,7 +185,7 @@ sub input_filepath {
- }
- 
- sub filesize {
--  return (stat(@_))[7];
-+  return (stat($_[0]))[7];
- }
- 
- sub md5_file {
--- 
-2.11.0
-
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
deleted file mode 100644
index e1df62fc0a0f..000000000000
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune multilib-minimal
-
-DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
-HOMEPAGE="https://www.twolame.org"
-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 ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PV}-perl-tests.patch" )
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-O3::' configure || die
-	# remove -Werror, bug 493940
-	sed -i -e '/WARNING_CFLAGS/s:-Werror::' configure || die
-
-	if [[ ${CHOST} == *solaris* ]]; then
-		# libsndfile doesn't like -std=c99 on Solaris
-		sed -i -e '/CFLAGS/s:-std=c99::' configure || die
-		# configure isn't really bourne shell (comment 0) or dash (comment 6)
-		# compatible, bug #388885
-		export CONFIG_SHELL=${BASH}
-	fi
-
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-		econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 9f06a0070226..3fb6d50b4d5b 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -2,5 +2,5 @@ AUX wavpack-5.3.2-fix-overflows.patch 2094 BLAKE2B 8c2abe6d72109b108d1e8f4400f5c
 DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
 DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
 EBUILD wavpack-5.3.2-r1.ebuild 1070 BLAKE2B 44d32a09ddbc7ba87f4af8fb53d1f57fe21525e1b50563fbf8063ab362b9e06040409ab91068a225ee4e32748ca0401b6bbea28661ef89ec985ffdc6183841a6 SHA512 c21d4e74634e9cde5ae49be7becbe7ff02dc0872caef71ffd067e73c8db5e6b008a1b5cef7673002a3684bc72c1d491d682e39bb8b43574a8572281e471c2f1d
-EBUILD wavpack-5.4.0.ebuild 828 BLAKE2B ab2b2363911c89d7c3fce6e8f3203d59f3693867831107bc3338f2a2f009443dfc92d5996d6ebdb342c4767bbd6447cdd2123cb53a932a545e43edc4336eae27 SHA512 7db9e5f3c9724cab760d76fff1b1b26030162b90b654a387cd5741bebf1be35a6cdd7d2a4d4c7e426cafd6b3e2644238d4178b4ca75652ba94fd9e77f7d80a86
+EBUILD wavpack-5.4.0.ebuild 849 BLAKE2B 0ac7d602bf2093cd0f685bed438624d12d63d9bebd77640e7f82e7a6d5ed68bb3d0179efd48b9038e882ae28d2fa1d6e88611c9cc2dfad9c57347f000ac98941 SHA512 a0ddff1a9b696df7d2a9dd718d8092ee2599a1939a1f8a73a78f9bccc1113d3cebd2cfff54c8499dbfd114fc57db25fcd7eac552f91bbf5058779e35298e1913
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.4.0.ebuild
index 65dfcefe7f5d..623e8cd7a6f6 100644
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.4.0.ebuild
@@ -26,6 +26,7 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
+	emake -C cli wvtest
 	cli/wvtest --default || die
 }
 
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index 5f5a63e17924..379a2c020310 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,3 +1,5 @@
 DIST wildmidi-0.4.3.tar.gz 196750 BLAKE2B 580903dd1e7dc61193b593f3706d5070ae5cf26394919f8d632098aa0dda14d8d65631c902a6a01d02d046e639df4d66727849954b5d6f76dba8d12235e20b8d SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f
+DIST wildmidi-0.4.4.tar.gz 197597 BLAKE2B 5f5b11bec70b24b4798ac39d4d30420916609f3d65497ef88b48ef292f41d0cc81cc8d9c8c47ffc68705d6297a9ce55ef5d7ebdf63f8c18b8b0f7982c1f60bfc SHA512 5b74ee83f1d7ce3b45d2f996aaa30ec6e7d7808eab294a3eaf6fcef77443523df1f54bb0fb1b3105edd0d72d75885fda1a2e97c68defb5bbd687bda5077d3454
 EBUILD wildmidi-0.4.3.ebuild 1322 BLAKE2B e5e32633203e7bf0ee7f2bbc5d618e05132e91415a07a48cd01b4b5c0719172d313808abb318c68cd625124c4a79e5578e27abe9c887e9b054dee581b0f600cb SHA512 99a54c4d0124caef134e9c8fff60d563e974db43bba0ae74476e9bc5cd0a37ea5e8276e8c91b54c2ecaa89b2e7f17e41bf46c192dd0d8cf98ecb4572cb5c1f2c
+EBUILD wildmidi-0.4.4.ebuild 1327 BLAKE2B 0ff5beb04442aa8c17208c1252a894392506b7faa9b8b5414d707ebfbd94f2be9df1737b483303d6ae50c766199ed9edf11313f51e8753bb30ad09e8173597d7 SHA512 e8f96cf1ecb95bbea6683b4a7e8401d0b2c6bd5f4c3c3cdf7dd854fdd4f6e3d10001388f7d9760a3fe3fded7e7f7943c038331d3aecd5a0c600ab96b6b662a73
 MISC metadata.xml 614 BLAKE2B ff532f36af5f957e1acc46d35a7931984ad70f82d3557b5f516ee8a16ed8d5a7fb2f202243c437aed84cb951275c76d32a75107ba838969a96213f2be584ac26 SHA512 bc3725016c1386bfc5c1c1c8d3df9e17f92a16cde8603e88c0166dd6d802b82004a3545645f874092f5f1e045f8519c780d76e733af0c4484d93a118a25b5db7
diff --git a/media-sound/wildmidi/wildmidi-0.4.4.ebuild b/media-sound/wildmidi/wildmidi-0.4.4.ebuild
new file mode 100644
index 000000000000..f6f59cf6d838
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="MIDI processing library and player using the GUS patch set"
+HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
+SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+alsa openal oss +player"
+
+DEPEND="
+	player? (
+		alsa? ( media-libs/alsa-lib )
+		openal? ( media-libs/openal )
+	)
+"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats
+"
+
+REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
+
+DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
+	For more information please read the ${PN}.cfg manpage."
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	cmake_src_prepare
+	# Fix location of media-sound/timidity-freepats
+	# See #749759
+	sed -i -e "s:midi/freepats:timidity/freepats:" cfg/wildmidi.cfg || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PLAYER=$(usex player)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/${PN}/
+	doins cfg/wildmidi.cfg
+
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
index 46e826b0511a..40f6e957ee5f 100644
--- a/media-sound/xmms2-scrobbler/Manifest
+++ b/media-sound/xmms2-scrobbler/Manifest
@@ -1,8 +1,8 @@
-AUX xmms2-scrobbler-0.4.0-gcc-7.patch 209 BLAKE2B 85db53cb3136ccf5d2b97c31adb1fc843efa863d5c7bfad485e12f7a3911dbd6c7cb4ccb9c25f4af755c370279bd0efdb71b1721e273a3a94e386fb95b60de3c SHA512 a6d44d0dcbe0804623a8f528e87ab41b159d28dd8ce0a1514f42710fd7677b14f3074d6c0368b4d65091773217fd6ea29ad630ca6c21942e36225405d96ac9ed
-AUX xmms2-scrobbler-0.4.0-ld-order.patch 1662 BLAKE2B e0e11a68d0e1bb52143a4a7ad809fbb7a4881c2fcb3b5478885fbb2e86ee872c2bb9ee8dc4b0ea37a81abcd886a7dccff56e60f1b7bbb45a4e4d6f723ed8a23f SHA512 c233a2c49e641b4030a250c660d883b5cbb14ab7996d35e58da2681a46ea181587ad576aa2d3b9ba78508e938fef2870b7874f8401162e27bde209c11f8178c7
-AUX xmms2-scrobbler-0.4.0-ldflags.patch 685 BLAKE2B f3cf24b772c857cfbcd9c19e98368203379f4d83f6985931062296d28b5ac2a676e18753368f205efedf907cf1dfa8e3012242bd67c4e5fa28c863fa4772a77a SHA512 8c954180d35360193eb13a91992d6112696b4cf7b6714597c3b73585f3358b66da00ce9fa8a4d8cd0d521d111de78ee63dee3f8aa30e40569474918aa6e4474a
-AUX xmms2-scrobbler-0.4.0-libs.patch 621 BLAKE2B 78ecc5b4bcf8e16607dfed56345ed8c47d29610a81fc47b3377b7c32dac2b3b76224921398efdf879444468ee723ac202259c3a7879496a857f9a29d340f9888 SHA512 7156685a51aa4283dbc584b04c0c68925a5720cb92c3dd1b7d4356336e946d2e162d17a5408e45eebaf9ec2878f77c162f3a540c225a0d27f5662c58edb2e407
-AUX xmms2-scrobbler-0.4.0-no-XPTR.patch 618 BLAKE2B 33a3e91cce78e7f9c6c2cff237643b8aae57be6efda47a114c1059211ac66dbfa9d426c90b6b9bab45f27410df5501b32ad148b99344ad59ce6f87389cbbe3af SHA512 24b7e3b0472cfd277ba3bba8f0bd3fd11de43c7c6d3cfb117d142d4950fd820acfafec7df0a3f17889f847437a29521a786441272a59d599986c5d0a6179fe09
+AUX xmms2-scrobbler-0.4.0-gcc-7.patch 130 BLAKE2B 8e2180c1d6f00e4e3c3ba6f9e8339fece4354d0b98035852ce2131b366a30b3453b89c0e2bc7f8ba1b85193ca073f015f8a3fa3db8047995d2da3c59a784d6a8 SHA512 ce5582e35f714c7554c1f4ab65231cb179524165e0e02f2e10da57627ccffbc31ff640b6eb23c321d441c47c8dd384e1cf0f483f1d3d528663c1f95028e3fdcf
+AUX xmms2-scrobbler-0.4.0-ld-order.patch 1599 BLAKE2B fb2fae49c2eb4d3f3cc1f93e4923d6a6ebb2e8d3c9ce441f221f564e9dc383c56394f3791db333f44ddd07d8af1e2fccd5068de7a37043edf2927f695d66c428 SHA512 f730f08dfbcbe1ce07153bb15b6308e7a8091491196dcd81cf0e271a8117ca6a938d58a1011845c40ab781df82f7c8efa45beff4a2d171d9ec2b745a5f7a59a0
+AUX xmms2-scrobbler-0.4.0-ldflags.patch 622 BLAKE2B 788c89110b44b0d1f160a0bf65453766631753f2d4807a15051145249fef25ee5a106e36091c1f7590e0b1336a74f7a269f5df362ac77dfd91172aad46735099 SHA512 4bbae7c0d1652dd467d85a89e755bc7752d9df7a6af72e3a0e1d82ba5309ea740bbf8dd2204b38bc32cb4f4e129c0d620d3b4dc992a270c271b32498a71ed768
+AUX xmms2-scrobbler-0.4.0-libs.patch 558 BLAKE2B ca130e564b22e4ab10848903a81c5bd3c775612ad6413f86b89a8c0296e8383bd6639a952bb364e593fe17da2c273ed691ca76bc38d143b35774c59558175d85 SHA512 bf6f1a052a237828be64c338c20af9753f86accc81c0f04b44b2f1802a34542083d16caeccb35b12ef15673fcaa84a2cae840d6f159fb537056f3ee935feb7df
+AUX xmms2-scrobbler-0.4.0-no-XPTR.patch 529 BLAKE2B 8a3a79ba35afa0f75160d3bd74529e4ffac6ed039b5f1bc7617b6b9491fcf931b5e5578eea72b930f8d202277ad09898507f9e4e555438b91512979e7ff2e1dd SHA512 5b8e39d48259cfba1dc9a163b13b2ad8650b40be745aab3f12847595a8355d78cecc6b94ac35730db347a417895a9ca51cd124bb17489e6e7c08c2812aa2f45b
 DIST xmms2-scrobbler-0.4.0.tar.gz 19831 BLAKE2B 84194a2359b825c5571637e4d875003262235f8bce550ffeb54a123c53b1aeee49b7fd21c5549903e24348869abba96ba9b7e78cade4dc44dcbb798f4604d8fa SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b
 EBUILD xmms2-scrobbler-0.4.0-r1.ebuild 1298 BLAKE2B 60e15173cc17e6790455206cd5edde0f8cae04ba172ff4c8f58ab3fc124671351b8703b1eec973a69bff4573037be79582a9a403457220f849edcb07e202cfd2 SHA512 64078c2b5f2c0825aa6111c95bd9f1eebe7981bb7fc7a17f68f18704786c7f3f6211a7f89d663106376f7f82f724ad1641cb2865d5ab0871b21e337a033d0712
 MISC metadata.xml 534 BLAKE2B cba02182ace8baaf5933ba4e01464e323ea0c6dc58c575ebea0850808429f45df267c55d4856394885dcb4f8c69763f1c8aacec5ab401b079c8cee893d8e5f61 SHA512 ee2450fc9a95750c4c86c4413ae4b3a560952a6fcee22f5d27f5ac5ff0388deb8e71131a92972e15415cea0f736be554db3c9c607ac374cddfb9b46ba181da76
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
index 383bb0596eb9..6cc9686b6164 100644
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
@@ -1,5 +1,3 @@
-diff --git a/src/submission.c b/src/submission.c
-index 422db0a..326b003 100644
 --- a/src/submission.c
 +++ b/src/submission.c
 @@ -24,2 +24,3 @@
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
index 1ba5443a9264..f252edaa56a9 100644
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
@@ -17,8 +17,6 @@ Date:   Sat Mar 3 20:24:21 2012 +0300
     
     Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
 
-diff --git a/Makefile b/Makefile
-index 7693bd2..4207cda 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -36,7 +36,7 @@ install: $(BINARY)
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
index a570548ed4e9..33f188cc8a92 100644
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
@@ -4,8 +4,6 @@ Date:   Fri Mar 26 20:10:54 2010 +0100
 
     Fixed the build if the --as-needed linker option is enabled.
 
-diff --git a/Makefile b/Makefile
-index dad3fcb..3331e30 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -35,7 +35,7 @@ install: $(BINARY)
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
index 959f1232e6d5..7f8f417b7a5d 100644
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 3331e30..7693bd2 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,4 +1,5 @@
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
index 950509b3d2d7..bb25361a4e41 100644
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
@@ -1,5 +1,3 @@
-diff --git a/src/xmms2-scrobbler.c b/src/xmms2-scrobbler.c
-index 244fccb..8cd06ed 100644
 --- a/src/xmms2-scrobbler.c
 +++ b/src/xmms2-scrobbler.c
 @@ -534,3 +534,3 @@ on_medialib_get_info2 (xmmsv_t *val, void *udata)
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 81a5258a028d..7894b1ae4f3b 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -9,5 +9,5 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r8.ebuild 8256 BLAKE2B 9fb4b7688ab3fec6b11f829177ec457ebd6d64c93c8ef743123bb8c49c6b093da42ab8081f6fba6438bca113e80163cb4972e67c28fbe380e2bf4a1c749c7680 SHA512 46e653cfa596d9533258bb7ecea05421e599e4d61ed8feaa05c3e86b1eaa1c00386199a4b01020c8d3d6ab30ea5d2d78dae50c6f7785b73bb945a203d241e535
+EBUILD xmms2-0.8_p20161122-r8.ebuild 8269 BLAKE2B 057ffae93e91774c50babfc125d80a2a0e14b9bf65ee0a40a6dd104a0ef7cc2bf4242a9e86c1281f46b1f4687a51588f818b7725a21141a6a56a3d5e55368907 SHA512 5960e9c7f1e951e855c1d772b59eca5b91ee3865bfe7cab3ecc5d646570c9045b6c90fa737654176052fbe19314502cc2731c4167f2b470bdf08e1d9c8ba994a
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
index 8b2934f38db4..f092930f7a2b 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r8.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
 PYTHON_COMPAT=( python3_{7,8,9} )
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit eutils multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
+inherit multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
 
 # generated as 'python2 ./utils/gen-tarball.py' from clean git tree
 MY_P="${P%_p*}DrO_o-949-gca15e830"
@@ -127,22 +127,22 @@ pkg_setup() {
 }
 
 # use_enable() is taken as proto
-# $1 - useflag
-# $2 - xmms2 option/plugin name (equals to $1 if not set)
+# ${1} - useflag
+# ${2} - xmms2 option/plugin name (equals to ${1} if not set)
 
 xmms2_flag() {
-	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
+	[[ -z ${1} ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
 
-	local UWORD=${2:-$1}
+	local UWORD=${2:-${1}}
 
-	case $1 in
+	case ${1} in
 		ENABLED)
 			echo ",${UWORD}"
 			;;
 		DISABLED)
 			;;
 		*)
-			use $1 && echo ",${UWORD}"
+			use ${1} && echo ",${UWORD}"
 			;;
 	esac
 }
@@ -258,12 +258,12 @@ src_configure() {
 
 		local option
 		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag $option)
+			optionals+=$(xmms2_flag ${option})
 		done
 
 		local plugin
 		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag $plugin)
+			plugins+=$(xmms2_flag ${plugin})
 		done
 
 		if use perl; then
@@ -309,7 +309,7 @@ src_install() {
 	local m
 	for m in "${ED}"/usr/share/man/man1/*.gz; do
 		# For some combination of USEs no mans are installed.
-		if [[ -f $m ]]; then
+		if [[ -f ${m} ]]; then
 			einfo "Uncompressing '${m#${ED}}' back."
 			gzip -d "${m}" || die
 		fi
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /media-sound
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)