gentoo (valentine's day) resync : 14.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
commit: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree: c44943ee0563a3fa957716de909fed683117fcb9 /media-sound
parent: 69051588e2f955485fe5d45d45e616bc60a2de57 (diff)
91 files changed, 1243 insertions, 1160 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 8a2c3344787f..46176062720a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 0ccac608da47..948a6a6ec792 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,7 +1,7 @@
 DIST abcm2ps-8.14.11.tar.gz 259453 BLAKE2B a5b2b4142b9d3190fdedd3b560f8baa582293badd90fd380ddb9991871b2e08050d07c3c97f908529be715bce62b9cda242487f3d6a7885ecf802318a64b7df8 SHA512 b156c84cfa929aa5999a42b23564af5bac399dccbf116342891b5e5ed2e34e81b4658fab9f3c51f5de084cc96d8ea0965a2bdf81de14de6eb324b8998dbb8b98
 DIST abcm2ps-8.14.4.tar.gz 258383 BLAKE2B 7f9163309cb7a31eaecf443b5bd754c7389b4717ed891e2082f618499b4491428ae0fff7b4804d2c21c8ff3d948557c9d649afb0c2a9ae9407aad39545ed66d5 SHA512 7ba5a25ef7ad18a46bdd45393836a0ede2838af2c24822ecf3c1759328619663fe600eaf607de900527f88fa4a9c21d1da8965cafa45f4aa6dc5754b37ae3722
 DIST abcm2ps-8.14.6.tar.gz 258520 BLAKE2B 99aba76df4ee0259d46924f5d37e707d2fcc1872502c475bca52c22353d4a6f7dcb3f52b0639b8d619f2414a6cb1d20b7b8bf6808218f0b99c71eb76b9766bf9 SHA512 f9863480bc757971eacb0a3bb30e046bcafe2f27bb15ac0e9c4d89afa568f23682fca4388523c429a72b01386e44c390efc8c487cae569b59eb6fcca8ad9a98a
-EBUILD abcm2ps-8.14.11.ebuild 880 BLAKE2B 1b3abbe2c30bdaf0a3f48738493e4d745485e87736ae139bf33bd38505e95a1d1de8101801feb2093372323086cc6f0293a7b9c1f39fa20bcd5f35273b461d9d SHA512 d34ceecaf4794c8124167b7922c23b578395ec0ff317970f322567fbd42bf8fdca87aef921aa75478434413b419d3b232969eee40e10700c37a06421d9c4504c
+EBUILD abcm2ps-8.14.11.ebuild 878 BLAKE2B 36b88fa45779d165602ae5b5805d501e3dda59ebf6d0712e0201b6af0922a8e7cc7a3322d7b9ac0efbaee636f59079caf3fa14b83d28071efb3e50b931139901 SHA512 8d166545f746551422117be43d011fcab1efc2591065a8e599089537c098f39220de25354f7963040d462c6faf203ee13957993bc66d6ca1c7ee0daaec2404eb
 EBUILD abcm2ps-8.14.4.ebuild 878 BLAKE2B 5fcd6a249f5dd7ae3c476a61fc0c38da2d7490a2162c4e6f0dd1d1dea79e8478d10493e723ba296e3fbf7d9be61b3e7e45868f92182cdb3795641b8fbfe24a95 SHA512 059ad7c4a783a8127701eba3e09f45c770c1b535198a996060038d689f1bbf95b6eda4256962f54a64f7c8930bd614a9e54db518f2f65973940a7757038c2db6
 EBUILD abcm2ps-8.14.6.ebuild 880 BLAKE2B 615b9633bad0a6f8700613f22dd14d7966f799c2dc5ec7169212adc6a7d75f48681608e41ba6a2bc9140e6e7d4f2d2c01ccc7df1d72a5dfac9e37a5e6a3dd2e6 SHA512 b9fd72b73b362d2bfc3ff8aa44a3284ce01745584da9253274ea6bdf4ab8644df5c9d0191911a1b2eb49419b21e6f3ff2c9f8fb2cfd9d586b707eee17970b1e8
 MISC metadata.xml 442 BLAKE2B 1644918baf09ce3fbbdfb92858c155cd739f48f0d7b3c52827b900547cb065f93a645203250bc6cb9f40ae9086cd6dd1e92f5b23a06d4cd19139c9f0952626b9 SHA512 b73b1bb4b151438f0328d9371f636d172072ade500c8d055b749a53a10975174f7d4a3a6f61937206e0342202827f7fb968f3d073745bf62fa954f2ffc8c9d0f
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild
index 48eee1a8dfd2..1af8b60d3f2d 100644
--- a/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="examples pango"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index da57d7d3456f..56d350cfd3d7 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -7,5 +7,5 @@ DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
 EBUILD aqualung-1.0-r5.ebuild 2510 BLAKE2B 569242aeec1453ccbf040cc826847f27fac5e7e191054057308bf5b912d971a8b008020b7da76faf2bc225b38bae2b1533855bd909843ad2c813819350183f26 SHA512 f6d69930280c3d0068b1a960ccc8e968b2e9d476d4934edb94cc332f10ef805c834a12f062ec8567f839bb8663ce9d563c4deca51cafd800c48ddb7a6569e1c4
 EBUILD aqualung-1.1-r1.ebuild 2418 BLAKE2B ed3f80c963cfb65720f43a0d0f895b6323f3be1a06050bea5b20231c8431fb3c91124f14bdf9295744a7cc605d1f899a52826d4337404364145207af5b2c7d98 SHA512 fba638ffd7590bf25d0072678abbbe33d6c4121f0bd955ef830ad964089b956cb3672cee2e06e04c67bdf6997d67c1c1f815814f455da70ef18d5974d73100bb
-EBUILD aqualung-1.1-r101.ebuild 2448 BLAKE2B c54d59927cfddbbbddd42e3ffb46af8273b2322475b1d253a7d7d92449f809ee60e5c72fb5e9e1e364baff3c4546f556d5d6c7542efb855ab8605023d92f3b74 SHA512 b78a609e43231ebea61b8e4af0d6d2c63ea02dcb73a120014c23736572520fe63b4ed53eb188800b682070a5ba00c3e50bd53c8e2a49cb03f5b4afc75efc9513
+EBUILD aqualung-1.1-r101.ebuild 2498 BLAKE2B 23ecf60db98468881ee9c4d338998a7c988bbd2d0c1e50cdeece3213baa84d210f4daf6d8c55dd8aff6d57fb64b3a9ef6d3b495bb4d512973a2f24209163bcf7 SHA512 cb2b8401f75e1a9be4fc9c30d4ab0559c25b01668da23e6d914d31f45783545bc494298968124a8dff9fe173f1a9d597d3f06e88c846f162fa202c210e75a954
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index f497e1bb19bf..87d3f7995f0b 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -57,6 +57,10 @@ PATCHES=(
 	"${FILESDIR}/${P}-var-collision.patch"
 )
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_configure() {
 	econf \
 		--disable-rpath \
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 838cf9f0bd76..6fabdad942f1 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -4,7 +4,6 @@ AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d21898542
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
-EBUILD csound-6.15.0-r100.ebuild 7223 BLAKE2B 73f3fd6164233067b25e6f723bfb333cab897c9d69bc91e442c961af6e823f63a5523075a79fe197c7955a6589263d616ef00719b16cc238ad64554a28c1e5f7 SHA512 7eab8a8d937626d6c48f204dce0ef8a2ac0717be7cfea262a4201769f6d66823ec5e78974bd0b9b93253a3991a4bfe0cf3cbc4498f79d938cf2d9621d907f893
-EBUILD csound-6.15.0.ebuild 7352 BLAKE2B 6731504a6c40609f936d3929d2b666f7d49dfcc1921bb2d3630c68b19ebd2bbe35236d0c76e80d00dae0280ef796635e8ea88bec0e9002fce526468cd50f5087 SHA512 ea37acd1a5ce19f684a3676453431e3a24ab2950571749269c0c42456709a067ae4d806ce140ad3e915d5f5ae07c0ac55c66495f58eef0e30b82003271a6922a
-EBUILD csound-9999.ebuild 7225 BLAKE2B 7e220d4b31eeaa00ea2734baee46b94a522d0f5b8b440d246f2f4c3548f52cfeb19b0db969762c6d229dcd1659daaf50526ccfe45f3c024a4bf0f9410bb92783 SHA512 33a6d52ca2de5ee307455ce01def4f05a6c4839a5829a4d1027f056693d64ff949dd703ddb3f07e68e15346549b1277b3b4bf923e1f04af2960cf91c6762d624
+EBUILD csound-6.15.0-r100.ebuild 7242 BLAKE2B 1bd143e32a403c31a56a60418a081494538ffe642ec17674ecac1f0f9bc88bf21152a1c37e2072cbe658b0e7797e9d4bc2c7ed07c40b69b2b10b9345543cafcd SHA512 fc4835b16a97ba2a78666389361322cfb8b494fd6b992824a6a5e7ca6450ce9ea0a3d56c4460c29831b574689e67eacb5c070dd07667cc180faeddf9aabf2eb9
+EBUILD csound-9999.ebuild 7244 BLAKE2B 0166d4d0ebba238eb91f286970bae7630cd9c4c6fa232620fdbc1f832ab1ffb7f3e39a1b3e6f819cf4c933a7201bbe0188453a3e681d94834bdb67eaa03f8810 SHA512 1f2551193a6947be3cec77452e60db47349c35b4ccc6763925e181f5ac8e9b20f71abd37aadab358909206f8ecd8eb880d982fdbf945916aef07ccf2180d6d41
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.15.0-r100.ebuild b/media-sound/csound/csound-6.15.0-r100.ebuild
index b25982383b31..99d7b30062ac 100644
--- a/media-sound/csound/csound-6.15.0-r100.ebuild
+++ b/media-sound/csound/csound-6.15.0-r100.ebuild
@@ -37,6 +37,7 @@ portaudio portmidi pulseaudio python samples static-libs stk test +threads +util
 vim-syntax websocket"
 
 REQUIRED_USE="
+	alsa? ( threads )
 	linear? ( double-precision )
 	lua? ( ${LUA_REQUIRED_USE} cxx )
 	python? ( ${PYTHON_REQUIRED_USE} cxx )
diff --git a/media-sound/csound/csound-6.15.0.ebuild b/media-sound/csound/csound-6.15.0.ebuild
deleted file mode 100644
index 65e4c105afb3..000000000000
--- a/media-sound/csound/csound-6.15.0.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	DOC_P="Csound${PV}"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-		doc? (
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-		)"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, see src_configure
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-#	java? ( cxx )
-
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	python? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#	java? ( virtual/jdk:* )
-CDEPEND="
-	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
-	image? ( media-libs/libpng:0= )
-	jack? ( virtual/jack )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua:0 )
-	)
-	mp3? ( >=media-sound/lame-3.100-r3 )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	dev-libs/boost
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-	"${FILESDIR}/${PN}-6.15.0-lame.patch"
-)
-
-pkg_setup() {
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_COUNTER_OPCODES=ON
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FAUST_OPCODES=OFF
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=OFF
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
-		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_RELEASE=ON
-		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
-
-		-DFAIL_MISSING=ON
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DREQUIRE_PTHREADS=$(usex threads)
-
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
-		-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
-		-DUSE_CURL=$(usex curl)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
-		-DUSE_GETTEXT=$(usex nls)
-		-DUSE_GIT_COMMIT=ON
-		-DUSE_IPMIDI=ON
-		-DUSE_JACK=$(usex jack)
-		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
-		-DUSE_LRINT=ON
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
-	)
-
-	#use java && mycmakeargs+=(
-		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
-		#-DJAVA_AWT_LIBRARY="?"
-		#-DJAVA_JVM_LIBRARY="?"
-		#-DJAVA_INCLUDE_PATH2="?"
-		#-DJAVA_AWT_INCLUDE_PATH="?"
-	#)
-
-	# set the library that we want to use
-	if use lua ; then
-		local libdir
-		local libname
-
-		if use luajit ; then
-			libdir=$(pkg-config --variable=libdir luajit)
-			libname=$(pkg-config --variable=libname luajit)
-		else
-			libdir=$(pkg-config --variable=libdir lua)
-			libname=$(pkg-config --variable=libname lua)
-			[[ -z "${libname}" ]] && libname="lua"
-		fi
-
-		mycmakeargs+=(
-			-DLUA_LIBRARY="${libdir}/lib${libname}.so"
-		)
-	fi
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 4eca61bfb21c..bb0ad26e45fb 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-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
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -37,6 +37,7 @@ portaudio portmidi pulseaudio python samples static-libs stk test +threads +util
 vim-syntax websocket"
 
 REQUIRED_USE="
+	alsa? ( threads )
 	linear? ( double-precision )
 	lua? ( ${LUA_REQUIRED_USE} cxx )
 	python? ( ${PYTHON_REQUIRED_USE} cxx )
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index eac5bbc1c7d3..2c73fc25cccf 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -2,4 +2,4 @@ AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d2
 AUX denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch 2103 BLAKE2B ebb91ff4df71ec412ff881cc2443c7a071ef105ba180ec72dcf61cdd5d5fb97070deb9b9a73e49a133e746a9c159a6ff8c93640784047a5792a97ceae674aed1 SHA512 74f02aa8801ded5bf1c33f7bfeb38db258ba924241e72be05c5e7784538f0eb4d72a88e0b810b5b8b1c96e95d27b135b6fcf3fea8f7a9ebcd9ee0652e3b6560f
 DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
 EBUILD denemo-2.3.0-r1.ebuild 2979 BLAKE2B ef184232adff0cc1119acc79244b8637a8ccc39953bb93018078595a286618e88f787c9e2ca69da31c81af9c310a602d12843b44cc04486e0a9c905106f64d99 SHA512 7ed1ef229552d8d279bee4207563446ab6915f7033565c6149ed92e9097ec81d89afcf0db6dfb77fc7372bd7eb9517126d8b0ed97c8e61ac82eae3d4352ae6f2
-MISC metadata.xml 1266 BLAKE2B f8a27a8c74a982612bacc612dc531d1ffaa67ad380c637405d624a2deb2651e25f09636c72cfe3a9f6228e7a5289484ef99ae1d00a5e64df9cc5f220dda23409 SHA512 09c7e135243a32eeef5a0f6ef53156c2109398fd9515b377b69ed926c7c85c2aaca036704ac819803715f5776321a734896908ff4dd4c05c8c4820c339cb4f79
+MISC metadata.xml 1274 BLAKE2B 8a6295efa303234ef42f968bcd6dac26806930d268e8be965bf9a11d65a4e36a8a3e8c94df2e6cfe1166035ddc6b4d0e014addb05ac188c58500cc9c74cc4f68 SHA512 88c7d18f20310dc32b7b4c0ecb20ffa745263ab6b2cb41adcae79d7b90629394961414b197240bb80afe14e2d64ea373bcdc193dd79e8edf750dfd9356556b5a
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index 01f6188337b1..8c5aa41f5cf3 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>waebbl@gmail.com</email>
+	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
 <maintainer type="project">
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 0efba497c302..f0e7cf8d5a18 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-20.08.3.tar.xz 1635656 BLAKE2B 74b28f7acb8561918aa57f2aaa3a0fde9c041c5dded88fa4d134391288c7b545e058e347d42d3247586ee3a3451e3c072adc3b4367d3bf7fced37d2e33a17f66 SHA512 0ac2c8bb5e4a1df4259b10361acd4094ff32e00f340e4c2418483d8c8538fb439d8205f52af1ca3f31fbc7c129ac1f8e1e3edcbcb96e85f9c8cf270ec8ce081a
-DIST elisa-20.12.1.tar.xz 1660660 BLAKE2B 2c4b71d820c302899ff4ad4071e8c2a4025fab0f9383a7ec60c6297e407c452cadc5682a040d013ceaf6f5e3606e76ca760f609ef41f15dbc6d24d0870cf6ea7 SHA512 8e565956dd896fcac8d55696c12f7646a935c38f498ce8a78adddb36a8fd2bae4823d558835a70256ea1cbc04d2af920db3ff5209abcac65ada593e45cda85da
+DIST elisa-20.12.2.tar.xz 1661580 BLAKE2B 2a06cd3df5569526a28ee8d7483f68454fb801894dadf7a6b818e41f348d90c2a34899b61ab5a328df50baac1d095c289546e4cef950d61433df3eefc89d6cbb SHA512 3aa681f5729f235fec152ca878a7f5d860c9087230d042481f7bb6d83fef9685dc6d6e1767f2a125d70bb8ea80aa3eda7f657a7fab6f4813231a444b256e4b0f
 EBUILD elisa-20.08.3.ebuild 1660 BLAKE2B 0f2f97fb2a63060c6b2de73204577be1a798be207188e261789a517e75054989ab25af613ed58c24b828b1035944a3a7494aac5c9bd2c35f9dd7279f21f2eb53 SHA512 a8b51c1155cfc602f3e69bbfe176ada35229bfe38c553f794a96946205405dabb428aeadaaea402acedb021b0ed546fbcc8c730a735da83d0cc34d202f636d0c
-EBUILD elisa-20.12.1.ebuild 1663 BLAKE2B 1f368728110cf74bdf201e3a0716c36bfb9297a35ba856966d7450715038164da50e78c2ae3c05336d3a62cbb3967f0cf64f667f450cfc4d0bfaf5bfbd96ad72 SHA512 39123313f5f4efb30ca7a9de41c8657b9bce06275a13361eb5e1ab271c4f89e2ab35eff8bfbce0dfa4a64e6db99bf9c04d0bd1ff7beb86b12e2d37bf71da9dbb
+EBUILD elisa-20.12.2.ebuild 1663 BLAKE2B 71bc53de9b63943fdfdd31538b40afe4d489a1b3bab54eb737d827da6f5d2fee36f06b0d683551b5a68f4775e5b7f1f4be637e24a4cd09484cb951fdb866f231 SHA512 cd65c68137af031a4f03c76a043b7bedfac599df7786f1b2be41dfcf70bbe0d31ca3c92cdfcb40b04d68c331d90967901072892a44595f6cec993a0c49f51ff9
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.12.1.ebuild b/media-sound/elisa/elisa-20.12.2.ebuild
index bd521419ba33..265311b6fddd 100644
--- a/media-sound/elisa/elisa-20.12.1.ebuild
+++ b/media-sound/elisa/elisa-20.12.2.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 KDE_RELEASE_SERVICE="true"
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 5c1f367b9903..101cd61d361e 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,7 +1,5 @@
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
-DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
 DIST guitarix2-0.42.1.tar.xz 71825372 BLAKE2B 06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43 SHA512 66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0
-EBUILD guitarix-0.41.0.ebuild 1820 BLAKE2B 2bfd2fda4e262d7d7f0fdd25e3e3a01a7bf4f2587145b42667bd5212c6c3b362adb61b29d5cbcb58b359818490fd3b5716406db8544dde899350f09a8c8f9aa7 SHA512 6aa556fd5c060f1dc516e2ac15d1b59c0dc049117c3d2ef680c40cb4cc25fa52a2688d14d4cc57ce86d9d7c940a7ce4f0d0c8c8d69e9992e998ae14376002c2a
-EBUILD guitarix-0.42.1.ebuild 1829 BLAKE2B 29b4b6db244e5eaee9d7ba9e771831b722d3c30002c6942f3ac573646606d88e18d8fc026c144a84b92bbae157018cd7ac36d3d74979d400a26ff9ba8de068e1 SHA512 89329fc48c8acfdcdbf9a32aa9f2ff4f0b4b74bd0c90b3b6e0fbbe7eb8e367a4e4a4650dfcac203b0c45e2cdb804bc06f461b16e71ee5cbfc9388c6bca69825f
+EBUILD guitarix-0.42.1.ebuild 1828 BLAKE2B 6d247803d4c1a6efa833ac58309e7ff3c0fcb9b164d19e62a38edac0aed13fa9c5228f350ac4a4e9e5036c63607b58e970cee8691807f6e87db65c471f274700 SHA512 8461dc20dbf0c332ee6786f4425c80abc8a9c2e219140c80104f88b05b7107a092939dfb8f0b6335ab753b98e05dac8550e334ac55d5be80f393a75628f361fa
 EBUILD guitarix-9999.ebuild 1792 BLAKE2B 0bd201b1b4ead9e31efa6e6055326d99e71176d7dd7a10ac03ab93f9d0cbcae929c434eaf126c9f93ed6823256956301a5381f0afd082bcbb8d6fcddc0b9ff28 SHA512 6b86ab87643212ee1a37753755b409ba73c9fc1501e6d478760988cbad75615265dca629be68e9bfc718b821b43ea9eceb13ebf743647d15e3993296df0380ce
 MISC metadata.xml 661 BLAKE2B b68ff384f8ed21006ee3f7722a481b3b0060729786386ca7f6804dc38481f998a66e714800801417f5b0b429ca42cfb562f9bd289e899365a5d9a4ff53a6e489 SHA512 087467e4dc44968f8ae3ed95daf1da4ef6c39e0af8c58e1bb280ae08c46a568b672a7bd7022ad1a81e86fc6c7a15a13e4cfd61d2eb95ccd019b132a4386d2c28
diff --git a/media-sound/guitarix/guitarix-0.41.0.ebuild b/media-sound/guitarix/guitarix-0.41.0.ebuild
deleted file mode 100644
index aad4f7690df7..000000000000
--- a/media-sound/guitarix/guitarix-0.41.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils xdg
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
-REQUIRED_USE="|| ( lv2 standalone )"
-
-COMMON_DEPEND="dev-cpp/eigen:3
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
-	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.1.2:3.0=
-	x11-libs/gtk+:3
-	lv2? ( media-libs/lv2 )
-	standalone? (
-		dev-libs/boost:=
-		media-libs/liblrdf
-		media-libs/lilv
-		virtual/jack
-		bluetooth? ( net-wireless/bluez )
-		nsm? ( media-libs/liblo )
-		zeroconf? ( net-dns/avahi )
-	)
-"
-# roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
-	standalone? (
-		media-fonts/roboto
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-lang/sassc
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-DOCS=( changelog README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nostrip.patch
-)
-
-src_configure() {
-	local myconf=(
-		--cxxflags-debug=""
-		--cxxflags-release="-DNDEBUG"
-		--ldflags="${LDFLAGS}"
-		--enable-lfs
-		--lib-dev
-		--no-desktop-update
-		--no-faust
-		--no-ldconfig
-		--shared-lib
-		$(use_enable nls)
-		$(usex bluetooth "" "--no-bluez")
-		$(usex debug "--debug" "")
-		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
-		$(usex nsm "" "--no-nsm")
-		$(usex standalone "" "--no-standalone")
-		$(usex zeroconf "" "--no-avahi")
-	)
-	waf-utils_src_configure "${myconf[@]}"
-}
diff --git a/media-sound/guitarix/guitarix-0.42.1.ebuild b/media-sound/guitarix/guitarix-0.42.1.ebuild
index a4de888c3ad3..3a9ca22629b1 100644
--- a/media-sound/guitarix/guitarix-0.42.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.42.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"
 
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index 5fcd791006a1..f154b765a4f9 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,6 +1,4 @@
-AUX jalv-1.6.4-qt-5.7.0.patch 462 BLAKE2B 54918c977485c0c420a3f23dbcbf4638def779429b6bd7065c79b0ddffc0263b1a65402b3ec0a7d8678f0ccba694a758d211d9d5fc589b6723cd728bcb4d29ff SHA512 048352f5355aa957a6d88026374555a9dc4b33a4aef972fa39de5ca772b1ca77298f81ae938482d43a41da513594255ae37c57bd2a3b70fe6b22b03f46d80ea7
-DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b
+AUX jalv-1.6.6-suil-always.patch 410 BLAKE2B 7aee87986df386383990e2fc1c012592c95793a3ed7d80faa98c1946130d591eca283db62954bd6c8419cb0b57ef600ece58886dc5c33be7eb0d0addc8b09d81 SHA512 534cc589ddf8f40f32c9c5febc71a6707bc546a6277f5fa556f65f2fff20f053851063449723708460279d22efb45b505f8bbc5e5316781164ed33993847bfb8
 DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
-EBUILD jalv-1.6.4.ebuild 1371 BLAKE2B dd6720a3b703b2d72361293cd52b0dbd5e24314b33b60939d3cb3f71de71b78f652d864a897d981e23d862e9da65a8704c1768682d49ee3ab1483a820a345b6d SHA512 2ca995beadf265d5f73e7d20292a947b8ffec650af0dda9e15a63125fb3fe9d0a0ecd7a650bd810407f7603fbbd9e9c6c3c941ac3c85764c39ba16ca6d6740b6
-EBUILD jalv-1.6.6.ebuild 1246 BLAKE2B 7e2a74f9637477540ad4722fa70364565df7ef170fceada2af6bbd2076a6048fde714260282e81fd123c979b234c3733c824697478af5bdd87cb424d8a27cfcd SHA512 bcfe4936f3c3a22e69e2841d40b9d78db88667738592e67c1517fbe9a19ccf0a094060c7ac4bf67b95eea96a38c3e3b4ed8ce1ea4d6e9ecbf8ce678878368e00
-MISC metadata.xml 1152 BLAKE2B c5969351b829ace0f2e54d452526a3f77939f99f721acd846c34ce84ca2264ca2c6996725969c034721df7de41abbf9dfbfcbdde9ade5b375f845479ec66d3ac SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c
+EBUILD jalv-1.6.6.ebuild 1220 BLAKE2B fd07f3e2a675afc446532077147f4324025eae70720396c132e209def4d5c1f183105b4affda28a06cd62ff9a70ff0b0aec37445b1a7569ca8c8ce5c8212786d SHA512 0ac8b2e49cdbb4814462f02c989bd3fc6e87f4b6970ecec113a3c2e40d5308d82e5e812ce0322acb4746006443111aad91734f8b3b3b955b8bafb7df1e255c86
+MISC metadata.xml 1051 BLAKE2B b6f05c6cb84eed6653069e98a49467816e383e39d388bfda8f1384222b55a22e656c807a607d96f395c0f11ec2869ebeda693d4585771a136eb6e03ca2d958a0 SHA512 3f16ac2415d2e4b411532bcbd9cba26830d3a28b84bffe4ea0d1764de762a185d3a5b2bbe30ddc6f9d2567d4527c7ed306a9002c6fa6971d4cf29da134492a47
diff --git a/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch b/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
deleted file mode 100644
index 1f9b6147a219..000000000000
--- a/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wscript b/wscript
-index af363ca..5060b4d 100644
---- a/wscript
-+++ b/wscript
-@@ -235,7 +235,7 @@ def build(bld):
-                   lib          = ['pthread'],
-                   uselib       = libs + ' QT5',
-                   install_path = '${BINDIR}',
--                  cxxflags     = ['-fPIC'])
-+                  cxxflags     = ['-fPIC', '-std=c++11'])
- 
-     # Man pages
-     bld.install_files('${MANDIR}/man1', bld.path.ant_glob('doc/*.1'))
diff --git a/media-sound/jalv/files/jalv-1.6.6-suil-always.patch b/media-sound/jalv/files/jalv-1.6.6-suil-always.patch
new file mode 100644
index 000000000000..938f34ee0556
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.6-suil-always.patch
@@ -0,0 +1,14 @@
+diff --git a/wscript b/wscript
+index 06f74f2..a269b14 100644
+--- a/wscript
++++ b/wscript
+@@ -170,8 +170,7 @@ def configure(conf):
+                 conf.env.HAVE_QT4 or
+                 conf.env.HAVE_QT5)
+ 
+-    if have_gui:
+-        conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
++    conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
+ 
+     if conf.env.HAVE_JACK:
+         conf.check_function(
diff --git a/media-sound/jalv/jalv-1.6.4.ebuild b/media-sound/jalv/jalv-1.6.4.ebuild
deleted file mode 100644
index 9c1796284073..000000000000
--- a/media-sound/jalv/jalv-1.6.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 qmake-utils waf-utils
-
-DESCRIPTION="Simple but fully featured LV2 host for Jack"
-HOMEPAGE="http://drobilla.net/software/jalv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="gtk gtk2 gtkmm portaudio qt5"
-
-RDEPEND="
-	>=dev-libs/serd-0.24.0
-	>=dev-libs/sord-0.14.0
-	>=media-libs/lilv-0.24.0
-	>=media-libs/lv2-1.16.0
-	>=media-libs/sratom-0.6.0
-	>=media-libs/suil-0.10.0
-	gtk? ( >=x11-libs/gtk+-3.0.0:3 )
-	gtk2? ( >=x11-libs/gtk+-2.18.0:2 )
-	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
-	portaudio? ( media-libs/portaudio )
-	!portaudio? ( virtual/jack )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.7.0.patch" )
-
-src_configure() {
-	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
-	waf-utils_src_configure \
-		"--docdir=/usr/share/doc/${PF}" \
-		--no-qt4 \
-		$(use qt5       || echo --no-qt5)       \
-		$(use gtk       || echo --no-gtk3)      \
-		$(use gtk2      || echo --no-gtk2)      \
-		$(use gtkmm     || echo --no-gtkmm)     \
-		$(use portaudio && echo --portaudio)
-}
diff --git a/media-sound/jalv/jalv-1.6.6.ebuild b/media-sound/jalv/jalv-1.6.6.ebuild
index 17bf69398aec..42870c71a5f1 100644
--- a/media-sound/jalv/jalv-1.6.6.ebuild
+++ b/media-sound/jalv/jalv-1.6.6.ebuild
@@ -13,8 +13,8 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gtk gtk2 gtkmm portaudio qt5"
+KEYWORDS="amd64"
+IUSE="gtk gtkmm portaudio qt5"
 
 RDEPEND="
 	dev-libs/serd
@@ -24,7 +24,6 @@ RDEPEND="
 	media-libs/sratom
 	media-libs/suil
 	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
 	gtkmm? ( dev-cpp/gtkmm:2.4 )
 	portaudio? ( media-libs/portaudio )
 	!portaudio? ( virtual/jack )
@@ -41,6 +40,10 @@ BDEPEND="
 "
 DOCS=( AUTHORS NEWS README.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-suil-always.patch"
+)
+
 src_configure() {
 	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
 	waf-utils_src_configure \
@@ -48,7 +51,6 @@ src_configure() {
 		--no-qt4 \
 		$(use qt5       || echo --no-qt5)       \
 		$(use gtk       || echo --no-gtk3)      \
-		$(use gtk2      || echo --no-gtk2)      \
 		$(use gtkmm     || echo --no-gtkmm)     \
 		$(use portaudio && echo --portaudio)
 }
diff --git a/media-sound/jalv/metadata.xml b/media-sound/jalv/metadata.xml
index de663c86a7ee..8b8731392d54 100644
--- a/media-sound/jalv/metadata.xml
+++ b/media-sound/jalv/metadata.xml
@@ -15,7 +15,6 @@
 </longdescription>
 
 <use>
-	<flag name="gtk2">Adds support for GTK+2 in addition to GTK+3 controlled by the gtk useflag.</flag>
 	<flag name="gtkmm"> Adds support for <pkg>dev-cpp/gtkmm</pkg>: C++ interface for GTK+2</flag>
 </use>
 
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 42a536beddd8..76cef6664882 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,6 @@
+AUX kid3-3.8.5-tests-optional.patch 2531 BLAKE2B 47764202cbfdeb7f4d55619f883a6aa5af1d0ef5034280a80cbf668eb0770cc80568e69d5e46b4ea20cf97eec217b4558082441fde0912325decfcda35ebce3c SHA512 d42e4a1e1a56ce3caef480a8fe08155d21d89b5e869f4411776b61373c6900f14073b8803001b1a70bd89532da48553bb8cca4bf45fd34ec589d695c434bb220
 DIST kid3-3.8.4.tar.gz 3161673 BLAKE2B 0055805bd0470bd000549c970c69cf911eb12d0ca291985759d0ebc2b6aa7394c65a72193606a4730136eeafef7a3d7a21822e998f2d841caa0a23c424a1f906 SHA512 c5abef6b0b7b4cfe606aa547563efff77f70b06770ea8423ed2cb25099a5c015e5de4badf5e87e080b05926459423584bd747aa3e475393026d92f6d73c9782a
 DIST kid3-3.8.5.tar.gz 3181228 BLAKE2B 8e409c0697cc6045c0a1da4b19a8eae952bc63fa824e21aca19e6ad2130ef71a3fff2c25fa34078ea72e3cbd84459c77bbb616b1d1fb62d0f1023aa2fd6cfccd SHA512 d1f0bc91d50538c29807ddca2a039e758c58850d1224675a1674e3e1d89936bf80db34ffd3cf3678e1008eb600476ebb722ca78796eba2537defcc57664ff00c
 EBUILD kid3-3.8.4.ebuild 1782 BLAKE2B 6d0bab38a20dbd1c35869368f0f3ee9cc92489db759e2dd789cdd48ec176f06b3dcca310c7744c2c14fcbbe9992d21b815d34e99b8a57149207167e3068acb97 SHA512 2d5745d314c1977b4fa63e7211c68fb0960e6d51f9154eeac52796621c0bf1ed4a87c6f4d2a2b827b334167577f0d5641a6392d90df8b2ae4090ff7efcff4414
-EBUILD kid3-3.8.5.ebuild 1784 BLAKE2B 3456565643ec32ac8b80564798880042e3c367743beba6a67c8777b78845af91e5766afb17871a600df2261756591a61446a391bdff12ecbc583d13d1fff96d7 SHA512 e7c2337a91364ef23bbd879991a4e075d42e145e868ec7a1f4d38860cd9c3cdc1d8177ec5a1014e280e8c1f3885ad0b0ddb436eb9b87ef6c7df5b0253252e654
+EBUILD kid3-3.8.5.ebuild 2120 BLAKE2B 95486d3a308e69ccc39820cc07f3f0ddfdf97bffcdd2413c4456d56972d2b0ece0a7b04134121e8d32faf64e9d55fb58cddab90b603f56b293975800d45891a2 SHA512 c8071d090083209a70d461e7934ffa73cd3c3e5fdfe2275271df776ad989d068cea37ee1a1342f113ef63953b2d4ede33ba08711e1900ffd5c33f4c96c445ba1
 MISC metadata.xml 581 BLAKE2B aaf7af21490a043596d92081040312887a687778836e126b6057db01eaf8bae1bb677ebdf2513bf5ab36f7ad95a7327315de3e42384915b7575d45ef1959e148 SHA512 6f4f92be39dd0099d1f762a07407e1fb6a75b9f0a7b01f0b60f7273eb1c04716e999633720b4535a7d42ea0ca447f8080377f00f93686c019baebfbce2cc25d8
diff --git a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
new file mode 100644
index 000000000000..44af299f13ce
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch
@@ -0,0 +1,80 @@
+From fe096c5d05c95bfdcfae6a5976e242e324f4152d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Fri, 5 Feb 2021 06:17:42 +0000
+Subject: [PATCH] Use include(CTest) and BUILD_TESTING to make tests optional
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     | 29 ++++++++++++++++++++---------
+ src/CMakeLists.txt |  2 +-
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 92d50265..ee476ac5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,8 +211,15 @@ endif()
+ set(CFG_QMLSRCDIR "${kid3_SOURCE_DIR}/src/qml")
+ 
+ find_package(Threads)
+-set(Python_ADDITIONAL_VERSIONS 3)
+-find_package(PythonInterp REQUIRED)
++include(CTest)
++if(CMAKE_VERSION VERSION_LESS 3.12.0)
++  set(Python_ADDITIONAL_VERSIONS 3)
++  find_package(PythonInterp REQUIRED)
++  # PythonInterp sets PYTHON_EXECUTABLE
++else()
++  find_package(Python3 COMPONENTS Interpreter REQUIRED)
++  set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
++endif()
+ include (CheckCXXSourceCompiles)
+ include (CheckCXXCompilerFlag)
+ include (CheckLibraryExists)
+@@ -256,7 +263,10 @@ else()
+   find_package(Qt5Core)
+ endif()
+ if(Qt5Core_FOUND)
+-  set(_qtComponents Core Gui Widgets Network Xml Multimedia LinguistTools Test)
++  set(_qtComponents Core Gui Widgets Network Xml Multimedia LinguistTools)
++  if(BUILD_TESTING)
++    set(_qtComponents ${_qtComponents} Test)
++  endif()
+   if(WITH_DBUS)
+     set(_qtComponents ${_qtComponents} DBus)
+   endif()
+@@ -472,12 +482,13 @@ if(ANDROID)
+ endif()
+ 
+ 
+-enable_testing()
+-add_test(NAME test_cli_functions
+-         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/test/test_cli_functions.py)
+-add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure)
+-if(NOT CMAKE_VERSION VERSION_LESS "3.17")
+-  list(APPEND CMAKE_CTEST_ARGUMENTS --output-on-failure)
++if(BUILD_TESTING)
++  add_test(NAME test_cli_functions
++           COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/test/test_cli_functions.py)
++  add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure)
++  if(NOT CMAKE_VERSION VERSION_LESS "3.17")
++    list(APPEND CMAKE_CTEST_ARGUMENTS --output-on-failure)
++  endif()
+ endif()
+ 
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c6c703ac..db067265 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -8,6 +8,6 @@ if(WITH_QML)
+   add_subdirectory(qml)
+ endif()
+ 
+-if(BUILD_TEST_APP)
++if(BUILD_TESTING AND BUILD_TEST_APP)
+   add_subdirectory(test)
+ endif()
+-- 
+GitLab
+
diff --git a/media-sound/kid3/kid3-3.8.5.ebuild b/media-sound/kid3/kid3-3.8.5.ebuild
index a047ed173a3d..8ed70dc49ede 100644
--- a/media-sound/kid3/kid3-3.8.5.ebuild
+++ b/media-sound/kid3/kid3-3.8.5.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit kde.org cmake xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake kde.org python-any-r1 xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
 HOMEPAGE="https://kid3.kde.org/"
@@ -15,15 +16,16 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
+RESTRICT+=" !test? ( test )"
 
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
 	dev-qt/linguist-tools:5
 	kde? ( kde-frameworks/extra-cmake-modules:5 )
 "
-DEPEND="
+COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
@@ -57,10 +59,19 @@ DEPEND="
 		media-libs/libvorbis
 	)
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
 	!media-sound/kid3:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	# overengineered upstream build system
 	cmake_src_prepare
@@ -70,12 +81,14 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
 		-DWITH_CHROMAPRINT=$(usex acoustid)
 		-DWITH_DBUS=$(usex mpris)
 		-DWITH_FLAC=$(usex flac)
 		-DWITH_ID3LIB=$(usex mp3)
 		-DWITH_MP4V2=$(usex mp4)
 		-DWITH_TAGLIB=$(usex taglib)
+		-DBUILD_TESTING=$(usex test)
 		-DWITH_VORBIS=$(usex vorbis)
 	)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index a8b73005b5e0..89ddad07c9c5 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,9 +1,11 @@
 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-9999-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c0002f03785225e081b07d4ab34db459bd8d241b97051273846dd9efee4536e00b37fd0a064302d05b537069e17b6dff834a1b9 SHA512 523e5d1ddf68c07715e791ed9367c836010603369f14ee22ce7ab2979131be1c066dabdd66a942ed9b098c3f535577dded0bb0e1e48c35754d7f9c455d4911f5
+AUX lilypond-2.23.0-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c0002f03785225e081b07d4ab34db459bd8d241b97051273846dd9efee4536e00b37fd0a064302d05b537069e17b6dff834a1b9 SHA512 523e5d1ddf68c07715e791ed9367c836010603369f14ee22ce7ab2979131be1c066dabdd66a942ed9b098c3f535577dded0bb0e1e48c35754d7f9c455d4911f5
 DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
 DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65
+DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
 EBUILD lilypond-2.21.6.ebuild 3259 BLAKE2B 2cb854d7b37cafe41bba0a32e0a121f6c1c40ae7da0dfa1d61018ecef07d430a5055b12fa57fbf7e23dbcdedfe3e9d5fed3d42fd035ebd8bdd1fa1b53edc02f8 SHA512 e62aa41a9a884abef1f0ae028c3816aa5c51b5c3699a8f723b049bb70a0449c42d4ee120edad5c932be18c17892946003b2762627c63aa343a7d96525f88ef55
-EBUILD lilypond-2.22.0.ebuild 3262 BLAKE2B c4a5fdfdbeb8ac51a3b3b05541ea15b10f76e352436629e4b3b962bf036e06e18a34c4ba2e72ce3882958fe365d1d54cd98c125e571203da6d643f9de4cbcf10 SHA512 f99fb3c68797c5b7c25f9f2794d192b141a3ec98b93f32d1bc6c4d0d5efaff9a0263aa5382c52c14063721d7196cf66c82fbaa1aa643853d4ca8e5aa3f2c0662
-EBUILD lilypond-9999.ebuild 3254 BLAKE2B 4607e049c7bce54313b04c1a16579b3de91fca7e2c4312bbd4ab033637c9c1370815b2ec79448c81918c4572b54d9283f5554db982bc7f4b62781b6f1bcb0d8f SHA512 dd0de198a1c34073b3e61f72e5a5fa5135f973182af5f392631da82f6cc261de1f24fb89580c79c6b6f77bf88e454fdd7e83e32c1fd7646f31ee70e1cdc190a0
+EBUILD lilypond-2.22.0.ebuild 3260 BLAKE2B ed1441a62347c2467baf6efbc35b973c280cb366d1e154ff06c88acfea301701c15b74a548be5e9beb8ded96d5b6ec425b664601ef4ca578c469443814640df9 SHA512 8b34f3617757e4a445f978e5ad7cae30577b8315442ee8a8421b0165bb476883fa2385a93363a5ab72bad119628f355e4efa793ab9c2a7af129c42b960a41fd8
+EBUILD lilypond-2.23.0.ebuild 3125 BLAKE2B 09cd1233322c01a66ab269587e26e749d6cadaa59850cf9d43a1871ff83abe7c055bb6b3af9217025787ac39fb72cf19139d0cdeebaaa1ed6ebac68e8e3162f6 SHA512 05e6f86c0e9a077593ef291d7100f6d483ae38840675490abba3035b054ee66f48ec861db8d15723fa5f37b19445f5b1155517c2ed4bcc158c2504c2e0380fa2
+EBUILD lilypond-9999.ebuild 3133 BLAKE2B 0654eabc0c866033058b8acc79534507eaceff26722308b80a8fa813bd11f1dcfa403ef9a5630eda9c4bed42c45598b77cd3cdef19509dcf7720df482ec2b272 SHA512 df015a49fdc4eace7530a6443e71a051b1739ab09ba75f36b44081b794b99ab29a636b686fd05dd12de55ce8860befa1ee0f20903314cf408cfaf08154868e36
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/files/lilypond-9999-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch
index 45a3ad5e22ca..45a3ad5e22ca 100644
--- a/media-sound/lilypond/files/lilypond-9999-fix-font-size.patch
+++ b/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch
diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild
index e6944858abab..5214b122e904 100644
--- a/media-sound/lilypond/lilypond-2.22.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.0.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0.ebuild
new file mode 100644
index 000000000000..de2a548eb654
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.23.0.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,8,9} )
+
+inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
+else
+	MAIN_VER=$(ver_cut 1-2)
+	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+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}"/${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-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 4b7150162b1b..24d67598c447 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -21,7 +21,7 @@ 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}"
+IUSE="debug doc emacs profile vim-syntax ${LANG_USE}"
 unset LANG_USE
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -40,11 +40,6 @@ RDEPEND="app-text/ghostscript-gpl
 	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
@@ -63,7 +58,7 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 5d87147d61d3..0a1752cb25fd 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -7,5 +7,5 @@ DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650
 DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
 DIST milkytracker-1.03.00.tar.gz 3705395 BLAKE2B f14a7112de39748121933d242d89dc6efb71a73c3591fedb92785814e2edc788edfb6608e9237cdfed19ee7337d5920d0232eed5d85f692dbef5d4cb43a27cd0 SHA512 d5489994d9c5d24552073afcbd787c20720096dd81d640356fc13b2e2b8a49713b798066d54f2b589f3819c14279142e295e4d6317ed325537069faad47abbe6
 EBUILD milkytracker-1.02.00-r1.ebuild 1527 BLAKE2B ad59c3aec2f8c6875131d84463a76a586af11f2222a073728ec26f7117362d1e0f8447b7b41d5fb56cf9f03816f1e10e9ad0430a26529ef0c0cdeabd67f83557 SHA512 cf999b71b395b7d42575f374ac4e5b21d3e18db0c749cba2811d63c16a926e3c1103bbcc96c46faa3c91bc18bb056fafd66ed96a2a774b39facac3bc80828c23
-EBUILD milkytracker-1.03.00.ebuild 978 BLAKE2B f803f07e825564a84dce1bd856580cb1748694dc5ea1d5d79730a720102ebb45890b21a5e225335d61646038396777aef8602a06aa7a761b10661d658626056c SHA512 483809ebac9d84f9b5e7459ecd2158ed725cf043bc26f7b65c5df2afd67804e75d80292573300b4fa0c82927a1b7ff70bdca20bc1295749f1b77a86baa1bf35b
+EBUILD milkytracker-1.03.00.ebuild 976 BLAKE2B 32834e351f8b0321b8fcd8967a93dbda9226a764e52d1ee9987f0fca9354e1a3b51ea45109e17da01e53deefbfada7455e745a5704e88fb49933b889b29aedee SHA512 15d34b6e27b4c2d9fd17effc22eb2c896ce63decce1412cc87b643e26cc174888e95b1956431988fe29685f4fed9dbe0633817fbc1fd7fa888ab92db71f7dadf
 MISC metadata.xml 336 BLAKE2B 25e72a4e6699474f9a932ab2f4a7a360165e399b59086d719d4edcbedf4d5a1c08f2b8e790fd7eacddf4e0c3a444fbe640df7fd14b50169b8c92ecc8e0d78410 SHA512 0490c225b35946c04189594aa9d1855b9391ace1ac83914536317df7d7615a33dd1467a45dfb1b3e75a6a677fcd8c460bb6be197ff5d8010f9bf6e4c1ee4e916
diff --git a/media-sound/milkytracker/milkytracker-1.03.00.ebuild b/media-sound/milkytracker/milkytracker-1.03.00.ebuild
index 7497b79d44be..793d66516750 100644
--- a/media-sound/milkytracker/milkytracker-1.03.00.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.03.00.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/MilkyTracker-${PV}"
 
 LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa jack"
 
 RDEPEND="
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 64bd075af608..9e1fdf2d5f4f 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,8 +1,6 @@
-DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
-DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
-EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba
-EBUILD mumble-1.3.2.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
+DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
 EBUILD mumble-1.3.3.ebuild 3814 BLAKE2B f59c05d68a56cee5f840d6991718bf10cee2fe10bd70d78eeea5a87aea4ddf545c96807ccc52bb1c01615348695cdc166d94ebc6dd651042c0945337621f37a3 SHA512 7d7d42d1ce7b90b4f25522f4ea71696218b2b8c4addfc8f8c927ecfabf1493ab08d811136b24bfaeb708928d3b6e733e0f40c65103cc11ed87071e04bec12577
+EBUILD mumble-1.3.4.ebuild 3816 BLAKE2B b938985537d3d3f569e9774a1005d27425c25b9e26e02117c5f9923106ef872753623010d1d7d30e51fff0900097b930aab35a8cb66fa3f8caf675a297164c1e SHA512 a69a2279b3f939eb8c53ad523a20d9993d01c09f5096289da8327fb9b92e536351d604929f497e2f3a312e69308da3f45a87d580bc541e38e1a44710f5324e2c
 EBUILD mumble-9999.ebuild 3043 BLAKE2B f6e699e41a172ce1b816cde9b30e021b0ea15579a29bed4037d272c65d0859dce1dfa4a2e14275c85a47cc6e2b11e39d62302df993bb48d85983fc20205c98b0 SHA512 5a643584e6202916ed620a899d77fb59088026ef96a0420e4bde721a68ee68174827b29dd776ea35274a89af6bb0645e9792fa1e8a39acf5efb3363f7bced9b6
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.1-r1.ebuild b/media-sound/mumble/mumble-1.3.1-r1.ebuild
deleted file mode 100644
index c462111f1123..000000000000
--- a/media-sound/mumble/mumble-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib-build qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	insinto /usr/$(get_libdir)/${PN}
-	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/mumble/mumble-1.3.2.ebuild b/media-sound/mumble/mumble-1.3.4.ebuild
index df7176498fdf..327b8d715c81 100644
--- a/media-sound/mumble/mumble-1.3.2.ebuild
+++ b/media-sound/mumble/mumble-1.3.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
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 9863aa13a50f..f7a6fa8a50ca 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -2,11 +2,9 @@ AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137
 AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
-DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
-DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
-EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
-EBUILD murmur-1.3.2.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
+DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
 EBUILD murmur-1.3.3.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
+EBUILD murmur-1.3.4.ebuild 3690 BLAKE2B 217b1750db4ac3e2a86aadd74c1b2e0ee7aae204ba869b3b0bac3217ae3507705efb8c654093ff4fa6d6935d42cc4921eb9ab29688b8946ce39d7c57fec25b5f SHA512 38572cb3fae7ac5a354610f86ff078d073bddd6abe8a48fc1f4c4b32ed6033817dbda4a5dc14c67b7cef48ef55f31da5c5f81a1f01c90a3da86afd2f1ad0cf6e
 EBUILD murmur-9999.ebuild 3748 BLAKE2B 220d4e0fd63cf2464fe0586938525c8c3c8c8b26f3b08c55d5c8e5dd4f9a7a996567fb28f7fb9bef6a602c3f041b743180445f0fd1024583dc68b4a81d472b23 SHA512 0cfb9421a3c7e389ea3dea6a536e49485fd586a6785d0813435165ece1401597b7e7858f6378bf1ca7793ddbdaecdbf9410e0bc5ffbdfcc13d392ba59156c404
 MISC metadata.xml 530 BLAKE2B a6618cb804deee82cf3f88ee683a5b406eee1317e9ca815f7f4e363a0e14c7c8cc2bcf4400d3a79b62f5652881e46be4405d0ac88afe610187419978ac57c9a6 SHA512 ef162d69805d3262f9f4f1732e9d8a031cac73e130f04013123d8f8e1d8e48132df243653ef2464bda1d8b8c0b88485fd32edaab8b3e62555a6295c676c1f5b5
diff --git a/media-sound/murmur/murmur-1.3.1.ebuild b/media-sound/murmur/murmur-1.3.1.ebuild
deleted file mode 100644
index 606e4379065a..000000000000
--- a/media-sound/murmur/murmur-1.3.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
-	fi
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-"
-BDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	virtual/pkgconfig
-"
-
-if [[ "${PV}" == *9999 ]] ; then
-	# Required for the mkini.sh script which calls perl multiple times
-	BDEPEND+="
-		dev-lang/perl
-	"
-fi
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-i scripts/${PN}.service || die
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local conf_add=(
-		no-client
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse ice)
-		$(myuse pch)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	eqmake5 main.pro -recursive \
-		CONFIG+="${conf_add[*]}"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local dir="$(usex debug debug release)"
-	dobin "${dir}"/murmurd
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	newins scripts/${PN}.ini.system ${PN}.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-1.3.2.ebuild b/media-sound/murmur/murmur-1.3.4.ebuild
index 17d28a117c43..7dbaf80197b1 100644
--- a/media-sound/murmur/murmur-1.3.2.ebuild
+++ b/media-sound/murmur/murmur-1.3.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
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 75a9be38e532..b5c01de62e44 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -4,7 +4,9 @@ AUX musescore-3.5-remove-duplicite-declaration.patch 245 BLAKE2B 5d42790b4c1147a
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb SHA512 4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
 DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad SHA512 8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
+DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 EBUILD musescore-3.5.2.ebuild 3030 BLAKE2B 4b8499c5ad5672c7994173558fffff771dd8885314e76970d8f5519aa103507984ebcd0606a335861ea636351b22d60291a45cb2fd7eae0575cd5f24adf8c9ed SHA512 273facf45e3e610cf52c0792c79e69deb5ef2ea6db549f4e026d3e64817cdbd20a23988998a3739ceeb2f3a7091abd928c2b477bda2973f71e9d1a527d22bcab
 EBUILD musescore-3.6.1.ebuild 2940 BLAKE2B c758a38461d735aba0974360717bd9ae94fbe86fb38ebf65e2ec9ec1f99c53fda25f2aef5221d4204e145cd5df48c995158f1e4710d8ae56d4273c05bf5dcfce SHA512 f9e7f1664134ea10c2fa9a10e3f8df2c01c1a8b21f14d4f79003cc5d5283660906a54943e80aa48100ad37e5211950e04f17a2632c7e34beea34265197ac57a9
+EBUILD musescore-3.6.2.ebuild 2940 BLAKE2B c758a38461d735aba0974360717bd9ae94fbe86fb38ebf65e2ec9ec1f99c53fda25f2aef5221d4204e145cd5df48c995158f1e4710d8ae56d4273c05bf5dcfce SHA512 f9e7f1664134ea10c2fa9a10e3f8df2c01c1a8b21f14d4f79003cc5d5283660906a54943e80aa48100ad37e5211950e04f17a2632c7e34beea34265197ac57a9
 EBUILD musescore-9999.ebuild 2884 BLAKE2B 733677224abc2be6cb04328339392069832574fa48e00fbeac1a0cec8f18add469d34cd9ba3cfd68bd83be88bd1fb8c6d82065d71d3378df4d71e6c89064b220 SHA512 829ed729aaedd2aff35466e4c286ac5274e39a46033ab173c2fff196a36e713a0a834cf01ea4d27d8839118f26fba0c4b8576451f0aa55cb963e189b251affe9
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
new file mode 100644
index 000000000000..bb23b9e040eb
--- /dev/null
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+else
+	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
+	omr? ( app-text/poppler )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	sf3? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		unpack ${A}
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAEOLUS=OFF # does not compile
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_CRASH_REPORTER=OFF
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PCH=ON
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PORTMIDI="$(usex portmidi)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TELEMETRY_MODULE=ON
+		-DBUILD_WEBENGINE="$(usex webengine)"
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DHAS_AUDIOFILE=ON
+		-DOCR=OFF
+		-DOMR="$(usex omr)"
+		-DSOUNDFONT3=ON
+		-DZERBERUS="$(usex sfz)"
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
+		-DUSE_SYSTEM_POPPLER=ON
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
+}
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index c3fee6bd2aba..0b3fb5d46185 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.4+release.autotools.tar.gz 1470690 BLAKE2B fade97324b350a4c6191b21f6e87cb1f04ac010aaf3c52ce8e66b3382e27e46bfaa99cdd044a7bc8859ea355a5ca82c53844272345439961ef50cf7a5ac1a233 SHA512 2acb5f04bbca84dc01e0aa0e002924e3cd41c0d3516d3f896705c2906d8b2f8646c45d3dca609ffc94972629b887fd63da383e3d0127b2420731de20e4590b5a
-EBUILD openmpt123-0.5.4.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98
+DIST libopenmpt-0.5.5+release.autotools.tar.gz 1471537 BLAKE2B f79c27a376cb6dd01957f7c53e4844a08936c6fc34b26bb582367bbb745ac82e5e51f93769f668661532e7518173d2e4797c2f9ac20bc81052e0f923cf1cefa8 SHA512 8a56fdd0994b6db3567ea81d6cbd6ab69caceb82e7b0eb1dde017eb5c001c291384e7ab4a5a8a3ddbed3df4ac6b073a4d26e66f493926f582d198fb6810f9890
+EBUILD openmpt123-0.5.5.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.5.4.ebuild b/media-sound/openmpt123/openmpt123-0.5.5.ebuild
index e80baefa2b25..386c068f1a59 100644
--- a/media-sound/openmpt123/openmpt123-0.5.4.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index 3ec03388fa1c..0095ff79af6c 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,7 +1,4 @@
-AUX patchage-1.0.2-string.patch 329 BLAKE2B 0721d815bae7aedfed9b0d8a6a8b2a528a176684d6f01c392d290ba11b0e547504ffd5200dd754800c64e44371a2304cec5d92e0327bf7739a3839aae7415ca8 SHA512 bda153cb438980982fe19e552b5d930b4ca8f7f206a4578a259c846bebbac3ed79e9b73f50cfa176a3e5f73db1059464f5c273e408f026ef9b04f1fa89ac4368
 AUX patchage-1.0.4-fix-compilation.patch 1561 BLAKE2B 53f1fe7f55170de0d9e4261dbac98c1bd0d964fdd5644bf4d431b76758829f2bb183a84644f714813a03d666a4630e3b38bf1a171c7534d3bc5487ca8566ebe7 SHA512 00d4bf65a9ba73fdce5690f23ef80c84c02b532dd607025ddf28f19b5cb8e81c2d661e61b6b1ea31e2783c72ee1650f1befe01df1b52c0413d9f02438bce253b
-DIST patchage-1.0.2.tar.bz2 586298 BLAKE2B db52e267dc6ecc246ca5a30d88976c426b607c47c10cf041fe3bb0ab2d6b22d7b3c55a704be0d2fb6b87b3d23d26f15dd49b3d151d3d1dc084f290f4e7ccb01d SHA512 8d59bf4a71c2b41a1c9d8f72da30046568573c6cedaca69815b279fd1c24d44267da6846e219449d47f43157663abc331ef89f241d94dd16e666e06da9f81e12
 DIST patchage-1.0.4.tar.bz2 661824 BLAKE2B 3e56b7513e19e0acb1ef524ba7d7754699abdb6a968547f7a545c8651f23a33c209b9728dae01d839022ec380185a1673ff58733c1553007a6a3b7c889aa7f03 SHA512 665d81ca16c1052f71c3037d2ad8f9a6120b09a323999468484dda1b4c4b567c36728ebe38c54152406b63a4107f04764d0dede52302bc7a7b124e82132749fb
-EBUILD patchage-1.0.2.ebuild 1071 BLAKE2B bd83e8d16610d33844a7ac6d4e316693f241e0c457fdf2ad9c6646c7b27004d29fbf430697cb06996fe00bbaab9dbf7f2d36995837b55fd86382bd1782bbd0d1 SHA512 035cd6edfba294a02ffb5026f5805834754df3f2ecd664f6cdffced93109d8091446f2b65a3661862bed24d1a219caaadd813af41577449fdddbada6028dffbd
-EBUILD patchage-1.0.4.ebuild 1007 BLAKE2B 77c5ede0aa637bb32e7a2b3be640234a019f79b5bd82642b4cb5fd0116b2bd90a2515111fcbe61085d692a85f831e8864338ce7eb2f95d574ca70f3117a6764e SHA512 825d4fc3881730c3cbdda6fe6f64abbd0c40ccf7697fd00eb1e537084061a99a82fb409274c7895495e8b3c3d8f02ea23dcd8a259ca3ee25fde9e27fcb8b3c8c
-MISC metadata.xml 460 BLAKE2B b2f9f3d58de315e1a6a807cbf8c02ace30e8ce14405078c0a694ff87667c0abaa4cec0243db6cb1f09ae2106709f030edc26eb3dde6a7cf4626b10585695b42f SHA512 a8bff330319ae354d6f6d158bc0a574d1c16be8a9794cd9bf908f5d216d56c10a1de8d51196e20799d397ad4895ea3ec80020c29d0220c1e03897c116a3094b9
+EBUILD patchage-1.0.4.ebuild 1005 BLAKE2B 620a5712144aed5bfe0c647498489e5297c0b80d7043298bf16d3f5d65fb5b609f241b30c7b48696003d916af2247b568b4bb759ceef1811a45d3220a1a9d989 SHA512 12458b0af96e2acaba6244d90f16359c2c9a76aac0b65b1fcb9dc72b110b42bd6ba134833d3d63fdb07e9026469a831aa17c0b074f2d9bea95f2975babec6ef5
+MISC metadata.xml 354 BLAKE2B a030981876913f6a9313b801978cdb3ebd4c5144c886055865879093cd33258c00c2fa3e188f9d7bcb4fe39f94ece223673fa66824a823a8a77a1ecc319bfaaf SHA512 77594550a95399ed6997e08e3fd7a90feafd36751fcf4be464f54712ac8461c7acbcc261e81471b7317857cb75ba4af59ed6d807a80a40d2f67818c1773f020c
diff --git a/media-sound/patchage/files/patchage-1.0.2-string.patch b/media-sound/patchage/files/patchage-1.0.2-string.patch
deleted file mode 100644
index fe63be714d8a..000000000000
--- a/media-sound/patchage/files/patchage-1.0.2-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Patchage.cpp
-+++ b/src/Patchage.cpp
-@@ -743,7 +743,7 @@
- 	for (int c = 0; cmd[c].uuid; ++c) {
- 		std::string  command = cmd[c].command;
- 		const size_t index   = command.find(var);
--		if (index != string::npos) {
-+		if (index != std::string::npos) {
- 			command.replace(index, var.length(), cmd[c].client_name);
- 		}
- 
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index da07c271dfdc..36a962a08ac4 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/metadata.xml
@@ -7,7 +7,5 @@
   </maintainer>
   <use>
     <flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
-    <flag name="session">Include experimental Jack session management
-      (save/restore) support</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/patchage/patchage-1.0.2.ebuild b/media-sound/patchage/patchage-1.0.2.ebuild
deleted file mode 100644
index b5955f1048d3..000000000000
--- a/media-sound/patchage/patchage-1.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='threads(+)'
-inherit waf-utils python-any-r1 xdg
-
-DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
-HOMEPAGE="http://drobilla.net/software/patchage"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack-dbus session"
-
-RDEPEND=">=dev-cpp/glibmm-2.14:2
-	>=dev-cpp/gtkmm-2.11.12:2.4
-	>=dev-cpp/libglademm-2.6.0:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	>=media-libs/ganv-1.5.2
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	jack-dbus? ( dev-libs/dbus-glib
-		sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/boost
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-string.patch"
-)
-
-src_configure() {
-	waf-utils_src_configure \
-		$(use debug && echo "--debug") \
-		$(use alsa || echo "--no-alsa") \
-		$(use jack-dbus && echo "--jack-dbus") \
-		$(use session && echo "--jack-session-manage")
-}
diff --git a/media-sound/patchage/patchage-1.0.4.ebuild b/media-sound/patchage/patchage-1.0.4.ebuild
index 07b1e83730b7..a231618a5018 100644
--- a/media-sound/patchage/patchage-1.0.4.ebuild
+++ b/media-sound/patchage/patchage-1.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug jack-dbus"
 
 BDEPEND="
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 4d2fe46c643c..80a790cb8e24 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0-r1.ebuild 11362 BLAKE2B 41a93f8965857a6b17e103ff37ac93bd8fc441e00f93c48c3992e4afd640cdeb5d69d8b6aeecb6041321223ed54320b0d212c8719a616fc9fafdf5ba4dfcedd2 SHA512 8972587a8a12e79d73482d7173f0dce408b1ceaaf22e1540293515e73064f48baff1ffb05c10298a744fd6a4749eefd4c9a7029de3ec8431e6db9cd7a413c419
+EBUILD pulseaudio-13.0-r1.ebuild 11356 BLAKE2B 6ddc1176aeb259c55607e4202fe1d8a0aa98e2d805e1fa5245f3f709effa5810cee07b438fbaade15cdf8d12c654290b50327f607bdbd4b1ef4d195a1822e30c SHA512 6d1a8c0e0f8d98f73c12c6f60a3dcd38417f83d8efeff0da1c0030404e859b7b25b4276d92359b63c7ac2f8d73eb9df20d580668ce07fde63a7f728d5cd559ef
 EBUILD pulseaudio-13.0.ebuild 11572 BLAKE2B 1cbf83260874c9af3f16942054fd3f6d49740c45efc917e1df0794bb5d7e39d69cec65eb56954dcf6e6f83c430f4bd65aef1ba07e94c5be8874c5179a082526c SHA512 98e9336312c8f9e2d6f0c715d22d3cfa193ffd6a8cf6e05da03756dfaf9be6aa05293f5554d4d923ad67d7eaeab9718343d156873db62997a97e1dec445de019
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 5d88aeb97634..cdefa5223e0b 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 09352b2fb886..928dea1f8bb1 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -4,6 +4,6 @@ DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac70
 DIST pulseeffects-5.0.0.tar.gz 2030440 BLAKE2B 3d68f48ea6beeee308cc82dd3aa10a242587d2c5fdacdb89cf2618ae6ea537966e33e0c9454fab0258c64d05fa71ad196d462097d2abeae1e57a1bf1e7d89ef4 SHA512 f43e1ad22d243689b94d840dd71046079ff806a42606184918e2a28bc6a287d40e709a43abc51e4ea5ea36e99963db43486206a122cc89fe533afe1f9ee54e2f
 EBUILD pulseeffects-4.7.2-r1.ebuild 1903 BLAKE2B 50882416becc1e4545bcef6dcf5a245465064aa11b876ff4191d79bcd8e0723fc01d05b76f5d4fb6930f2a330edb4644d4a0b63ad1083c589e7e93c400494a3d SHA512 1726d0a7c5135c9423c4d85613d4b3b90854452e25a51ca2ada570d9c502d923eb4ddf89c481dccb4ba12f4583f5b42d74efc7b0e59833fc104452d468c003bd
 EBUILD pulseeffects-4.8.4.ebuild 1809 BLAKE2B 5494b4f6321de6d23d53b03c53d4c13af32506bc8590cdf1a19f81686f25657e507a8e7d798927fb7bf0644524c207bfe987a7a8f6a3aa7051a722aebac0a774 SHA512 3753055c7e014dab2b9bf5584e859a55232382e9cb447f0ec1488e9d387c1ccce21ed1b0d4a59ad3eaea46419cee31fd77fffdcb44f0c425ddeb3b28e47a3958
-EBUILD pulseeffects-5.0.0.ebuild 2119 BLAKE2B 3a880f69cbb05777ba1f97cf0d3186b267037bd65c76d30210a02b139296e553989b0df7908184d93e7f54b1e593c0f7398c8e9d39f0b288c556179578d54b0a SHA512 b4616fbacb1466767d0cb694542517750b03287fd53a6c4a92080a964c6a81971276eabaee4c0b5d0e097e6fdbfb30a4880c13b6126952067e945b8e3735140c
-EBUILD pulseeffects-9999.ebuild 2119 BLAKE2B 3a880f69cbb05777ba1f97cf0d3186b267037bd65c76d30210a02b139296e553989b0df7908184d93e7f54b1e593c0f7398c8e9d39f0b288c556179578d54b0a SHA512 b4616fbacb1466767d0cb694542517750b03287fd53a6c4a92080a964c6a81971276eabaee4c0b5d0e097e6fdbfb30a4880c13b6126952067e945b8e3735140c
+EBUILD pulseeffects-5.0.0.ebuild 2130 BLAKE2B 0a3ca49fb2abd6bde8d608c7688908780204d248031801dd8a19d7c6a9029be81f691419ff821a672f4daac699cb962b047750ded4ab81d74e6521df3382b91a SHA512 82a3cd700903aa4959bf284a4c9ce29a684106384023185de5addaaa8f99b38b4f30bffd5229982e7c9ab26f134033c5e9b7435d26d908b863735467f1d099f2
+EBUILD pulseeffects-9999.ebuild 2130 BLAKE2B 0a3ca49fb2abd6bde8d608c7688908780204d248031801dd8a19d7c6a9029be81f691419ff821a672f4daac699cb962b047750ded4ab81d74e6521df3382b91a SHA512 82a3cd700903aa4959bf284a4c9ce29a684106384023185de5addaaa8f99b38b4f30bffd5229982e7c9ab26f134033c5e9b7435d26d908b863735467f1d099f2
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild
index bc49c613efc6..434a705868eb 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
-	media-video/pipewire
+	media-video/pipewire[gstreamer]
 	sys-apps/dbus"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index bc49c613efc6..434a705868eb 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
-	media-video/pipewire
+	media-video/pipewire[gstreamer]
 	sys-apps/dbus"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index a41ae6bd9220..2bc3ffa5b6de 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,4 +1,8 @@
+AUX qjackctl-0.9.0-disable-git.patch 543 BLAKE2B b4ddd7f6d85b5c93a99f1b7d5a32062a8a45cee77964b151e2aa686ee43fec0afe88e5188eb17f367234872eb555eee3b3a68a0b342622c154ca2d4bf6b614ba SHA512 5e30ab78dae12707615e8db396bd180b958713feeb738f711ab19908a51126bd85ddf733e1be04eb3bac54535bcaff6a20f51706802eb5373c96ab67c6fe8795
+AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
 DIST qjackctl-0.9.0.tar.gz 1088061 BLAKE2B 3be89091b6efb34d2dffee92fdfda5dabadc8b6e9f9a248cc5cd60df423482dc65342e9758a98f34c5c01bfba74eac64039e3ec2de157df0e03f8bf09a7a14fc SHA512 5aa6f3e86b6a5c528daa5fdb71b5400d5882fea6569d585a86bb6b9fa66b62699472fd82999a6f4eb1a375c70e684a20214240c1fc3b44239c22d182e3ae1b1c
-EBUILD qjackctl-0.9.0.ebuild 1137 BLAKE2B 798e9cf2a60f5a6463e632a6b65244e43e759b67a0631bbd5362f8d4d9c3f4b9da3c6bc88d573e6bb8e775a868866c7e12230ab1a082d3989fc799cf14ec4654 SHA512 7c08e0553a0589b4649683a60a9d3c57ba4d6d8649736f355b2bd25645d2f015359a570eae08129646fddd79d39607ab65769f5fce996a4a78747e27b07c3a21
-EBUILD qjackctl-9999.ebuild 1190 BLAKE2B 07f1dd83705cd04140dfb771d32c03d8e81733d84ac5bf92e8d419d1fa1563357aaf0254fcac2fd776d7a59528dc5d0acd506daa2f5832dbc1909b35d5688ddd SHA512 4c5553ca1e7a4e9c79492d94281aa5c0a91680ed2fbe4fd356f05fbf72b717502b3d15648abfbcc7537b3703aab7db2c6c45ab361d6724d9b3022c1812b094f2
+DIST qjackctl-0.9.1.tar.gz 1092787 BLAKE2B 1ae68d3b61591bb31f7c8c31f35f8a42f0048cf34c49ff0eadca9155c1a770d9880728582f6b7abdaf27a28ccb3d6a20ca87e3a6178b090579b6ead811f091f0 SHA512 7d3a6efdeedff9335897f9d943dd51d13bf7c48d55ee2bf31d53fe685cef88e281133c164cf6cdb95669b9fe394eb06d3544a78b9d760f4420a9acb3c800c612
+EBUILD qjackctl-0.9.0.ebuild 995 BLAKE2B f910da6191b27a80d6029907f39cf3314f8c48041f711c90371ea7c89948b740b71ea3da8fca973227e80f3f9c3e15da15a052d8ba8aa0362b254d57e55d85a0 SHA512 074d7812b57af254f640d693638eebb734eb585e6c1e7156d8b25ee79f037e4a231bde8d45fc58a27fc7f6da8163463c7886f860161733c6b9cef77fae080852
+EBUILD qjackctl-0.9.1.ebuild 971 BLAKE2B 04a7faf6c36d97efa75ec83ef3fee84b462267188ed5c6967ea950de891d78bfe5bbc1c5cf33715656b4e858cbac66b612443d64a0aa9d6e55262b2b81680a91 SHA512 1d2d18668e30da8e46964870361fc1df5cdbf6c3de98f129b536f32f7eb6f91d0d2e28f9aae57074b7be7e644579ee54ad813672c2183ba5e9059c1a3c102145
+EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch b/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch
new file mode 100644
index 000000000000..08dd2e56ba8f
--- /dev/null
+++ b/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f622eb9..2252e26 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.1)
+ set (VERSION "0.9.0")
+ 
+ set (CONFIG_VERSION ${VERSION})
++#[[
+ execute_process (
+   COMMAND git describe --tags --dirty --abbrev=6
+   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+@@ -24,6 +25,7 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
+     set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]")
+   endif ()
+ endif ()
++]]
+ 
+ set (PACKAGE_NAME "QjackCtl")
+ set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qjackctl/files/qjackctl-0.9.1-disable-git.patch b/media-sound/qjackctl/files/qjackctl-0.9.1-disable-git.patch
new file mode 100644
index 000000000000..6761d53599d2
--- /dev/null
+++ b/media-sound/qjackctl/files/qjackctl-0.9.1-disable-git.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a1098f..f83ed7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,6 +6,7 @@ project(qjackctl
+   LANGUAGES C CXX)
+ 
+ set (CONFIG_VERSION ${PROJECT_VERSION})
++#[[
+ execute_process (
+   COMMAND git describe --tags --dirty --abbrev=6
+   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+@@ -27,6 +28,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
+ else ()
+   set (VERSION "${PROJECT_VERSION}")
+ endif ()
++]]
++set (VERSION "${PROJECT_VERSION}")
+ 
+ set (PACKAGE_NAME "QjackCtl")
+ set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qjackctl/qjackctl-0.9.0.ebuild b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
index 1479ddaa98aa..13ebdc3b69bd 100644
--- a/media-sound/qjackctl/qjackctl-0.9.0.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic qmake-utils xdg
+inherit xdg cmake
 
 DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
 HOMEPAGE="https://qjackctl.sourceforge.io/"
@@ -15,39 +15,33 @@ KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
-RDEPEND="
-	app-arch/gzip
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	virtual/jack
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-git.patch"
+)
 
 src_configure() {
-	append-cxxflags -std=c++11
-	local myeconfargs=(
-		$(use_enable alsa alsa-seq)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable portaudio)
-		--enable-jack-version
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
+		-DCONFIG_JACK_VERSION=1
 	)
-	econf "${myeconfargs[@]}"
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
-	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
+	cmake_src_configure
 }
diff --git a/media-sound/qjackctl/qjackctl-0.9.1.ebuild b/media-sound/qjackctl/qjackctl-0.9.1.ebuild
new file mode 100644
index 000000000000..2a7d2e5c22cd
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-git.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 55ceab1b20dc..7a871d8a3a0b 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic qmake-utils autotools git-r3 xdg
+inherit xdg cmake git-r3
 
 DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
 HOMEPAGE="https://qjackctl.sourceforge.io/"
@@ -15,44 +15,28 @@ KEYWORDS=""
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
-RDEPEND="
-	app-arch/gzip
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	virtual/jack
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
 
 src_configure() {
-	append-cxxflags -std=c++11
-	local myeconfargs=(
-		$(use_enable alsa alsa-seq)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable portaudio)
-		--enable-jack-version
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
 	)
-	econf "${myeconfargs[@]}"
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
-	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
+	cmake_src_configure
 }
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 8992bcec40b0..d3db848358f1 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,6 +1,9 @@
 AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
+AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
 AUX qsampler-9999-Makefile.patch 701 BLAKE2B cc95a22d6e003d3b25993e2068e2101684a85da1b8ac47c35ae330dcebd9f72ab3cc2931f1ec840d484c3f1871c0991ab90d45e1744de9fabcec293a3e260f28 SHA512 7f582fa7103d77f79c14671551ffe9ce83ac4ac0a12ee76f5fd63a670d5838af6a2b7718b8de27946b8e1234081b7316fbc4837a94ceb28063797027f54cddb3
 DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
+DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d
 EBUILD qsampler-0.6.3.ebuild 999 BLAKE2B 3799e7cf4eb2c7695e532e3e2dbb8790a8715937d74108f4a83367d4a885d965e9f3b2f2beba21b0ca587ba6219f30022807b887a260666e461e22a2580eb03f SHA512 2818e544b0b51e87812f60d0bf02a6033faff016ef2e0ed6574dbc599786329b0fa5ad637def0b1cb1787ac8ee17a39e3c40398ed2e22a8580a9e72473702493
-EBUILD qsampler-9999.ebuild 1072 BLAKE2B 756a2fa86b6e39d464018c6873017f8c914c59b08a9d3ae702af01fd20549daf7e2249591045b1a3ce6cdf6f3acf24f4be567749ee943c09a6fafd6dcbd8a2bd SHA512 9a58651e257148e1d13979573d036047acea54a60566dc2e979d7008b34e11e11e756220f816af0e70ca20facddef6869c615a3f30a7ea66d79443a56a0011cf
+EBUILD qsampler-0.9.1.ebuild 1155 BLAKE2B fdb2104d86549c6dd02d2d242e7851b5104ce5808f36183dff15f08444450ea1d1783c27df205c05b3e440f0e3205094fda77fae1f7281050170d17b211528d6 SHA512 a118819b0e2072251b97f31c59b405b5e56a64dcf6ded3b403591df196d67e923ef6e6bf25bfc089ee7801c271b66e2a431c80ffbe0c45718ff14ab6270e8c17
+EBUILD qsampler-9999.ebuild 1103 BLAKE2B 384a679252d732ce1c88792f6296c48fd9d0b086334b2c801be560969d574586491d60f1902f72eaad41196cbecec0964aeb3fb0ecc4239fa3cba2c601f1c74e SHA512 7c4891824ff700f25cab9311a1c9db7688978fc72d1155c87db31f1a12ce6837c2b66707d649b19ea5463a98575b212915b7d98e693e08fe55418adfe4f1bace
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch b/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch
new file mode 100644
index 000000000000..44b7c3cb6443
--- /dev/null
+++ b/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8304e80..666deb5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,6 +6,7 @@ project(qsampler
+   LANGUAGES C CXX)
+ 
+ set (CONFIG_VERSION ${PROJECT_VERSION})
++#[[
+ execute_process (
+   COMMAND git describe --tags --dirty --abbrev=6
+   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+@@ -27,6 +28,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
+ else ()
+   set (VERSION "${PROJECT_VERSION}")
+ endif ()
++]]
++set (VERSION "${PROJECT_VERSION}")
+ 
+ set (PACKAGE_NAME "Qsampler")
+ set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qsampler/qsampler-0.9.1.ebuild b/media-sound/qsampler/qsampler-0.9.1.ebuild
new file mode 100644
index 000000000000..d2d0dd804cbe
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.1.ebuild
@@ -0,0 +1,58 @@
+# 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"
+KEYWORDS=""
+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-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 23f189c07e1c..cd513200a60b 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -1,10 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
-inherit qmake-utils xdg autotools git-r3
+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/"
@@ -21,34 +28,27 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
+	media-libs/liblscp:=
 	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
+	libgig? ( media-libs/libgig:= )
 "
 RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5
+	media-sound/linuxsampler
 "
 BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
-
 src_prepare() {
-	default
+	cmake_src_prepare
 
-	emake -f Makefile.git
-	eautoreconf
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
 	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
+	cmake_src_configure
 }
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 9be5df706534..c879a4148f74 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,8 +1,11 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
 AUX qsynth-0.9.0-cmake-no-git-version.patch 1328 BLAKE2B 32294aacf7e17696ab4e42e4de642fd47c3fbe0bef093fce9dbee9733ef1994d295c225fba82352885bae78baec2cd1180e5b6aa53aa3a1787d892dad2618221 SHA512 a6295a89bba8d1b5a770c8f7a6f0dc6346750ae0004f772b7d7e1afa6f014a3b9f2f6bbf8252d5109f67bc77ecb42353004934dc652fd27499b03079213f4627
+AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
 DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
 DIST qsynth-0.9.0.tar.gz 383118 BLAKE2B d9464a2f122d7281ff69171c431fff72d05886ec130d20aae8d8f122e1cefd1180b8bcdc157f324c5cdbc7e2c524c82a9cc7f481efc8b69912ce61912e73ed58 SHA512 5cc0e099cd05f3639ded81642bde80205c8921b65d22dcb32d40ac874107043edeb672e69d7e4734e0fd37a498be2e5b787f0b8c1707be45e39cfab616fd522c
+DIST qsynth-0.9.1.tar.gz 393897 BLAKE2B f63766614d821409cd12e418e36b8dbd739da8e2cd7deae91c2b00dd4f5ba2f447a3ca19c3829de3282e368baa37567333be051641221300d13dd7948d762008 SHA512 70bba332b90963d1c1da18fb3de8f05544fed3406c2144b6ed78cf93720cbcb684ff367d7ef4bc80be94ebea060b38753ae0cb183e85f96f127014c08de701b0
 EBUILD qsynth-0.6.3.ebuild 1356 BLAKE2B 2d396d07ec3843126aa2b5b71a052da811c8fa56629f45990b5b7e3fddbd6282595fce10e1df195964ff5576191fb63941608c50c28c6a611e0eb8a2001b2241 SHA512 17d3439d50c5352298faeb06c0065abb4c306372ebae87d933532c80b09fbe4a789109a7b776006f86319bf9012905c6ddc40303fba06e53cddceb82b7e6177f
 EBUILD qsynth-0.9.0.ebuild 1498 BLAKE2B 65b8adab715e5e13665cbc3c7a3f2007b809ccdd444a8c54707cf1a67b6aca3b181b2c016841a21cf9f178532026c635ed125bc9f86183d9f375510433d51bf1 SHA512 3a3dad1db15066763d3348e26e5ebe00384825c5e42e7729935cb3aee188d9f0affbd96ba7f60b0b86885bf733a8b82660f8d917660c2740b80618496114cb98
-EBUILD qsynth-9999.ebuild 1439 BLAKE2B 24b7614a5ce5485268c6848c6e069712dcfe1ef1e38911ab84c133d9984cd14fa682492c38a0e5dc7affdede1342bd1e4fcddaebe943228d0777eb892ead91c0 SHA512 d4e6304c00f18047a74972f61efc4be915b4fbe55f4143061133a8ad3a584d18b480894cbe8fcb22316b503778926a02fd932880a5a46c2979ed81517414559e
+EBUILD qsynth-0.9.1.ebuild 1408 BLAKE2B bbf4bc4e8a0e548846a03c0347ff90421512fc8a3e8f9c029110db4480138b02b89be42860a023efa96e97df33bea41a7f87f5c271ab0ce8f2e8ab218e5ba60a SHA512 a702265c3ab735a706fe0ceb09a39af1b0243fe20c5ea6b640a58673007e2cd6666c8825e342414ec7225d7e3ad13104b82ac7b78b910e18cc1ec81c08c3243a
+EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/files/qsynth-0.9.1-cmake-no-git-version.patch b/media-sound/qsynth/files/qsynth-0.9.1-cmake-no-git-version.patch
new file mode 100644
index 000000000000..9ea401abc26e
--- /dev/null
+++ b/media-sound/qsynth/files/qsynth-0.9.1-cmake-no-git-version.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47ea36f..0194f32 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,7 @@ project(qsynth
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+ 
+ set (CONFIG_VERSION ${PROJECT_VERSION})
++#[[
+ execute_process (
+   COMMAND git describe --tags --dirty --abbrev=6
+   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+@@ -29,6 +30,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
+ else ()
+   set (VERSION "${PROJECT_VERSION}")
+ endif ()
++]]
++set (VERSION "${PROJECT_VERSION}")
+ 
+ set (PACKAGE_NAME "Qsynth")
+ set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qsynth/qsynth-0.9.1.ebuild b/media-sound/qsynth/qsynth-0.9.1.ebuild
new file mode 100644
index 000000000000..dac583b64db9
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop qmake-utils xdg
+
+DESCRIPTION="Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${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-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index b0cfa6dfb05c..f2e790dc5a2b 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg-utils
+inherit cmake desktop qmake-utils xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
@@ -67,11 +67,3 @@ src_install() {
 
 	make_desktop_entry "${cmd}" Qsynth qsynth
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 9f5c81f46be4..6fb417bf1305 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,6 +1,7 @@
 AUX qtractor-0.9.17-dont-compress-manpages.patch 701 BLAKE2B 2d36699ef29e21dc80bb51b4530bb06f039b35006106e5f88bae29e1a813529cc70d861cef134e680036964c034c9f8c9f2b9bf11e115df5c213489e27890de5 SHA512 95d1c8135ceb2afa1b92410ec26a0b6586bd5bb419e4d91f83944d39fa3a877519e60e8c0bda9e4365fa358e9e2fecbd80a61bddded22a745265bc6ada95bbc5
-DIST qtractor-0.9.18.tar.gz 1937478 BLAKE2B 269d2fd9cdb3171155ba32d7af5d6c0ad0037287311d2e77efb706820071fde353c84ba6958c0c0fb75f3ecc22eea5e5f7204018d1503bbfb424f48aefc60150 SHA512 e488f95becde10117fc675a5b20b66378e8ae1f8c388fb12042cafa1f4434292d4156f5fe613b93e0c7409c414df9bf0e614afce843e0a42e4a1bce7c9ee9125
+AUX qtractor-0.9.20-include-QWindow.patch 732 BLAKE2B 0bf5114a1e0a3ef2fa320a421fb3b23287f2d98b78b54a42378ee39cc06d4139e4d19b26fe1c22de5533a98f478a4d93c8eafdbb79587bc836183e203aab9f76 SHA512 3553f36025412f896d5521952f68dbf566651b1379fe2ebdf2d503ee1a5e38353cddb02ee4e70edece9814ed8234634823d8f5a6621d8fa08345b712312e19ad
 DIST qtractor-0.9.19.tar.gz 1943040 BLAKE2B 33ccb2e4002a8a666dc9f325dd7f14e66a2f624e0dda9eb916f8b958d01e2a8f72b5e8390946482e6170de9e2fcc28a4efcf8447b6610b21003288e7c7b9f9b7 SHA512 cab7ef6dc259ba570645a7f20efd6816377ae9707e004370f24745e00e20df90be9316543c5cb5ddbdc6bb1c749053bfb964e53ac97dc8ae2dd468e371274bfc
-EBUILD qtractor-0.9.18.ebuild 1553 BLAKE2B b12af248379fdad5200cac3e15f5083d4c26e23957302f940d1ac08bf7375732c97c5fcea6430ba16da74811a91c454803925a2f6977ab9d0176cfbab42aa315 SHA512 f730533f9d39018116e8ea7e9348ffb4e8f3b8df7d0765b2e9320907a668c480f3b05c9a91f1fa125bc0b1eb054bdf2e2e2439a5cefaedf94ae7f9b4e50bcd91
-EBUILD qtractor-0.9.19.ebuild 1546 BLAKE2B 1b0cd7afc0467fdaabcb3a147ad2038b3fb2a45204edc6542880f857dfdf10852d1ed11d93300298bce6706c3a0d742cbf13006b9c556e1a7b5cb2a9c508d006 SHA512 3628da5c441676af9cca53f10ad9e803b4d6b4ebd5873d2b0f157d6a4f0964bdcd8a9a99fadb32a02da0fcfd52374cb557ee6a15bbc5948863e3c2dda26c5ee6
+DIST qtractor-0.9.20.tar.gz 1944885 BLAKE2B 7989e827bdfb72cf8402a87a2e219fc2767fa971ce8f958cd8fb5aa0536aa12d486fc854b2d3a407de9e2b0ac3d6737420163d39b194bcd1d08e831f26cfab0c SHA512 663d43f0ca2a2ee8deb260c29c7dc39ac36d2a4f4f3b1b6e3074e66fe5bb60c37a93fde89c09ceedfd6848ba1519de8d38d613d68b2693356fbda97a5d1c2c00
+EBUILD qtractor-0.9.19.ebuild 1544 BLAKE2B cdd6f8c325772d378ff9be04814e647b832d584e0102be1e3822a7bc8d5bde80b2bb078a343af256833fff581eacc5d354452258aea7269f7a3088274fa7bad6 SHA512 4341868dbe80ee10aecb83fb5b86c95e60a316cabd36888568bf9406d428cba2a58e1b9c832784b32920baee00d8a520f1aeab6e724bc5daf223db2c8fd0bf9b
+EBUILD qtractor-0.9.20.ebuild 2481 BLAKE2B ea9e5e11421ec2b9e396e1f9afada13f221d001d93e0d21da7eb39ef5f912525f69db15c567ed036be02b585febc58427f5f939ba6b345950dc4e07ed4e454d7 SHA512 7e9a4ab0cdcd0cfcb2f00f7c6a344fd5fe2a0c2294db62f24ddcf18b0c4645f84d0d5f44c254c217b196525eb18577ac5a3d07ca19dcbd862a63b3733e3746e4
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/files/qtractor-0.9.20-include-QWindow.patch b/media-sound/qtractor/files/qtractor-0.9.20-include-QWindow.patch
new file mode 100644
index 000000000000..8809311b1c54
--- /dev/null
+++ b/media-sound/qtractor/files/qtractor-0.9.20-include-QWindow.patch
@@ -0,0 +1,23 @@
+From f6f6742e8318dfaa678734b3c3d00da510aeb017 Mon Sep 17 00:00:00 2001
+From: rncbc <rncbc@rncbc.org>
+Date: Sat, 13 Feb 2021 00:06:31 +0000
+Subject: [PATCH] - Fixed FTBFS when native LV2 UI GTK2 support is disabled.
+
+---
+ src/qtractorLv2Plugin.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/qtractorLv2Plugin.h b/src/qtractorLv2Plugin.h
+index 36d37c62a..ea2c37d1c 100644
+--- a/src/qtractorLv2Plugin.h
++++ b/src/qtractorLv2Plugin.h
+@@ -65,9 +65,7 @@ class qtractorLv2Worker;
+ #include "lv2_external_ui.h"
+ #endif
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
+-#ifdef CONFIG_LV2_UI_GTK2
+ #include <QWindow>
+-#endif	// CONFIG_LV2_UI_GTK2
+ #endif
+ // LV2 UI Request-value support (FAKE).
+ #ifdef  CONFIG_LV2_UI_REQ_VALUE_FAKE
diff --git a/media-sound/qtractor/qtractor-0.9.18.ebuild b/media-sound/qtractor/qtractor-0.9.18.ebuild
deleted file mode 100644
index bbeb12feb8c7..000000000000
--- a/media-sound/qtractor/qtractor-0.9.18.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	>=media-libs/lilv-0.16.0
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.17-dont-compress-manpages.patch"
-)
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--enable-ladspa \
-		--enable-liblilv \
-		$(use_enable debug) \
-		$(use_enable aubio libaubio) \
-		$(use_enable dssi) \
-		$(use_enable libsamplerate) \
-		$(use_enable mad libmad) \
-		$(use_enable osc liblo) \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable zlib libz)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
diff --git a/media-sound/qtractor/qtractor-0.9.19.ebuild b/media-sound/qtractor/qtractor-0.9.19.ebuild
index 41b62db5a499..372261f84c4d 100644
--- a/media-sound/qtractor/qtractor-0.9.19.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
diff --git a/media-sound/qtractor/qtractor-0.9.20.ebuild b/media-sound/qtractor/qtractor-0.9.20.ebuild
new file mode 100644
index 000000000000..ba0b616769be
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.20.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	aubio? ( media-libs/aubio )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-include-QWindow.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=0
+		-DCONFIG_VST=0
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
index ed03ef4dfd3a..dcbee962f2b3 100644
--- a/media-sound/sndfile-tools/Manifest
+++ b/media-sound/sndfile-tools/Manifest
@@ -1,4 +1,6 @@
 DIST sndfile-tools-1.04a.tar.bz2 715692 BLAKE2B e65a222bfdd96803293f006c2c5704fd1037d81524559d86c8e3812b91bd90fa0b47d1f589adb303f68e1ffdbebfd8b4ec616c9f1d897ad993768981c83022e3 SHA512 b93fd74386960c986031fd1652335bc34243bd785ccf31480b82f4d76ef86760ca53173aace273a635db70db46c0c1c4066328aef9c21c01c6e76346dbe56390
+DIST sndfile-tools-1.5.tar.bz2 555122 BLAKE2B c273bb655163816dcad81f15b089fa36a227a73b3b331d51bc16f91025afdca4a994b5d3838c5cf61335b5f900e8da3a299f9dd9cf8e34d2c9b2c21987625809 SHA512 04926a6c489634762efaa787e468ab653990762d5b96ba3cdfca595102c1d5eeb86411c9010d5640b1b3ec2b38d8d9d434fb549c52446e4b88d5b2a1d06a2bc6
 EBUILD sndfile-tools-1.04-r1.ebuild 814 BLAKE2B 7bc18f59b0cedaee69f0f7112174f99ae2ac05a8f9633f86f255b920ec31744f4dd7eeaebc3c57af27d2db6e802ff9c4686726db1eb65fe6d53467baa1b67d55 SHA512 4476acf6d5a8cec31fdc033c795b354d1c77e25c4622032188490c3065212a81e35cddb0893656167cbda5ed241cbce7e0259b4c0614968f4485ea6d6baf02fb
-EBUILD sndfile-tools-9999.ebuild 797 BLAKE2B 0bbc1527cc2ca304fc378dd1096f996ccf87d5bb0405ddc557f86a67cd25bd53fe3d53c9300f73363343efa1daefe2c8d6f78eb1e041966455d9dd6db9eb9986 SHA512 47580fac47af1ff1e3b3b6a1ba6e6ca4d9d9ba3c822b74da91b221998e48c58ac17ce5f5306439a48dce997c857955f200f717146e991bc1515ee881e8e39b38
+EBUILD sndfile-tools-1.5.ebuild 826 BLAKE2B 1151db8924698735b1d681b7c173c765e38691b8de92f36ce7eba15d5e1a31ee23f58413eebfae3c9417305478b14ad8996d95b103b53ae285c8409b7643947a SHA512 88ee9d0ebe584ceb1f0c125ff617b61db43ad016b66afee173a91f6f95b02f181adb0e9554d3aebd113c259bdb763c8d264c712c3e07e68652abf48c89ec2d66
+EBUILD sndfile-tools-9999.ebuild 826 BLAKE2B 1151db8924698735b1d681b7c173c765e38691b8de92f36ce7eba15d5e1a31ee23f58413eebfae3c9417305478b14ad8996d95b103b53ae285c8409b7643947a SHA512 88ee9d0ebe584ceb1f0c125ff617b61db43ad016b66afee173a91f6f95b02f181adb0e9554d3aebd113c259bdb763c8d264c712c3e07e68652abf48c89ec2d66
 MISC metadata.xml 572 BLAKE2B 473449aba53817e0599e9135148ddf893d438fba7bac2325c923a180c3ef10fb63de920af5e1201117d1130647455e7f57f6e131cffd0ac9d5b82e6750ff014c SHA512 9d91c621d44f3a3bb70ac84f026d746db918ce6ba0c4b6b9b7e2c85811e10f4c7936cbb15368ae1d38bed6a593115ec7a63f6966aae30cc88140c6edf3527ec2
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.5.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.5.ebuild
new file mode 100644
index 000000000000..0c8db45bf7a3
--- /dev/null
+++ b/media-sound/sndfile-tools/sndfile-tools-1.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small collection of programs that use libsndfile"
+HOMEPAGE="http://libsndfile.github.io/sndfile-tools/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/libsndfile/sndfile-tools.git"
+else
+	SRC_URI="https://github.com/libsndfile/sndfile-tools/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="jack"
+
+DEPEND="
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	x11-libs/cairo
+	sci-libs/fftw:3.0=
+	jack? ( virtual/jack )"
+RDEPEND="${DEPEND}
+	!<media-libs/libsamplerate-0.1.9-r1"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable jack)
+}
diff --git a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
index 6ed4dd5751d3..0c8db45bf7a3 100644
--- a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
+++ b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Small collection of programs that use libsndfile"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
+HOMEPAGE="http://libsndfile.github.io/sndfile-tools/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git"
+	EGIT_REPO_URI="https://github.com/libsndfile/sndfile-tools.git"
 else
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2"
+	SRC_URI="https://github.com/libsndfile/sndfile-tools/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64"
 fi
 
@@ -23,11 +23,9 @@ DEPEND="
 	media-libs/libsndfile
 	x11-libs/cairo
 	sci-libs/fftw:3.0=
-	jack? ( virtual/jack )
-"
+	jack? ( virtual/jack )"
 RDEPEND="${DEPEND}
-	!<media-libs/libsamplerate-0.1.9-r1
-"
+	!<media-libs/libsamplerate-0.1.9-r1"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index 255ca5c9c230..bd535716aa6c 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,4 +1,4 @@
 AUX sndiod 58 BLAKE2B 66ccfb1e14b145e34851bf6f06566e9c7cbeb6d5a0b4af3d1ee189133441697563b828af9fc96d6313fd7597c89821a79b0d5d67e9b15c5658891605fa54dcfc SHA512 7afae426a04482ca556c360fedfb08e92dbf54af108db3725dce5db74d5332d8fc46481f04804674bec56aa901ab679bae6fdfc21a065c91333dbc169dfdc434
 DIST sndio-1.7.0.tar.gz 147989 BLAKE2B 20f5969cfd6d6a62d9c04e493eda7648f686ad394db18e43ae574db235f31a025705f40f9c6ea821e04449bc1cdbc35c23dbeff9575b71fccc92c24140341d7e SHA512 f9db7bad5f30e8790488c4d20198c8a5a51f04f94e4b1067eadd7fe0fcc6f6ced3250173a627439d661dcf6faabc7bc4786b30af013788a5c88d972f1c9dc1f8
-EBUILD sndio-1.7.0.ebuild 862 BLAKE2B bf15daf727e3db6d19c16ddc6a67f37e8a474d20a1d536807a7686d3eb286c3645e0f4da0cec1ea8323eb60cf11f4dfd78a1a4a55540fd5a84adf4136f8e291d SHA512 b489a41cf744989b27dd089bd2a3f2b74c68fe656f9c8dde332a59a08916e71f80fa8a889e8af3f14e4b8260dd99004aef3daaccb636a4c1e3abe7e3f03bacb1
+EBUILD sndio-1.7.0.ebuild 898 BLAKE2B ab94a572674d50612ea15e05c4ac42043a0b22db28fecc0e02196cac1a7a1ce1d06bbff1233a4b00ae055477521de33d99a4d55a87b6fb061fde8a81a529ad9c SHA512 0089f39fb6fc155bc37ba8e766bb142582c3d52d450f37366551c89d9c2d9eddf22547ab63baf66edf8fb8a63c3520266a5c2b41dd8d9123c6238c40de0b2aad
 MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
diff --git a/media-sound/sndio/sndio-1.7.0.ebuild b/media-sound/sndio/sndio-1.7.0.ebuild
index 24f14c1d8c3a..18d25351250b 100644
--- a/media-sound/sndio/sndio-1.7.0.ebuild
+++ b/media-sound/sndio/sndio-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.sndio.org/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/7.0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 06cd0a7c6f1a..cc46e27951fc 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,5 +1,8 @@
 AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
+AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
 AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c17e28676d32c0adf1c479a7f46a28572ec055f1c9bb8331b91497afaf4d241ebff6d2cf81e0eaed725559e SHA512 16a3f2d6adb715bcbc49ddf549f163e06fd1919a2e475d54dbc80d7b4cb8a757bf3124f75e158e53df132bcd9c60ad68da61b2ac0164af62ec1e3bb00415b264
 DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
+DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
 EBUILD sonic-visualiser-4.2.ebuild 2857 BLAKE2B 480517d4a7be070af7e4b70727b66cb7fb6bccfd46fa532b9e1896685f092417b7ef4082019c414181ce551b8dcf7deff66af89acb1e2b27e17e5f2cf4967d4a SHA512 95e5d27ac10caac3752b45a01a75f07131cc0ad70d477b475c57382c1dd4493e7f7db433bf49ce84a30222c5a779f7a0c1f5099c72186561796193f42434750b
+EBUILD sonic-visualiser-4.3.ebuild 1601 BLAKE2B 2607a86ce68466b0f3a21b02ed591a252d4129d1d0a2925e9da82df21451e7d1b2acf41fd46f8966d9f62a384321c644f8afc350dac25e4d064c5af892155e4d SHA512 c2c741cf1cfb304665a4a91a96c387934eefe62e6fdbc769ad7562c04ba3372cab2be8510ba262d12bb6d79400b42e1bdfa5eac53cd7688bd33caab9720df5a0
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch
new file mode 100644
index 000000000000..d92c07d587f7
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch
@@ -0,0 +1,182 @@
+diff --git a/meson.build b/meson.build
+index d1771e1..b18a5b6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,17 +90,7 @@ if system == 'linux'
+   serd_dep = dependency('serd-0', version: '>= 0.5')
+   capnp_dep = dependency('capnp', version: '>= 0.6')
+   lrdf_dep = dependency('lrdf', version: '>= 0.2')
+-  oggz_dep = dependency('oggz', version: '>= 1.0.0')
+-  fishsound_dep = dependency('fishsound', version: '>= 1.0.0')
+-  mad_dep = dependency('mad', version: '>= 0.15.0')
+-  id3tag_dep = dependency('id3tag', version: '>= 0.15.0')
+-  opus_dep = dependency('opusfile')
+-  lo_dep = dependency('liblo')
+-  jack_dep = dependency('jack', version: '>= 0.100')
+-  libpulse_dep = dependency('libpulse', version: '>= 0.9')
+   alsa_dep = dependency('alsa')
+-  
+-  portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false)
+ 
+   feature_dependencies = [
+     bzip2_dep,
+@@ -113,23 +103,8 @@ if system == 'linux'
+     serd_dep,
+     capnp_dep,
+     lrdf_dep,
+-    oggz_dep,
+-    fishsound_dep,
+-    mad_dep,
+-    id3tag_dep,
+-    opus_dep,
+-    lo_dep,
+-    portaudio_dep,
+-    jack_dep,
+-    libpulse_dep,
+     alsa_dep,
+   ]
+-
+-  server_dependencies = [
+-    capnp_dep,
+-    sord_dep,
+-    dl_dep,
+-  ]
+   
+   feature_defines = [
+     '-DHAVE_BZ2',
+@@ -142,26 +117,110 @@ if system == 'linux'
+     '-DHAVE_SERD',
+     '-DHAVE_CAPNP',
+     '-DHAVE_LRDF',
+-    '-DHAVE_OGGZ',
+-    '-DHAVE_FISHSOUND',
+-    '-DHAVE_MAD',
+-    '-DHAVE_ID3TAG',
+-    '-DHAVE_OPUS',
+-    '-DHAVE_LIBLO',
+-    '-DHAVE_JACK', '-DDYNAMIC_JACK',
+-    '-DHAVE_LIBPULSE',
+     '-D__LINUX_ALSASEQ__',
+     '-D__LINUX_ALSA__' # for RtMidi
+   ]
+ 
+-  if portaudio_dep.found()
++  enable_id3tag = get_option('id3tag')
++  if enable_id3tag
++    id3tag_dep = dependency('id3tag', version: '>= 0.15.0')
++    feature_dependencies += [
++      id3tag_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_ID3TAG',
++    ]
++  endif
++
++  enable_jack = get_option('jack')
++  if enable_jack
++    jack_dep = dependency('jack', version: '>= 0.100')
++    feature_dependencies += [
++      jack_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_JACK',
++      '-DDYNAMIC_JACK',
++    ]
++  endif
++
++  enable_mad = get_option('mad')
++  if enable_mad
++    mad_dep = dependency('mad', version: '>= 0.15.0')
++    feature_dependencies += [
++      mad_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_MAD',
++    ]
++
++    svcore_moc_args = [
++      '-DHAVE_MAD'
++    ]
++  endif
++
++  enable_ogg = get_option('ogg')
++  if enable_ogg
++    oggz_dep = dependency('oggz', version: '>= 1.0.0')
++    fishsound_dep = dependency('fishsound', version: '>= 1.0.0')
++    feature_dependencies += [
++      oggz_dep,
++      fishsound_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_OGGZ',
++      '-DHAVE_FISHSOUND',
++    ]
++  endif
++
++  enable_opus = get_option('opus')
++  if enable_opus
++    opus_dep = dependency('opusfile')
++    feature_dependencies += [
++      opus_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_OPUS',
++    ]
++  endif
++
++  enable_osc = get_option('osc')
++  if enable_osc
++    lo_dep = dependency('liblo')
++    feature_dependencies += [
++      lo_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_LIBLO',
++    ]
++  endif
++
++  enable_portaudio = get_option('portaudio')
++  if enable_portaudio
++    portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false)
++    feature_dependencies += [
++      portaudio_dep,
++    ]
+     feature_defines += [
+       '-DHAVE_PORTAUDIO',
+     ]
+   endif
+ 
+-  svcore_moc_args = [
+-    '-DHAVE_MAD'
++  enable_pulseaudio = get_option('pulseaudio')
++  if enable_pulseaudio
++    libpulse_dep = dependency('libpulse', version: '>= 0.9')
++    feature_dependencies += [
++      libpulse_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_LIBPULSE',
++    ]
++  endif
++
++  server_dependencies = [
++    capnp_dep,
++    sord_dep,
++    dl_dep,
+   ]
+   
+ elif system == 'darwin'
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..e0da4fb
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,8 @@
++option('id3tag', type: 'boolean', value: false)
++option('jack', type: 'boolean', value: false)
++option('mad', type: 'boolean', value: false)
++option('ogg', type: 'boolean', value: false)
++option('opus', type: 'boolean', value: false)
++option('osc', type: 'boolean', value: false)
++option('portaudio', type: 'boolean', value: false)
++option('pulseaudio', type: 'boolean', value: false)
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
new file mode 100644
index 000000000000..79ea3cb16090
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson desktop xdg
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="https://www.sonicvisualiser.org/"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
+
+BDEPEND="
+	dev-qt/qttest:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/capnproto:=
+	dev-libs/serd
+	dev-libs/sord
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib
+	media-libs/dssi
+	media-libs/ladspa-sdk
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/rubberband
+	media-libs/speex
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	mad? ( media-libs/libmad )
+	ogg? (
+		media-libs/libfishsound
+		media-libs/liboggz
+	)
+	opus? ( media-libs/opusfile )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+
+# tests fail without mp3 support
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( jack pulseaudio portaudio )
+	test? ( id3tag mad )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-meson.build.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use id3tag)
+		$(meson_use jack)
+		$(meson_use mad)
+		$(meson_use ogg)
+		$(meson_use opus)
+		$(meson_use osc)
+		$(meson_use portaudio)
+		$(meson_use pulseaudio)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/takcd/Manifest b/media-sound/takcd/Manifest
deleted file mode 100644
index 4c2bc96a6303..000000000000
--- a/media-sound/takcd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX takcd-0.10-fno-common.patch 926 BLAKE2B 2bda7bfaebb59506c4218fa5bc4fe966f7fe8230d78105ab76a6e2e9b3276fdaae548ae1615127d3ab5d79b03e2cbf724dd74163ecd3c1efb2fcf3ca731e46a4 SHA512 e52b3f686205aecca2b71c4a0fbabcafc9ab589c911f4650e3b6d1db372e13e6d07442111dc25107a5022b05d1f1f941fc05f39dd058cd8e155cb9f4729b5b12
-AUX takcd-0.10-overflow.patch 367 BLAKE2B ab2168e1445ace23dcf31410040f363575302ea38ddee9a308ee4dcf7d24ccd0ae9909a72444a4c663412c54a5ccb3811f7f14e222569c76bbf52e2c40c83d92 SHA512 0e1193d558c0c3af0d37d06b0dbacbd10491e0be3dc42e58bcdecdad3308ed19394a9ba3401996df8df5f9cba9186f727272fd9d51cc34ac4334778ec809b7f4
-DIST takcd-0.10.tar.gz 95457 BLAKE2B 60e29a67d84fc600bcd55a7aa24e65bc042de13bc02686597a41cfd2e0490110ac66d60d0dc66977b4dce7bbdd34b7a20a1f6fe46474df16b11cbe1149b7d403 SHA512 a7211ec32adac1a9caf278cdceef9b9daf1ae47fa8ccb1d10eda51ca95566d8d6693f2f635b36e6d78f8f6f9e0efa711bc7263bbdd0f23c3f3ad884682b01e33
-EBUILD takcd-0.10-r1.ebuild 536 BLAKE2B a80cbe24d5f48261e806eeb4c961dced9e8170a2416f3183c8f79749afce932a0391cd798eb65c9d70ad5755fbe4014273569a2fb75553541d1870a15466b762 SHA512 247b16b0e79f22aa155de32d4669fcb8b6ecf169416b86dc84fda87845052260b628b314b31456c8bfa007d5b8d3c3680bcdf41279a5101d337c170c30319b35
-MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/takcd/files/takcd-0.10-fno-common.patch b/media-sound/takcd/files/takcd-0.10-fno-common.patch
deleted file mode 100644
index ec97e62eea30..000000000000
--- a/media-sound/takcd/files/takcd-0.10-fno-common.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/bsd_discid.c
-+++ b/bsd_discid.c
-@@ -29,7 +29,7 @@
- #include "config.h"
- 
- const char *cdrom_device=DEV_CDROM;
--int cdrom_fd;
-+extern int cdrom_fd;
- 
- int Discid_Init(void) {
- /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
---- a/darwin_discid.c
-+++ b/darwin_discid.c
-@@ -29,7 +29,7 @@
- #include "config.h"
- 
- const char *cdrom_device=DEV_CDROM;
--int cdrom_fd;
-+extern int cdrom_fd;
- 
- int Discid_Init(void) {
- /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
---- a/linux_discid.c
-+++ b/linux_discid.c
-@@ -31,7 +31,7 @@
- 
- char *cdrom_device = NULL;
- 
--int cdrom_fd;
-+extern int cdrom_fd;
- 
- int Discid_Init(void) {
- /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
---- a/sun_discid.c
-+++ b/sun_discid.c
-@@ -30,7 +30,7 @@
- #include "config.h"
- 
- const char *cdrom_device=DEV_CDROM;
--int cdrom_fd;
-+extern int cdrom_fd;
- 
- int Discid_Init(void) {
- /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
diff --git a/media-sound/takcd/files/takcd-0.10-overflow.patch b/media-sound/takcd/files/takcd-0.10-overflow.patch
deleted file mode 100644
index c3e7e16d286a..000000000000
--- a/media-sound/takcd/files/takcd-0.10-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config_api.c b/config_api.c
-index b62e41c..2b6a6cf 100644
---- a/config_api.c
-+++ b/config_api.c
-@@ -41,7 +41,7 @@ static void on_change(config_t *conf)
- int config_open(config_t *conf, const char *filename, int flag)
- {
- 	struct stat st;
--	char mode[2];
-+	char mode[3];
- 	
- 	/* set fopen() mode or return if flag is not valid */
- 	if (flag == C_WRITE) {
diff --git a/media-sound/takcd/metadata.xml b/media-sound/takcd/metadata.xml
deleted file mode 100644
index ee7258ac28eb..000000000000
--- a/media-sound/takcd/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/takcd/takcd-0.10-r1.ebuild b/media-sound/takcd/takcd-0.10-r1.ebuild
deleted file mode 100644
index 9bbbf1143850..000000000000
--- a/media-sound/takcd/takcd-0.10-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Command line CD player"
-HOMEPAGE="http://bard.sytes.net/takcd/"
-SRC_URI="http://bard.sytes.net/takcd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-overflow.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	doman *.1
-}
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 157aaa999456..a9768e58c805 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,7 +1,7 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
 DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
-DIST teamspeak-client-5.0.0_beta36.tar.gz 112040920 BLAKE2B 9d75cdf6c21175aba6b015c97d35023e60c2e2831eca7ba8afa57bd3c62c799494a4d3973ba4316c3033393afb3b467e448eb46963d553c915c9f7fac9c5055c SHA512 ce103ca62b36963881439307c42db05d98739fdd30a6b8c7edb1d15a7a814dc17807bc4aae8971bd135f8bad6bb22c1c839c95645a8fb2882f655e0540884437
+DIST teamspeak-client-5.0.0_beta40.tar.gz 116647752 BLAKE2B f0e5cf0aa2fe4c69bd7c621454918c13175d0708c3ad54b5dd0b18dfbbd0dc18af520d0f65e391f36d7d5cb3a8c2eaffec0619101f4b59262b8885cebf86629b SHA512 abeacf9d200f68ae4ac9a9adee146a52d81a7f34c7593cfa0ca363300f18ca1d85e582181d1c874accb5a84eb17bb1ed6bc79fb460708fbb2ebd937c40f28607
 EBUILD teamspeak-client-3.5.6-r1.ebuild 3043 BLAKE2B c11d9e2fa4c0dc7609db979a3efe2066fd5c9eab0fc104ca6009026a8f2566e4e9abade67968d6a9bfe8ece59ddb356c26c5198dc0a1a6405d603f3497ed7c3a SHA512 22ecee625ce5b934108f117d156714178e4909f623984733f1176f000fbfe041f0b264ed9c95dbdc2a3838d75c37cce67d61c5148f7cf1a802557812434f8902
-EBUILD teamspeak-client-5.0.0_beta36.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
+EBUILD teamspeak-client-5.0.0_beta40.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
 MISC metadata.xml 744 BLAKE2B e5a883b78a951de65c5a0ac3ef23674fc120339531a8e10225f5049a67d42f206fce5296f41bbb329105386b2138c83385c0b3293199409ac76b92c10dd17696 SHA512 6e8688c9c36c34625b8bf8b0e2870b88a8f7df4986f2a2579c089260058022cc5177e5108e8f4616cebfcfc1c132277eff74b9d45054b6d61f87c8966dff9156
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta36.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta40.ebuild
index c10184fe8264..c10184fe8264 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta36.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta40.ebuild
diff --git a/media-sound/volumeicon/Manifest b/media-sound/volumeicon/Manifest
index d0d84df60752..5fd3ea8dd36e 100644
--- a/media-sound/volumeicon/Manifest
+++ b/media-sound/volumeicon/Manifest
@@ -1,3 +1,4 @@
+AUX volumeicon-0.5.1-fix-libnotify.patch 650 BLAKE2B 899eba04b6959e50807e6728aaffe3c144e484514d9cf3c79e4f886916fe4b6a63847074395a02eb158c6a27f23e8277541438a869f8e883b5323ca29e51a547 SHA512 bfb49e5cac861cb97c40ecc52ab0decfb3e2407ecadb8e1b8d811212798ffd71031fc0a2dbc814001a302dcf326a81cee2cf9027adb629ad397bf000a61dab1b
 DIST volumeicon-0.5.1.tar.gz 172401 BLAKE2B 6638ef0746fff8eab8e4ff80698793ec8cc5ac2152cbe52f61cd06041c3f5f9e690818f885e362009354a768e46d157fc6a82389e87024cc0cd072ec3b50ffe5 SHA512 a96c79f91a8a0ec96f3297af659cf738547bb33e5908edb6b499bcc5081c61339ceaccc3a854a2f953a6f177fe6d8be1578cacab522d8be63a9dda8cf7c7a452
-EBUILD volumeicon-0.5.1-r1.ebuild 677 BLAKE2B e17088fe69455d2e5f02165879004e28a2e67c382028a136a00bc5fdf2b3924e3c255c436f7128773575f13fa10fd3e1ab147519384583376f59555da10827bc SHA512 93f442e2fac1ab27abe20bbda6f09ee8310e41324408250acac05c922a0be88528694e3bb321c6d2ea086d5c91d1126dcd28a2fe5060051da91ce866814d1971
+EBUILD volumeicon-0.5.1-r2.ebuild 798 BLAKE2B ba5599a5d891fda711e6f6ea269954b9b478ad85d3408a9bc75d064804aec0c6a41aebb2541fef9ff0247e6c2dce78b995dc13439a120bc519e1315dd5c024f4 SHA512 dded00caebc6854dd09918855165e519469d8eeaf72faa7f08e3a4d47a6f9bd393c5ba959563a933d9b24bcbbaa04692ea6e4ae381294acbd57eae6f7c25d011
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch b/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch
new file mode 100644
index 000000000000..bdfaa4f11a2d
--- /dev/null
+++ b/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch
@@ -0,0 +1,22 @@
+From 78a9c23775ebe12d3f3be93c0798144a6e732d90 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john.lindgren@aol.com>
+Date: Wed, 30 Dec 2015 20:50:46 -0500
+Subject: [PATCH] Add missing space in NOTIFY_CFLAGS.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6ad78d5..c8b72bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,7 +86,7 @@ fi
+ if test "x${notify}" = xyes; then
+ # Check for libnotify
+ PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.5.0])
+-NOTIFY_CFLAGS+="-DCOMPILEWITH_NOTIFY"
++NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY"
+ AC_SUBST(NOTIFY_CFLAGS)
+ AC_SUBST(NOTIFY_LIBS)
+ fi
diff --git a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild b/media-sound/volumeicon/volumeicon-0.5.1-r2.ebuild
index 9843572f6c72..37b89992df4f 100644
--- a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
+++ b/media-sound/volumeicon/volumeicon-0.5.1-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="A lightweight volume control that sits in your systray"
 HOMEPAGE="http://nullwise.com/volumeicon.html"
 SRC_URI="http://nullwise.com/${PN}/${P}.tar.gz"
@@ -19,12 +21,20 @@ RDEPEND="
 	x11-libs/libX11
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.5.1-fix-libnotify.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
 	econf $(use_enable libnotify notify)
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index b6916237e94a..fd4fa99ee4c3 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -2,5 +2,5 @@ AUX wavpack-5.3.2-fix-overflows.patch 2094 BLAKE2B 8c2abe6d72109b108d1e8f4400f5c
 DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
 DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
 EBUILD wavpack-5.3.2-r1.ebuild 1070 BLAKE2B 44d32a09ddbc7ba87f4af8fb53d1f57fe21525e1b50563fbf8063ab362b9e06040409ab91068a225ee4e32748ca0401b6bbea28661ef89ec985ffdc6183841a6 SHA512 c21d4e74634e9cde5ae49be7becbe7ff02dc0872caef71ffd067e73c8db5e6b008a1b5cef7673002a3684bc72c1d491d682e39bb8b43574a8572281e471c2f1d
-EBUILD wavpack-5.4.0.ebuild 835 BLAKE2B 5689248de4d20d3919e4ef0360a36ba4e56831c0eab4b263e542bd371ae44b387897dc03b6fd08be8750ddd57f60114759c0b52370af1771e7c735d71ebea7a3 SHA512 47d2cdadc0f1ae2a879d81dce9d8f597e5138d6b921332c60d59682ff723da14b1942b76d41480682ea3f1e72bd5cdf5419c73fa76f973befc481f00c3a55ac8
+EBUILD wavpack-5.4.0.ebuild 832 BLAKE2B 7faca395788a857042c96c10e92fa573c7d9668e89d676ef2eb1885de48d65139d91dcb4369a92e4eecc88596ec2cd06145ed810be13ee3ec23fd6dbed0ccb9a SHA512 d28d60397a7c299c3ea73b7b9ee515ac70792c1cc2078ab79253451a4fe0dd1d343215b78168a3bc6e767db874b31dae192fc1c0adbcb415b9075d5d10448fca
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.4.0.ebuild
index 2d12827f2435..5833174135ef 100644
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
commit	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree	c44943ee0563a3fa957716de909fed683117fcb9 /media-sound
parent	69051588e2f955485fe5d45d45e616bc60a2de57 (diff)