gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /media-sound
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
80 files changed, 1041 insertions, 534 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 945adfeb7551..99730408bd33 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index d2e8e6979b0e..9670ffa1524c 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -2,8 +2,8 @@ AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554
 AUX abcmidi-2016.05.05-fno-common.patch 745 BLAKE2B 8e6cb17df225b21261e42abda4f8073c4493ea41eaf833fcf2f4616a6a828afc03e116de6c1807ee2436c9f385bf39527406e93c628b07dda2c16b3f5d51a0be SHA512 33c72c178812f527b7c2ce27635368a8f6531369025d36ab4d760f8ee19391027029de0b3d8698454b5eb35a1227b5d6efc1602fc5d5b6f58967ecf89579aada
 DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de
 DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969
-DIST abcMIDI-2021.05.19.zip 603712 BLAKE2B e856eb8773be0525c783aeec60767f8e58a04965e55bf88eda5c9e3227b73d3532ae87580fcb9d9a5b2636c396330886b9ae2694b553b74a881634827c7deaf1 SHA512 d362b158b9ce15ad3510597c83f59acc9135d6052d9d12e4394f8e4d630d5ffd1c804c18e80110cbc7f8a174e60993189749170a414f1d24ac3c911a291af234
+DIST abcMIDI-2021.05.25.zip 604797 BLAKE2B 78b2d43bb7569aa2eece63f319352aa71b77e9c5219c5f806384f007ffe026741a0852ffffe1e6b6c15b60f69f54e143cb26aa47b54baca41bc2fc231fa5b66a SHA512 57975f7c131855a713fc399c7aa1c7bd94775e7a257f2412d321aa51d0bf95cf9e1410e0819d2ad5cabde9ef996512ccca16058f7267baabc5702a926c173b3f
 EBUILD abcmidi-2020.01.22.ebuild 836 BLAKE2B 40f9d16d5c10a2897d1395ca2334e8ec58ea32a8e126ce5bf9e570c3e0fe8a5081737e3c83d71d522abaae6e7b7eaa2a3a3c875690e62e8bf88cc9351af9d4e6 SHA512 a64b2ce08d7968f332b9d617274ff0c08af97f554f375808608baa7c7687ff8a1ffcf1f4e264fa55346863aa853955e652f9243c5aca4536360bbea7068ae892
 EBUILD abcmidi-2020.06.07.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
-EBUILD abcmidi-2021.05.19.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
+EBUILD abcmidi-2021.05.25.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2021.05.19.ebuild b/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
index 10c98f2d31f4..10c98f2d31f4 100644
--- a/media-sound/abcmidi/abcmidi-2021.05.19.ebuild
+++ b/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index d221909ff927..880f5a74f6d5 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -5,7 +5,9 @@ AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b76
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
 DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
+DIST alsa-utils-1.2.5.tar.bz2 1326676 BLAKE2B 52cbe978390e1b5600bf7422e67ece1d24a946d99acddbc059bf6eb3a0b8dfe37cc573167013296e923bf1597973eb55b2580eaf849e088822ba7b2afc14279f SHA512 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1
 EBUILD alsa-utils-1.2.2.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
 EBUILD alsa-utils-1.2.3.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
-EBUILD alsa-utils-1.2.4.ebuild 2341 BLAKE2B d3634b987e5fe5917a2f5e336ef9603a141fc67b1e7a89d258ffaa7c04d5b674613f7232d8d6b1f00f687a0471ab8bdeb28e7e2eb4164a9f9e5b098cac614b43 SHA512 73cf0447b2e8e97e8d53d518a37a637ae939e6a9640a198847bc7be8e60d13e690ea5ba53691f837cf8e981fdd7b542fc4577f6fafb598285361cb46677ba9c8
+EBUILD alsa-utils-1.2.4.ebuild 2335 BLAKE2B 001e48c41114d82be491c59c42f04d351bc2949498e4bcb6c29cd9697206ff76c93c76bda22528f6c7745eae05f5190d7b3c6ec2472b2e6506a4e829261ead57 SHA512 4e47c7a7db56f528aa524376dc365a9daf076f65629262d962ebe6878bafa8b6cc5a3975792fde7a71a9c456001ed3e9836a9026bcb935b8e1deb7748770c27f
+EBUILD alsa-utils-1.2.5.ebuild 2341 BLAKE2B f1d3124447c60c824dac7c2e9b4007ba93e5eeaf558dacedb344a4a6d0b18d3e7be5bf7cb2b8f99f1f6d07e62da85cbfcf416a049030d3edc2c74b62b5185546 SHA512 2dfcf714a7d865085086b742914c2faeb036825273bef722351ed9219ca074612e7745afd8b11a20a58e1e8999f71d28744992d98b4c3bc9cb9df438d5c66b49
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
index 24b8ba3949fe..e88a3ec3ab73 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild
new file mode 100644
index 000000000000..507876a36c16
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usex doc '' --disable-xmlto)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index c2fb7159d743..172dfbd817c9 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,7 @@
 DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
+DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
 DIST ardour-6.6-volatile-atomic-glib-2.68.patch.gz 22322 BLAKE2B cd113f721d0c6c63c85372873cd43782e3a43b8963c4f9222e771039c4b397585582ffd4cb77d4928bcdc656ef533e4a4b40799ff0c32355985c592589766466 SHA512 3fa2ede8b943881b9c77b233892f146e354c4722265f6599417d55fdf69961d65f6d54ed2c74f53f1f835d006ee99e44adcb03ee117ba44a7be3bedbae2c8efc
 EBUILD ardour-6.6-r1.ebuild 4945 BLAKE2B dda6893230c2d51602a747fb457112a7936bf9a2e2a655704e4f63ebc8dfa9733b432350a2ae68aabc4b16332777d35eebc0ac802e2239a1e90c39bfa795b3da SHA512 7e1e73686843a064bfcf6721e833f149b1fed9e31db00e67da6408bb2c9b8839c2bd909c22dccbc89043769deadb843bfbcdf4273857c5f40bc0dde4683a9414
-EBUILD ardour-9999.ebuild 4792 BLAKE2B ecb861308230b9cedd58ee98920a3e5c0c72a725ec51b3a8fe8fc55365835a072ff5a038b7891151c10b4f62e6a1138f984063190560cfc7ac4d033a53b10c36 SHA512 fe12fe655495d6ca027de5348e88dff7a41d1c1361e667cd35aa8d7e506acecc955db62d8f4ec786e231e6d26f4c5ac809e84e16114c95e65d9ef907d1f6d3e1
+EBUILD ardour-6.7.ebuild 4795 BLAKE2B 33705f54a881e4d8274296ed6d0521bbf10156c42623f6f4122be5f0f5d95e60ce9cd0a2fb5b96c90a656293c9ff56b773b4f22641817018d3b7901c10ce007d SHA512 eea973718a53f4a40d4fb89ebd16467e601b93ea528a6dcf3f74a79e5e73cc7e3be31987a402f4ac23c2f4fdf6f693ff68c838065beedc544a0e8bfaf761d97f
+EBUILD ardour-9999.ebuild 4795 BLAKE2B 33705f54a881e4d8274296ed6d0521bbf10156c42623f6f4122be5f0f5d95e60ce9cd0a2fb5b96c90a656293c9ff56b773b4f22641817018d3b7901c10ce007d SHA512 eea973718a53f4a40d4fb89ebd16467e601b93ea528a6dcf3f74a79e5e73cc7e3be31987a402f4ac23c2f4fdf6f693ff68c838065beedc544a0e8bfaf761d97f
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.7.ebuild b/media-sound/ardour/ardour-6.7.ebuild
new file mode 100644
index 000000000000..c275eb05302b
--- /dev/null
+++ b/media-sound/ardour/ardour-6.7.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE='threads(+)'
+PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils desktop xdg
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="https://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="6"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/raptor:2
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:1
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	media-libs/suil
+	media-libs/lv2"
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_src_prepare
+
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+	my_lcmsg() {
+		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+	}
+	l10n_for_each_disabled_locale_do my_lcmsg
+}
+
+src_configure() {
+	local backends="alsa,dummy"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
+	tc-export CC CXX
+	mkdir -p "${D}"
+	local myconf=(
+		--configdir=/etc
+		--freedesktop
+		--noconfirm
+		--optimize
+		--with-backends=${backends}
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls "--nls" "--no-nls")
+		$(usex phonehome "--phone-home" "--no-phone-home")
+		# not possible right now  --use-external-libs
+	)
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	waf-utils_src_compile
+	use nls && waf-utils_src_compile i18n
+}
+
+src_install() {
+	local s
+
+	waf-utils_src_install
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
+	doman ${PN}${SLOT}.1
+
+	for s in 16 22 32 48 256 512; do
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
+	done
+
+	sed -i \
+		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
+		-e 's/;AudioEditing;/;X-AudioEditing;/' \
+		build/gtk2_ardour/ardour${SLOT}.desktop || die
+	domenu build/gtk2_ardour/ardour${SLOT}.desktop
+
+	insinto /usr/share/mime/packages
+	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
+
+	insinto /usr/share/metainfo
+	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index a2199b8d3d87..c275eb05302b 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
 inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils desktop xdg
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 7c60ebd59c50..1cd43127d98f 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,3 @@
-DIST asunder-2.9.6.tar.bz2 283568 BLAKE2B 320fe6984f23dd3998c29eea88d7adbb9f8201c5cb16b706fa272cd7c9dc97c3129c8a6357b61e9e0d6d3b60f130f5fe1664e7acab6fbe624fd2f90b44c18247 SHA512 336514c964c2b46bf93aea050d771b6954c0761c4d9ebd63627a97945ac0c6eb8389e49abb5b42fffe8c646adc281785c7fc3b937b8dbd97e65d6b5834477633
 DIST asunder-2.9.7.tar.bz2 283805 BLAKE2B 6c92d02586e7d0781ac0d698047d588ef7aa5e0c1544cdd8ffb4fd7c00d0066f61c01aa82502b4a4417ba6b70fb3da2c537e5d1e715ea992831f7d618724b949 SHA512 ef5e998b3e3e552ac23696619742caff9c30e52cb2b11f75395cc6e4b2134c58df1c4a97e930db0e8c61dfc31e77b3d9a99a4c9ab6c07ae59b9e91f723401e23
-EBUILD asunder-2.9.6.ebuild 914 BLAKE2B 4696b509ff0f3dc1dba4234a6cb1e2cff994049a0ebe9f54dbaa937669f40353d05889c799bd4f3e1d45b905d853ff5403d3bc54a34e1c6ad9d74cb8c11b2b63 SHA512 233b659bd573629c8ea7dec44e78fd5c5e30c79833091d26fdd1d2e42de0b8ad0f64d15ef02716208560067d2cd250a3f72e6a36844d0ccec04bdd6650f62bc2
-EBUILD asunder-2.9.7.ebuild 908 BLAKE2B 2f28178c9ef945a7ab12dfe3e0a6fe2d4acd6dfd7459a21f063a44588ef1821ec723f40efcb62875485f12f05c0ed7a695b4db8d7e0a4ce976763ca20ea52f88 SHA512 b9c053a1762cac558a886f962048206d70e278e133045419d6ce1ed655bdb0ef8557cc04eef1967074d2bd9c9943252f59fa620b466fdab991a56147b168842d
+EBUILD asunder-2.9.7.ebuild 906 BLAKE2B 50301bb65799f9305209d740962871f7530f317a5b5a29f32b9d17c650479f705ed476ba6f4a9de2560b1638a6b290116baabe105500c8dc59370112159bc9cf SHA512 93c77ffe0639a1afd305584c0962e17f87939e4bb6916651ff0bfabe872d04acbc2e212781d6405464fbdf9d9ad25e11c1420cb48078e541b8678372d3ec9f0d
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.6.ebuild b/media-sound/asunder/asunder-2.9.6.ebuild
deleted file mode 100644
index 47c5b5d9426f..000000000000
--- a/media-sound/asunder/asunder-2.9.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Graphical Audio CD ripper and encoder with support for many output formats"
-HOMEPAGE="http://littlesvr.ca/asunder/"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="flac mac mp3 musepack opus vorbis wavpack"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-DEPEND=">=media-libs/libcddb-0.9.5
-	media-sound/cdparanoia
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
-	mp3? ( media-sound/lame )
-	musepack? ( media-sound/musepack-tools )
-	opus? ( media-sound/opus-tools )
-	vorbis? ( media-sound/vorbis-tools )
-	wavpack? ( media-sound/wavpack )"
-
-src_prepare() {
-	default
-	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
-}
diff --git a/media-sound/asunder/asunder-2.9.7.ebuild b/media-sound/asunder/asunder-2.9.7.ebuild
index cb49e4fc026e..7c67d09ec973 100644
--- a/media-sound/asunder/asunder-2.9.7.ebuild
+++ b/media-sound/asunder/asunder-2.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="flac mac mp3 musepack opus vorbis wavpack"
 
 BDEPEND="
diff --git a/media-sound/bladeenc/Manifest b/media-sound/bladeenc/Manifest
deleted file mode 100644
index f3400662d81b..000000000000
--- a/media-sound/bladeenc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bladeenc-0.94.2-secfix.diff 394 BLAKE2B 102fca9a640911331e2bdf99966f260a017cbf709eddb2cab9d8b6e5d8507d288d0fa051c522a80a5eef43c8536d93cb372c3bf833bacbe66d64462f2d2d1d6a SHA512 6f590d4f9bdc34f36cb9aef3fc1a590893dd4aa52f9caeaeee9375653f1a80658dc1c52ec6bd679ef5836335b05d6ec02a3987392d3220294a78a23adac09400
-DIST bladeenc-0.94.2-src-stable.tar.gz 142949 BLAKE2B 3a939aa0a10d37b5f67e43c9b91936c05b7f6bd78142d6d781153eb29d7565debbebeb32a535990291d29766aa8eafe7fd98608e866b1cc3df46164b7c9a5e16 SHA512 570202a201c3582483078248fae7330d978d69018e4367d51322f84f26875cf84250de6c46527d11624cd6f19d4a98e30421447358b15ce9f256cade28e604ef
-EBUILD bladeenc-0.94.2-r1.ebuild 358 BLAKE2B 77cd9d5f9b48fdc631a895479892bba88a35b2fcb40ec332ce8930c0aabe52f25eeb5d3e1ab6c38729d3555c06bc2e5715a3e67dbf9666c5b042f257e0562fb7 SHA512 c5e494a470bedd1eb40e70688f0060d7323fe013526d1e967a953d5efd89165fa32b24aec7c8b93b9190f4450040ef431f0a4855775be84e65b7411b7820e32e
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
deleted file mode 100644
index 62d668d243ac..000000000000
--- a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An mp3 encoder"
-SRC_URI="http://bladeenc.mp3.no/source/${P}-src-stable.tar.gz"
-HOMEPAGE="http://bladeenc.mp3.no/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-secfix.diff" )
diff --git a/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff b/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff
deleted file mode 100644
index 5a126f2ceedd..000000000000
--- a/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur bladeenc-0.94.2/bladeenc/samplein.c bladeenc-0.94.2-fixed/bladeenc/samplein.c
---- bladeenc-0.94.2/bladeenc/samplein.c	2001-05-08 14:11:53.000000000 +0200
-+++ bladeenc-0.94.2-fixed/bladeenc/samplein.c	2003-02-05 11:19:59.000000000 +0100
-@@ -616,6 +616,7 @@
- static int					myFseek (FILE *fp, int offset)
- {
- 	char					dummy[256];
-+	offset = abs(offset);
- 
- 	while (offset >= 256)
- 	{
diff --git a/media-sound/bladeenc/metadata.xml b/media-sound/bladeenc/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/bladeenc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 609e15f95dcc..8847cfc699a9 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -3,5 +3,5 @@ AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cd
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
 DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
 EBUILD bluez-alsa-3.0.0.ebuild 2413 BLAKE2B 1b79b12eaafb4edbc0ce2a1f90099f1f7ebf30e062d7d12b2a351d24a9681b56e8b17ef6e774d7121501f99374d678d1f0d33e971bf038a9a0f5ebecbb3f843d SHA512 76ce2586414a1fc995993600522fdc0183252e3f234bad6bf876ca94a772a622e3b8d32dde205322cb97aa063180c90d54344e3bbd2dcc6e8127468345470283
-EBUILD bluez-alsa-9999.ebuild 2406 BLAKE2B 68c8643f6084d40405f7888f84b56914c9a1c0e4310168bf373755b07898ca70bed4dc8231a22bd60560b3918ebc34d8bc5b1e6eb8e301d000786686f206a232 SHA512 8ac1d87dcc0c33646529363256cbcac8abdc1a3d29e1204044182eba99ea3c1db682ef719b73b5e349277e0d3a41b62becd6b31cf211b9292c1e4b7bf25034ee
-MISC metadata.xml 687 BLAKE2B 5d06c77f99064183f873c61f33f550f344b841d87b20d77ca20d08cf4331aa791b6ae0ac40b9d82aaa320ba9804513ea69bb6b181c6f044bbbdbf621bca578a1 SHA512 e03836baea8aeee48b9a45db2d34dab4ff587971112ef5182117d7128e536b0a72eda9d34631ea6dbf2ee5a83eced76a462a439967a019b2125f0ed01956b232
+EBUILD bluez-alsa-9999.ebuild 2529 BLAKE2B 4481a9048405bcfd3eaf197eceec9aeb31ccc64e0fbdf7db5478ce234ba19eb9da4fbfacb959b561628ef3db9bbc65e06066b0ea956a8b74a86780bef4938707 SHA512 7489fd50092bb3e3dc8a96d541629592af1f81cf17cfa24981430fa3ed5d5b95ae8e1ebe74f39d1e0b7d51be888cfd8e675562e9f3c8844ba6a8a6e7454a5675
+MISC metadata.xml 778 BLAKE2B 3dada8fbc2d9ff4fcb093d437be17f1cae5e575a15ef65fb275e74459e72b4942fa5603c112ae15ceb7fc51f92c0961622cb00e64bc53e2ab8ef8b99a923614b SHA512 1b4913a7310386d7c01c54ba1d5baed8f392324759d6e58eb93084dc17903622d0dfaa247ff795a03fc91cfc0e6e438d51692a35272de6a882082b47fc8f5e61
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index c8620648df98..86a703524a0e 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
 RESTRICT="!test? ( test )"
 
 # bluez-alsa does not directly link to upower but
@@ -30,6 +30,7 @@ RDEPEND="
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	aptx? ( media-libs/libopenaptx )
 	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
 	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
 	hcitop? (
@@ -63,10 +64,12 @@ multilib_src_configure() {
 		$(use_enable mpg123)
 		$(use_enable static-libs static)
 		$(use_enable test)
+		$(multilib_native_use_enable aptx)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
 		$(multilib_native_use_enable ofono)
 		$(multilib_native_use_enable upower)
+		$(multilib_native_use_with aptx libopenaptx)
 		$(use_with unwind libunwind)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index 55feec0ee5bc..e23255b68bfd 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -9,6 +9,7 @@
     <remote-id type="github">Arkq/bluez-alsa</remote-id>
   </upstream>
   <use>
+    <flag name="aptx">aptX (HD) over Bluetooth (many Android compatible headphones)</flag>
     <flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
     <flag name="ldac">Enable support for AOSP <pkg>media-libs/libldac</pkg> dispatcher</flag>
     <flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index f24d92967293..3f367d61b188 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,5 +1,5 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
 AUX chuck-1.4.0.0-makefile.patch 941 BLAKE2B 64ef7342c0c07ca573efb7e7142854a4d366494983b400af484d9c0354cc662d1090bf6396e4955634ab2e1c9864a5011a8dcc6fe1213c02d4491cd9b57fb729 SHA512 3bb7cb3fa04863c2a4debf5eade64233d3d3ce38272f2d73d14d1772895c5f88ec415b1c22aa3b077204d4569a24ad25c6ca757e2c6a4df31e9fe48eea9c9fdc
 DIST chuck-1.4.0.1.tgz 14689073 BLAKE2B 408e2512f07a33fc86db80b05005ea65351257036f663153845038a0edeef95054dac9878d37eb22cc122035a6d1f80d008e151811277d4ee9d24ba3d79ad26b SHA512 92da0569349c900e633e8e3e544a0e5ec7df7b41a8508d2a99c825dfe490f00208b50b883298ce091b46f4e9274dabe0ec8bcfd80d094dd006b3c342f74bd202
-EBUILD chuck-1.4.0.1.ebuild 1863 BLAKE2B c7a8b58e5f32faad1f8ba5e378895198dff5f708dbd26812297aa10121019f1a8fe98997f3d9df5da32685af90aa1e394fb92cc6d78a89de3f7702155c53515f SHA512 b6f176f21295c705e0e39aea0cae97465e7dadd5a02267a5822dcb5910c360e1c7e6ff9658c5b73df88467b4970d01dda6cbcef079b612d2284c8496950eeea5
+EBUILD chuck-1.4.0.1-r1.ebuild 1831 BLAKE2B 913b35f2727d5f5f728bd35ad2ca414df4c364b6f3963dc67e2170433aaa3160c31c71d42da6b138a743c537fbb53f95394b14e4ed9a4dff1d69d7054dde88e4 SHA512 fec380d7c388988e382884b713ea32f6c007885cd7c1203a06ca64490e7d0ea8482e9b609387e7719ac4b8dcc1ffc6b7e07f9d53426aaa3379a3f493b570c364
 MISC metadata.xml 967 BLAKE2B 505781d22a20892538d6bcdda07f1a1ecaecb56c8574cc6745d4fddfa2b4d3ab643947c1403827bc306eb0082434327beccd0eb583287eea9a488bf6adc4ad21 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0
diff --git a/media-sound/chuck/chuck-1.4.0.1.ebuild b/media-sound/chuck/chuck-1.4.0.1-r1.ebuild
index cddaef76f39b..7bfdf97b999c 100644
--- a/media-sound/chuck/chuck-1.4.0.1.ebuild
+++ b/media-sound/chuck/chuck-1.4.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,6 @@ src_install() {
 
 	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
 	if use examples; then
-		docinto /usr/share/doc/${PF}/
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 191872d945a8..5368e7291011 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,3 +1,3 @@
 DIST dir2ogg-0.13.tar.gz 20338 BLAKE2B 4f00c7e587eb7bba349d7024977d0d67ac9424a09649650e923df7100c60a67db78f363ac9d41931e969a5d8131f9461485f120cc4f308b0abcca4d5b570aba2 SHA512 292c35dd20a8e0499b3bd22d89c6ed0ae0abcf2b58f669316a2f39d45092a1c9a14fb168ad9ac893dfdd5138600c8be5e66502141c9dc7376b18e1e8d1ca5054
-EBUILD dir2ogg-0.13-r1.ebuild 1207 BLAKE2B 19fe8154c322eb54267fc97cf3969a5432eaa21e4630f2f349c33183470ae4ef5e947b6d586f585c4c55ebd920b1904712c2cc53b2b571f92ed4c7d629f6f5d8 SHA512 51de740d23f22679d6e8f7edef7ae8a2b313bf2592bed9c0aeb06e0e8175caa295eb1b22a08ae5fb9f4652571c43a05f7dd5b5ec85ec8b0a53c6948fa7e4a4d3
+EBUILD dir2ogg-0.13-r1.ebuild 1208 BLAKE2B aab3238a9de44908065d0b172fb12cd252c3bb014179fbb65e37e34ea1d1b4bf5a4260f6f3335ba1c2fde10dbb3df28183958815a98c40d4db7e3f7c64d53211 SHA512 c2c3b62ccfedd7643528803b58a9fa9674b6bc9d5a6248cb9c2b382cdb010e5020c4129eb752d59f11438b9466ca432b422a5afa24093a72fbaa68a200238277
 MISC metadata.xml 445 BLAKE2B 4c9df40d55c76b73a306d4545da2f0f9a96eec30eb595f7c3646473ea19d487d3e493f9993a201a49710e6b636a58a7689d32a0bf8d0c9b3e305b3084fbc3438 SHA512 4f334533b08adb0b5e100b7facd73dc45e358f4d22739b26e897ff8fd899f07dba1f1d2b27acf3443b72c0306b644334ea392edc5fb2139252cccf253aa28f9c
diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
index 43c5922051c9..e907dba50b31 100644
--- a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit python-single-r1
 
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index f585d1153741..e5f4806f2348 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,5 @@
-AUX exaile-4.1.0_alpha1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e
-DIST exaile-4.1.0alpha1.tar.gz 3605803 BLAKE2B ea4862581aa4d95c1944967e1d30979284538353e7d95ef345e6dddf1702be98e4c7c21918bf9a8cb277f339c812fd6671d84e695d6e5b179a2f65358e0e75f0 SHA512 56e73f7cc4d250fbc30870170b50f65f0f99d27e97a8f28dd043af9eb93c919a8de3ed790cbd6c441133232afb3c405fa830cb62c8c33bb0a6e4d97b79d5b54d
-EBUILD exaile-4.1.0_alpha1.ebuild 1744 BLAKE2B 24dac3d59e71fc1f03c18d1c7f3661260d9582a62f5f037fb31a77b89d4029a1722dd5e375ce87dd2acc412460f2e5d85b4517a893aa5e03a6a8bf1699ba476a SHA512 5375d3aa230f9b7bba0c1c3720b742def3d0e22a025778026abb664011fa9140a8066dfacb37ff63eb81c1c34f5808a00a49816d978700e2e7b4a94541edac65
-EBUILD exaile-9999.ebuild 1758 BLAKE2B 79104748607bfe676eee8aa196cd29b0f1402b102160aa383b38ac51eff782c0cfe30fde2ac7458b80be9af04c5ce362b865307bf336abce0b07c36f863b7a5e SHA512 58b9cc5d092a23de493c23e2637bf6bb448371c342bfd858e4316264fbb0858614b657ad534bb04784979caee6138a10aab578c1bfef856747a530fd47ddd88a
+AUX exaile-4.1.1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e
+DIST exaile-4.1.1.tar.gz 3641073 BLAKE2B 34222ddba782dd51897c017d7a77da9a796e45dad69983f934e76cc559c2e52f2173ee418004943ca087fd894439bc42a6eff2a5d6146e6189ec1cd478f5d08b SHA512 babf37253054fbeb6dad33aedafe969201860d4f35222d577343256730be943682c1a5f2f7cec7c574695624cb2b7abbdff4e6eaada848d22fea073c2c44bd23
+EBUILD exaile-4.1.1.ebuild 1745 BLAKE2B 1208834f32ceebabba8a497a7a0a1d830ede5905c58c73bf65bedc49665fc2c89196f46da8b8cc1963a428694763ce970744f083947819ca26ab304ee32b0251 SHA512 9413433a313b67ff2240d0539c16172b211c0ef5b567259dc9a54df39fac15cf8981e557e9fcba24e2bd5deaacd05f9c77ca74c3eb5b7242c20481e46bd2527f
+EBUILD exaile-9999.ebuild 1759 BLAKE2B 791c8d8958a0651b7da7f218443b770d30b0add13016bd9b1653970fd33b261897e4d3469f6eebeeb970828947023777a5129842e51c1951d328ef7e74f3fd90 SHA512 f8fe43cf78175bf9d36269a9582f0c2dd6afaafabcc79e8ce14f611b701e3f8c9d20b982be0e54db91f2ced777802c5ee7f312bed2ff5bdfd64671bc47ffbabf
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.1.0_alpha1.ebuild b/media-sound/exaile/exaile-4.1.1.ebuild
index 0ac3b200fa64..fa7f552d22f3 100644
--- a/media-sound/exaile/exaile-4.1.0_alpha1.ebuild
+++ b/media-sound/exaile/exaile-4.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit python-single-r1 xdg
 
 if [[ ${PV} == "9999" ]]; then
diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild
index c5528fc64cb2..270bd3209261 100644
--- a/media-sound/exaile/exaile-9999.ebuild
+++ b/media-sound/exaile/exaile-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit python-single-r1 xdg
 
 if [[ ${PV} == "9999" ]]; then
diff --git a/media-sound/exaile/files/exaile-4.1.0_alpha1-metainfo.patch b/media-sound/exaile/files/exaile-4.1.1-metainfo.patch
index 11e80706bd8e..11e80706bd8e 100644
--- a/media-sound/exaile/files/exaile-4.1.0_alpha1-metainfo.patch
+++ b/media-sound/exaile/files/exaile-4.1.1-metainfo.patch
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index 4319fd9c1ab3..5494fde0481c 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,3 @@
 DIST frescobaldi-3.1.1.tar.gz 6244496 BLAKE2B 0687a608c773d3295197ea7ef117fa099acc2dfcd2de0f7e7ed69ff6ab643007d631f9e3abc1509163503473cc2d95f7cfe7ca87a5d636a796490af8479b8db0 SHA512 b4f65bdbcb5ed1c9837b84f9721b166dbac3d5ed12d03521d91d9f4660ff61af951209071ceae07158da3ad9f7c7152924a4f5ce87deedc8d90decf4b4efa86d
-EBUILD frescobaldi-3.1.1.ebuild 985 BLAKE2B 022644c48b6ac1de0019db9497315e8717e8161ab3477c63ca8d58275d1017215a0ba1b877077402243234f670af834beefabbc96901d3de60076a35e3551783 SHA512 d90a8260f02d9ae62261e227df3ca97a2d27589f069bebb558317610ce6ba4c61ac28346f783c010959483b8a61473b8935a1b90aeb912e48d3ed1973cae924c
+EBUILD frescobaldi-3.1.1.ebuild 838 BLAKE2B f135fb062dfcdc5f29c64aa4449849b086dcff9289d89d19f3fc00d2756663f24c670019dc1c08353a378998a3af475efa330ff184072bee634309459413121c SHA512 f6520db654c7da55afd8dac96c4685b27afdf6854502548eada5a7c345b57845aa655c8170e10b6e9175e1d91ee31c78e31cc63e8a84f55829113649ee42e352
 MISC metadata.xml 437 BLAKE2B 5df0dcf6f211964427c34070f126b8a7b65f4341d5ca0edc899e413d112eb3920197086981537847506148b11b58cfcba80213839e5171baf8c16f05781765f6 SHA512 fee7fc00ca40615d9470bcf15ac3df4541864f825f55021c4b8d59891ea1fbec88f4e5133cceef05791cee1d95be320c7405cdfa67446863bdd2b23e86ca2940
diff --git a/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild b/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild
index 10bc77b443d7..a446e22e0a73 100644
--- a/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1 xdg-utils
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 xdg
 
 DESCRIPTION="A LilyPond sheet music text editor"
 HOMEPAGE="https://www.frescobaldi.org/"
@@ -29,13 +29,3 @@ python_prepare_all() {
 	rm -r frescobaldi_app/icons/Tango || die "failed to remove tango icon theme"
 	distutils-r1_python_prepare_all
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 0e88c7837647..77376906bab6 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-music-3.36.7.tar.xz 971980 BLAKE2B f27d0eb49a1728873ef6d439eead83cc34fb6802afdba3b4e0ef8d15c88d2012634ec0a18a4df4ba18079915d4227f526a93ac7989ce6ea4a807b620722fad1e SHA512 3470563621c17004d0b92451950ebfca203e830cb9ffe481fef7fe4d5187afa36ccb33130695226d4db95a89af9fac592910d2a19e715af4dd0c0ffba081c3a4
 DIST gnome-music-40.0.tar.xz 977412 BLAKE2B acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7 SHA512 7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
-EBUILD gnome-music-3.36.7-r1.ebuild 2048 BLAKE2B deffac9822c4e1e1cbd7763c1232e2ead11e75f85be8eb83ba47d64908f94c0a12ba39124c55ebab873d8aa36f946d249895aa9d32a7649e8755ed5ccbb49de2 SHA512 e35d55d9ebdffd199e1cb33e4e939ff6d086bf681db5de8a6f411ba0f23967c23a66bf045a270ad0ac962c1b47709566c66666aa6c168debb523531f7511d03c
-EBUILD gnome-music-40.0.ebuild 1924 BLAKE2B 773b2de156bd6f7ba259474f5238a75f512eb71e6a12c5f4cc46e81d6a8ef36c7b97e60e4052048e5710a7d5c18130f2b527c17408b714e537c45b7c53eca2a1 SHA512 2df4ac444137043ed57c452c4f7b15ebf2d7f6a4026d6ece952b4743eecb35c5654a00487e531885a821e2d7339e3ca1dfe33332f5f5ca7688634439ab3c7c99
+EBUILD gnome-music-40.0.ebuild 1922 BLAKE2B cb18d9568e0fb13bceecff8b94618c268f9afd415ab3e9a7a89d4c91888673b6e559ad7f078f4aee1fd00d18526e30d9c6cb2d26da022c72f3d27e2ec1ebb483 SHA512 9b12ea406f65353ad45eb719999fad8b45ff79fee26dff65b5cfd3e07b082fb138e845b1f0f90c64be18be3ad914f33e73cff0f94a18280bcbd3d2816359dafb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.36.7-r1.ebuild b/media-sound/gnome-music/gnome-music-3.36.7-r1.ebuild
deleted file mode 100644
index 53a0cd867dfc..000000000000
--- a/media-sound/gnome-music/gnome-music-3.36.7-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	>=net-libs/gnome-online-accounts-3.35.90[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.7:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-2.3.0:0=[introspection(+)]
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.12:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.10:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		>=app-misc/tracker-miners-2.2.0:0[gstreamer]
-		>=app-misc/tracker-miners-2.2.0:0[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-40.0.ebuild b/media-sound/gnome-music/gnome-music-40.0.ebuild
index 2a208528839d..b9e291603ed2 100644
--- a/media-sound/gnome-music/gnome-music-40.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 4d63ded1ac4e..92bda9081df7 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-sound-recorder-3.38.1.tar.xz 198328 BLAKE2B 80fc581a9aad2d1ee944982f9b0c93eb4de75711d7242a25fdbcdbd6edcf71af337bf6c49806b2265f4d099ac58fb5619964f6d473f291827f026d01fe497461 SHA512 e725b8c0d899680eff767f61360645a4adc2df29db8813d6e799b4affa3d05cffc5a7de4c8ee8eafafbc34314655831d7524963f974a23f472fdbb6f292e6c2c
 DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
-EBUILD gnome-sound-recorder-3.38.1.ebuild 942 BLAKE2B 25e245b4a3c5c267f72c5353ee607e36d861b59c4a686dba7771af5877b71ba51f2bffd236a9c4795362045eb57d651890442fa231b11f0bf1480a1db1f83c7c SHA512 94a443923a75ad085423f0482f3ee140ffb7b06042202c23b19acde8a53c23a369b3f5793a9eab227422d071895cea6d7c6f35e2a83be956d0df78e48f058028
-EBUILD gnome-sound-recorder-40.0.ebuild 1043 BLAKE2B da35fdf71b8d098cf0986a3c38d25e7388a3a4e1c7306982215634611def580441509d768902fe01380a860e02f1dc3fef684a76ebaa686930de584862cfcd81 SHA512 cad44d02ad711e170f42f08a6e0bfde3e16b9ba2b0000155eb6d5fc068dd6bbbc46651e4bfbfa9c7769c1e568c7de0a64a142259112da71469990b4e1d6d0a04
+EBUILD gnome-sound-recorder-40.0.ebuild 1041 BLAKE2B 5ee12aad7c5e782970991de609ef9efa8c2144a7397668d8e0bdbde0cf780b2ea78197589732967ce1e7234d81ddcce65e47278af09af4a7cdf64daf118cb580 SHA512 0807cc982b4a5632757c5b7023e41a0c81bcdb8ec4a5a164af2e8fd9f5271f87a2fce11a1992545c19f59cbdc461db68abdf37105f4d0b8ff7eb97b3b4739ac4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild
deleted file mode 100644
index f2d2d8c87a56..000000000000
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Simple sound recorder"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/gjs-1.54.0
-	>=dev-libs/glib-2.46:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	media-libs/gst-plugins-bad:1.0
-	>=gui-libs/libhandy-0.80.0:1
-	>=dev-libs/gobject-introspection-1.31.6
-	x11-libs/gdk-pixbuf:2[introspection]
-"
-RDEPEND="${DEPEND}
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection,ogg]
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-flac:1.0
-	media-plugins/gst-plugins-pulse:1.0
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
index 0ec0b46892dc..7b4b3c46303f 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=dev-libs/gjs-1.54.0
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index cc30af2a2a54..2b60f044f9c3 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -1,5 +1,5 @@
 AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d68ac5160e962e0178637a3406221019c07d4a4035aa4baba00c4d883c005f6190f92cd81888277531ed232c41 SHA512 15d5fadd81f5dcb837ac4f91d62b99834fd192a508d5df9647df994b65807fc3de25eaceccad9b39535dc56abb83feb2f48109cf46d95d1ddb68a8212d096ad3
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
-EBUILD klick-0.12.2-r2.ebuild 1082 BLAKE2B 7e6dfcbb58925f4443b809b763406f6aff75f2a3b89d64221f8f55e1addf76d35a1d462b6dc87aba29c295d9b783c662e6486051148d5683ba2c350644fe3364 SHA512 8afd68cce31cbd913b6a308ce21eef9802360dda4deca7ea0908defd5daa1c744fadb93b4a282b88d487c66aadf8d0aa31a04ec7133ad4d3ea5b9390487c11ad
+EBUILD klick-0.12.2-r2.ebuild 1083 BLAKE2B 56b91729dedc79d6f5718d2d38801483f9530b49a44be395b54b3709f1615e8b9501babea8c3dc79a7d4f9dc649c9a7290270b8590541fcca0a2a64e22eb6b45 SHA512 8268dcfb3c7adf45469d367a9c5c7d92ffaa558d4e473bc93099fe76638a083fb5f7c8cf582f58cdda768f80d5c6c6129fc5d71bcf51c8c766a406cceb1e193a
 MISC metadata.xml 545 BLAKE2B 4aab06c4f32e54c49e8beaa53443eb10eaf79b1883998c1c1d9af47c1ea2b29051dd7b6096414b1960839f5187fd344dd3ecc78c4691b6af31819f49f72bdf2b SHA512 b23662bc73eb39d41704b18a639711715d8c5358484eeed7c0613da436d233875c488586ac882005b625af3bc708713346be70088d468e1b57078fe0ead2605e
diff --git a/media-sound/klick/klick-0.12.2-r2.ebuild b/media-sound/klick/klick-0.12.2-r2.ebuild
index 0c783a18a695..d7417732e2e2 100644
--- a/media-sound/klick/klick-0.12.2-r2.ebuild
+++ b/media-sound/klick/klick-0.12.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index f11ef595f527..4d71e7164db8 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,9 +1,14 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
+AUX lilypond-2.22.1-fix-font-size.patch 567 BLAKE2B 7a2988db6af343f32475e0e49867b09137459765624177fb255ee6ff3b947e9f8bd278929733413ce63759249ea27c83b3547a1fa7ccc415d1c56c6e4e3157ab SHA512 be8b2c1a2173a539c7d58c918056b8768898f14a982df50ed279340f6c6621365176e3dd564e76826ef7bf49c10057ed57f174bb8d23c9cfee0e16c76cd47493
 AUX lilypond-2.23.0-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c0002f03785225e081b07d4ab34db459bd8d241b97051273846dd9efee4536e00b37fd0a064302d05b537069e17b6dff834a1b9 SHA512 523e5d1ddf68c07715e791ed9367c836010603369f14ee22ce7ab2979131be1c066dabdd66a942ed9b098c3f535577dded0bb0e1e48c35754d7f9c455d4911f5
 DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65
+DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a50c95c7b5adbe8ab1de3cc4e84a0580fe54e2166372b6640ab3d486b48d40edbcf4eacbf211d4fcb4e5d6defae2ff SHA512 dfe159928afd8592769fe9bf940b35e285465c2103707d855e82dba860e817a195c906fa9bda6fdfabce6f5adeaf49111891e14a822bf9cfb70a98312c6a9d1d
 DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
-EBUILD lilypond-2.22.0.ebuild 3259 BLAKE2B 2cb854d7b37cafe41bba0a32e0a121f6c1c40ae7da0dfa1d61018ecef07d430a5055b12fa57fbf7e23dbcdedfe3e9d5fed3d42fd035ebd8bdd1fa1b53edc02f8 SHA512 e62aa41a9a884abef1f0ae028c3816aa5c51b5c3699a8f723b049bb70a0449c42d4ee120edad5c932be18c17892946003b2762627c63aa343a7d96525f88ef55
-EBUILD lilypond-2.23.0.ebuild 3125 BLAKE2B 09cd1233322c01a66ab269587e26e749d6cadaa59850cf9d43a1871ff83abe7c055bb6b3af9217025787ac39fb72cf19139d0cdeebaaa1ed6ebac68e8e3162f6 SHA512 05e6f86c0e9a077593ef291d7100f6d483ae38840675490abba3035b054ee66f48ec861db8d15723fa5f37b19445f5b1155517c2ed4bcc158c2504c2e0380fa2
-EBUILD lilypond-9999.ebuild 3133 BLAKE2B 0654eabc0c866033058b8acc79534507eaceff26722308b80a8fa813bd11f1dcfa403ef9a5630eda9c4bed42c45598b77cd3cdef19509dcf7720df482ec2b272 SHA512 df015a49fdc4eace7530a6443e71a051b1739ab09ba75f36b44081b794b99ab29a636b686fd05dd12de55ce8860befa1ee0f20903314cf408cfaf08154868e36
+DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269
+EBUILD lilypond-2.22.0.ebuild 3259 BLAKE2B 34c9bc2171a85cff5b02886e578195d44559302641c04a5b626c92b788134c73fa3f0eb6483ae6228c52580fb0ba3b17bb5be399fcd28a35e24f230f9453e034 SHA512 6441a2cb9dc97a70dd8d258a183116dcd95949fb0b30dcdada1bd2ca21529a87dec441969fe4dade21284ffbf93987e121579f43548c501ef46bf3c6f452ee4f
+EBUILD lilypond-2.22.1.ebuild 3254 BLAKE2B 01ce9c46004b87b209537f0abe90fcfdd0791056247c64f7c1617a9c65b73c2d2083aeeb8f71efe3e53922f619cf488faba5ce918e2491d27f858e3d3dbb0f22 SHA512 e039f1e478ba5838a612924e2532cf6520757887f0381e3961a4fc47a6e4f64556609bc7f048f2eea5331238a77e2056942557773bd0ce4760be2c7b10d8deb1
+EBUILD lilypond-2.23.0.ebuild 3125 BLAKE2B cc75ce170b7808b0b4873b50a0cc8d4e9f3c663b900122e7920cdc797e898c93d8a80c8655380163057b38b876335bbab18ad3215e8d7b51c083210955895005 SHA512 977dcb4ab03848244317f437c03cac79ec3b28294c2539ea216e6e0281d8963f345284ad80ec9b9fc71b9126365a5ad3daab5fd48e7ffac9bcb75f82edd71d5f
+EBUILD lilypond-2.23.2.ebuild 3133 BLAKE2B 0bdc00c6b4bb019de37e3135a0d00c9233a805c4608912396dfafc5cdaf96704b9e336aa48c885db92a23031a66484c7999f21e5a29e3efc366c0b9390f94735 SHA512 64390cce7a554bc8226b892820f40ee22215f51f96ec56aa8fffd2438485c82a4bda5ee8d81b29cdaec324c2d4ed6c4100cba2147e8638c13f86f58cc7f38006
+EBUILD lilypond-9999.ebuild 3133 BLAKE2B 0bdc00c6b4bb019de37e3135a0d00c9233a805c4608912396dfafc5cdaf96704b9e336aa48c885db92a23031a66484c7999f21e5a29e3efc366c0b9390f94735 SHA512 64390cce7a554bc8226b892820f40ee22215f51f96ec56aa8fffd2438485c82a4bda5ee8d81b29cdaec324c2d4ed6c4100cba2147e8638c13f86f58cc7f38006
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch
new file mode 100644
index 000000000000..ab2bd8e59ae4
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch
@@ -0,0 +1,13 @@
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index 053ce17..48bddd3 100644
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -382,7 +382,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
+       tail = SCM_CDRLOC (*tail);
+     }
+ 
+-  PangoFontDescription *descr = pango_font_describe (pa->font);
++  PangoFontDescription *descr = pango_context_get_font_description (context_);
+   Real size = pango_font_description_get_size (descr)
+               / (static_cast<Real> (PANGO_SCALE));
+   pango_font_description_free (descr);
diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild
index 4b0263ccad91..60368b530796 100644
--- a/media-sound/lilypond/lilypond-2.22.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
diff --git a/media-sound/lilypond/lilypond-2.22.1.ebuild b/media-sound/lilypond/lilypond-2.22.1.ebuild
new file mode 100644
index 000000000000..cf3311c16dd4
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.22.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
+else
+	MAIN_VER=$(ver_cut 1-2)
+	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
+IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}"
+unset LANG_USE
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-texlive/texlive-metapost
+	sys-apps/texinfo
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? ( app-text/texi2html )
+"
+RDEPEND="app-text/ghostscript-gpl
+	dev-scheme/guile:12=[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	x11-libs/pango
+	emacs? ( >=app-editors/emacs-23.1:* )
+	guile2? ( >=dev-scheme/guile-2.2:12 )
+	!guile2? (
+		dev-scheme/guile:12=[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	media-gfx/fontforge[png,python]
+	sys-devel/gettext
+	doc? (
+		dev-texlive/texlive-langcyrillic
+		l10n_cs? ( dev-texlive/texlive-xetex )
+		l10n_ja? ( dev-texlive/texlive-langjapanese )
+		l10n_zh? ( dev-texlive/texlive-langchinese )
+	)
+"
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-font-size.patch
+)
+
+DOCS=( DEDICATION HACKING README.md ROADMAP )
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
+
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable doc documentation)
+		$(use_enable profile profiling)
+	)
+
+	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
+
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake LANGS="${L10N}" doc info
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	use doc && emake DESTDIR="${D}" install-doc
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0.ebuild
index de2a548eb654..c82db90488df 100644
--- a/media-sound/lilypond/lilypond-2.23.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2.ebuild
new file mode 100644
index 000000000000..fea5dc370d4b
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.23.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
+else
+	MAIN_VER=$(ver_cut 1-2)
+	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
+IUSE="debug doc emacs profile vim-syntax ${LANG_USE}"
+unset LANG_USE
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-texlive/texlive-metapost
+	sys-apps/texinfo
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? ( app-text/texi2html )
+"
+RDEPEND="app-text/ghostscript-gpl
+	dev-scheme/guile:12=[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	x11-libs/pango
+	emacs? ( >=app-editors/emacs-23.1:* )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	media-gfx/fontforge[png,python]
+	sys-devel/gettext
+	doc? (
+		dev-texlive/texlive-langcyrillic
+		l10n_cs? ( dev-texlive/texlive-xetex )
+		l10n_ja? ( dev-texlive/texlive-langjapanese )
+		l10n_zh? ( dev-texlive/texlive-langchinese )
+	)
+"
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+)
+
+DOCS=( DEDICATION HACKING README.md ROADMAP )
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
+
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable doc documentation)
+		$(use_enable profile profiling)
+	)
+
+	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
+
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake LANGS="${L10N}" doc info
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	use doc && emake DESTDIR="${D}" install-doc
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 24d67598c447..fea5dc370d4b 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index 7d3d9893ba4b..9295e3341c01 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,4 +1,4 @@
 AUX mp3gain-1.6.2-CVE-2019-18359-plus.patch 6742 BLAKE2B 1216085064f712751ad9c7739a5d7a3ae9ca258ce41860a177756005b911371b6784a6ee4b7b68e829e5e1b4eede86287abd048cca01db99c53aa1ac9ff94c8f SHA512 b795167c594b106b8f6336d4c975bb73812a4fbcd5e16cfcedfaeff0c291f6ea01e62f20318d5107e62c9c42e843e8cd618745acdd17fd35c4e9a5052d85227e
 DIST mp3gain-1_6_2-src.zip 71246 BLAKE2B 5172c2103bb2267bf819f36180e9cd7a9d57df6f7ddc29900e9063f97c4513972053bb0c3f1f69f7ddd12ec0cf4251e93e1b6920389a8246bfdd5650176a90d2 SHA512 ec9de6c755120480ccb72b34a0042aea7546ef923090ab04e420d5b189523b4504e29952a3d695d3c42c74348f5c3c9123ff090bcc671e43375711e085d67480
 EBUILD mp3gain-1.6.2.ebuild 672 BLAKE2B c870f64b39a698b7b46e4547108ddaa662292ef928a9fef21c5d6b3635421bb80e2084f5bf193301a31f09168f596ec2b31d6c29862c943c81aa5f6e8162d21d SHA512 7d34ba3237d51c7b55653d5f7f797d122c41992c176b5efdb7b8f72aef275bf371b14cc8ea4d684d749f7e29357aa9b2788129fc92fb5e67966371059df14f21
-MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119
+MISC metadata.xml 340 BLAKE2B a62ee5aae977753aaf6b8186c204e0ee7692741b42ba2940efd67d1b11a2a6d30edbc77044da0472e96125ab686a205475e983aea261af0f2035901831a60a30 SHA512 1849338172073be902d03cbdeef611c63b5ee98ffac045eb7f0fa66613c3b65a5f2ceb78bfe43025d7ab2975141cead4628487ab593467309ba2a77d9dd4b695
diff --git a/media-sound/mp3gain/metadata.xml b/media-sound/mp3gain/metadata.xml
index fd6447570dcf..9fa302645123 100644
--- a/media-sound/mp3gain/metadata.xml
+++ b/media-sound/mp3gain/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index cd6a77b64ee1..fcfc4c49c445 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,9 +6,11 @@ DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d
 DIST mpd-0.22.4.tar.xz 729264 BLAKE2B d8060a205f94fa369ad8aee7a3e12f1389e7587aac7843eeec6ab3e6b39c2e063cfd5413bc7c9738ce6c68c56d3befefd48112c1c93f725a6940ff1889d882e6 SHA512 e169d6656b378d52798e822ffd47f554bd7c076ca8bc5a1119e3b2fad36bee79335dc392aa8d78d854689af62168625698c1777440e08a67075099898ee5fe34
 DIST mpd-0.22.5.tar.xz 730308 BLAKE2B 2c7375af25c1b5d6dd8cf79f71e67842f75dcdb38b1ca90c8dda2661a5bd6d110ad0ebbefc53e0a38cfa6434ee4d2ad99688982588ee6d8d6895b24e15e3f927 SHA512 589516b7ee5820cbeee99042017b411a46857d39547302bce0bedb9c265da2c8465224a6817a1b7e65105f344398bee5fb2a3674064e42507157cdac01416295
 DIST mpd-0.22.6.tar.xz 730524 BLAKE2B 675b876415a343ba387e26ad800b2e562b40a5e3aaacdff31e0ec9d6ad09f0117406f82e519a08ba3187020b482dcd0434267f9e84dd13e9e1bf8565d1967c2c SHA512 5e417204e24d11fa609740ae92bc1d796aad2d63537655f655074d829cd79cadaf1ca025171dcf5486c1e557cc946152c21e299286b1cb74cc342da2b1f41343
-EBUILD mpd-0.21.26.ebuild 8029 BLAKE2B 9d92ab16796b2a34c7e3505ed36ea23657140a9700b170c2931f993d1ef4e81add1c0db85bb946610792dc96e2fbd974b2beb87b6c1bbb6dde510ad357a4e5f2 SHA512 5444629bfb131179c080f812c42b850a0828648074404032e4fbe7a02ef92fe5751d812426464905a223f990bb471beccabc5c1d97ff543e1d376a811a553b5d
-EBUILD mpd-0.22.3.ebuild 8086 BLAKE2B b51face3a7a1bb65ce77b1d947c5665d77976e650f04a19b9eac5cf0565f383f341c27bb8b226c7a3b5ad2f16bd5a8bdb3d84323abea7edd65fa6e3daf25ac0b SHA512 474f928e928ca4d139e31686f5b7b5b55c09d6927bec508a4879bf4c5bfc15935665fff06d02fbfc79eaa4f80dfa01214165a51702af23abdf9176e89c162955
-EBUILD mpd-0.22.4-r1.ebuild 8478 BLAKE2B 8157eb7c510096f5d7be5b158d7e8dcf326b799be79d95d5325b7e69490deefd63f84566ba73acc08a243edf1bda96192cc80794c66612cb9d0a225290eb69ca SHA512 f4d65db5fcd452f7775367a75de4eaaa5799fd5423060c8f119035e1ebfa336a8424845d48b7efd10fa8108ce1112074b96726810edf60ed4a7f6c20f78f72e9
-EBUILD mpd-0.22.5.ebuild 8478 BLAKE2B 8157eb7c510096f5d7be5b158d7e8dcf326b799be79d95d5325b7e69490deefd63f84566ba73acc08a243edf1bda96192cc80794c66612cb9d0a225290eb69ca SHA512 f4d65db5fcd452f7775367a75de4eaaa5799fd5423060c8f119035e1ebfa336a8424845d48b7efd10fa8108ce1112074b96726810edf60ed4a7f6c20f78f72e9
-EBUILD mpd-0.22.6.ebuild 8478 BLAKE2B 8157eb7c510096f5d7be5b158d7e8dcf326b799be79d95d5325b7e69490deefd63f84566ba73acc08a243edf1bda96192cc80794c66612cb9d0a225290eb69ca SHA512 f4d65db5fcd452f7775367a75de4eaaa5799fd5423060c8f119035e1ebfa336a8424845d48b7efd10fa8108ce1112074b96726810edf60ed4a7f6c20f78f72e9
+DIST mpd-0.22.8.tar.xz 737368 BLAKE2B 96866fdbcf124534d99db1bde89039d515c64afd7c65d341e6772be796feebf2fa20714f90856f82036dc322087ec2f85d8a4d85efad523a5f275f3d89d64920 SHA512 54b381e6d4e6113cd170ca7afbb671bef4ababb4de80a80504fe951f53aaf66269c123b7923112ab40291e069fa27457936227204cc84b42cf44aac1721c0d0d
+EBUILD mpd-0.21.26.ebuild 8065 BLAKE2B bd01f82bd58a5026a179ed246a5b280b48c1f55fdbe80f41481f36a1e25827cbecd1a9904de791bd8a81e249b187aa0d94eff31c09e58f01032ea85196ef8338 SHA512 96879862ea3f10d67e420968703a476d02b4fc0c288fa1118170d225ce853303507de4a5265913f6afaa6690cde7b7995a7cf190ad8073df4c34914fd73af44c
+EBUILD mpd-0.22.3.ebuild 8122 BLAKE2B 79a904effc8fb09208f648dee611ba9795f2b25676399e9972aa0b4708c1084368a5c691dbbbe9336b8825439029a7f2b1b090bd0d58263569c104a2080b239a SHA512 23ef558178b9a67bbf39ade963e6cea591ee18157403ff0612c28640a8820d4d328b4dcddd465127658277222d8683a3f0ae8e02dfa8dd1ca32904abb5e83584
+EBUILD mpd-0.22.4-r1.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
+EBUILD mpd-0.22.5.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
+EBUILD mpd-0.22.6.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
+EBUILD mpd-0.22.8.ebuild 8514 BLAKE2B 2724c46d1ee527aea93d3767cd89cb72ec416cf3e733e5a085cf023a265002f3bffe4e3faffd63151b8be0c259a8d065472f9e023b01327836f4a72fe3c3841c SHA512 52a61a59ec75fb83e6c04bbe59dd2e7d3f0a420d5f6a5f1b76016ecb2acaa40be2c4c2785621c3b2811c99e12e8392e8886395955a64ff8ab2b900e38bd1fec9
 MISC metadata.xml 2563 BLAKE2B a974514d9226d8ddb4ac85adaaccb4beb5104fc28d68248ac4afe87ab5358e2e7a4214444444419c20c22533ffeb1649308f805958273bce8f603f6f47551884 SHA512 642ecc4d91cfd82db6e4afa9e35f1dd01dd7c4be23576303cc29e266e629463b73491c61d0c0ff5b7dba753ea6c60ec89ccf1f5a895968e9127852b445151a39
diff --git a/media-sound/mpd/mpd-0.21.26.ebuild b/media-sound/mpd/mpd-0.21.26.ebuild
index c546d9352ef6..e4821554af5d 100644
--- a/media-sound/mpd/mpd-0.21.26.ebuild
+++ b/media-sound/mpd/mpd-0.21.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -283,6 +283,8 @@ src_install() {
 	keepdir /var/lib/mpd/music
 	keepdir /var/lib/mpd/playlists
 
+	fowners mpd:audio -R /var/lib/mpd
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.22.3.ebuild b/media-sound/mpd/mpd-0.22.3.ebuild
index d45d4a1f51a9..5ba4a5f6cde5 100644
--- a/media-sound/mpd/mpd-0.22.3.ebuild
+++ b/media-sound/mpd/mpd-0.22.3.ebuild
@@ -284,6 +284,8 @@ src_install() {
 
 	rm -r "${ED}"/usr/share/doc/mpd || die
 
+	fowners mpd:audio -R /var/lib/mpd
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.22.4-r1.ebuild b/media-sound/mpd/mpd-0.22.4-r1.ebuild
index 9f489726eb47..0578b8f6aabd 100644
--- a/media-sound/mpd/mpd-0.22.4-r1.ebuild
+++ b/media-sound/mpd/mpd-0.22.4-r1.ebuild
@@ -286,6 +286,8 @@ src_install() {
 
 	rm -r "${ED}"/usr/share/doc/mpd || die
 
+	fowners mpd:audio -R /var/lib/mpd
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.22.5.ebuild b/media-sound/mpd/mpd-0.22.5.ebuild
index 9f489726eb47..0578b8f6aabd 100644
--- a/media-sound/mpd/mpd-0.22.5.ebuild
+++ b/media-sound/mpd/mpd-0.22.5.ebuild
@@ -286,6 +286,8 @@ src_install() {
 
 	rm -r "${ED}"/usr/share/doc/mpd || die
 
+	fowners mpd:audio -R /var/lib/mpd
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.22.6.ebuild b/media-sound/mpd/mpd-0.22.6.ebuild
index 9f489726eb47..0578b8f6aabd 100644
--- a/media-sound/mpd/mpd-0.22.6.ebuild
+++ b/media-sound/mpd/mpd-0.22.6.ebuild
@@ -286,6 +286,8 @@ src_install() {
 
 	rm -r "${ED}"/usr/share/doc/mpd || die
 
+	fowners mpd:audio -R /var/lib/mpd
+
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpd/mpd-0.22.8.ebuild b/media-sound/mpd/mpd-0.22.8.ebuild
new file mode 100644
index 000000000000..cb6f9fbd098d
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.8.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
+	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	fowners mpd:audio -R /var/lib/mpd
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/ogg2mp3/Manifest b/media-sound/ogg2mp3/Manifest
index 132eff7e0bfd..f09041f21586 100644
--- a/media-sound/ogg2mp3/Manifest
+++ b/media-sound/ogg2mp3/Manifest
@@ -1,3 +1,3 @@
 DIST ogg2mp3-0.6.1.tar.gz 13257 BLAKE2B e3cdfe4de8134a2dbb86615f96606befe985f8aeddf77bd7e3f62b9364596ccdf0c9e5fe542bd2c7e459cb12bcb8f6dbb4782cc4934391ef98edacca88c83080 SHA512 24f24ba342631fbb4743153dc8f4c2b809b744ce01ec99fda442d2a39bf3a774ad2540fd35b6b7940516e63353979fcc30a14214100bb80c9a486ea65ae95999
 EBUILD ogg2mp3-0.6.1-r1.ebuild 614 BLAKE2B 437ecac878793934653e2bd6877c8ba8389526744cc5c67e135387d3ed35ee62163655c38a7dc02786ff3347fd601ce43d9326d6e1fdd9994cfc44cdbb02b34b SHA512 96e647434e5110351c5fb61822bc49aaa324c2c16ab8cabde1b8b7787050426a72e9e313bae1a0da1a063693010a153c34d7180c2457373eabd0dd4ebfb94910
-MISC metadata.xml 810 BLAKE2B 2f1603be452c221f69bee63530f8d7ff5bf8f8341e6dcd8176150fae12c6ab18c0de9a225c0e55c00398760ab3ab23c921dcc83e4b0586386b510fc0d026328f SHA512 312c138ac3a57f76b3e11718d694aaa3e82ce2ee22be957d6b80a82b789a5c8d07da860333d61e5de882cf97d6aee6469659f50c2ec06bbce636585562e0c65d
+MISC metadata.xml 698 BLAKE2B b5ce19c14d7d068c463b9b3c00d3871aea98a4308984ae2f814a6e70d0ef44e151c9dcab0e37c68aa2ba0a661a3611cc6f64762ab0be27401901480e7b7345cc SHA512 fa870e8c57cdc95d060ac316eab5cb99335149374a06e21ace2d99d4d60986d141b846d143acb199e7e4384f36c05725081c109a2a5ea7cf13346bbeff6a5b41
diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
index ace2b810a565..1d4510f4660f 100644
--- a/media-sound/ogg2mp3/metadata.xml
+++ b/media-sound/ogg2mp3/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
   <maintainer type="person" proxied="yes">
     <email>james.ausmus@gmail.com</email>
     <name>James Ausmus</name>
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index 3e9434a2f9af..3f710ae8f5b5 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,5 +1,4 @@
-AUX pithos-1.5.0-py38.patch 1815 BLAKE2B b47a5efd83f41562919d9bfbaf97f714c30ec2aa6e92bcced871326ca84a060c3ad5c128d7974f3084e9eb045db7a434d53aa766775decad5ed58823ff7be22f SHA512 40174e33251b11f8c95099ad01b7ab482026a76ee625f12a5a68e38abe8d081fd265e5bc0939dbfc27e3650cbaac18085a215663cefb2a23417ab437fbadbde0
 AUX pithos-1.5.0-tests.patch 730 BLAKE2B fbd1613c2c3e38a6acefd215e35babd9a6f41aac6fdb492b51e0d1285eac3b2441f3323206282acd8c72bb33dcd9b80c5a8d0fd53e478df9445f6d42ae4392ae SHA512 a50e0929f9a19cca0e2d7e888d5ac228ba820ff58c7d71e08b57f92394e7913bf9bf02e5ae2de736df4b69621c913b07bf6baf14ecc9aaee3e5df921965d70ea
-DIST pithos-1.5.0.tar.gz 123047 BLAKE2B 6f93a41bdda6c3e9baf4d71248748d4e798f9426377fcdf5dded0bdbfec92278f98c215fe818b4d1fc5378d47275539d3a559f7b9d9d8c920f5218431b77c3b3 SHA512 eec2d2fa2fec7f87decc5934d4e1c2f8e11754cb1e042e749be102b27353811a6868636b51b8b9f88ad6f649a12347b82da98d81a476ad3b610ef1049155b657
-EBUILD pithos-1.5.0.ebuild 1746 BLAKE2B 7710aeb5b046d7359204c3453702d705ec606d8cfccc474a7583c8aafe221891c42f2771ced786549cc7f8be14105c4f375a106527a14730e79a1016244660ef SHA512 43bd12189a868c1f0695f797056c6f95b925908c64a1d36742cbbf618dc3bd78d4f6e313cc55496d5e4e39a78267083d92ca4c8803f584b09a82c8084639155f
+DIST pithos-1.5.1.tar.gz 123504 BLAKE2B fc7cd51fd773989b5734d7bfcea674c622b3c9e5072d8ae65ed724476a025802f08916c533ea6c338e748aaf5fcce595ff352b0bae6c72dc074de2afaddbb737 SHA512 43841194d0a3c3df9dd98b819c8a1e30862ebd49aad8ba4f92e91cc7e680fba97159b70748f4042737d5e399bda64cd16d6e9f6d0e29136350c78be57474442e
+EBUILD pithos-1.5.1.ebuild 1707 BLAKE2B 61b5b14b480b1f9ae11aafbd58edeeae0dde8f68ab93bf5bf9c0be6b4efbfe46b4b221198586a3e7e8a03469679fbf5b7ed751c66ee83e608066c1ef8772376f SHA512 4cc56ed3173a47ebd821f005f34ac415c2e7db38e3261092da41e70ff43d09ca240713645b219d1c8d6bca0a7ecf39e483dad0fecb4708f5d17bb09e92ae65ba
 MISC metadata.xml 418 BLAKE2B a438f3fc8d1df9e7dcdd099f5fce71bdf2423b5f030ef7c73c747cdc88a9de543321a825c1c4674ce3fe5659b71ee643c3e561d7237de2e290dafd6ac4583bef SHA512 2a0e965854663d1ae76b17729ced051a6571016e989fbf1605f41ddbac699e99e51a03dca7b171d829635725f920bfc13c5885110d3694878a425660201ff651
diff --git a/media-sound/pithos/files/pithos-1.5.0-py38.patch b/media-sound/pithos/files/pithos-1.5.0-py38.patch
deleted file mode 100644
index dd4327a0d3fd..000000000000
--- a/media-sound/pithos/files/pithos-1.5.0-py38.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 3a23742614058b4bc97d71e1bb826e19891f0d24
-Author: JasonLG1979 <jasonlevigray3@gmail.com>
-Date:   Sun Mar 22 20:50:53 2020 -0500
-
-    Quiet SyntaxWarning: "is" with a literal in Python 3.8
-
-diff --git a/pithos/SearchDialog.py b/pithos/SearchDialog.py
-index d8eec14..fcc9004 100644
---- a/pithos/SearchDialog.py
-+++ b/pithos/SearchDialog.py
-@@ -61,11 +61,11 @@ class SearchDialog(Gtk.Dialog):
-                 return
- 
-             for i in results:
--                if i.resultType is 'song':
-+                if i.resultType == 'song':
-                     mk = '<b>{}</b> by {}'.format(html.escape(i.title), html.escape(i.artist))
--                elif i.resultType is 'artist':
-+                elif i.resultType == 'artist':
-                     mk = '<b>{}</b> (artist)'.format(html.escape(i.name))
--                elif i.resultType is 'genre':
-+                elif i.resultType == 'genre':
-                     mk = '<b>{}</b> (genre)'.format(html.escape(i.stationName))
-                 self.model.append((i, mk))
-             self.treeview.show()
-diff --git a/pithos/StationsDialog.py b/pithos/StationsDialog.py
-index a2b51b2..43cdcb6 100644
---- a/pithos/StationsDialog.py
-+++ b/pithos/StationsDialog.py
-@@ -201,9 +201,9 @@ class StationsDialog(Gtk.Dialog):
-     def add_station_cb(self, dialog, response):
-         result = dialog.result
-         if result is not None:
--            if result.resultType is 'song':
-+            if result.resultType == 'song':
-                 description = '{} by {}'.format(html.escape(result.title), html.escape(result.artist))
--            elif result.resultType is 'artist':
-+            elif result.resultType == 'artist':
-                 description = html.escape(result.name)
-             else:
-                 description = html.escape(result.stationName)
diff --git a/media-sound/pithos/pithos-1.5.0.ebuild b/media-sound/pithos/pithos-1.5.1.ebuild
index 16a9e61fadcf..e2e787a9ca02 100644
--- a/media-sound/pithos/pithos-1.5.0.ebuild
+++ b/media-sound/pithos/pithos-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit meson gnome2-utils virtualx python-r1
 
 if [[ ${PV} =~ [9]{4,} ]]; then
@@ -46,8 +46,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/pithos-1.5.0-py38.patch"
-
 	# comment out tests that need internet
 	"${FILESDIR}/pithos-1.5.0-tests.patch"
 )
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index f931bd2ff2e7..7915bbf1c806 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,9 +1,7 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
-DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d
 DIST qsampler-0.9.2.tar.gz 283494 BLAKE2B fcc5a39e5f8069ae79e6e7f1df27c49f5c27573dbd8f937fe699e1cfd7149600eaa1e697cb86fa446a795d949267c92340b4f40868c9847eb493409126a94cbf SHA512 dcc06fbb66f9f7caf04359ef2f75510666214452251a005605a5235709f2846b3d58ee8cbb82f18f676d079d1484b91b7c3efc397fdc99e84ffaa1c95ccafb4c
 DIST qsampler-0.9.3.tar.gz 283882 BLAKE2B 1171de42c7f27481a5e2f95c1d868b68594288d3a640fe118df9a7f1588d0fea73e06bad4d3acd08a99ec4ccceaee7d171a047a96e811be09ebb3c48896e064f SHA512 0abfcb35aafb773d1b0f2c31406ea7b04581a4a47b01074c70d1b4833a3f06e8223cfa57b1e7f0233bc347636f41732db37150e5bfde76ccaad4eb959428a7ba
-EBUILD qsampler-0.9.1.ebuild 1142 BLAKE2B 300be269a1d3a1f7fe9de4f005f4e4ad5da41e389785e3ae4f7f9e37d28d4a8e86e87b63670e53b51b43121fc96dbbe8915b54fbff8d1e7187a2cf952894ae2e SHA512 6ec6ea3673602e1c02cc12fab0db591c12519a012503646205369df95ce37bcf5fc8d95cc210524da871f1e7a9a8be7e3c4268ef25f4d11322daeec0a6256d36
-EBUILD qsampler-0.9.2.ebuild 1150 BLAKE2B 7eef5a0385db52a6a8ecf942bfa8b18adf797c9c62c45b3dd53e7901a8dcedfa33a9ef51c9f75fc3e3a979f9efff59a3e9815562b907392dbeaeb8af03214295 SHA512 96fddbb2518d4c28d14ec7bdc37490110d3399f0160154a170e9671d71245ccd9a5bd1cc9a92df9d0e04716a454579c13ca18a417996a0cca0624845b1b12675
+EBUILD qsampler-0.9.2.ebuild 1149 BLAKE2B 24adc485f6dcbad6d34712d9021b622a3db66d0094558a83fc6dee56eeb083ab10159569d61d641883e8574c691417e69cc518da9560b982ea4237da1144fd21 SHA512 d98e52041849c6372faa209d2983d63c307346637c021901111286bed5eb73fb4ace7132e76e7bb817f31d22b41a927a47b9f92deb49a0263f33c0a55f309282
 EBUILD qsampler-0.9.3.ebuild 1150 BLAKE2B 7eef5a0385db52a6a8ecf942bfa8b18adf797c9c62c45b3dd53e7901a8dcedfa33a9ef51c9f75fc3e3a979f9efff59a3e9815562b907392dbeaeb8af03214295 SHA512 96fddbb2518d4c28d14ec7bdc37490110d3399f0160154a170e9671d71245ccd9a5bd1cc9a92df9d0e04716a454579c13ca18a417996a0cca0624845b1b12675
 EBUILD qsampler-9999.ebuild 1091 BLAKE2B 0e70c9b8c857bcffd4619e31f8610a4a6d7728ea06319cbf0d25fdf9e6ed7b6b9707f2fe61d73a3d04ea24ea567695137da8f62c0c908c6e1378c336bcb7523e SHA512 0afda6467ac557df22f6988d7150d6eca07e51f98848f7188b1fbcb78bb87c2e02bfad01f1e96a4961904f66ad1f950c20d8529c8882da7cdc9622325ac28220
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/qsampler-0.9.1.ebuild b/media-sound/qsampler/qsampler-0.9.1.ebuild
deleted file mode 100644
index 045fceca4bd1..000000000000
--- a/media-sound/qsampler/qsampler-0.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake qmake-utils xdg
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +libgig"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/liblscp:=
-	x11-libs/libX11
-	libgig? ( media-libs/libgig:= )
-"
-RDEPEND="${DEPEND}
-	media-sound/linuxsampler
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake-no-git.patch"
-)
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_LIBGIG=$(usex libgig 1 0)
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qsampler/qsampler-0.9.2.ebuild b/media-sound/qsampler/qsampler-0.9.2.ebuild
index d948252e61b9..b1939a889744 100644
--- a/media-sound/qsampler/qsampler-0.9.2.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index dadf99ce401e..86f640720830 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,9 +1,7 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
-DIST qsynth-0.9.1.tar.gz 393897 BLAKE2B f63766614d821409cd12e418e36b8dbd739da8e2cd7deae91c2b00dd4f5ba2f447a3ca19c3829de3282e368baa37567333be051641221300d13dd7948d762008 SHA512 70bba332b90963d1c1da18fb3de8f05544fed3406c2144b6ed78cf93720cbcb684ff367d7ef4bc80be94ebea060b38753ae0cb183e85f96f127014c08de701b0
 DIST qsynth-0.9.2.tar.gz 394009 BLAKE2B 9560efe95992fc6e992871c8057898e1acac46718534c7e79060dde4d1519f9fd4798385812f384c97a764676e3e1005ebe24708545db3dfb9f8e08973f07441 SHA512 ab9a2268e3926439e4784c8dc2511d7c39aa2bfb97ffb7bb34f6761f1e859d1ea53f9f6da4d5c31395c6c03dc250b74c8c250b5d71321f2a151b75ec636be3d6
 DIST qsynth-0.9.3.tar.gz 395265 BLAKE2B c19154ba02680ae784ea016bbcb2dcd6c3517d6e810d76cc16919508e2e7310d23a8e8397f45340c138f018340525ecae8d941ce5acf5d4e16295e88d3450069 SHA512 7da5bc0fd8feed6b3b0b048e7ac3fa86937d82ff34528fd0dbb1dd5a05fbff2bb2d8e360e499325660172acec7216964ce1442b75afc10ab0647b91376b2c421
-EBUILD qsynth-0.9.1.ebuild 1404 BLAKE2B de7309360b92eb8003cd2f875acdf499a9d03e0f89f6761443fc23ad0a0ce9f04d05d70f4813c46be61703e795a8c1c3b7ee435e8d644d6f2e0a72ac9fb9aaef SHA512 b86b7c6e5411ed28ce4795a37df8111d289c27ad2cf0fbcce2de54f6fd6fbd709b1a4e47eaed4be1ed9e466649c72fe730df1ee437f7b75ad6b0a76389666329
-EBUILD qsynth-0.9.2.ebuild 1415 BLAKE2B e06b98fe3d4580b90d17488772c0e389df21de7c79a563df10fce3ca7685d6f0f1896cca5ad463f4ba2385417d9088c3ef21f83dc9e15debc5adefa0c3f7503b SHA512 70f46a7a6b807aac1e56c2f3f864b27e4eddb6330c24f73e3a975268790d27b66048cc983075748514b6bbb7c8878aa207a09370b4755cc6e8a38f57c9e1ce5c
+EBUILD qsynth-0.9.2.ebuild 1411 BLAKE2B 224fb67d8c438ea03f47bdd1b11fd0f17992969582f46cabc67e36da7ec965d70f64b7ea926a29795ed7bf9cf2bf4e2cf40585761eeddf9fd2aceb1aa27a45c8 SHA512 ab5a4cdf1f9c2cd4aae7c6a5f81fc0824a25d8009a95d5495afcb43282a9916333d25c45bc5f8e97e8477d5d6ae2a344a76bc37b64b693cb8f2b19ebe80aa6ab
 EBUILD qsynth-0.9.3.ebuild 1415 BLAKE2B e06b98fe3d4580b90d17488772c0e389df21de7c79a563df10fce3ca7685d6f0f1896cca5ad463f4ba2385417d9088c3ef21f83dc9e15debc5adefa0c3f7503b SHA512 70f46a7a6b807aac1e56c2f3f864b27e4eddb6330c24f73e3a975268790d27b66048cc983075748514b6bbb7c8878aa207a09370b4755cc6e8a38f57c9e1ce5c
 EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.9.1.ebuild b/media-sound/qsynth/qsynth-0.9.1.ebuild
deleted file mode 100644
index 9c902ccb2db4..000000000000
--- a/media-sound/qsynth/qsynth-0.9.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop qmake-utils xdg
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-no-git-version.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.9.2.ebuild b/media-sound/qsynth/qsynth-0.9.2.ebuild
index 59c6e5666ca2..a9c46977ac25 100644
--- a/media-sound/qsynth/qsynth-0.9.2.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
index f5d7fff5d631..5b40cdea695a 100644
--- a/media-sound/rip/Manifest
+++ b/media-sound/rip/Manifest
@@ -1,4 +1,4 @@
 AUX rip-1.07-change-to-gnudb-org.patch 1080 BLAKE2B 5a2af422e44dff3a4641a0f51979fe3b9c3c4aa7ffd88756df0080d778c84ae6f4245037da25ea0db05ea75ef70744983eb14e260a6b4b25354ed0479c0383eb SHA512 6cf3bf8221484dcab061f3fa6ba0db3bd6c1531715b87f58492e6185518e62632478ac5e9a614f652a1cc027c8e6d686a7a20d2a3dfd2f5e64c578bd99f5bc7c
 DIST rip-1.07.tar.gz 110261 BLAKE2B 93ef85bf4b50e577180d343f033e6f8765ebe7f17992626b8f7e6ecac13be692edf5bab79fbe0a17b9dd64dbc19886323bc769be6edafcb8e133f58888ea80d8 SHA512 4a89b945cb917d07459f1765bd6e19bb20b84d45e762b01a25374e0a80fced79996440ab85e01fc2fb1bf87175eb9407745294e3099b396d2e4dfc6ee652cc87
-EBUILD rip-1.07-r2.ebuild 660 BLAKE2B 17ef7f440d2c02871ec71fea5077fef192d7680e11e4ae9d0df0076cbfda1c612f9863fce88a40f83e5b5d986dca0a028c543125ae90e24fac046cac60085305 SHA512 e0a9e48d75cabc945bc93e925e35d4b213f2452d63b137d636745297780b18c4cb3cb3acf0a18bda13c0d4c6d6fd9c55f350eaced8a0da098f79fc32aeca2955
+EBUILD rip-1.07-r3.ebuild 637 BLAKE2B 5b2fee3125ab32fad72e7f0a6a7c00a01d63d66bfa85ed2494921f99b8a4587054e78fea3f8849e42bab14424bd4fac3cb445b377a1a7a5011824ff0586d0ed2 SHA512 b73c21f3d0e602f0711d048cd2592a27c33bff8263edee3fca794d1e1fa80978dea73f375a5dee03da9f5d920582e50e99a273d7428c2f9809a5590502db0d66
 MISC metadata.xml 326 BLAKE2B 14293ba2c8d9da5e7eef3dff49ec33c4f7c816d2df9b75ecf0f1d5dc6adc8f88028fba7bde542f4b5439890d1c225555a4b3243a2d88433a825851ba2a123003 SHA512 9be190109b6b10f56e73609510a59a349a3f4c2e841eb64fabcbbcb35535047f8806fc33a3ebaffd8ead47b1c1057e93e435b9db79ba4eef9e16e6325846c13e
diff --git a/media-sound/rip/rip-1.07-r2.ebuild b/media-sound/rip/rip-1.07-r3.ebuild
index e53e18270c80..46bbfe68a29a 100644
--- a/media-sound/rip/rip-1.07-r2.ebuild
+++ b/media-sound/rip/rip-1.07-r3.ebuild
@@ -18,7 +18,6 @@ RDEPEND=">=dev-perl/CDDB_get-2.10
 	sys-apps/util-linux
 	|| (
 		media-libs/flac
-		media-sound/bladeenc
 		media-sound/lame
 		media-sound/vorbis-tools
 	)"
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 0cf06292f139..b862ba1dae82 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,7 @@
 DIST schismtracker-20190805.tar.gz 1307914 BLAKE2B 97158f05b55063173fb3a8198d21d4c3f33a1c9d2882170b8dbce91dec75863ae1f282297c66fea376fc94559b9492477dadbc3e2516cfb2dda8772793f59124 SHA512 6ef51d8938a31b2978cfa40bef2bf04eb6b02e8443d8b221454f6e47f3b49308c9999f1af61cf9786b5bc32b621c1548a702e53403df211176dacabc3252b83d
 DIST schismtracker-20200412.tar.gz 1308056 BLAKE2B 8c104d92889982310d895b9d432ee8bf6da75f583d38490d6796718411298aa0627cc268e070f8c679de4341c910507f78e394b5ba8aeb5b71b3410f2919aa35 SHA512 f4c55ad7d47c9e90aecd8fbe9be399e0b82cd8a815ba1df9c1e23141b0c8a8bb80c9256ce5530327f52b3a34bf84b918d4e1f093ab19d47c180435a63ee6f23b
+DIST schismtracker-20210525.tar.gz 1309489 BLAKE2B acc295bed4236d3161fd67a8c97ddadaa07d6d6319a0ad75710fb4d3c7ea251edd2648932533e9181b512fd78b54db929b07e3472ff754220f16cca2bd610932 SHA512 1f20535e4e3b5175ceea803a45b7286a99cab248829c39d11bc85780bc63e0e26c49ad78997a13e290fb4ad2c292d15eeb494a975d53fbe25dec80499e675b16
 EBUILD schismtracker-20190805.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
 EBUILD schismtracker-20200412.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
+EBUILD schismtracker-20210525.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
 MISC metadata.xml 355 BLAKE2B 90bb7342fbf7defe952aaaa3a65ad1e1144455314d8a2af7219805450a9e3a3df9b0fb9b334c8eec07af7f4f1296e49cf2c9fd3ae750b77f4a5325efa5524337 SHA512 98760ffd7921d91711f3293f3650270ee8de44f7d143066e9d6861b020dd4fe06fa4083ec1a4022846aaa47187151dab2847cd2fe9c571a5c251fa917effea9d
diff --git a/media-sound/schismtracker/schismtracker-20210525.ebuild b/media-sound/schismtracker/schismtracker-20210525.ebuild
new file mode 100644
index 000000000000..68df087a73c5
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20210525.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+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"
+IUSE=""
+
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/libsdl[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
+
+	# workaround for temporary files (missing directory). Fixes:
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index b8f8ac169ef8..6b15047bbbdc 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -4,5 +4,5 @@ AUX solfege-3.23.4-itstool.patch 6767 BLAKE2B 0f0fe564fea7ab8396fb597257bccf90ca
 AUX solfege-3.23.4-no-xmllint.patch 448 BLAKE2B bbc9b1247f68f36ab2a426972255dee4fa6c2531919df090133c9daf59e964eb6be93bac04f99e88c0d1184f10429b2b3d63b8b7a6eeb8acb089628f25295832 SHA512 3eda0a2c845d6f4e82b79542835a9a20658a522c86b162821b0b0a61187505c811710660ee1fa5395709f14607fbd8e95b542263c155284e47950b5178a1854d
 AUX solfege-3.23.4-topdocs-encodings.patch 1347 BLAKE2B 40211d4dada0e2d3d9185f299ab2ad7e8b4e3afeab24a6c35d9c5bdd8685f35bea157d3f6ab916aa6a347c96f5a35495c7e61682b118513e3a2a35833334a712 SHA512 550f1ad9a01fb27e3d3a5e6b8b99a2126b8607cf72bcaef2d8f039c28c77e0f11e0e41da3f01907f4fdc430cb97b114135b9c1a64317fdbff106d9377cfeed8d
 DIST solfege-3.23.4.tar.gz 5148412 BLAKE2B 8543aaa659f753af87f7b911401ee38713aa51afcf3dc33d4bfacbc880c8088aff78a81ce03369ba0b58d14a4b6965d78d97486ac2c3481f066591db0f29743d SHA512 e489dec514b4f387ebac7627d83d1a7766718d10a26c3ec6257d3f4b27a082501df16a27c8a16023b34a06cd4832fabaa1c73bcded52c502fc68ab57b303eeea
-EBUILD solfege-3.23.4.ebuild 1742 BLAKE2B 442cda2f54c37e30d268c3af8799820eb5a4dea0e37016be1de43aac0c69ea46b7dd22e2acc389327450bc465a414503737c797cb068a582104b8c06c6a5c336 SHA512 8fd1a9bd6fb0935a698b154d47706c571080a7db29d144a044a1f67afe1ce3892e46f7ebead2a530f521a507d388297d2daf2629a2ff4f87b5b4b1be310473f2
+EBUILD solfege-3.23.4.ebuild 1743 BLAKE2B e24c8702ddaf919d6b19b22ecaa067f6ba29e5ff328610d3de9b8b2e7f2067f44226d2f62547554c00077f1a69aacc22fb94d50de00929c1c1872ab52a9e8f8d SHA512 07ddc4fc3541c0cb72061e90b1017ee65aa31e83714459e763164c4f424c8eb4eaa5c780c8a2d9359873046146746cf2d72268c048b9efc086987ba495e65cb0
 MISC metadata.xml 330 BLAKE2B 7b72c052aeabd90cb225ca7ccc8ba50caceacccc2d2265dfbcc9c99e535753c5413cc6428b159c62b7bc7aeae0107e8f583371a8f813190f7085c16a43936bb4 SHA512 8b9ec04258e5d3437339d00e9ce5e565b865b7f80230d78bd39cafcea569a4d5f413d0f251899842adbfc7583c77041aaa50e9ee101f2a0496b01393b0740c86
diff --git a/media-sound/solfege/solfege-3.23.4.ebuild b/media-sound/solfege/solfege-3.23.4.ebuild
index c79448880de0..afac9800dc52 100644
--- a/media-sound/solfege/solfege-3.23.4.ebuild
+++ b/media-sound/solfege/solfege-3.23.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="sqlite"
 inherit autotools python-single-r1
 
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 711613337595..8ca8a319ded9 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,5 +1,3 @@
-DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
 DIST sound-juicer-3.38.0.tar.xz 1775916 BLAKE2B d811f91256197cb6575f491e3c692a60ccfaa78ae28d5a489c27e835dec07a16c19b5bae6cae774e6efe3bc7ae10cffc3c03f652f9e60263325167cb1b348743 SHA512 d76d38839c1f5a997a900d0ba4f43d59e38d9a1d547f51bdf15d1aa9ee0a2b24210a876bfccb7b221feb1adab5882ac1d884da6131a0f259dd985326222eff9f
-EBUILD sound-juicer-3.24.0.ebuild 1512 BLAKE2B 933447422932c677b7801e909f88fb34f50682d247e808db05675555144efde242eebe25c88e9d1d4faef25214c7a18787bc986fbd41c26988d0b3072cfc00ae SHA512 bc2e44b3b21b2c032c932d959157a7ead461e78119bc60d97aa694d9fb22a8d2a7161b0f484ccce9d3c63cd5be39070df1f2e9a7791e8470a904d5a2c6143ad9
-EBUILD sound-juicer-3.38.0.ebuild 1259 BLAKE2B eb83a83b4c2fae0016797331fbbd7bb4bfcb35b92d93a04dfeb095d6f2e1b6d9a715f2b8e74228d8a4007ba8c99c7aef73d4f46f0004bd2a75c4ef3f464cf6b0 SHA512 7a29cfa79603398b478f9970a79528e771e37be2d732e82396c389cf90306322f39db8b5e650e0049972d756d17d4de7fb70b30f06e3fd1c45eebaafb2a70691
+EBUILD sound-juicer-3.38.0.ebuild 1257 BLAKE2B 84f632ea04e71fa744bfd955e19cf9f6e57a001877997f3da7525de02d7dd621c33f17b6c3132b53534d8ccaa6b713c059b5d2b52c15a2a04b27593afbe5fdcd SHA512 6e993870e8593c69fc78bff94011e02e69770d209f2bd82f9ecc1a22e22ee682a270e61ebb357af593f3918f2cd997cedd229b3b588beadd04421e00dfd8e2df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
deleted file mode 100644
index ed690672588a..000000000000
--- a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="CD ripper for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug flac test vorbis"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.49.5:2[dbus]
-	>=x11-libs/gtk+-3.21.6:3
-	media-libs/libcanberra[gtk3]
-	>=app-cdr/brasero-2.90
-	sys-apps/dbus
-	gnome-base/gsettings-desktop-schemas
-
-	>=media-libs/libdiscid-0.4.0
-	>=media-libs/musicbrainz-5.0.1:5=
-
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[vorbis?]
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[cdda,udev]
-	|| (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )
-	media-plugins/gst-plugins-meta:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.3 )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: gst macros does not take GST_INSPECT override anymore but we need a
-	# way to disable inspection due to gst-clutter always creating a GL context
-	# which is forbidden in sandbox since it needs write access to
-	# /dev/card*/dri
-	sed -e "s|\(gstinspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ')
-}
diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
index 3951abd8a3b9..352b520fdb30 100644
--- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="flac test vorbis"
 RESTRICT="!test? ( test )"
 
diff --git a/media-sound/spotify-tray/Manifest b/media-sound/spotify-tray/Manifest
new file mode 100644
index 000000000000..e502262391fc
--- /dev/null
+++ b/media-sound/spotify-tray/Manifest
@@ -0,0 +1,3 @@
+DIST spotify-tray-1.3.1.tar.gz 22084 BLAKE2B ee8f269d1ac618794eee8a67b814f689f3a65f18433a1e3c2382465a2b9b247e70e16fb43f061d1c7cef9188f116d0c7e8478fe3ffe2ab5f2de54dc8ccb40808 SHA512 c1fd533e3879f2d9e451264969bc797c6b8ca35f191460d40822728fc6b637ec7487154b0794871f25cbd6e01b16c7ff5eb33806a1235ac09e45e49580d1337a
+EBUILD spotify-tray-1.3.1.ebuild 617 BLAKE2B 1432cf1f86e45e202469cd5a5bb667705f6e762ac8be11787624b426ece6ff0f0e00dbcb4ebc4fd234c78ad296a2c0fbd5f7e70702e6abc36847491dd8b97c2a SHA512 063603de63effcab6223b13378c5ff781e78b0cb9a9e70dcbf0c6a75a5483e33cab5c199e8bfd6fbb8ecca5efde50275bcff5e4f3598e4a99da49a632ea2310a
+MISC metadata.xml 413 BLAKE2B fc8f119b724d71ff5f53c79db1174ef4d26ab4418ff6ef72dd717f5b4d1211473e88a4bdd421e8aad00606954a4ba80b9d16d7eb14040724f5aba281e97f8a83 SHA512 bbe0abb6afd27760324e085b2a6775c8d4c7199cb82c1d92140498d17462ccea1461fcc830490070c0475ff05e161a2e635027e0bfa53fef0c65da021d353259
diff --git a/media-sound/spotify-tray/metadata.xml b/media-sound/spotify-tray/metadata.xml
new file mode 100644
index 000000000000..5b36c64896b9
--- /dev/null
+++ b/media-sound/spotify-tray/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tsmetana/spotify-tray</remote-id>
+		<bugs-to>https://github.com/tsmetana/spotify-tray/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild b/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild
new file mode 100644
index 000000000000..28d534d9a35d
--- /dev/null
+++ b/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Wrapper around the Spotify client that adds a tray icon"
+HOMEPAGE="https://github.com/tsmetana/spotify-tray"
+SRC_URI="https://github.com/tsmetana/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	x11-libs/gtk+:3[X]
+"
+RDEPEND="${DEPEND}
+	media-sound/spotify
+"
+
+src_prepare() {
+	default
+	# Fix the name of the icon
+	sed -i -e 's/Icon=spotify/Icon=spotify-client/g' spotify-tray.desktop.in || die
+	eautoreconf
+}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index ae5f112e2264..459d8499b619 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
 DIST strawberry-0.9.2.tar.xz 9956324 BLAKE2B 0b5ccfa76aa98c0d7cf5ca0f79465948c34d6c7e7f51264b1fb8623099a4de2d0548464f51d813a4b75b8e524c653a32e8682410741a3c3fbc604ccaa4816204 SHA512 2ce22e7bed5832dc33191f5ff6f0f656861f4e574ad5ae2d2987a0c75274490dad2723579fcc5766f398654600a0819c5d0fa956dce12a54d5aab505a2f1ea30
 DIST strawberry-0.9.3.tar.xz 10928116 BLAKE2B 3edb80065876d63b79292c6b75660aaaeaa6ea294bb84011124fa8aee3163717b8ab4f0e8d6e7aff321466d3cfbc214b5e8b987c9ae9b0823f8d3c681aae6e9e SHA512 d253ffaa6cf0412eb135bc792c31458816fc0a1ae7070d6885487da4fb4855ffeeeeddd285b853fd10220c797c3beb73a91059514d76b1b1638350fdff17107c
 EBUILD strawberry-0.9.2.ebuild 2936 BLAKE2B 696328255c443ede4eb118a09edb84f8818307cc2c4288ab5513d01377af86a5e9a1ef452550e328a471ce61b87a9326d7417f92efcfb08a8627bfc80378a63a SHA512 58357aa926039d93c1bacbe435350fee3cf23287024ad89a5cf08c9f5b1e8eb0c296edff64add7beec37529c3fa7ea2f7bb67dc1fdd76b3bb68308bb8e37e427
-EBUILD strawberry-0.9.3.ebuild 2937 BLAKE2B b206a72e4066488f8e7e5a0eccffc47074f689898984bbc82a2874aa1f764d678a39739bc284aa8e6b6098974df0d2ad0752d40532828e7eb50dffbb3ee71a59 SHA512 d2b2d03f06db0209999a4322149122cb32759017a34fba8846019d803b0e0ee38154c5b807a19ad7972e95364de3976dfbaaad67c4600568ba0c3459d9b73241
+EBUILD strawberry-0.9.3.ebuild 2936 BLAKE2B 696328255c443ede4eb118a09edb84f8818307cc2c4288ab5513d01377af86a5e9a1ef452550e328a471ce61b87a9326d7417f92efcfb08a8627bfc80378a63a SHA512 58357aa926039d93c1bacbe435350fee3cf23287024ad89a5cf08c9f5b1e8eb0c296edff64add7beec37529c3fa7ea2f7bb67dc1fdd76b3bb68308bb8e37e427
 EBUILD strawberry-9999.ebuild 2938 BLAKE2B b0c616bf39d4161c62a8e6cdf268976a9c2c76e6d36bb159807dcc9accbc01b4e6cb87cd06df4b29ea212f2b75819d21952684664ecaf2333f150d2663815dc4 SHA512 19c81894d095c42d63554f8290160d9ddde1eeab99b06d3d99c82c699839983c91c4157e3fca024a158613983a6a88c11c7e5fcd8420746d9c3c0d367809871a
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.9.3.ebuild b/media-sound/strawberry/strawberry-0.9.3.ebuild
index 13ec62aadde7..d3fdeec4bd47 100644
--- a/media-sound/strawberry/strawberry-0.9.3.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 8df865f2cecb..2cff3288a8e4 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,4 +1,4 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7
-EBUILD whipper-0.9.0.ebuild 1281 BLAKE2B 62353cb598a64554b4df46fa462511a79935f4f52b788a1573169e92b97f5befdf36a50a62b2e3da3613685e17d33dfb997454477a0fcb6e281441ca206a379e SHA512 d8269d4dca43cbbaa5389b0bc3cebe90bca4520525bf7ee274dbccc2f0481dd0901e7880c81c44232511aa2e04783b12c43394d46bef65e0ed550421d3b7ed44
+EBUILD whipper-0.9.0.ebuild 1241 BLAKE2B cf63fcaee645e139ebea91a7582980122893c0ca85d369c65eb45a7972c3d2f5c2aa717ed8251ffd9537c4ca51c97a4eef5e9793cf9dc00c412c2d98e58a4f1e SHA512 bc9a505cc0523496265d2f8684a79853a3807f99f3751c5e74a8ca0298ea7902b9be653af6232e68ce81d7858e4f55e9089d9d4c6344a2e21651c8d8edba0887
 MISC metadata.xml 574 BLAKE2B 6af7eae8e89d5522a54e3fd3de786b42e63b5c656b938edee4022f104c00bc2f8579145fbb71ad4d0bf285d09315145efffa372a92908fc656f4a5a0cf3afef3 SHA512 a42d696b9a6156aa69d94f3f60a520326c4dc250806e7670c33def7f80e7d233b97bdcc45ed947ba358cbae767d0d17c12b83966dfe96dcb703c07a0d90c072b
diff --git a/media-sound/whipper/whipper-0.9.0.ebuild b/media-sound/whipper/whipper-0.9.0.ebuild
index 6798ca12b889..c14aa57f5c22 100644
--- a/media-sound/whipper/whipper-0.9.0.ebuild
+++ b/media-sound/whipper/whipper-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -25,7 +25,6 @@ RDEPEND="
 	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	media-libs/mutagen[${PYTHON_USEDEP}]
 	media-sound/sox[flac]"
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /media-sound
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)