gentoo resync : 22.12.2021

66 files changed, 1039 insertions, 53 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f31e2e690e9b..e325ad8176c7 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 0aa4ffcece90..af930395bc35 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,7 @@
 DIST abcMIDI-2021.10.15.zip 607327 BLAKE2B f36d212c582c4098faffde797c55fcbfde086dd64cfbeca9f58300d80eeb519f3f5aaebf6649bab25912115c583a0e11998dd9c5076547bd77009749051ae7f2 SHA512 f9877444c28add8d036223d1f8aa309928d14a26b923509411fb5781192c77292138a02837015673a92c724b0ce59aa8fc11c66177371c9dd1d23501410f01e7
 DIST abcMIDI-2021.11.25.zip 607419 BLAKE2B bac5f8f31497a5cbc2133e70c7cfc1a925e22f8ffad67393a59fb1b976cab057f255bee9eaf4d8b48c597763c70e403aa9daf99a4ca82947d138493caed6d390 SHA512 d019c1445f75d91a7b2be5636aacadaeee29dcfbc195e2851ecf5dcf5ff0c45b459338dc625aed9cdcfcfaef1f1e120594126ded3ae044c3e3bae45ee6df38ab
+DIST abcMIDI-2021.12.12.zip 607868 BLAKE2B 89b978b3a8a635617e44a870a6d1f36c1053fafdee189fce5c1d419c51cea94f77b1ca1a8ecb6a7bd0cc0c4d92309a8f4d590ccba8d581f9793ae94fc8e4abb3 SHA512 909c25cbef04b9aada3914bbed1a13bc1ca47414a104601fdea733adc37bc7c7fd19be09c1dbdeac76e10df778a0d9481469d5df4d2b6a94622e157531d866e1
 EBUILD abcmidi-2021.10.15.ebuild 676 BLAKE2B da71fd66f245bdac7a72f8016e7c1c9324561e6f4b1cc0f1e943672edd93ae174913af401a8b0aa07a48926a9f508676d8008402f357a914a9e41252ca8e2589 SHA512 4505cce6306e087e8a8c038105ff4f3a40933de133a75159d735f7b08f41a3801bab2b03d32e52c29ba699814f96c654909bbb0d7088f952503963fcb3608b4f
 EBUILD abcmidi-2021.11.25.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
+EBUILD abcmidi-2021.12.12.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2021.12.12.ebuild b/media-sound/abcmidi/abcmidi-2021.12.12.ebuild
new file mode 100644
index 000000000000..a0a2a9de38ec
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2021.12.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+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"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	sed -i "s:-O2::" configure.ac || die
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index bbdc11ed4651..deee51ce1656 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -4,6 +4,8 @@ AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
 DIST alsa-utils-1.2.5.1.tar.bz2 1326965 BLAKE2B 79f96fd3ba1d92e72dc634dc01439acd3ccd02555c39cc1714c52bbd1e4bc8b68ec7bf5d219a704533e4a61587c3528504ef9cd7c652924d74daafa90f74e42a SHA512 bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf
+DIST alsa-utils-1.2.6.tar.bz2 1334063 BLAKE2B 3b81cccc836e0de9f6d98f311dc3a316a02179ec1fc7520da9658192f27e7701c6dc41b04a82639d6269d6943afd8a89cb6477406cbc36ac450e57919cff46f2 SHA512 6842f0f4c2f7cc5ac3ba94736ee259d9988b5d3e0d2b522f858d712e16938d2845fa9ef64f4aa60222b8ef6738e053f9113a5ea24a197f2c0d6c4dbd70030f5e
 EBUILD alsa-utils-1.2.4.ebuild 2347 BLAKE2B e88315e90b294ccdb23be786b62441b4dc8a962512253a585b52eb20c0198e6c5b19105f2f379829002afa5f04c1ffd6a4646a4c413585bf07eccb7bc7b13343 SHA512 aa4a8d1783e8ccc6ac18a1143fcb8200a24132cbe12d547ff22c77634fd05b212dfec2aeb6d72bf8f2a2526707e7898d9daba01f5673245b3d6bae59b733a19c
 EBUILD alsa-utils-1.2.5.1.ebuild 2362 BLAKE2B 7acbdbc09430867420509a8d1eec1bfe99384e7c063d5409844ff320a784a7a1621799c78f5c0368f41eb0b17438d6389f4fbe6d581955f4dff6e45920f467f7 SHA512 5089297682395c41c7aec121853425d0c5acf9232e4cbd6b83a0b4bedc6ca3e6e3ebd4b5a8926fd0d22e1a4d5b3f5d2fb858b5a30aab3ca144416e1c17cfafa8
+EBUILD alsa-utils-1.2.6.ebuild 2362 BLAKE2B 62da683d992eb5eda22a69860397dd0f730f108854d5174318e282595c16915d8cca24a906a1d4537bd47ff9baa7b097b8c0f3f5bf306404f50f2c0ea46c39b5 SHA512 2a732932b831581f985167b3f1460c296221252652cd54f32d91130d24dbbfa928dbb0d28f678a9d16c6273d1e68cc9f550b758f2c2cb9690a318253e9338c82
 MISC metadata.xml 480 BLAKE2B 1017b3f508632b0a56786a3b1e46304e4f4cbfd78335f07894ea0d4200e743a22ff0f4803f38314d0fc10dab6d35c40dd1af69e1d5aad3d36034a1cd504c4862 SHA512 c8440f0dc84c3e0d5459c07b975fc723ab346c5b817aaa1ae113964af9678d89d00692fb58494a1c88324a5cfbc9d2bede644362b34e97405c6add51730e943e
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild
new file mode 100644
index 000000000000..78f480047b42
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usex doc '' --disable-xmlto)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 59bb3c98db54..fb3fe04098ed 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -2,5 +2,5 @@ DIST audacious-4.0.5.tar.bz2 577422 BLAKE2B a65810baf0f733327a3e37e6efd2af3d3524
 DIST audacious-4.1.tar.bz2 586472 BLAKE2B baed9f47ddca9b6a4668da542483e8ead049126383e8d1b090b29153b698cc83042ce0620bc5c3e78e59c599cb9f1be72b9c8d2e8c3c87f36fae45554a743b24 SHA512 6e603108c245a146c3bb360e99d85e949b25a50a4d97eca6a0519cb457a93e8d73131504ae10f86c34c0e9d98fb5fdf6660accc0bb3bb480332cb674ac27ac9f
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-4.0.5.ebuild 1773 BLAKE2B 0debd08f37dd9d9e1bbe5cf313afc2d5769f75a12bab7b6df82ca73d3fbb92946aa2ba98a27395a1b2fcf8b1f5a9cedac67ffc9f2e212e395362e27f69022602 SHA512 effed1ada2d153a2734607ea4e0c3b0990d70dddd9eafe8b703ca1fc8683d85cba863d5ee5e49babf643919ecdbe68aa563a4df9e8135f862de827c55e443203
-EBUILD audacious-4.1.ebuild 1465 BLAKE2B 7ffc93b77444d6af074a894ea427060fdfdd6bb4346cc5d09e7a32692dd9ed7c655bf9fa26bc7c30bc65acf825e2f279d17fac10e60316dd9b2113afa6d212f3 SHA512 0c96c6ba78911798457dcfca6ba3fadfa98f74585a154f621a21e45d2cf53e62605fabcf3f96ce44afc8f1cbb8e623de81ca123a471f2946b5622c502efc9a5e
+EBUILD audacious-4.1.ebuild 1464 BLAKE2B 36b95b5207f046aa76ab875c29210aab567950a70f1ba7a3eaeb0166ea446f4ed0f5e01498d27016c1de1c39b5097c18cbe28e6d871dcec758d525f93af82225 SHA512 eec0a2325f5cc77594001bfbe7a408a956a88bf8569f13cd1e252f2e78d89814b8e2ea43fd41be81c89f3a3762a6032f4b4bd95fa8132951fbd0c6338ba5050e
 MISC metadata.xml 510 BLAKE2B 76fa4b58a1b93140cf1b0fd33a14670567ff2ed0fb7b9779db3dd99ebbc7a316d25f7e4d8c3bb6eb8a6d90bd96f0610c0c42fb00cb1b74800e7cba20acdb0ed9 SHA512 b2603e668fc0b82dc2eb86862d98a4b3e5ad2233036a8413785d998c4df09dd7f2974dc644f7c5cd99ea73e423d6ecf850adcf624a081b6071cfca064959828f
diff --git a/media-sound/audacious/audacious-4.1.ebuild b/media-sound/audacious/audacious-4.1.ebuild
index 3203374019e0..e5e8c7af2f8e 100644
--- a/media-sound/audacious/audacious-4.1.ebuild
+++ b/media-sound/audacious/audacious-4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://audacious-media-player.org/"
 SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="nls"
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 53d0e03a0760..431434bd6520 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -2,5 +2,5 @@ AUX clementine-1.4.0_rc1-QPainterPath_include.patch 1395 BLAKE2B e95d24a03e8a7ce
 AUX clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch 3349 BLAKE2B dcea69040e8de44746e7e83d9d8024d1133e68915c110e397b262294239b9a8151784ec13d3d5871553c6ba5e5b43d4638dcd3f69a5599ba22696c4ab8fd42f8 SHA512 60dfe7f5e28ede7e1cc5c91fffb2690cd17407e8a4f59e29008d6025e36e38d8f80eb67d49c1c3f4c982c4eea5821c11bd9760cc8d1dadc4706ae7bcc9232d79
 DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
 EBUILD clementine-1.4.0_rc1.ebuild 4988 BLAKE2B a80aeb5d542e72bd762471bcbd8b20d36792f9d3d4aa8fe154da4992f9fbe1390b637138720fa9654f4ba475510c957eaa7851d0ce0e1c3fd62fe5365bc811eb SHA512 d80d92da2256cc0ef44556bd2989627710eab6225d9ee4413514d71eaec02e0e112cb6191d5cb5e142a41ff8a00806c0fc7a26dbfed7a7a5839f7c29dc597b98
-EBUILD clementine-9999.ebuild 4822 BLAKE2B 3ba9856098109037df8bb9e865f8b7ad75fdc287cacdfce03f8e2fdb44224b2ae76dff3c8e97c5dc46425318ddcf7e79440ca3ab666f37ef154726ead960343e SHA512 d56d26c47718a76e2b2a8279f3c537c31887e783dfdb2acecb21317c7ddc0b8d4a4006e6261f5e0f53a7d5cff9751f6befeb1bada031cd40d8a35d906a468eb4
-MISC metadata.xml 1053 BLAKE2B 2ecbe837e7e882184e8aa9386a23a61be4627feceb3f47f684191d59434149cb6baf18cf979c328b623be241ffd75b50c3a5ba51e6b6ba33c9c2b4f4ea0bf3b3 SHA512 24fa40da705270081e8858abf2ace39a6a79782c035dbf45ffd80fbfed294e9c961b89a55d1f2581a6dd2bcb7d34e3b2bbb500cfe0ff25be63935e3e8b5f1882
+EBUILD clementine-9999.ebuild 4836 BLAKE2B 17bb5833b19f9d6b509c364c644dc9db396a284ef882cae2bf2eeebc19f5d592adfccccf582617debec34c56b0ede199c889539e961464467cd29e568476a42d SHA512 7fa3f576783bc18c05ca5e3c0005b032d9364a923796c7fb4c1276bf9c0a4e87df8434eba7971ddaee363c73c7ffb151970da5a8897311e1c0b85de0604a01a9
+MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 7043ee826cde..3e4023b68ccd 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -23,7 +23,7 @@ else
 	else
 		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 319a76d18094..e87e946c4d6e 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 6cc8897ace9d..b2c89077c96b 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,8 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-51.1.1-makefile.patch 1906 BLAKE2B e620aa00b69c460a694de60a4e16539f6b6f123e38a282e59db6b2e2b623cbec3bd793df2f1e7d935d955314023f90dd4b2dd12f155bb0c261328456af46a1d9 SHA512 02f3080beeadb90d725e4f94d4e39bc944aa22287b2af3b78b8094c4200ad58ffd02ad0359c4b677c89a426874394e134b526347b53ea3efa76fe950b007eafb
+AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
 DIST din-51.1.1.tar.gz 3700797 BLAKE2B 559a4476188ac6d9da596be011bdaa8b379bb336220b3f94edf04e3eeb9ca0100fbaaa0fc10f9a9f37d3efa436acddac5c06435c6b3ebb4d21afdbd7c65b2dc8 SHA512 ea5e1ab79cbc24abb80a9fd25d8304f36ab2345505ee98132196685cda73b31dd7db3f62cb1821cbdc9694703d3454bd58d733833710d492ecebffee23732a0f
+DIST din-52.tar.gz 3706694 BLAKE2B 054d3857bed1b4f4affbeffa0fc5c27ef356f200a60f9d6c5145327311accc5f0b1c8deaf425b745ea4cd2c1accee1195b2e840e9125d105edf67e09062b8574 SHA512 c2ec779746d07ad6579aeebadff45e218fd29715ac446f00840b513d3f9c8d1ef79f556a1f5c7d931adb3451b547f58fb58d6da699170755ae62f25d70b95158
 EBUILD din-51.1.1.ebuild 1083 BLAKE2B 474d674d77d7350c744a50d61863b12cba148e73afd6d56d52f30d293b7a89659d658a3ede854dd0de281ade1d26e399aca940b90565a9980537acce5737b780 SHA512 d9bc8d1038e6f30e3fb6c1cc608b6760135e4df33fc8da7525df75b4fadd22d4676083e6c3abb05300cc562444fa7a1503c49209a90b5765130ac8ef6b166736
+EBUILD din-52.ebuild 1085 BLAKE2B e7a1c6e4c4e4efaa825733da31a56d19b50d71842ed3343fc8d3a9b9c2050af7f2c7aac993095799e77460404661cc74d7370a9d299497789eb6efa05f516273 SHA512 e0184a6602de34393f51e1cb42597ced4ca5a0c2acf7a0a87a0f1a486ce13e9661eac05de895a342aaa253956f562da596670bdb19076378f1e80428c5a6eb0a
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-52.ebuild b/media-sound/din/din-52.ebuild
new file mode 100644
index 000000000000..69a4da0ac755
--- /dev/null
+++ b/media-sound/din/din-52.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}/${P}-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/files/din-52-makefile.patch b/media-sound/din/files/din-52-makefile.patch
new file mode 100644
index 000000000000..3205bb973fb7
--- /dev/null
+++ b/media-sound/din/files/din-52-makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 120bfa6..b3f4cd2 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ #dinincludedir = $(pkgsrcdir)
+ 
+-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\" 
+-LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\" 
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ bin_PROGRAMS = din
+ din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc autoflip.cc autorotator.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc defvelaccel.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index c23b372f58d5..e013381811f4 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-2.4.1.tar.gz 2014026 BLAKE2B 4e2765430438505c910919d5a5069b13a63e72083c4a40bd8b406e3463842ccd5ab024f4a0fccbceafe808e3926b3be03e98338afcac4520de978b0f5c950ee8 SHA512 5063201b643cd3e58db4c77521444e7816febb39ceb739309ac63b164b2fc67b6bdec16a98945141d7b41add41d82b2bd2ddf99890f12edb2f86b73e643ac6d6
+DIST drumstick-2.5.0.tar.gz 1914679 BLAKE2B 1b9c12304156577230f22dee5bde068ecdc2a3c0dc7406db4d9d8588788a29e1115330d0f9bab8376e1adb72cbf0ff23f4b72ac66c90e1ee83c8322510cf2a2a SHA512 d2e4438d66307dc8259b1da8455c4f2c9954bc3605836b993ec004fb0ca326189d3c8a706ea86bf4836701b80b24d51e756d46c86f04301d5c1601687d1fa6fc
 EBUILD drumstick-2.4.1.ebuild 1280 BLAKE2B 84f086bcf5bfa81e6f700d1ee82a871daa32929d353db06d91cb572dc18c50dfc25fad9da53a058863281c888bf8fdb2013dcb92baac52ccb1e9b9463c5917b9 SHA512 85a2dc9eff1690c4b441a8b44a3d0bf84240c97fe5a8feb518ffe27b4ac289c46ba78f5709733d6a48a96519f0523cb05700b7be7bfd6db579fef3b2e0225804
+EBUILD drumstick-2.5.0.ebuild 1282 BLAKE2B 019bce62e329ed8f99d946684005d3e9c57d45ef48a9bdc5fe4ac81c6d9f01a8adab66f01bda027d29b6e42ccfc8dd40c24a9a34a40593703a3e25a0ed602cb0 SHA512 497b08f55faf4f3b4f7485936ff1d15515314db60d9366719116e2de469e6880fcb69027066b7f8fa370a667cb969875b589d163256e706849df393e6d03d27a
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.5.0.ebuild b/media-sound/drumstick/drumstick-2.5.0.ebuild
new file mode 100644
index 000000000000..70bc8c734398
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.5.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 network pulseaudio"
+
+RESTRICT="test"
+
+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/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( dev-qt/qtnetwork:5 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DUSE_DBUS=ON
+		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_NETWORK=$(usex network)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-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/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 893ed2cfc865..d07f6a25f786 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -4,5 +4,5 @@ DIST easyeffects-6.1.4.tar.gz 1959269 BLAKE2B b3a4b7f2e1816353bfda4d232f380483e3
 DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6
 EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
 EBUILD easyeffects-6.1.4.ebuild 1997 BLAKE2B ac38c18dd06f16486a7d4595025b64e607fd28f75bae3de7ff12da36f421b2f003c0b79d15e5faf952e01260540229d3cf3ee3c63f3c363ae54f42911861ade9 SHA512 e58bcb7303515868a68e8553a2c8c0028cd8266514ac662d66786af1e4c34e89d02be8e7637e17d1e0b8bd70d23707931b9ef51eebbaf96df6b3eda351e0c66e
-EBUILD easyeffects-6.1.5.ebuild 2010 BLAKE2B 6a995c3015311d0bdd97d9139d7cc695a7af9ceb9381306744a1a102b17e3d6ab5e50e51278c32976f8c7b55fa77d0750d2a2ed1fba253c4442ebe33f1921eec SHA512 29c0f45ab2ca8c120d8f31d183585766e5005ffc93cf4efa38e85761bf3832bcc1cd07bf8341ef6adc90d7267052d609e68ec6527502f66da391925b6963cfb7
+EBUILD easyeffects-6.1.5.ebuild 2015 BLAKE2B 57921182fb3a2b9f1751c24b75614b8fe9ad42be4754463c19ccbf3de39b186564bfd3f13dd2ce9bdc9a4167f9945e44d297d8c930ba4ec4603ef48b20be1c93 SHA512 4f76014d7358280c49c186847ae7a306267afb3b976fe67605bcefda6c0908a793b0dc4fe14a409e7ba870eeaec1b0a461f539ab7504ec44ed3446ba431a38d4
 MISC metadata.xml 1285 BLAKE2B 2f08a86e1d8dc764ab015461101f7983cbad6c4856239ba2dcf332e23f3cbdeecb9e93bd464315b86125b708e8dba80008f1536dc4cc8fe240137e3cfdf461e5 SHA512 6bd4a58517ba2124ec04cb7dcbc36fc8f029729041abe623e1e4de8671439bba2471bb6d03febd780b820a2bd9b37384dc3c289c87f6eaa39d2005b544f16cf6
diff --git a/media-sound/easyeffects/easyeffects-6.1.5.ebuild b/media-sound/easyeffects/easyeffects-6.1.5.ebuild
index 600dcea72c95..e2384d6fb9ab 100644
--- a/media-sound/easyeffects/easyeffects-6.1.5.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index d2fe01046451..9a82f3c51d88 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-21.08.3.tar.xz 1739368 BLAKE2B ba802dd260e2061bcb652511c732b4c6c9431ca4c3af30f71980f06637bf9942b94874b56312eaa24a3b764132db290d73165bae0c6b967f84293ca07c656196 SHA512 839a35d3bd69b6c57eff85b583d78d8a630536f7911283e407776ada8c69625d2c3e06a0ac1591cf91420eb05ff1cd9bfbfe6eb8dccbbb26a31845a3ab9f2018
-DIST elisa-21.11.90.tar.xz 1745008 BLAKE2B f128b80b53830e8f597ea91ce6efe6cf533d94cda4c298b26bf6d96a4d4aa2b5d0d5718692281e4daefe94b45392d99e9ef2027df4a3ae490382aaa719796559 SHA512 33af6ac67d4a70181a220124f63b413613289006b54525c2fad98290b3aab9f8b80c26d89375b03c14d0f1c7f4e2a8baa98ba70a7fcf56e40ceb92d1188a760b
+DIST elisa-21.12.0.tar.xz 1745688 BLAKE2B bf1159f629cef3c99625884485b1e0f4328e4c9553181dca14b30fa8d36da1c110bed57ab15368e661aa371d87e746891023326b0da32d149507be795fb1d5c3 SHA512 d20cd4db50b39827a47432269a402197021a44cb964cf19f9b139bf81867cc2997605ffe59b1ddec38233f4c47f6501bc20cb07d0f3970030ad5aabf0c4d9cfd
 EBUILD elisa-21.08.3.ebuild 1645 BLAKE2B 1eeb11af3bba9667ac966d084e44138c73b18f8d24b5e54f8f951c03edeee36580de42dc4de8c8d4d15e2067db5962116e3900ff28d9db0a5625f993a706815a SHA512 105c60d1091c90941af584ce31f46c9cb131a1a1c31c57cd42569e0566898a57f9a4edd505ffa071d6d737ea6afe27acee6d6ef9abffd68570ae28075d7ab1c8
-EBUILD elisa-21.11.90.ebuild 1648 BLAKE2B 4612f06330d9a2175c3fa509024229266a8a682b471da67dec6331f63c505c1661b81add2255b0a1995e9bf03829b129e67441ec0be12a542e317535efb8adfc SHA512 0ff224e6ef8a2b21057e72dff076d5dcd3600c50b6192c50557344d86d3d3c742b849133d8d32d1cc35f08fbd15d0e8f890abb624b8aaa67aa9fe745bb72b407
+EBUILD elisa-21.12.0.ebuild 1648 BLAKE2B 4612f06330d9a2175c3fa509024229266a8a682b471da67dec6331f63c505c1661b81add2255b0a1995e9bf03829b129e67441ec0be12a542e317535efb8adfc SHA512 0ff224e6ef8a2b21057e72dff076d5dcd3600c50b6192c50557344d86d3d3c742b849133d8d32d1cc35f08fbd15d0e8f890abb624b8aaa67aa9fe745bb72b407
 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751
diff --git a/media-sound/elisa/elisa-21.11.90.ebuild b/media-sound/elisa/elisa-21.12.0.ebuild
index da3021ddb376..da3021ddb376 100644
--- a/media-sound/elisa/elisa-21.11.90.ebuild
+++ b/media-sound/elisa/elisa-21.12.0.ebuild
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 1c7d93d3ba1e..59c257ddab56 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,6 +1,8 @@
 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
+DIST guitarix2-0.43.1.tar.xz 71742288 BLAKE2B bfa72a20f5fe1bdd08162e283f7074f6bcd6b4d6ccb1771f0351e60802ebf030f8f6627d2480ccd2e5972215847edd62bff38c338723fd0bf2504b9b2cee5101 SHA512 30e56d863308cea18bb4af6f71d3e8d852662b4252c998507a1c3de9a2d97fe1c4ecb525bd35ef8e176b5cb5138806553cba157c1aa6cb14e48fe0bbea8a7def
 EBUILD guitarix-0.42.1.ebuild 1879 BLAKE2B 36d5b345407d6d6de9f5b0e8682c4c2c7a818a82099d966fa7b105fbad4d83d2de4d178aa53e5226547c607a84ecc05ccfbf54e037d1ff9465064dc6c3bd41a3 SHA512 6d7c320981ad12ec0f8a6b380c564a27c6097c69bba1f101af511faebd2777d2ff7d519bc34df63be82ee7e33d28e69e64d1ef3198b78a309d43786f24531980
-EBUILD guitarix-9999.ebuild 1792 BLAKE2B 0bd201b1b4ead9e31efa6e6055326d99e71176d7dd7a10ac03ab93f9d0cbcae929c434eaf126c9f93ed6823256956301a5381f0afd082bcbb8d6fcddc0b9ff28 SHA512 6b86ab87643212ee1a37753755b409ba73c9fc1501e6d478760988cbad75615265dca629be68e9bfc718b821b43ea9eceb13ebf743647d15e3993296df0380ce
+EBUILD guitarix-0.43.1.ebuild 1799 BLAKE2B 1b720e72d59dfc3b7173ebaa140e9d30d698142563a61a866617f9af40198adb8d0151e79231f39b33e2b8ff5162d2ece778aca7be1b0d9780b8025ff2881b46 SHA512 cab4955bbaae6a9e49311e7a2757d34128dd7d6164242856c7958137dff3994f2dc810437afdce18656052ec9edcd3c1f7acdd68e1bd12c84c0bd5bad275a049
+EBUILD guitarix-9999.ebuild 1762 BLAKE2B 6bc5e9ef78e46f02196e6866d081801774af2cde30b65b7035e81e85168f099c449608922d7694b0f74b9768c6eddae195b51c5485f7401f8cf35e4066144d99 SHA512 f5b0d0c1ad5d4d7fc52744ac187f26153cb7f5681395be416bf83dc1a46ae4cb42ad8b0fe6a6ed84df3248b26ac4a32c8abe614c9dfcaf5555775e7f46803cf1
 MISC metadata.xml 692 BLAKE2B d71528f5f53831df41070160d9abee21667fc98c2000f28f87abd1669497cd7dbdf5f16ce8401d54e1886eda75ba7f991387586b9c758a35c5b5a9dde6a29a2a SHA512 0444744e99fd322718d0cd5b42406b549e72db08ca053a8ff06fe405646946291038719e6b6873dd1695b6661e2864c03f225476108b2424a5c9019e9983a0c4
diff --git a/media-sound/guitarix/guitarix-0.43.1.ebuild b/media-sound/guitarix/guitarix-0.43.1.ebuild
new file mode 100644
index 000000000000..d7de3341b7f3
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.43.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="https://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+DEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-libs/glib:2
+	media-libs/libsndfile
+	media-libs/zita-convolver:=
+	media-libs/zita-resampler
+	net-misc/curl
+	sci-libs/fftw:3.0=
+	x11-libs/gtk+:3
+	lv2? ( media-libs/lv2 )
+	standalone? (
+		dev-libs/boost:=
+		media-libs/liblrdf
+		media-libs/lilv
+		virtual/jack
+		bluetooth? ( net-wireless/bluez )
+		nsm? ( media-libs/liblo )
+		zeroconf? ( net-dns/avahi )
+	)
+"
+# roboto fonts are required for correct ui rendering
+RDEPEND="
+	${DEPEND}
+	standalone? (
+		media-fonts/roboto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	standalone? (
+		dev-lang/sassc
+		nls? (
+			dev-util/intltool
+			sys-devel/gettext
+		)
+	)
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+)
+
+src_configure() {
+	local myconf=(
+		--cxxflags-debug=""
+		--cxxflags-release="-DNDEBUG"
+		--ldflags="${LDFLAGS}"
+		--enable-lfs
+		--lib-dev
+		--no-desktop-update
+		--no-faust
+		--no-ldconfig
+		--shared-lib
+		$(use_enable nls)
+		$(usex bluetooth "" "--no-bluez")
+		$(usex debug "--debug" "")
+		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
+		$(usex nsm "" "--no-nsm")
+		$(usex standalone "" "--no-standalone")
+		$(usex zeroconf "" "--no-avahi")
+	)
+	waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index 766f8d088f1c..ac32a3ca36c9 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils xdg git-r3
@@ -26,11 +26,11 @@ DEPEND="
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
+	media-libs/libsndfile
+	media-libs/zita-convolver:=
 	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.3.8:3.0=
+	net-misc/curl
+	sci-libs/fftw:3.0=
 	x11-libs/gtk+:3
 	lv2? ( media-libs/lv2 )
 	standalone? (
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index a7b8db19235e..b0ece183dbdf 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -2,7 +2,9 @@ AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b6208
 AUX hydrogen-1.1.0-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
 DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19 SHA512 116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8
+DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089 SHA512 c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37
 EBUILD hydrogen-1.0.2.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
-EBUILD hydrogen-1.1.0.ebuild 2039 BLAKE2B a76037393333d532b1c8d2fc273f9d2c88492e479b251069da4ae7b510f2d842227d67192fdabc34c74efbccf30f9ab7fe73569dc02de89b7eac2e7cc37f09ae SHA512 0dd08ba3b7d3f45c85b23937f32d8fb9245a65dcdfea5f23ef090052a9b85bfd943d549b2c28b9a770362a151f4fb4fff6d8da54fbcffd42584f0d0767dd6d13
-EBUILD hydrogen-9999.ebuild 2050 BLAKE2B 6196b99a92cf45e3b4af44f5015e19c1727af83062362332459dd0b207baea81822e7ceab88942b37a76bd8f8ecedc5291cb666a2c753a9bee430b7d3f43f792 SHA512 c0c2426def5cdbdef507d724f6c22d79da050064d96ec70add7b1b9554c6325eedfaa0817f6dc49d44308d964693546921bcfcf0df6231da8b9dc85978f3d118
+EBUILD hydrogen-1.1.0.ebuild 2079 BLAKE2B 32f5db272650f71d573264c5466cf963c01d25108a6a930378480106d30c53c99b7367992564720c3a02dbcf147f594807904e3af6460605acdc773dab7f5f84 SHA512 00f0756680c74df3ddad342b08832ab1aef12fa87b2fb8b2ba3b90a56371746d73632be70445f086910362e9210c7384084e9a71eec7f056ab08eb874b05ab22
+EBUILD hydrogen-1.1.1.ebuild 2090 BLAKE2B abc474aaa19680527906c49da5cd94346f61cf8bdd2c1781895f736ed71219ecdda00d3e4018e0c4ef189469acad50bcf0cc8ad92253608981610456eac0b190 SHA512 3dc8adc1822899719230ae5f7b999c00efa7e5756b3f7e80400a3bad6db09b006814745bea9200e1f2cac4000aaf3ccde913cdaccbce67d2270fd20487779513
+EBUILD hydrogen-9999.ebuild 2090 BLAKE2B 194dad4a7e4ed8efe043e4d53175dbe42805153670eadfe4e2fb51ae3c7ec80531798cd96904e89a859105b2084114c88991b0cef0bef32affa8e5fbb5b47d53 SHA512 00d1a1367617ead9ce2c2853efc58c081c37ec9aada417b47beab567ef143c5ae6561aa8c3fc0bfc2b677bb2346c3ea3f693adfff41851e106591e8add5a2a95
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
index 966393b75e6b..99394f5d5f81 100644
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -40,6 +40,7 @@ CDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive )
 	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	doc? ( dev-texlive/texlive-fontutils )
 	jack? ( virtual/jack )
 	ladspa? ( media-libs/liblrdf )
 	lash? ( media-sound/lash )
diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
new file mode 100644
index 000000000000..da67dbaab4b4
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 )
+	doc? ( dev-texlive/texlive-fontutils )
+	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.1.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_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 6d861d99ffa9..150f2e7c64d1 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -40,6 +40,7 @@ CDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive )
 	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	doc? ( dev-texlive/texlive-fontutils )
 	jack? ( virtual/jack )
 	ladspa? ( media-libs/liblrdf )
 	lash? ( media-sound/lash )
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 90894c7dd466..6e1586a8889f 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 DIST kid3-3.8.7.tar.gz 3356781 BLAKE2B 967a7af8f3ca5413716b1f246d07fa1723f57113369f466f853c00106e81648efb19c54abbb27b802ca9dae308c44683764356ebbbc708c7454e9669ae0201f4 SHA512 9d1a2c64d05e19c7a8c33f5447f896043ffd68ec95387dc04502549d59cb0398dd6946d17bfce12ed57ea445e0b39c8b3769918069ee9f1862f2480482bf2a01
+DIST kid3-3.9.0.tar.xz 1778964 BLAKE2B 946d4bed60de8774460d26d54de69df6a208e4a0eb25f5d7f54a66c31716a4ba479d1a75979f2febb9a398c5a1429d1822230dad7d9eed77e3e5c912c65fb1c3 SHA512 276a1e564b82cb2091008a8a532fc2b86a522ac3a5d83e8388b22c1172d88422555cb330ab51037e04d674dfb172f994d2494d4f6527b5c9ab635346531b4f7c
 EBUILD kid3-3.8.7.ebuild 2005 BLAKE2B ada62f924eb468088bc94361fff8fc2985a9654a271035890e4680458f76f6bf0ea09fa8bd4e6aa3188602a3f08fa42d61e284189fbe12e8603f810c018b27a8 SHA512 d1f1ddaebcb873bf9d8b344b09a529317a0d9ce8232487e0ab53baecab22b71a083fe3d0302cfb9006c83f994b12b718153450cb2b723bfa7442815a8ec72d27
+EBUILD kid3-3.9.0.ebuild 2103 BLAKE2B 33964353ab6279a21fe1ebf75cd27fc28ec5aea490f43593ef13c9ca07234832e749167f79f29185edd68950ed0c579e94f21ef9675e2d02646292c5bf5bdbff SHA512 afc1d48ccdc39872b7d0a879d26181f4b8e614d12682651ca27670eae1146dd23249f49f16b63f7596deba07bc617e8f3ef6e0f3e2ade6f8d5f2840b0c6910bb
 MISC metadata.xml 650 BLAKE2B a05aeb21a41043f2a4891e07db9fcdb32051fcb306dda9db0e892165e44728607430d3aeaf9f749e6a0b0a88b1935d1768853572661c1437c4b51a79a80acbf9 SHA512 02720f1bfffea6ee6a6f29d7bd2241b0bf425c491b5844f119d1ea9b6512b52d6c75a4eb9052d506905edb4790f5af0f7778d0ce05ddd3b17ba37e9b83cf3a5a
diff --git a/media-sound/kid3/kid3-3.9.0.ebuild b/media-sound/kid3/kid3-3.9.0.ebuild
new file mode 100644
index 000000000000..417c35f22d21
--- /dev/null
+++ b/media-sound/kid3/kid3-3.9.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	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 )"
+
+RDEPEND="
+	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="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+"
+
+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
+
+	sed -e "/^find_package.*QT NAMES/s/Qt6 //" \
+		-i CMakeLists.txt || die # ensure Qt5 build
+}
+
+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/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index 4dc9ea259433..7ddd1664dbc2 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1,3 +1,5 @@
 DIST kmetronome-1.2.0.tar.bz2 227803 BLAKE2B 89d95f088ff038586ceee56315ae8172715a32e8b1c3c2b482fff4e072b523900016b2004b16d19e0e0210b743a8a6753552be8c0ca3e2873038cbbfd8fc5b9a SHA512 6bfba857661b031da37067a88a3ed07f687167ad218f924295d2b953ee555722d00bd5700d541207a93a43afce3f95ded11809630d15657b6d4b0df055792ead
+DIST kmetronome-1.3.0.tar.bz2 366463 BLAKE2B 5140fbf8a31a76febda94713419f14455196ab0017ef048be1d780e66bde95c9f79f6917a02a73f74cd996f39d5e020c6b6fff744c48f21ae0c516940f43aba7 SHA512 3b888dfc802a5a3e83d11a42c6f6f9fd5cd21e294fafa6ef670a6a76cf6b0f37616fcf465d0589c10238b18881e44b85a2104f9b986bc5ddfeecddb51918a78a
 EBUILD kmetronome-1.2.0.ebuild 608 BLAKE2B 1ce94adf543072d2c858c0bc4340eed7560afc1869c4034238dff35a42039670cbf0aca11ce109334bf7f1b54c39bc706c5f7f83f7e0d8cca7fa20ef3a8d9aff SHA512 e683d5c28181d1c1f2c527b0cbc9ae169c54ba728a975d207defd17e964199b818e582412d5fee6ba121cd59ea46d1d1f82255f3207339be00447a3e2d425488
+EBUILD kmetronome-1.3.0.ebuild 665 BLAKE2B 62fd9cd92592dacff5cdcc1821a9d209ae833bb9a524fc26740d690baf5bca0dc02179aa5ca66d86a450c62390206cfc53191febdeb635621153324478ca1e82 SHA512 e3cb13d9af3ef3dbc4778850dd7838384972cc64ee6ac3e1b5beb4b703bf3186ae7552c3e62af0345edee1bcba84b4a6f3e785aff1d9b72853c10dfd0adf7db8
 MISC metadata.xml 444 BLAKE2B dcbcb4ac3aaf26e6732bede37e196ca0ed5962038888d4f15fea2adebfa767059bb7be433355e9fad07faa18e3a7fab60afeadd61ff699b7e70888b168859f70 SHA512 efb191ddc954fb7115879eb8c6c992da1c5aef70d84fdb4d22a78202634aa7bad4a602ea60bf1a14d23b6ea6ffdde883a04a31d3a5cb76be003a45831490b074
diff --git a/media-sound/kmetronome/kmetronome-1.3.0.ebuild b/media-sound/kmetronome/kmetronome-1.3.0.ebuild
new file mode 100644
index 000000000000..4a254b284185
--- /dev/null
+++ b/media-sound/kmetronome/kmetronome-1.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="MIDI based metronome using ALSA sequencer"
+HOMEPAGE="https://kmetronome.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	>=media-sound/drumstick-2.0.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
+		-DUSE_QT=5
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index 3ac6347f4a53..5374f9607ce6 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -1,4 +1,7 @@
 AUX kmidimon-1.1.0-fix-install.patch 446 BLAKE2B 3a1a4633c63dee9334ddd1f8a5b40f8a8427d83193ea65e7296c833f7856544323c47a02684ad90c59906fb63d9dc5f2de008a0b197a4e6325f953461271ad95 SHA512 9a3cdb4586b988a78c9f38fc167475db27cec608bbeca2bf489252a74007bcde241732e9cf4dbe5db709637ffa70e5e43ddb2b51859c0bfde723f420d8c1dae8
+AUX kmidimon-1.2.0-fix-cmake-pathvar.patch 579 BLAKE2B c3a169a4d947aed747fcf63a01ae550759d78b26315fccaf5e7a4666f3b7807ce655add3028800144fa075b78bbddb86afd443a357a00e0b5f6db8840219529c SHA512 dda87e16ae63a6bacf40faa3dd02ef26eb2a90040a4e27bfc7f6dd9c26b8415493dcf63df4b15488d80deb23655e5c6a7045822ee765961800d95afb81ed975b
 DIST kmidimon-1.1.0.tar.bz2 392541 BLAKE2B b4b45eaf0d370c0b0989e7c1a7a30473cb8e252346687a6b3d99a5d3e78a8155893e478d354cadc00b1a7df07a174dbd21ae07fd9a0746f5b7dcdb5786520797 SHA512 6792d2b45e2ee9da777d2f29623453a41532d6f6d93a6e375afd07b4cbcf2eb18f11ab2d9358febbb22925ee7e63912c5bd4714a3804b95971a52a1c0b00a324
+DIST kmidimon-1.2.0.tar.bz2 696057 BLAKE2B a0a3cc8ccd7d9f065c5b1b5594a6baeafd36e4a124207bd8b8f55a3d3c22f7bc7eb84771b51f71f07f3251da3d796a79980a8e22a545576220dce17b354a1403 SHA512 ea62240438111428b1b10e4df2179497495038a376b848cd3fc910ca5eb6126a63f1ebafe9eb1408a0037a9626ffab5bf43e7e3cc31608d878b329450ec17463
 EBUILD kmidimon-1.1.0.ebuild 704 BLAKE2B 0c28d4e8a2115feff95b3fb3483601a3ea4b01e5640de8a922d68aaffd1ff6dbc63438421f5f1d32a91695f5504f65ed963d4544400a5f9a0cd5cddbd089018e SHA512 27f0a3ab0327b75819be82071ea4e9876400a54f02bca775c6b77bd16368d526a2d6ae7174509af5e23a9b8f546cbb69dd155f1b123a1021352c797e907be3ce
+EBUILD kmidimon-1.2.0.ebuild 742 BLAKE2B 9586f619f5983b21000a26cb303862c47f5535833b7941161a73e5a77e05362b02d97e7e20f278c14a29cd284fbe79c1ede0d590651e23d01e2f8726f4ba50a7 SHA512 6f284633ea305648bc4742406d1d916123bfc5b512d28d9253a1c8a0eca570f9978812bb13f37f50b5d6338122f603fa2b0a41c75653aa3c82eea7bae3bc64b4
 MISC metadata.xml 442 BLAKE2B 20c1a6190737f4d447ab159fa0568f27b731d3472b3a4ec26fc4d3225ec9e82fca014d82ad41fe1c8c6b80e785973d066bf7101078ccccd7efac67d3d992749b SHA512 bf4cb478d26b5e1f49057954f77284b6126c72541925299b71f901559bba3020c25a8ca6e6b9b4ccee966f612c71a6b8554f08e64e97e00c3c09232ded483c09
diff --git a/media-sound/kmidimon/files/kmidimon-1.2.0-fix-cmake-pathvar.patch b/media-sound/kmidimon/files/kmidimon-1.2.0-fix-cmake-pathvar.patch
new file mode 100644
index 000000000000..6ee1afea0932
--- /dev/null
+++ b/media-sound/kmidimon/files/kmidimon-1.2.0-fix-cmake-pathvar.patch
@@ -0,0 +1,11 @@
+--- a/doc/CMakeLists.txt	2021-12-12 11:29:13.249013335 +0100
++++ b/doc/CMakeLists.txt	2021-12-17 11:45:36.458111658 +0100
+@@ -30,7 +30,7 @@
+     if (UNIX AND NOT APPLE)
+         install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}
+                 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.ja.1
++        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.ja.1
+                 DESTINATION ${CMAKE_INSTALL_MANDIR}/ja/man1
+                 RENAME ${MANPAGE})
+         foreach(_lang IN ITEMS cs en es fr ja)
diff --git a/media-sound/kmidimon/kmidimon-1.2.0.ebuild b/media-sound/kmidimon/kmidimon-1.2.0.ebuild
new file mode 100644
index 000000000000..927feb7fa79c
--- /dev/null
+++ b/media-sound/kmidimon/kmidimon-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="MIDI monitor for ALSA sequencer"
+HOMEPAGE="https://kmidimon.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	>=media-sound/drumstick-2.4.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-cmake-pathvar.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DUSE_QT=5
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 699f452e3a17..6e4c4c81dc28 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
 DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
 EBUILD lollypop-1.2.35.ebuild 1485 BLAKE2B b2259b9ad1469a62faa46800ad2bdf9830b4fa28aa46266ab3b13dd99f1e5b48c80d7194bb48f0c6bef833b9c7093ced5f51adcb6898eed293e7a4648906a551 SHA512 04235991552dc76decd9ff1430f30bbc1e99f050fe5e244163a2f1f5b7768ea09d47dec9eec4b5fb6e2f8376bae5b003465b95c23be077acb7381bd45c70d5bc
-EBUILD lollypop-1.4.18.ebuild 1510 BLAKE2B 2517184251761a4d3a64d51f662a3b7623dc18043eb6626329f10da26b8f8ab6ae35cc0d9662d8b5d05c9323bcdc4a4218da5692a16d0fc0b1e80bfec13f7789 SHA512 9c3ff2942f58532a22514c906e481e205aa7dda6ae868130b384c7f11bff606ea8d662ecce6bf8cdcd8a870459ed9a8e4dc6024ab5456f676ad9ef47dcd04122
+EBUILD lollypop-1.4.18.ebuild 1509 BLAKE2B 4e9d46ad8ce25f14dc0d39f58ed0dc58d5ba7578c6d3fb947044725855ef5baaa7348b2b908e82ed9931fe85e11c1c41be6b79357fc6b230fa2d71b3356ba41e SHA512 a840729b46f12905702088b27fe62e80361beff30d5cecb486184b4ffb2b2982ce78382b1cfb30d1dc6299ee8ffe6d3efcb0492b566470bdb76a9933c6646316
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
index 0f4355032947..43b03562b2c9 100644
--- a/media-sound/lollypop/lollypop-1.4.18.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.18.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 gnome2-utils meson xdg
 DESCRIPTION="Modern music player for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
 SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 34f62691543f..d4c2cf82e5d5 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,3 +1,3 @@
 DIST milkytracker-1.03.00.tar.gz 3705395 BLAKE2B f14a7112de39748121933d242d89dc6efb71a73c3591fedb92785814e2edc788edfb6608e9237cdfed19ee7337d5920d0232eed5d85f692dbef5d4cb43a27cd0 SHA512 d5489994d9c5d24552073afcbd787c20720096dd81d640356fc13b2e2b8a49713b798066d54f2b589f3819c14279142e295e4d6317ed325537069faad47abbe6
-EBUILD milkytracker-1.03.00.ebuild 976 BLAKE2B 32834e351f8b0321b8fcd8967a93dbda9226a764e52d1ee9987f0fca9354e1a3b51ea45109e17da01e53deefbfada7455e745a5704e88fb49933b889b29aedee SHA512 15d34b6e27b4c2d9fd17effc22eb2c896ce63decce1412cc87b643e26cc174888e95b1956431988fe29685f4fed9dbe0633817fbc1fd7fa888ab92db71f7dadf
+EBUILD milkytracker-1.03.00.ebuild 983 BLAKE2B 4469a4dcd15d597adde057803a17386c028c2f4e003242b07678f2250fb6ab9ea57971954ff8fb2a2a4faa2a8614c9bfa23fe01d97297522bd3be251c221bc50 SHA512 3293356b7439e5fbe52deaa189ee6e0aa988a0b8e9a8f5bb5cebbf0460d0a35fb1a7a306ec13fabc602841b2e3f43a36de1a45ecb13eaa4384f28b17d72be7aa
 MISC metadata.xml 337 BLAKE2B 3dd35a6e9cd890d3274998d7836d0eeb44badf77ffce449e4bd6cde3118e8c6c0fbbea369afe7fc04116b3a378bda752e5fe30d02c7528369f889d001daf4c5a SHA512 0df3c694d72b46f4183f0ac5eced5245466736099479f9456c96094fa0074311978e50c2682553c2e88786c8528f077beb467bae786411d9d22abc26476a5854
diff --git a/media-sound/milkytracker/milkytracker-1.03.00.ebuild b/media-sound/milkytracker/milkytracker-1.03.00.ebuild
index 793d66516750..d3bae8b7784a 100644
--- a/media-sound/milkytracker/milkytracker-1.03.00.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.03.00.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/MilkyTracker-${PV}"
 
 LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="alsa jack"
 
 RDEPEND="
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index f14e00160de9..146a3d3408d5 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -3,5 +3,5 @@ AUX moc-2.6_alpha3-stdint_uint_types.patch 1179 BLAKE2B 73dcba135553cd9630cf44e4
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2-r3.ebuild 2113 BLAKE2B 7b015775dc97b5338b4c10d2880bd57a6336c88b13323f09fa51144c7a912b48c46a47f27fa38fd49f73a7ba4fd0736a64681735486825e11c14f3b0626a43b2 SHA512 b316c0fa8a983b2bdb69e0e787f1f65aab014d71661b38c1b9a8745b53456a512957b73ec76604391cf945bbaa10bef573a92f8258458a0ae003d63c2f49d729
-EBUILD moc-2.6_alpha3-r5.ebuild 2442 BLAKE2B b9d45c55de5104a6683a5c26e814091151efae3450e2a35a148af5b0f5ab4869aba0fbafda5f71943002c69354364a40293f71c51c100c3119a3e18830449db9 SHA512 140d77e6a802e83ba616a5dd3f8e4969f34c82ed92692c07604fc974a4f68b886ccc3a686840002a59ea6cb38c3fbd48796b8a3b3cc5a9d4a6985ad359c2db59
+EBUILD moc-2.6_alpha3-r5.ebuild 2449 BLAKE2B 8ccddcb71782f68f2794a4a9b6320833b866bb808c4d8fc0813f4dd9397c142888b701a0c56cb780012579b6109a5e7a1e01f59458c5e84a5654c00eb4eee456 SHA512 9a8cb8541dcb3602895452cc57c363f6060d98158db78d9bd64a487b7e812c3520f976450cf7221fc3a4e17b4fd32cbcca32f67c2a5783d87edb27cae6887dbe
 MISC metadata.xml 621 BLAKE2B 8e9ff94f7028fb60e0c03cc521aa973888619c8928682345edd24d24866a979dd238e7c6470b1cecf38a5177384aed3f4d784d368901633c218f286a435d08c6 SHA512 605392312ef0aa6951c0acbb934f5645ce51f6af7aec42f0dde309f858fd5ae114389be51942ff0d55f0e899163a617b6a355ddc588ed9460fd1c1c919285791
diff --git a/media-sound/moc/moc-2.6_alpha3-r5.ebuild b/media-sound/moc/moc-2.6_alpha3-r5.ebuild
index 7df9af78e4f3..3004e11e9e0a 100644
--- a/media-sound/moc/moc-2.6_alpha3-r5.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 9009f9df34ac..db68fd76caf9 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,5 @@
 DIST mpg123-1.29.2.tar.bz2 1069976 BLAKE2B 2580f1a4ce3a9ba7016c61289da08e0185eed363d51e4477bab34f1e4ac296b9ab4912a565afcffd29c16f5287c320d8a3d4f92872a0b8a7e2a32c147d87b7c9 SHA512 ffb82ffbebedeb12783338b5159bf055afd25cb77e1b705bef29f04fa50bcb2ceaf2a6418d0e111fab1151ea956fe48ba3576d978e6b0c8f4ca72c3883608ec0
+DIST mpg123-1.29.3.tar.bz2 1069979 BLAKE2B d01a8d77ffb6c344592d1b90026ee25ae12eb2e063446e88370e0aa508705a843b987f1a400351b5ed87d211251057b7b31a2e653401b800fe9871ac2a5756fc SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6
 EBUILD mpg123-1.29.2.ebuild 2992 BLAKE2B 4bb2cafa1ed3c1f69097a953697fe924c675b78d5117dc52d1abcd3b8a9e6fd6b694e791320c9ada6fd6852c478f3a93eb5e810323f59fdd719ec2ad829fba66 SHA512 804e99324bf8c5fbbf870307d8b243733eb09708b0c6a9a6068803f8886219169d7153789f43690e368a0c2fc2ed2ac47ebcf84a67fca035937c202abc5869a4
+EBUILD mpg123-1.29.3.ebuild 2999 BLAKE2B 49a074e953c393d80541c36a02e2ca1340937b4d844650177316b76662a2b4a47c775ff119f32ad0c65605f1daf554c6e46c985bbf83070961064479c9fea15e SHA512 359623d74681fd7401f131d63094219cb2a1e42fa2fa1a27692c48c432e1929809c5b10f9b9a6d3a97983de05ae4410f176368d39e9c269a10eac264d81447ee
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.29.3.ebuild b/media-sound/mpg123/mpg123-1.29.3.ebuild
new file mode 100644
index 000000000000..29a2b1f3de75
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.29.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~riscv ~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.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
+RDEPEND="
+	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/libsdl2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	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/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index d6859b89be01..7bc322205d78 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.13+release.autotools.tar.gz 1479605 BLAKE2B dd8abffb89950e14843a19d8f8066b052a773a1ca8f441c5fd02b191886d605db693dc861ddc7d9d50979231554aea2e76b82d74d35f92a6218a6d1b3fc4c5b8 SHA512 5ddf293755ca9696acaeaf2130a38dece3bba9a45519e1d4b61b594b2e014e67e6f3f79f55d54e7cc2528b9e40feac6d36bbe78788b6f2a1888f89c090872242
-EBUILD openmpt123-0.5.13.ebuild 1719 BLAKE2B 98f417e228f2ce65d60c3fcb52a34c3044ebacc33de6192b3264cad083c8141411f84f6d323896d5f4ad084f90296b51ff7afb7b84034fc3c81b6a0a6b3c5951 SHA512 6759737ab75659c1725d59d5aa1342f90edba5e9ef01064fb9f5dc17ddc86295a53dd84c3cfe530fc470483cbb93375b2c14d84b2faeae4904706340790ee4c6
+DIST libopenmpt-0.5.14+release.autotools.tar.gz 1446898 BLAKE2B ab6ff8db2e19d859fecca882aea3e569b58d96d5055ec0dd42494a7eb38fefa9c8b88f4700d354de71346c71c6d9a96327db1c2b7b48e227928dcba0ce7347d6 SHA512 8897549c18afb57c5bf54f4dd8a1d80983829bca958052d76cda1315ef4a37f4201575817b7cedfe17a44ee79051a52aa35b26a51b554091e92c9d2dcf5924a3
+EBUILD openmpt123-0.5.14.ebuild 1719 BLAKE2B 98f417e228f2ce65d60c3fcb52a34c3044ebacc33de6192b3264cad083c8141411f84f6d323896d5f4ad084f90296b51ff7afb7b84034fc3c81b6a0a6b3c5951 SHA512 6759737ab75659c1725d59d5aa1342f90edba5e9ef01064fb9f5dc17ddc86295a53dd84c3cfe530fc470483cbb93375b2c14d84b2faeae4904706340790ee4c6
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-sound/openmpt123/openmpt123-0.5.13.ebuild b/media-sound/openmpt123/openmpt123-0.5.14.ebuild
index 82cbe36ce684..82cbe36ce684 100644
--- a/media-sound/openmpt123/openmpt123-0.5.13.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.14.ebuild
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index edb95dd9ffc5..9871fb8e264a 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,5 +1,5 @@
 DIST pasystray-0.7.1.tar.gz 56041 BLAKE2B 5f7cae7a55580bf3dfe294e95bbda372c3a679bec000d222964b4027ced2462dfb4a8446d0683f8910e96ab98e1541b3fa9fafc36da530c92d2285f00a1beb65 SHA512 2af5176e6a5bf6d74baf0a0b52b731b7a3b54f787c4e89d945357aab4e186a35e0f77288d69d66743bf4e21f758e0d961cc1f9b339ce513eb4eb2bcab0d754bb
 DIST pasystray-0.8.0.tar.gz 58770 BLAKE2B dff11dec46986d3b086acdff43aa7eda97e8edcdef0ef85a246087a3a0da9407cb4475ab4b579a370f90c23327d065ae704685124915b27e03f0be1a44e50a58 SHA512 104c68e41659306ca1e750d0d580d6ffcf4411da2da51a4f2780f551e12da9e104eb66ea841234292769f05a15f8f14ceaefc55893cf551a47124d086b1fb291
 EBUILD pasystray-0.7.1.ebuild 999 BLAKE2B 311f499a2c1eb72326a348893098836166330425c323a9cd6ed117f0619eb7a8179d1c883344143d0d858f7037193451c5b3c0486f47dec52bb192aad557e5c0 SHA512 74b5e0e8fc57f0bcc6c6285dffb7c60a1a9cb32f9d96d05b64a429a6f79bf0c638434529cf36323387fff1338cc5f6bbffe3362efe1d6a0179f4e093d7bc635f
-EBUILD pasystray-0.8.0.ebuild 762 BLAKE2B 163b8827d4ea18137cca66f6ca4733407f79e15b9065e6db672e301b59f4578834440a95bd221514b6be223e437ed433017516abf653aa8d2ac5e91f8eafe2e4 SHA512 57427a09ce1757a4ae69a4e803e0dbc2a68185e013c4ab1861ed16d699803302c35dd9b46c1892999e85e77d5be7c1c7116d4830eb14e2aa1d19387f304e05e3
+EBUILD pasystray-0.8.0.ebuild 761 BLAKE2B eaaea52da0a581800446fbd3fe37d88195dad259b5ab1a3d5d8e4c91872f00d7b9421bc3e9ce6fda4a172266f0bb230efad6fcb0d66d95243fc04116069a5f08 SHA512 5ba573f74b1ec5f468863738b4d5a28aae4a07d5b74a2f0baad1333e358ff91253c5491e050b3881adce4891f5b8c8a4d511b47159e54d2aaf5ba0605438ba77
 MISC metadata.xml 666 BLAKE2B 6729f9a6e3bbfeaa9f8319c53770972326a0ffe851c02b5238d0e928c02d222d93bf569d00a9b6c1f33602fc13b764f9750d4473f67b1fc5d36da06e52fe96c0 SHA512 11a383b58d521ce5ca4bdcf3505e45b8dbd3053cf3e075c39c8dc4b83c94e3e7654141ffc8048cacdf8b4cc0c4d6565fe0d9609a3e14bf14bc248578978cf39d
diff --git a/media-sound/pasystray/pasystray-0.8.0.ebuild b/media-sound/pasystray/pasystray-0.8.0.ebuild
index 3bbcec540569..06a1e5a40adc 100644
--- a/media-sound/pasystray/pasystray-0.8.0.ebuild
+++ b/media-sound/pasystray/pasystray-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/christophgysin/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="libnotify zeroconf"
 
 RDEPEND="
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 88ddd574f509..4a14d5de9290 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-4.0.ebuild 858 BLAKE2B e613591d317859e84c8330efa3adaa311b005153044e4e588c9131ded0fac49a0e7ed6212d77a214cc8e9b5419e9ac96359ead9cbf61bde86c7c8c96ef656107 SHA512 3edc52431b727d80603cfc51704d57f4cec1e12fdbeeaa56729d64cdaf0bf2edce65028f9c0d929f7c0cfa64541fd5a706fb97fcc65cdc286835bffad2bdf956
-EBUILD pavucontrol-5.0-r1.ebuild 833 BLAKE2B f90664f078155feede1197fc5b096eb61dc23af0b34795875e5a621787cacc21feda80e328008750f70205c263c5eeed49acadf658ed6a39d48d08bbb3622b74 SHA512 aa80a32798079aa0fc77fb9e0959465967e287503d287df270abe264d36da6d1d079eedd6a270c41b314f709843691c414de906140db62540c08093ae689ecec
+EBUILD pavucontrol-5.0-r1.ebuild 832 BLAKE2B 1a30b574beadff9fac98c365ad33f369d48a196a3ae09863c0c442a4c58e00240bfbfe17572ceb550d6d964fb3ba22ad3abe71c6b88e089181fd6d61cf40c7cc SHA512 e6bce7c6a3f51220dc418c6380317634e8e8d0b8b9f82e276d330eec988f1fca719acc45971b7a94434acfaebbc6022d9f16fc9497ce490c598c80031c9c3cd5
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
index 6274d4258cf8..d1aa59fa73e0 100644
--- a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 6025ca519dd3..a9288fb7fe8d 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,8 @@
 DIST picard-2.6.4.tar.gz 4319362 BLAKE2B 78768b4a8a22c51c118ba03a9e97ba6c4bec9180e5739867b5756170083930a942a0a1ceaeb74bbe724af3ca392b92139cbc4acdde9556e9031be16a968a0240 SHA512 5f44f91f9f44cb17ecd27e204b75c83b776a2c55e2a6e42f96018c83f4073d92f028ef74006d6acbe42b1ed374543a65e177f34c561bfdf13ded1085515bf353
+DIST picard-2.7.1.tar.gz 4884448 BLAKE2B b9f5ac2b6205aadbb707dcaee2dc6c89c333568d8fc6ca85da3fe8f9d308d0a54076d17b3f14be52e0154767c4f24ee2fd89d9df909ce1c74b9fc57c970ff0b1 SHA512 e3cffc538bdb7bf851e378b5ce7d4155fd6a2c13e77c42eb4c10a6cd129d45bb0c52d295bc209694fd89eadd60b0f04eb2d7c9eedbcec0a03ab00b7ee1f4e0be
+DIST picard-2.7.tar.gz 4868049 BLAKE2B 87f04056843623f81165bdae181699125d5aa8e41e5da47d645026bb1b3ee4a70edeeef0399f3230584026caf8f014cfe27b5d9f3f2e6b71a8e2de48a832655a SHA512 b88d2cc24a9b6a01e6bb1a54f93bb8ec62c901fe9ff352641ea402b5e091d71241665b067fd12bbf77cf219b951db9a570400adda82fa9da9406f9cfa6aee4e5
 EBUILD picard-2.6.4.ebuild 1373 BLAKE2B 0e4d19baada49a91a0f5e9e2023c910343417d45b7e9dbaeb445069ed992338d3dc335b1985d26122e6b15309600da15ff568dc91334b9224ea4d391a4e6b416 SHA512 3f0056bf9addd5973b1cb9fdbc39288bbcb745157d6505f462e4be06b4f3f360c8df98e1a1fd26e29b1cb5b0fc4a20c3ce2c317f866fa26b8191ffdccc6c144f
+EBUILD picard-2.7.1.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
+EBUILD picard-2.7.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
 EBUILD picard-9999.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.7.1.ebuild b/media-sound/picard/picard-2.7.1.ebuild
new file mode 100644
index 000000000000..3b869df3541b
--- /dev/null
+++ b/media-sound/picard/picard-2.7.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="discid fingerprints nls"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
+	')
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
diff --git a/media-sound/picard/picard-2.7.ebuild b/media-sound/picard/picard-2.7.ebuild
new file mode 100644
index 000000000000..3b869df3541b
--- /dev/null
+++ b/media-sound/picard/picard-2.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="discid fingerprints nls"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
+	')
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index b8c1df832d82..2212f6fe9e7e 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,5 +1,5 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
 DIST qsampler-0.9.4.tar.gz 284055 BLAKE2B 83f0eb7102d6dbba994d2efeee59ebc46ce2b07d40b9dcfe97ed3059fefd449fa90167718ef65ef41f04709ef9c985c86e2b35a0572b47a948172cf5b1a5dc23 SHA512 0e43a335c503bd76d41bfe88967b199bcd8c34a44a65293c1460daa342ca1e35f236984af74e30404637e9f6c8428b4cc52fc27501af7d52e1c9e30f1a80d35e
-EBUILD qsampler-0.9.4.ebuild 1149 BLAKE2B 24adc485f6dcbad6d34712d9021b622a3db66d0094558a83fc6dee56eeb083ab10159569d61d641883e8574c691417e69cc518da9560b982ea4237da1144fd21 SHA512 d98e52041849c6372faa209d2983d63c307346637c021901111286bed5eb73fb4ace7132e76e7bb817f31d22b41a927a47b9f92deb49a0263f33c0a55f309282
-EBUILD qsampler-9999.ebuild 1091 BLAKE2B 0e70c9b8c857bcffd4619e31f8610a4a6d7728ea06319cbf0d25fdf9e6ed7b6b9707f2fe61d73a3d04ea24ea567695137da8f62c0c908c6e1378c336bcb7523e SHA512 0afda6467ac557df22f6988d7150d6eca07e51f98848f7188b1fbcb78bb87c2e02bfad01f1e96a4961904f66ad1f950c20d8529c8882da7cdc9622325ac28220
+EBUILD qsampler-0.9.4.ebuild 1137 BLAKE2B 840ed40ce55f34e831abc36184174e7efbfb9cbd811042df77fd2ae7e8691d73f0a05b47ff1fb121634d2e389e05fc888cbd8eb1fc2d4ae534e4e923e31d02fe SHA512 ffe1374211b4aabda05bd4d4fb8b829806759f7ea3873bc8714e71fee7e82d8cf0df200860a50a23e38ca98e702e8474b7c7118b86a07db3a75b085391561614
+EBUILD qsampler-9999.ebuild 1066 BLAKE2B fb8717ad1c4fa88cc5a0177a6fff158cfca12c0b5ef717d808ae70b721f733534895dc80ac9f3ae1a0862d44e3e1354535e72fceff18ba62d5d66794177659a2 SHA512 fb773e6378edccd26ad0e6be0deb16481b604432e505ac2581c4cdb5c431aaf70b9055abf5dcb6e5dd84d5e8b9d23467113e8bc7ba118aba40ffe873af3ae57e
 MISC metadata.xml 494 BLAKE2B e15f94a046f20f6430b293d548b1b9694e172b083d51542d398abf2de7beea5aa5915b670ac335bc31f797dbba71e82db55b72a93e88bfbdca8d862d9840975e SHA512 b136da53c09415395c0529c6d02d328520617737bce205ba1089725c3705ddea4be61e8208d814479976a420673498fba53caba64b5e0cb49ffe79694045f25a
diff --git a/media-sound/qsampler/qsampler-0.9.4.ebuild b/media-sound/qsampler/qsampler-0.9.4.ebuild
index b1939a889744..6e2be545d90a 100644
--- a/media-sound/qsampler/qsampler-0.9.4.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake qmake-utils xdg
+inherit cmake xdg
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 3fa9e7942e40..8b26d4432493 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake qmake-utils xdg
+inherit cmake xdg
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="dev-qt/linguist-tools:5"
 
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+DOCS=( ChangeLog README TRANSLATORS )
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 776998c6ad76..da24891ec16b 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,5 @@
 DIST rosegarden-21.06.1.tar.bz2 6479487 BLAKE2B c18e1b6d14c2caac1ac7a2ddba2d40fb5a19d8a6468b81c696267ac984875db58943ec0fd46afe4b5d511afa1f5cb1ada93205b6088effcaf75adf234beaa516 SHA512 a0214d95c26e01c5c0ce671bf23f4ebe7f63e54cecf6471226768aae5b4ce8dcf9f03a1970c26317d734a16a0d741d83ce684a53f115db656538522b373ef7a6
+DIST rosegarden-21.12.tar.bz2 6490931 BLAKE2B d1f3bbd173e1d082c5380be2fe0bd9818a741498add5edc9b24c47b9e37e24b928869c00734bf84dd9c2cb9a79fed15275de35a8e7cd4cbbd8ff6cdcb739c09d SHA512 d11756f57e4f364993af67e4aa10c25ef6a7f5fd4baddd127df50c84c29d31aa1e4a42485c8503e9fca31a8cf8e50c3c5b3bad2a08ac945a3fc8cd1a5874d4be
 EBUILD rosegarden-21.06.1.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
+EBUILD rosegarden-21.12.ebuild 1135 BLAKE2B 0043a742125f952ac76ffc12179df22dd24e34398c4df87007a5a3255fe7f8d273637382c5b0ebcd243cbb750d1ed7e9ebb2556957b8d94b774b873fd540f531 SHA512 f6f2595054121d9765f794187be730cc976bf3e47af9d22a8a7896fe3020638206f5a10a1c27fce38134563ed52dcc20f052e265b99620edfc8cb30832bbba90
 MISC metadata.xml 350 BLAKE2B a98ce813216f0135bf3db7e71b401be679ac05012731d4380820df75d91cc919db2923c867f1593aff8939c5202b03d3b3c1cdf1a7884ec12f83952a66845a38 SHA512 9287817aa2c7a4d7d7767f3a44561920dc06a40fa376e3f9d04e6998e3995e93ff74170f772baedbd94c4519bd62c2c7b1b619e9a69c4a7c707ece518b6ce7a4
diff --git a/media-sound/rosegarden/rosegarden-21.12.ebuild b/media-sound/rosegarden/rosegarden-21.12.ebuild
new file mode 100644
index 000000000000..7c555572ab0a
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-21.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg virtualx
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_LIRC=$(usex !lirc)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# bug 701682, tries to open network socket and fails.
+	local myctestargs=(
+		-E "(test_notationview_selection)"
+	)
+	virtx cmake_src_test
+}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 627e7d7968a9..1fdd6ade4d80 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,5 @@
 DIST schismtracker-20210525.tar.gz 1309489 BLAKE2B acc295bed4236d3161fd67a8c97ddadaa07d6d6319a0ad75710fb4d3c7ea251edd2648932533e9181b512fd78b54db929b07e3472ff754220f16cca2bd610932 SHA512 1f20535e4e3b5175ceea803a45b7286a99cab248829c39d11bc85780bc63e0e26c49ad78997a13e290fb4ad2c292d15eeb494a975d53fbe25dec80499e675b16
 DIST schismtracker-20211116.tar.gz 1309344 BLAKE2B 9c6475779cb28955acffa708d8a54b4d6be28d107624a3fc0d3604fc4edbab04cc730da08e78f623e287bcee5ffa337dc56215004aa1a67bc99377c0971cbda1 SHA512 5f666995ac2f0785c3f39077dbd39d6549b9d0d5b9ee85dc72b3bbc1e77d5d7d2465df9f64cff77ee2896c148f8c4166ed6eb88efc1e7121736017bc56a00026
 EBUILD schismtracker-20210525.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
-EBUILD schismtracker-20211116.ebuild 1432 BLAKE2B 73b4909e04dc57b3156453051d3d9dbc27d797940d9dc5238d37688f5395086e57e10897878f2adaba4c03d69f8540ce404f1205a68dc3429ff956f4f3853abc SHA512 bb1815fc622bf3f6a55cc3342118127d27b83d57cd79615194d454da40e61000eca6e14e981bec26bd56665829a8903af57b082906dc6010c6d20cf72afc0a39
+EBUILD schismtracker-20211116.ebuild 1430 BLAKE2B fc04c0a8c3a4dc72e1f17a56b2661a118f9eb5f55288800ca174de3867d8d3abd4e66dd686d94639635e7ecc5238e1b32580453c45161c83f3d3f6469483d8fe SHA512 a865b8e70e7a5d56ffa05291e999391e059fd6f0060c2a3d666a6f30581ec89af5af4aeb495e85c92f979c66b85e1efdfb2c387b45d59a86d609e5a0832122c1
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/schismtracker-20211116.ebuild b/media-sound/schismtracker/schismtracker-20211116.ebuild
index 1647d1e38ba2..ea22c48958de 100644
--- a/media-sound/schismtracker/schismtracker-20211116.ebuild
+++ b/media-sound/schismtracker/schismtracker-20211116.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index ee39c220f1c7..995b1c9dc3bd 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,7 +1,7 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
 DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
-DIST teamspeak-client-5.0.0_beta65.tar.gz 126459577 BLAKE2B 95081e26f2effde3bc70c1dd1566114f1a7526a7a7faa8959a1f67f716bae4ef12fe026bf57c5423a85c8e743f460741cd2d30105f71d8f54be5b5a2cd2aec0b SHA512 9d2527651f88315b404da474160497cfbb73791ecc11ead59a04b3c47d991723da207434ebbf689baa2288abc669131e063b7ed355da2019d5a1ec54acb04fd4
+DIST teamspeak-client-5.0.0_beta67.tar.gz 126459577 BLAKE2B 95081e26f2effde3bc70c1dd1566114f1a7526a7a7faa8959a1f67f716bae4ef12fe026bf57c5423a85c8e743f460741cd2d30105f71d8f54be5b5a2cd2aec0b SHA512 9d2527651f88315b404da474160497cfbb73791ecc11ead59a04b3c47d991723da207434ebbf689baa2288abc669131e063b7ed355da2019d5a1ec54acb04fd4
 EBUILD teamspeak-client-3.5.6-r4.ebuild 3105 BLAKE2B 5be9bb40652e30ebf3975216fad766fc303200edad749fa087113d1aa16cf8b36812b7bb256b509c34528f8b1984d7ed2e4de99f4c25cae290bde5265cdc9e76 SHA512 8597838502d4792e2e2b6fa8281586aec7c763af9374f5ce928c8728d53a99dad3888229dc540e1df43678f81d6b78124c37176586b76e9f64202297210125da
-EBUILD teamspeak-client-5.0.0_beta65.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
+EBUILD teamspeak-client-5.0.0_beta67.ebuild 2076 BLAKE2B 60f9699640444bf70257b6576cdae0b9ec975481d495fd529d771696f2c74dcd7808f755e52e4a92d740d7454f803c82f3e42d2c5b1aa1672122d0caa7b46280 SHA512 9f26dfedaf9b2c5ece6df780d26efbbde5a2f635eafd769165e33e42f2a78e61c939794b33228a27b6b0a0893d98f236aa1894d9dbee1944620a59644515fd0b
 MISC metadata.xml 745 BLAKE2B cc8da59b725c8cc083242d9d73524c83feb0087781f67c2dd9ff29964aa044002081f2bf275ea043dc4e0afecbcd755d6dbcd91e9cf507515adbc1a6a3fdf9ab SHA512 b98d58cb14675ef68ba2e3c76dfec1a463359a84f0d3cdc1a5c225a1ee595d967aabc10c86cded433a932ab0770a34fe98f0307c05369025bfa6401e7c9e0be6
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta65.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta67.ebuild
index c10184fe8264..5b5951a987f8 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta65.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta67.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop xdg-utils
 
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index d2ff953dbce6..ebf21a7ca12c 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -6,11 +6,12 @@ AUX timidity++-2.14.0-CVE-2017-11547.patch 2480 BLAKE2B 6db9598d7f8c9b969163f8ce
 AUX timidity++-2.14.0-ar.patch 822 BLAKE2B ecd76b6297cfc6fa04fdc1760dad9879a2835db79378df98a224e758d22aaa08fa7cd6f82c16b394e6d6b4bd103b9f69b7ff84b2c7ebb1b0c82c487cc8eb5dd5 SHA512 b0c26daa94361bc471034431c0632052ceb2a8e001caabfb7e08bd3f401932724981dc2c903132f9319d16038f7bac05843ca8da1112a5a3bab626c88244514b
 AUX timidity++-2.14.0-configure-flags.patch 4241 BLAKE2B d1d083ad5e397aa0e827cd21eb98b4143638559c31d38d9541f41a6d4dc12358a1c17c8115f956e177359f9ca122ee44e775abd7b6009777ca1eaaaeeadd59a1 SHA512 be9ca5a580a47af5eb29e180c81b141628692e2cb538113b3ec596e4b800fb6d4792fa4c72921414ba41a8e6932ae655e9b9a1428021333471e2929fdab07b17
 AUX timidity++-2.14.0-params.patch 716 BLAKE2B d4426e36db91fea9561a81bacb5337c8da3e385a598ebd61a38cb00ff2ab8be5b07c6259068ea31e11d0e755b28ba5769ee0cf9e6a7c31a272d1145d70e0521c SHA512 b35596de8ba6ffc4ff91a8ab7a2a0a25c658af97f8aa4e226737e910227e2a11bf4b227a5f8c61ddc1452cd614e03f75736787a2240cc530e90aba437371a09a
+AUX timidity++-2.15.0-lto-workaround.patch 319 BLAKE2B a0aa616e6e3626a5694879e8e61bfb2242e71b5e216bdb5b4aa7d5eee95aa0a800a0ff4987e1492badf12e2e1aa1c3a4c58539994718e21839d8d2fe6db669c6 SHA512 ee7949bd54e2be657c3f45b1b4848162d2655682f86acf5474c69343c35dc7bff677b588820735ec2ad29a0e8d6e9a868c8c0ecdf9a9c79d4d4e69764ef9f214
 AUX timidity++-2.15.0-pkg-config.patch 4257 BLAKE2B f9e81fdc50ff485636aaab4b0c74e7a7caba49eb8884b5176b2a71a3a582542300872786ec56886d645f8b6ec23b5312908053c47c5b107d8ecf905dbdd27402 SHA512 e6ae48d17d0b7b9589df3e90e5923cd53c86b59b2730306c2ec76f8c20013e8befd70e36d4c2629bae906cb967c1404b3595334a6f208f8799d7fbd6e030fe08
 AUX timidity.cfg-r1 669 BLAKE2B 023edf8f503f23817c1941a0cb1a0341f0ff1475405fc906a9acf4adb36ca8769bc015df5c30af50a828dd522d214bf9d6c4feabe2db3419e8100ebd431fdbdb SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b
 AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6df3428e127c1eb7ea2b82750c86932239c8a6ceb507d06fce2bc5e5ee963d56fd0e8daf2ff7890a9e68a SHA512 34312594866d77244d0eb77b4111a8e7998bd20bcb3542b036b1626d73bf4672eef677a926badceaaee517f1d32752b3e3b1ea4d3f2cc0703d66c1c740e0dc2e
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.15.0-r1.ebuild 5087 BLAKE2B 67b4f4d28eeb90d54b2a4a0f91d5f6a4fcb03b73a11399cf58cca20eafd55721b66460756dc38c82ed1629e2f3f9fde99b1656afec6191deae1f2964e7483e98 SHA512 1c012edc9053866237147b16d2a1742a4a622249a9a34be8a8433b65b558e864e8b57a9d53bd467d0ce92fa4e995f57ce7ee2408ab9ac70dea31553c656ccb45
+EBUILD timidity++-2.15.0-r3.ebuild 5952 BLAKE2B dc8243e719c2ca236090aab5d19965c08423697ef2e32f40e7618ec22c7c2d2529ec842d2d3ba72e308b6e4d83bbdb0932c2ddb1ccf6999bb2ea32d2acacd746 SHA512 e0a3402e2887c0ad956959a581304ca7e32082647f1f61f5b52a751e10a30eeee0cd00ec38ee445856dd1440c01c6525ae23d50bc9e6df2f74109bf8388bd488
 MISC metadata.xml 332 BLAKE2B 417167c38c5b331872b74c9dd82d3c386cf4ea5f963201eb20744ff043ff74943867190193f87d7c5220435b38550d6a01a2879803df12934ead428d5f684126 SHA512 5e8adfac2728f35a8bda3e042450c5554ab9aa4a5addbf3dd4fa4dbe3a426a98a9a79fa8cca64c27934707d3564a26bfdc9e5acdb4f79590681885e07cd32bbb
diff --git a/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch b/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch
new file mode 100644
index 000000000000..2a9c9e8282e4
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/763612
+--- a/timidity/Makefile.am
++++ b/timidity/Makefile.am
+@@ -480,3 +480,6 @@ $(top_builddir)/utils/libutils.a:
+ 
+ objs: $(timidity_OBJECTS) $(timidity_DEPENDENCIES)
+ 	@:
++
++# Prevent .symver mixup with buggy alsa headers (global asm vs. LTO partitions)
++alsa_a.$(OBJEXT): CFLAGS += -fno-lto
diff --git a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild b/media-sound/timidity++/timidity++-2.15.0-r3.ebuild
index 786cb1c609b4..9d6db7b8acf6 100644
--- a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop elisp-common systemd toolchain-funcs xdg
+inherit autotools desktop elisp-common flag-o-matic systemd toolchain-funcs xdg
 
 MY_PV="${PV/_/-}"
 MY_P="TiMidity++-${MY_PV}"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses ogg oss selinux slang speex tk vorbis X Xaw3d"
 
 REQUIRED_USE="tk? ( X )"
 
@@ -30,14 +30,17 @@ DEPEND="
 	motif? ( >=x11-libs/motif-2.3:0 )
 	nas? ( >=media-libs/nas-1.4 )
 	ncurses? ( sys-libs/ncurses:0= )
+	ogg? ( media-libs/libogg )
 	slang? ( sys-libs/slang )
 	speex? ( media-libs/speex )
-	tk? ( dev-lang/tk:0= )
+	tk? ( dev-lang/tk:= )
 	vorbis? ( media-libs/libvorbis )
 	X? (
-		media-libs/libpng:0=
-		x11-libs/libXaw
+		media-libs/libpng:=
+		x11-libs/libX11
 		x11-libs/libXext
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
 	)
 "
 
@@ -63,10 +66,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
 	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
 	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
+	"${FILESDIR}"/${PN}-2.15.0-lto-workaround.patch
 )
 
 src_prepare() {
 	default
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
@@ -74,6 +81,21 @@ src_configure() {
 	export EXTRACFLAGS="${CFLAGS}" #385817
 
 	local audios
+	# List by preference
+	local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw')
+
+	# configure workarounds: configure.in here is written for an old version
+	# of autoconf and upstream seems quite dead.
+	#
+	# 1. Avoid janky configure test breaking
+	# ```checking for sys/wait.h that is POSIX.1 compatible... yes
+	# ./configure: 7995: test: =: unexpected operator```
+	export ac_cv_header_sys_time_h=yes
+	#
+	# 2. And yes, we expect standard header locations (this configure test is flaky for us too)
+	# This avoids a bunch of implicit decl. errors which only happen with USE=-Xaw3d(?!)
+	append-cppflags -DSTDC_HEADERS
+
 	local myeconfargs=(
 		--localstatedir=/var/state/${PN}
 		--with-module-dir="${EPREFIX}/usr/share/timidity"
@@ -95,11 +117,13 @@ src_configure() {
 		$(use_enable gtk)
 		$(use_enable tk tcltk)
 		$(use_enable motif)
+		$(use_with Xaw3d xawlib ${xaw_provider})
 	)
 
 	use flac && audios+=",flac"
 	use speex && audios+=",speex"
 	use vorbis && audios+=",vorbis"
+	use ogg && audios+=",ogg"
 	use oss && audios+=",oss"
 	use jack && audios+=",jack"
 	use ao && audios+=",ao"
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 0d173bc6a4c5..c410b2dc0480 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -5,5 +5,5 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1215 BLAKE2B 746bcf75ce5b1f73ecb4023e7760806
 DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5
 DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
 DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
-EBUILD xmms2-0.8_p20201016-r1.ebuild 5869 BLAKE2B df06d661f79002c4406d181ed0d85f7dd075a6ad6ba543fcdbbb19d1958cc22d33f0d83b156f9b557c12c3f434250ff2ca202e23b9af42d0fdae133db448de00 SHA512 c2c54fd728682790145e1e957727f744eb348f1d66e8d3f3ecbf695073c999f348a7781b88db04b8d2381e23226288b57d50113dac33434f31eeb6351ff1bbec
+EBUILD xmms2-0.8_p20201016-r1.ebuild 5876 BLAKE2B c200ded0045be9be4ce10c1434f6f1bc104344f893e62187159bc77f23cc745c30b3f45ed828e7e2814b70ed7b6a482bcbdb00d22f963aa283c40970747c3954 SHA512 0ad122574b7fcb2ad60c5ee0a898612a0beef3d661c7267336d52a589dab269dccfcdeb00c2cfd153113f72455aa1d8f9dddd6d9f7e3ccff13b40768d60ea4cd
 MISC metadata.xml 1529 BLAKE2B 0f5c762b0325e767ba28410bd6838960e84df8a8f30ceda76833809b21b4e109f01caa2c4c5e234aacd4697f9a0a43d8fc1012f62261b8a1e9e458e2530b9dfe SHA512 be88d429da72efc944841bbb11c85dd6e746201eae90c20cc588bb5c42958315fc23bb9388396e971f0bc2069d4eb6dd9189b9c8f4c7cf4f343ca491f9d744be
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016-r1.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016-r1.ebuild
index 8f6923d5c139..8672d4ed5099 100644
--- a/media-sound/xmms2/xmms2-0.8_p20201016-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20201016-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86"
 
 # IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
 # flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index e2742c89e828..70de1a4c9884 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,5 @@
 DIST yoshimi-2.1.1.1.tar.gz 7479260 BLAKE2B eec292d489c01054ff3e7b4402a359d5abc29157048b475df8482630dccaae9fdff6cc697d95614778e34d363215633b0dc8beaeb1c832c02f98f0f21384b42e SHA512 4feaf7b779d450e4d8f9612a141fdcd2858117c738c56bb43fa12a19f9806d6c990e560dfc62755c7d39e23608f516fb017b0c4063440996c5c17286a58bf946
-DIST yoshimi-2.1.2.1.tar.gz 7641690 BLAKE2B c08d965b87f9a0b84cc5dd946da9d6af2705e420e82c18f5f090cbf66a7645b12b29c5060fe0adc53a71d1e0b3d021dc182a98ddc56c4e10d381d1eabe0aadda SHA512 bb3840d25ac9012b253ee51fa003137cc5db92c5a31bbfb740c5a45d395b5728e0dda2c7ea4e4cc993633db87d6d30f54b48cb707749799c3b19e5f7f913010e
+DIST yoshimi-2.1.2.2.tar.gz 7641720 BLAKE2B 45da49df7bea0919d08f66fa37ddf21483ac3074aa7fcb57f1a55137ab9f29545dc2121041b7c0fb33d86cffa0608a5fda5a963a79ce54c33cc4fc90ab5e38ba SHA512 14e9dc19e9654d4178004adfc930ca74522ab9db6711aaf2780e57930d6426cb28fd51f3d8d9b7478864e6a3e17d737512dd42cb9cdceeefe168ba803e71edaf
 EBUILD yoshimi-2.1.1.1.ebuild 1193 BLAKE2B d29685b96b0e40949d055036cb266e7eae25d4b0e0f7c135f75fbb796eb0a6148e3c19b3a57c3aaede3ac84f4d679aa9a5402003b52d4689d8ab295d213280f2 SHA512 f8d6b1642c5540e67352af2ccf278ade542d1cf18fb8bc3772017bc94f1ac9568b52b80c0bb287945ed1fdf0a35a94493688b54bc8fb674a6feca9ed0b4579b4
-EBUILD yoshimi-2.1.2.1.ebuild 1195 BLAKE2B da06828a8f788358b0c2297a23f89abdcf74dd5246c1731edf5f2f06a4fbbe8fde1c78b94a91afa6223820ff0b0102b3b9608bccff6f37f23898d789cb5e6a0b SHA512 be8b0e2a161066f3cb81831d0b3e4ddc5c9b03aa62f7ac7913ed1ee1ebf30946d43ece559a8f3bb0352312e5812a436db14b431b9b93347c507b2419a954dcd0
+EBUILD yoshimi-2.1.2.2.ebuild 1195 BLAKE2B da06828a8f788358b0c2297a23f89abdcf74dd5246c1731edf5f2f06a4fbbe8fde1c78b94a91afa6223820ff0b0102b3b9608bccff6f37f23898d789cb5e6a0b SHA512 be8b0e2a161066f3cb81831d0b3e4ddc5c9b03aa62f7ac7913ed1ee1ebf30946d43ece559a8f3bb0352312e5812a436db14b431b9b93347c507b2419a954dcd0
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.1.2.1.ebuild b/media-sound/yoshimi/yoshimi-2.1.2.2.ebuild
index d46d4388b79d..d46d4388b79d 100644
--- a/media-sound/yoshimi/yoshimi-2.1.2.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.1.2.2.ebuild