gentoo resync : 21.06.2020

35 files changed, 266 insertions, 268 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 13d5b6fc8600..2f5b6427a222 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 00a11ca7b0a9..1c63c1498a47 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,7 +1,6 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
-AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
 DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
diff --git a/media-sound/alsa-utils/files/alsasound.initd-r7 b/media-sound/alsa-utils/files/alsasound.initd-r7
deleted file mode 100644
index da2d5b349b82..000000000000
--- a/media-sound/alsa-utils/files/alsasound.initd-r7
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-alsastatedir=/var/lib/alsa
-alsascrdir=/etc/alsa.d
-alsahomedir=/var/run/alsasound
-
-extra_commands="save restore"
-
-depend() {
-	need localmount
-	after bootmisc modules isapnp coldplug hotplug
-}
-
-restore() {
-	ebegin "Restoring Mixer Levels"
-
-	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
-
-	if [ ! -r "${alsastatedir}/asound.state" ] ; then
-		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
-		eend 0
-		return 0
-	fi
-
-	local cards="$(sed -n -e 's/^ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
-	local CARDNUM
-	for cardnum in ${cards}; do
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
-			|| ewarn "Errors while restoring defaults, ignoring"
-	done
-
-	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
-		[ -e "${ossfile}" ] || continue
-		# We use cat because I'm not sure if cp works properly on /proc
-		local procfile=${ossfile##${alsastatedir}/oss}
-		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
-		if [ -e /proc/asound/"${procfile}"/oss ] ; then
-		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
-		fi
-	done
-
-	eend 0
-}
-
-save() {
-	ebegin "Storing ALSA Mixer Levels"
-
-	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
-
-	mkdir -p "${alsastatedir}"
-	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
-		eerror "Error saving levels."
-		eend 1
-		return 1
-	fi
-
-	for ossfile in /proc/asound/card*/pcm*/oss; do
-		[ -e "${ossfile}" ] || continue
-		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
-		device="$(echo "${device}" | sed -e 's,/,_,g')"
-		mkdir -p "${alsastatedir}/oss/"
-		cp "${ossfile}" "${alsastatedir}/oss/${device}"
-	done
-
-	eend 0
-}
-
-start() {
-	if [ "${RESTORE_ON_START}" = "yes" ]; then
-		restore
-	fi
-
-	return 0
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ]; then
-		save
-	fi
-	return 0
-}
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index fb4ed4034af6..50cd7b2cdb8b 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,7 +1,7 @@
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
-DIST asunder-2.9.4.tar.bz2 272740 BLAKE2B 64d0850afb0ea5f30a7522a9709f57cec4ab0d67eca235b75ae4ffac2dcc293438b99827eadd63052e9ea4d98fe97684d4b367255e24692af79a0efd1ed30ea7 SHA512 9410b96f27e7ea46e7a3f290caf17ddee69da9b92770346e10ae8e9403d21a527ba763163cf92e879cefb32f219e7d22d3f9b4dc2d81a3aab2a7676b859cfb71
 DIST asunder-2.9.5.tar.bz2 273141 BLAKE2B 895f067bb867d5e82350cdb334551fcf2f408a0ceeaf02a453262661434b05813e184a325e6b27cdb3d3e47486e1395b539e07c4304eb5ec0940eff48649f96b SHA512 40e27877c8fa17465b13a7fa08df6f94dbcb893bd6d8d46a389ca18bce4f574e04e894f9ca19f52bc22e7d1ec0db67a79f236ae4037be459bc24fe95739771dc
+DIST asunder-2.9.6.tar.bz2 283568 BLAKE2B 320fe6984f23dd3998c29eea88d7adbb9f8201c5cb16b706fa272cd7c9dc97c3129c8a6357b61e9e0d6d3b60f130f5fe1664e7acab6fbe624fd2f90b44c18247 SHA512 336514c964c2b46bf93aea050d771b6954c0761c4d9ebd63627a97945ac0c6eb8389e49abb5b42fffe8c646adc281785c7fc3b937b8dbd97e65d6b5834477633
 EBUILD asunder-2.9.3-r1.ebuild 914 BLAKE2B c45c833d0f76953116802aab8c345209843fa28362fd321b7e643b2d726ab8febdef70fb6795a49f1433ffc514e86dff90a09c9775c323c430ab18bfcc5a29ee SHA512 50dd1394d95d7b441fd5a128e66155b312b5d5438ce568e660248bd5e732300154826e0abfcfa073f355eac44eccbfb785b9ca57cd711948816607948ead7de3
-EBUILD asunder-2.9.4.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
 EBUILD asunder-2.9.5.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
+EBUILD asunder-2.9.6.ebuild 916 BLAKE2B 80271d3d3fe3810df8dc2ad7f87251b8f931f31817f3740ab407a8840b26c588d15a163fdd6feb959d6d45f6b969813af61360b518a412ca7a274010878fd70d SHA512 4be367eec9e08b2d8cc5000eadf2a380d26479dce45fd27543172de9ad7cc3d29368330bd6cf50244715029788e803da279daa59906dc47554f12fcf5102d41e
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.4.ebuild b/media-sound/asunder/asunder-2.9.6.ebuild
index df537f03bf42..011da5958768 100644
--- a/media-sound/asunder/asunder-2.9.4.ebuild
+++ b/media-sound/asunder/asunder-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 2ac6c0bc7a90..5d021eae2030 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,4 @@
 AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114f80b86e35d6d94e48d224fc615c20103dc2b18d63a331ef88c0ee8dfed50e6f4ae0feb9d62a89f8bbf1bf12e68b7b94c9eba48 SHA512 bc85b3150067b26faebc494146e60062658cd8c8110523becbf85ff2034e5a949103ef0a46ff4941338a035a299a7475c9a1bb208e3bdd1935e725723b42416f
-AUX din-43.0.1-makefile.patch 552 BLAKE2B c73746b64789dc54f4186777d507fc77c9a0b25e025be4adb48c4620adf4560ef600a445a8822ac045b0a39b4003c5b9007b5a36ed97fd61cdc6a1b8d96bdf74 SHA512 408d71e3b1e262eb83cc6cf0cd3ab4ee164bb9a6fda5244a6445d627c53b23e3d3d3e64bfb9f2c69e8168ecda0a46f8b4768100710f219a8b78325d238af4207
 AUX din-44.0.2-makefile.patch 590 BLAKE2B 6fedfe655ae6a977da3b94d4e7ec9863ea679860a23f6bc7dacfc7e9099a63c9cf0f7b264e13544ea13b2ec491a0b561fe757dc67f40ac373fecda6c3a76ff2a SHA512 30ac7595fe33a8ce3b32df857f610719ff55fa97a8f3fbb90cffa17cdbddcdf4f90e282ec1e5619440301ac34c0474c28ec891a71c169772d9d0fe6bf36e6e74
 DIST din-44.0.2.tar.gz 3652445 BLAKE2B 2b8dab2c4f4c22442bf446c7f43fdcff911c6b245950a9b06c9c0eaffa7138dd276900e58cef4cd21fabf9488bc5e56080f60c38af33eb9d4a6486019ff4b76c SHA512 a90c6d4d2e1817f8a740ad849f27f2b2f2c2e879107f6edf5bb49ecbb8168eb3c742db9984b9df43df7c49dd6273a947271e80fb2ac6d8300125e6cb35720de8
 EBUILD din-44.0.2.ebuild 1084 BLAKE2B 976f42912df993640acba0cfeb2f0d6ecd027f95ce4711df06afdf1e05a9458714cc05f434b1b00ad08fd591d3b13d2ee2c9c151307da283349cad9584b0cb9a SHA512 467cfccf073e867affbd1fe78c57acb5f13a0ff8b854bb1c8cb40c4c6bee22a042da30ac698ae16031b27a48cc4270a5c2b0178793b54cd23e9d9b322964c510
diff --git a/media-sound/din/files/din-43.0.1-makefile.patch b/media-sound/din/files/din-43.0.1-makefile.patch
deleted file mode 100644
index f3a8116571cc..000000000000
--- a/media-sound/din/files/din-43.0.1-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bcbd601..12ca52b 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = -I ../include -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\"
--LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\"
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- AM_CFLAGS = -I ../include
- bin_PROGRAMS = din
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 4ded2418e63d..11b97a36cfca 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-19.12.3.tar.xz 1388096 BLAKE2B fc522daa74d1517f878b23d8162a21bd22cddb17d7f4f6917b8668d444685996dae9861263289086e093a88bb5526c7dc70ee031bd342705fc6305ec0e8cd84e SHA512 6eb2292e9f50139956ab77f85f566692b0223487d6e365f223d72ccfad7d9029b64dcd75d36f6888d011850eebea240e50b60e5895d9b92cff6886c51b3e1b94
-DIST elisa-20.04.1.tar.xz 1407152 BLAKE2B fc0522aaac4c58cb8971bf0eab9e7dbb92a97845be766cbbe0fd1521fa284fb2b45f8a8a999d4590848df8aaaf818fb6cd87a0d2d775a953b87735a737362b0f SHA512 1bec935ede6c6190c8aa8309bdc04bfd496d43a3f8dd372a5f97c071469edc3744b35aef3285d020ace252ac4ba578c9ad4713420ebed838a2797b139a6df47d
+DIST elisa-20.04.2.tar.xz 1407692 BLAKE2B 78fa7737cd9a122db8f9477dde8af90fbe7e6de172fc77c60fa4d107b4956ab8584d04ac207fec1f97606e9f7d84fe0f5c4f388fb8b35810882c5f33241d35f1 SHA512 827330fc7df00975d85050ffc9cfffac2db4e8a3d63c33cf6b7e68a4a2a2bcf9cb905a68823dc952fcfe6ed51ae5cebfdc92ccb68f2d8e0934e4c094fb6c9d5c
 EBUILD elisa-19.12.3.ebuild 1623 BLAKE2B 4b86451aec4bc1d4b89eee833888e10bfe61c29853abbaab9b59464d1a5ac12ef542312ff16a8a36ac42c09974392d163e54b63bdc5dcff218264af880238af5 SHA512 6fa420a0eaf783a60c27f18d39c3b2f9732a221a161cd620096672c2937aa0b88c530a02bf5f3d12081c2668673fda527856d3f6d9412e811b6d6176055d16f1
-EBUILD elisa-20.04.1.ebuild 1588 BLAKE2B c2660857deeebfe2274786fe6e5744fa09f2f940fd95e33b5bd946113ef34d9954def8f58db6f2079d7cf95778991ed50be7a5753fea00cb4e5fc0fde06b46a4 SHA512 7d6430295376ab4eda40a0ec9a22482e7fa10659140ace8d05537b4cacfb2b3ff50ee933ae04cd783af4077baf0728da78ed6492636525d134190fb1ff0b4723
+EBUILD elisa-20.04.2.ebuild 1679 BLAKE2B b3e1d82d62156ca8e2dabc9bcbb1ddd86ddcb6e3e1eb46c32eb75b4f0d9ce385da0dde2db6968966d25e11f8db12a9801c471135aeb73ac37340ce8fd351aebe SHA512 fa158a9ee72efc082b9a37e952a95082612a8685a6ab3b835d5ced43033d0112604ebe0abbfc8050e19d5f56475e96c9a2cad246aa9aae917ee6cee8d52807d0
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.04.1.ebuild b/media-sound/elisa/elisa-20.04.2.ebuild
index 271d15fbdf09..20074d13c643 100644
--- a/media-sound/elisa/elisa-20.04.1.ebuild
+++ b/media-sound/elisa/elisa-20.04.2.ebuild
@@ -7,11 +7,12 @@ ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 KDE_RELEASE_SERVICE="true"
 KFMIN=5.70.0
-QTMIN=5.12.3
+QTMIN=5.14.1
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://community.kde.org/Elisa"
+HOMEPAGE="https://kde.org/applications/multimedia/org.kde.elisa
+https://community.kde.org/Elisa"
 
 LICENSE="LGPL-3+"
 SLOT="5"
@@ -46,6 +47,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index f948589a162a..c11ec8df2012 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,5 @@
 DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e67061647c83cb9479630333b0bbc5878682d5d19d9050403875ac49f66f756947d48928e3367efef537408e86c4c4a00 SHA512 c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
-EBUILD fluidsynth-2.0.7.ebuild 2538 BLAKE2B ce7275797d9a3fb38ff3b95e753d4ba81d5c11f3cb84c9213cf96847d2c6dd408f3039eb928218e999b9e358f2e92c2b79f3f12dd85174eb53ae6eaf5ed9822b SHA512 9529008829a8d0829404d1ef85aa622cd833d034bafba538d527a9c0a380513ef8483eb8c8d4e40b096ecc16841ec70381546e0f0f06e165240ba8f5d93e15a1
-EBUILD fluidsynth-2.1.0.ebuild 3322 BLAKE2B 26e0a6129178d2815e34a95e0d93794ae675ac2f60d385f61ddcac0f12b66891da4add575360e4ed4b9204d8cec7f831030d74fff9ebf2cd2ff98dc5a5812d61 SHA512 24f2c02595add7681d482fe819de32229736a3679d4df4d1598bb3d5b31c7166f7edd296f5641a620587ff01ee207c75be48a9195fe58e19f7b1b9743b799c69
+EBUILD fluidsynth-2.0.7.ebuild 2518 BLAKE2B 2696f05bbb901fa99393a9ebcf5a9156e8e2203fcd145131b9c43f7e8595547c91ebf895c00484b6e1b8e3ab1a2b31b6017cedbfd389639103f09b2244d58e0d SHA512 86afe364b1aa048f1c9384f08ced83595757b45904eafc5069a538dca832fb8b20831eb43ccfef5cc006a9bae5e372eba4fe8d14b5208b8cfa820ce9efe7d2a3
+EBUILD fluidsynth-2.1.0.ebuild 3302 BLAKE2B fa194d9fdcd665e8cece17ed158039ff23be2214efd83e4812f7ad4db985e80c00028e993d62a3128520deac63877e4186953df9417ea2b46053331277cd2280 SHA512 e6a7e8af213573b351c3a2c388d00dcb23879990bf6c3773286f7311e10d2b67c96e9ea7e1343e19da24f62d4a4fe4a38ef209cdd061e064592b7c56520d3bf9
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
index 59d74664cf3a..494a305ed54f 100644
--- a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd"
 
 BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 DEPEND="
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
index 672fdd204679..a01ed47a190c 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 DEPEND="
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 29fe2b195159..01260b5d32da 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,9 @@
 AUX hydrogen-1.0.0_beta2-gnuinstalldirs.patch 2045 BLAKE2B 17c2fdf5e7cf5762db0c86bbe40f7edc58d428eadfe1e910e126d727faeb5dc04089a8a5cce0deefc2b3c4dba22dbe0fba9dc7ab2d3cb3585c4bf24e0947fa36 SHA512 c2556a65dab28977cb2a0fe20818b9b5c2bf6852fb8300721e212c9dc6fdcf32e10ee0d5b2efe9116a1621573e5d0f2eb999f68dd937235e19fe9c71b2bd51c3
+AUX hydrogen-1.0.0_rc1-gnuinstalldirs.patch 1239 BLAKE2B 5b3992a642b3a7807ee08772d9eab1db9258ac760d6937327e2aedda6ebe1c7b2e7e3708af7b63a3c031b552991e05f33f4e836b59458589538b04e08aec8238 SHA512 70c4a24db4713c77d2692dae131977c930a8357eb99151c2001ecececa8afd93b720cee8ee2ff2df2cb60fd6d797b589276e77b81a287a8e50a119ff0947e1b0
 AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
 DIST hydrogen-1.0.0_beta2.tar.gz 11375652 BLAKE2B 9eaf07d69060e74478dd130722450264a463135dbfb05486ec853c684f09fcbae2537e3a7b032ed831e7103ccba3a3ba7c6866d2fde241464ab11465f8ad9ea9 SHA512 8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242
+DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8 SHA512 1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be
 EBUILD hydrogen-1.0.0_beta2.ebuild 2062 BLAKE2B 0289014d76351d56ba5c00631b8d403e1a8fb6bbb61a7aceb507e086e85907d074d9470b72a49cb43e2bbae43fac6f13fe79bd1a5efcdb77a13d9c06aa40c78a SHA512 4a007b1a2535b0f8774958646e9f362b3f0ce1bdcf536d94f52509cc0bfdf893c733095e8c07fb342243fa039815d68a28143cc8d421c01a0499670517a25613
+EBUILD hydrogen-1.0.0_rc1.ebuild 2070 BLAKE2B 7c16219b532127c58cb8aa92809f4e6f3c5e245356016802deedda897a3dcd5a08c0a9539328615f3f0c0ea28a2bffaa90b0c22e4801883c35cf513bebe0928f SHA512 ac8289c4de3e73c3cf18f83cd718aa1d9dec7c557a80abef2cb6d05d2bd2f4fc21a7edfa1fb2c271790a964cd02a4d6c2e2c4a6e72e035a19ddef42cda5826fc
 EBUILD hydrogen-9999.ebuild 2047 BLAKE2B 51d1cec2bbb952555e0f76a9be02d4f9cbb5ba8abb3f4ffa835b07ba5b829a82cac91289076710daf1d6e2c780a5d52c247bfeba35b7d2fdb83370b701af54e9 SHA512 fe85e1e03b10ad11b8076166ec66cf803216e496116f127f5cad63e6ed2db6258dd1bf38d05934fb0b4df756aa524b20833b2e64793d2ff6d799bc6be931c81e
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
new file mode 100644
index 000000000000..a137dc580b82
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20368f1..b72a272 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -384,10 +384,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
new file mode 100644
index 000000000000..7b7b6694b999
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+fi
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JACKSESSION=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 7abb05debdbd..e593fde86bf2 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,7 +1,6 @@
-AUX mumble-1.3.1_rc1-qt-5.15.patch 937 BLAKE2B 1afb11851d3645a805190ab1094c054fb11e4de742f2ddf0b93e918d2cf75f192691d42b51be686714b0c5d4b61d000921ffb011f1dc58fdff8273dc427ac5a9 SHA512 e634e9736b21fcf4f652221428f8426476e229871c5da690ccac51f4b261bfad3d52ce313b96ce6bd82dc31b4d1197ec0099796bb747a8f6047c21249710fa12
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
-DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc
+DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
 EBUILD mumble-1.3.0.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
-EBUILD mumble-1.3.1_rc1.ebuild 3861 BLAKE2B 2214f7db3b1d97a9c64dbc869c20e964db9185343b417223e287debefdacb4d130bcc73228494daf8fa5ec82e61e566430d6ce5cbc0a0e1dfdd9843ef19eda16 SHA512 9c1641d264db4eddbd48d9565f5bdf5b973f2b0db6c83f069291a7adbdcfe534eea4b8518411fbc972cc00689d3e8b775c982a89a36f1829e3da013e953d69af
+EBUILD mumble-1.3.1.ebuild 3785 BLAKE2B f513550966ec70ed598e87c34bf890e27103149b54bf40a990f0915a01cee3bb324094226b9eed3faf29a6e0ebd0593a9eff07b908eb549793a39ac574d240c6 SHA512 3a137cf5da5f699d5da56e86f0008725e3d0dfe66efd9f64259a73603ba7c5a7f66f431084ad0bf02fb6390b6cefc9a96795b3db84f663f9c06b1f49a3716577
 EBUILD mumble-9999.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
deleted file mode 100644
index 4268d56e8290..000000000000
--- a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001
-From: Marco Genasci <fedeliallalinea@gmail.com>
-Date: Mon, 1 Jun 2020 21:01:00 +0200
-Subject: [PATCH] src/mumble/OverlayText.h: add missing <QtGui/QPainterPath>
- include for Qt 5.15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’
-   42 |   QPainterPath qpp;
-      |                ^~~
----
- src/mumble/OverlayText.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h
-index f06f2b63a8..c1cd9efdd7 100644
---- a/src/mumble/OverlayText.h
-+++ b/src/mumble/OverlayText.h
-@@ -6,6 +6,7 @@
- #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_
- #define MUMBLE_MUMBLE_OVERLAYTEXT_H_
- 
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmap>
- #include <QtGui/QFont>
- 
diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1.ebuild
index f23f44786ac9..6e81c6c62616 100644
--- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild
+++ b/media-sound/mumble/mumble-1.3.1.ebuild
@@ -21,7 +21,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 x86"
 fi
 
 LICENSE="BSD MIT"
@@ -64,8 +64,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692
-
 # NB: qmake does not support multilib but it's fine to configure
 # for the native ABI here
 src_configure() {
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index e46dd7da2fb6..178a939db0d3 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -3,8 +3,8 @@ AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e3
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
-DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc
+DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
 EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
-EBUILD murmur-1.3.1_rc1.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
+EBUILD murmur-1.3.1.ebuild 3689 BLAKE2B 26646b012d7c104a0dfec1f9829d1558c4a464b70bd6c906b7f32032a434a8e264a83c37ce6b63b581232acc9598d008e92915292de974ea7e9625e19c7eae19 SHA512 d8743685b61d4baa2bb72538dc3e05feb41c7bf7b01f76fa6a482eac5f5ca9906ba7aff4fd1fbed6d44117651f6f9eb72c5717d88e61065044ff78f93c9f7627
 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.1_rc1.ebuild b/media-sound/murmur/murmur-1.3.1.ebuild
index 17d28a117c43..18faea156060 100644
--- a/media-sound/murmur/murmur-1.3.1_rc1.ebuild
+++ b/media-sound/murmur/murmur-1.3.1.ebuild
@@ -24,7 +24,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${MY_PN}-${PV/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index f240871b6f83..3c249fe2575e 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,7 +1,8 @@
 AUX patchage-0.5.0-desktop.patch 224 BLAKE2B 74bae167f890e5c03043f8906a18576183d2519141d5413780e03091c9b5432044185812d192c12073eadaab0823e8ef1d25c81d57e8614abd120440763d6776 SHA512 ae000bc340d48a9bb89fc067b4b1abba3de39ef9be086c7eeffae71ddca6172ce500ea6ea9854fde8cc19df3117195cb6fdb4ecd0867aa69f332ac0a7d377b69
+AUX patchage-1.0.2-string.patch 329 BLAKE2B 0721d815bae7aedfed9b0d8a6a8b2a528a176684d6f01c392d290ba11b0e547504ffd5200dd754800c64e44371a2304cec5d92e0327bf7739a3839aae7415ca8 SHA512 bda153cb438980982fe19e552b5d930b4ca8f7f206a4578a259c846bebbac3ed79e9b73f50cfa176a3e5f73db1059464f5c273e408f026ef9b04f1fa89ac4368
 DIST patchage-0.5.0.tar.bz2 411848 BLAKE2B 50138309d31c4806072c95af7df46e1b0ca2fe570c606886d9d6eb666cb3a499c12689b3ba1db26c0d59dd0ee732e350a6dffcdb7bee98f78906fa957e1e2609 SHA512 2b6c971f5fb192309734d6f42f17db83979805e6dcafbc95b343c3749afd85ea65c9b7d101b0b4bdf5102b6d60394cabcaa0d511aeb3fe1bf2db924b7e8b46cf
 DIST patchage-1.0.2.tar.bz2 586298 BLAKE2B db52e267dc6ecc246ca5a30d88976c426b607c47c10cf041fe3bb0ab2d6b22d7b3c55a704be0d2fb6b87b3d23d26f15dd49b3d151d3d1dc084f290f4e7ccb01d SHA512 8d59bf4a71c2b41a1c9d8f72da30046568573c6cedaca69815b279fd1c24d44267da6846e219449d47f43157663abc331ef89f241d94dd16e666e06da9f81e12
 EBUILD patchage-0.5.0-r1.ebuild 1053 BLAKE2B f9325dd2613b625b24a3148c4e3564649be2c54ee8659fef6855fbe2f71a10689ef45b5ae71507052721d94d10305fb0e947d720103a7e775cb9be1366b6e582 SHA512 152269c91e8f51b549ac602ebbd01452789531b28912ee2510fd85950760f40605fe6c4549dbb3261203c493bdb87bc4f0750d8fd9a632608d659aee2ab702cb
 EBUILD patchage-0.5.0-r2.ebuild 1142 BLAKE2B 70b44df31cbd9a2d8a6f883f2daf296547a7ce0eebcc4e0d88b15c2ba933d0a4722812a162aca12fbb6c182609097e4705aed95df951f7c50238ef053fbb2197 SHA512 7ed8905edf25c21bda792405bf6a404deb21074537171b8d432d6ed79557d3ff2ad906f78a19a1085df1ac991ec24de644b4c74056e9d47a56359eb06a5667dc
-EBUILD patchage-1.0.2.ebuild 1027 BLAKE2B 30761c26b59787bdd5dbbd8386c5eebb98ca4b8fdfeee35f4f7aba9d150a47f36b825bc98f978a7c61acbe6cbd403a564a59cc3bb049e8f362cd34fce4e85a0c SHA512 63fd8c3694cefeb8265e74b5806c3ee2f99274bea21c311b16a88d39cb824e355b85bc66196d2d9c6e6ce6dc0baf31b04b4347bf773f6a309ce8e477df4e12bc
+EBUILD patchage-1.0.2.ebuild 1076 BLAKE2B 573d6c5aa594545514f2b4e3fca25439c3b8b82248e2bcbbe314ec9ce2a57d496ad4105bab1ae4d9de72e6757ff8a0e5130f2e2d4f859422d8ab7a655f6b670b SHA512 c995d2f439761e32bd5d2a08e4a6249ba67de90650f53b620f18976a037519d30079b667545096fa87779807c46d492eb7b4da55df389d8ab3ddf42ab496a56b
 MISC metadata.xml 600 BLAKE2B 89bfd8b0da00e90fdd9fb85ca8604c80de0e2a8e471309aec0022f31f844d06c914c7536a3928179256f85b313fefaa3dec8937159f7131a03838276cca86162 SHA512 d08bd05a57ca03d9f91c0904f9a1b92e332e4475fd6729feefb63c75df2c5ad6eebd718b6e7db8482819f463606dcca888400c1560dd9b2c9e426c26634ece77
diff --git a/media-sound/patchage/files/patchage-1.0.2-string.patch b/media-sound/patchage/files/patchage-1.0.2-string.patch
new file mode 100644
index 000000000000..fe63be714d8a
--- /dev/null
+++ b/media-sound/patchage/files/patchage-1.0.2-string.patch
@@ -0,0 +1,11 @@
+--- 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/patchage-1.0.2.ebuild b/media-sound/patchage/patchage-1.0.2.ebuild
index d936e4293435..7e4f4bd5b7e5 100644
--- a/media-sound/patchage/patchage-1.0.2.ebuild
+++ b/media-sound/patchage/patchage-1.0.2.ebuild
@@ -19,7 +19,7 @@ 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.4.0
+	>=media-libs/ganv-1.5.2
 	virtual/jack
 	alsa? ( media-libs/alsa-lib )
 	jack-dbus? ( dev-libs/dbus-glib
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README.md )
 
+#PATCHES=(
+#	"${FILESDIR}/${P}-string.patch"
+#)
+
 src_configure() {
 	waf-utils_src_configure \
 		$(use debug && echo "--debug") \
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index e9b52afe223e..b37ff67eaa24 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1,8 +1,4 @@
-DIST pianobar-2019.01.25.tar.bz2 48340 BLAKE2B 09078b0fdf43baab99c343a86d5f1c1e0ee7ab39e2af20e7cdde6c21320a74d82ed9bc02e821b02ab045329944aa7d273d637c80bcb0ce96692281dc2e1a0568 SHA512 bfcec235ff01e40a2f650166a29020276b43b241008fd5eb8b84944744b1ce6262cf3be140354404c9410b88d6910e4bcf77b4de787742a7898bbc8511fef0f6
-DIST pianobar-2019.02.14.tar.bz2 48396 BLAKE2B 3b25cdbd086efdb4c5f3239b9c47af6c6f647929573dd8fda93a569252dcace34654fc9460bc0cc9925057bb56a10912788a9aedaba8f217dfc2f9eae9718275 SHA512 00491118ed46df4871e8d019e7139d0779d07d03ab4c8a2312f024613a8b849430bb7c23339a021604023f2c5234015fdbd5d7078caf8cf6d690d03e7c648755
 DIST pianobar-2020.04.05.tar.bz2 48823 BLAKE2B 91e9b96f0a635995ab08bd189b7b6b353f553b6c6cd405be2e95f9c0401b075158df4aa28633854747eced4ac60777724dd265dae62744c773d5f4b4c12aa90e SHA512 40d717693f128da3718c0e1be9c90c269712becf9ac2ffe0669a91ea9417d0fdb0476949df29c1da908e2d78678f26955149dbb8c5a0167161f95835ce76084e
-EBUILD pianobar-2019.01.25.ebuild 1015 BLAKE2B 63d7be43743ef0758239c939c03ccb4ac4b3adcec06515bd34e55e62f0372a4de8d6090685b32130fd7d2a454a5380fa8c69b5ac33eb8c5eb1b809972dba79a7 SHA512 02705089829c265c0da59411f8490fcd5ba9a263173c28df2f7947d9111ed49484d551a28b160ddcd7ba7d5fbc9f23d6771453bc5a19236726c0b081f0da92f0
-EBUILD pianobar-2019.02.14.ebuild 1017 BLAKE2B 7441a958a2593150d5e456582dfe96afec1ec542d7311e671bdaf0911fa5798ece36f8fa77552f5fd07cdff384f9c29348ccbeee2cbc05d2f1293501f47b43fd SHA512 298018f09620bbbe022371f41cbd5d47056efbee0583b65c8dc3391543270ef7934cd43be18d3af14c5407465fcb777c8ce9e755cc9d37cde7d5496188884033
 EBUILD pianobar-2020.04.05.ebuild 992 BLAKE2B 16aaba26aa09d2ebeff2544644f34e85c6bd1bb2e2ad3a9e4695d5c2c20dadef1dfb88455491be301c21339d191e090d7bbce73d5b9b70d3b61db1467360e5fa SHA512 39a998c14439899b6d3c9856d6f6f4af593c3a3add50b5ff2c55b9fc57f20937e2009e52fc756141772a0cfac2c35ffb1f60af09cda81a628399b57803b4030c
 EBUILD pianobar-9999.ebuild 994 BLAKE2B 7400dfe4d9fbfee279444fd1e15fe7d3b6bbad645a1f4e7f4e7d2784933e0716e7b1122f661d85faf5758ef4695aaaaa0e0f79b5cefd6fe670f8ae25be0e80fa SHA512 dd60983120ee159d536caa06c1e1019b81220e05f616925e43ef6e3e5154b12eb2df85881be47583f7677a26f04f22888ecdeca0e48a019dd2790286b3f610f0
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/pianobar/pianobar-2019.01.25.ebuild b/media-sound/pianobar/pianobar-2019.01.25.ebuild
deleted file mode 100644
index dd49bf04b5f2..000000000000
--- a/media-sound/pianobar/pianobar-2019.01.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs flag-o-matic
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
-else
-	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A console-based replacement for Pandora's flash player"
-HOMEPAGE="https://6xq.net/pianobar/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND="media-libs/libao
-	net-misc/curl
-	dev-libs/libgcrypt:0=
-	dev-libs/json-c:=
-	>=media-video/ffmpeg-3.1:0=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	append-cflags -std=c99
-	tc-export AR CC
-	emake V=1 DYNLINK=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
-	dodoc ChangeLog README.md
-
-	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
-
-	docinto contrib
-	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
-	docompress -x /usr/share/doc/${PF}/contrib
-}
diff --git a/media-sound/pianobar/pianobar-2019.02.14.ebuild b/media-sound/pianobar/pianobar-2019.02.14.ebuild
deleted file mode 100644
index 5a3320ef9da6..000000000000
--- a/media-sound/pianobar/pianobar-2019.02.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs flag-o-matic
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
-else
-	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A console-based replacement for Pandora's flash player"
-HOMEPAGE="https://6xq.net/pianobar/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND="media-libs/libao
-	net-misc/curl
-	dev-libs/libgcrypt:0=
-	dev-libs/json-c:=
-	>=media-video/ffmpeg-3.1:0=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	append-cflags -std=c99
-	tc-export AR CC
-	emake V=1 DYNLINK=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
-	dodoc ChangeLog README.md
-
-	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
-
-	docinto contrib
-	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
-	docompress -x /usr/share/doc/${PF}/contrib
-}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 97ce0b8b1630..55aae38d10f7 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,5 +1,7 @@
 AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d5404aab1af91fe5c88af916ab91a16c9c527053beac018de0e1e2231b7df26e7d2271baf7be33db8f6af6955af1b SHA512 07c95e025e43f2c0a2bef0a5b1ca6eb7977bfb5a34c70f7c4d99a9a4d18d3192383ed82784a7548d6fe263b2860a361128c2cae008e41737d383f30fd324a581
 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
+DIST pulseeffects-4.7.3.tar.gz 2010399 BLAKE2B a77a24fe9f8708564b146d65eb10a0021a05f102bacd25ac137ce6a2d21017c4b5c68a57c5cb2345cc228280460f1163d5dbce038d3bd427829335c8aa78d9f4 SHA512 0170ae0fbc3f72120545657ad7013f81afb40a96224c690c41206b91ae7ac2637f17b19238ef7d8a9f21a361cb9e76a0e2bf83e84d1404cc69733e7ad156c3f4
 EBUILD pulseeffects-4.7.2-r1.ebuild 1903 BLAKE2B 50882416becc1e4545bcef6dcf5a245465064aa11b876ff4191d79bcd8e0723fc01d05b76f5d4fb6930f2a330edb4644d4a0b63ad1083c589e7e93c400494a3d SHA512 1726d0a7c5135c9423c4d85613d4b3b90854452e25a51ca2ada570d9c502d923eb4ddf89c481dccb4ba12f4583f5b42d74efc7b0e59833fc104452d468c003bd
+EBUILD pulseeffects-4.7.3.ebuild 1853 BLAKE2B 39c86df9a5b0d56ed0ecf183bf47a7bc28ba4a7f89233249483ea9d49de0b3ff9982f33732b030f810317955f7fcc4fdbec53e8d0675abb42b293d0ddef956f5 SHA512 22100898b102036d3e8359430cac32b6256e97dfdb0284a144c5b89fe7415871da96d349da8724d8be7b70f107c3a6570b2070db242a806b177ece2ec2d00e6b
 EBUILD pulseeffects-9999.ebuild 1853 BLAKE2B 39c86df9a5b0d56ed0ecf183bf47a7bc28ba4a7f89233249483ea9d49de0b3ff9982f33732b030f810317955f7fcc4fdbec53e8d0675abb42b293d0ddef956f5 SHA512 22100898b102036d3e8359430cac32b6256e97dfdb0284a144c5b89fe7415871da96d349da8724d8be7b70f107c3a6570b2070db242a806b177ece2ec2d00e6b
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.3.ebuild
new file mode 100644
index 000000000000..4ebaa69f9547
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.7.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+else
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41:=
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 9a7636d15998..7d3545e9843d 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,6 +1,7 @@
 AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
+AUX sonic-visualiser-4.0.1-qt-5.15-fix.patch 951 BLAKE2B 0148b2a825891b74664dd84819d274ad979b1ce4ed6f5f2d6c2a1f1d496123545f1cc7dec79bdb5145da441143be5ed88366ce00756e1c22f05a7945df7639e1 SHA512 57d5f55524612fbc2da7ff3a671fa9cc6fb66097111feb57e72b2fc254173947813644b95fe983faf411359db694d540f177a13b310b45930cb5769c318a483d
 AUX sonic-visualiser-4.0.1-qt-deprecated.patch 564 BLAKE2B 4ee5743d4dac92c5cfe7530a5d57c97f8ab875ba95fa3148424bc827c3735f1833203e8e30a3777e0a9219c0404205514ca28ca06874e8a7357794890d607403 SHA512 8af7b53474244aed2c61bff7a1276fe826a1be933b79e5aa1cf5f3af579d5ba374ff9cc2e65f7f4f97d6cd8fd2d28d19915856db6f9e196b35e9ee3280a07421
 AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c17e28676d32c0adf1c479a7f46a28572ec055f1c9bb8331b91497afaf4d241ebff6d2cf81e0eaed725559e SHA512 16a3f2d6adb715bcbc49ddf549f163e06fd1919a2e475d54dbc80d7b4cb8a757bf3124f75e158e53df132bcd9c60ad68da61b2ac0164af62ec1e3bb00415b264
 DIST sonic-visualiser-4.0.1.tar.gz 6649178 BLAKE2B c231833f7cc6228d450600e5cbc6a6db85d0aa784ce67a225bedb1393ca82a99bca492912bbaf8bf87f5fcce48e57facc3f216b057233b53f596ccd71835d174 SHA512 6557d7c90618f7f2c18f8bb0058b8cd74a084f26376999074b9d5f23f04e1548b7e82ccbb73a301fa68c1d2f047810d312e568a85c9c7f3f25da9ec9b00c4220
-EBUILD sonic-visualiser-4.0.1.ebuild 2752 BLAKE2B 9630349e613b2d199694d669cf8b8874034a52254553e005976bcabd2ac585389c3ce8fdea5c56b87051c9d8e4922b0c7a815c1b504aa7e76fb8db8ca78bb541 SHA512 c69998e0adaee1f79b9ac085082e67ebab8bdc43029214c3c28f6cb50ecc42c030b1db48fb77f0531fbde1d2628f7d030657008cf2205d890dec000c3446d11e
+EBUILD sonic-visualiser-4.0.1.ebuild 2790 BLAKE2B 776c2cf8fed6e68128ac5fa07adf129ae0ba0c4f44f3f37052d182029ab8744822266c8374654534201659089cd8e50b82d1cadec917314ab3c4afe26e77f477 SHA512 5ed5e4b90396c22c1d0e78bbb7efdedf3158f890dd23751a15d3bc04abebeb0df898e9fb751c3a2a20596b53a85a45deaf578411a2453bdff394b1b3eb176bef
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
new file mode 100644
index 000000000000..007df8ecbb67
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
@@ -0,0 +1,37 @@
+From 7ebbdfd514c70ab500c8079a11b8ed91d086fe5a Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Sat, 6 Jun 2020 11:09:16 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+---
+ svgui/layer/WaveformLayer.cpp | 1 +
+ svgui/view/Overview.cpp       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/svgui/layer/WaveformLayer.cpp b/svgui/layer/WaveformLayer.cpp
+index 8499ba3..07b5b3c 100644
+--- a/svgui/layer/WaveformLayer.cpp
++++ b/svgui/layer/WaveformLayer.cpp
+@@ -27,6 +27,7 @@
+ #include "data/model/WaveformOversampler.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QTextStream>
+ 
+diff --git a/svgui/view/Overview.cpp b/svgui/view/Overview.cpp
+index 7e4248a..449ba63 100644
+--- a/svgui/view/Overview.cpp
++++ b/svgui/view/Overview.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <iostream>
+ 
+ //#define DEBUG_OVERVIEW 1
+-- 
+2.26.2
+
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
index d69fb24dcd6b..9e65f200e3ff 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
@@ -59,6 +59,7 @@ REQUIRED_USE="|| ( jack pulseaudio portaudio )"
 PATCHES=(
 	"${FILESDIR}/${P}-notest.patch"
 	"${FILESDIR}/${P}-qt-deprecated.patch"
+	"${FILESDIR}/${P}-qt-5.15-fix.patch"
 )
 
 sv_disable_opt() {
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index cf0c378395b1..49f83c2b9b5d 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,3 @@
 DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
-EBUILD soundconverter-3.0.2-r1.ebuild 1827 BLAKE2B 7c9c3bbd2755db3b88676a8e4db20f5fa6901fa8e6e66cc43bde0c6f4047e0d21e20206008810b49b782a5d7a639517845eebe24a98ed464f7ac4bf7ffc40b33 SHA512 2441edc282b3b502d5c6eed8c68bd21637c2abed2cfa99f85536ecf273c95c731848d1e907984490c231ae7f49b5b6935839c5be16c4f62675cc55d8ddb65cf1
+EBUILD soundconverter-3.0.2-r1.ebuild 1831 BLAKE2B 2ce59f68140c513860adb5b4ac6d8f1c7f611bff1dbac4c2a47f19b42441209ac53f90e768aa30682a085442fac0828b139b49e02ff3626b2b1daa5538fb2bcd SHA512 eb5b19be38b255cd606ae250bcaa65a3d3a5c0eb5481c67862b86db59e489a617038d9364437ed0c4fb2261f98c18cd260abb10a0e5f3a0e51b8ab9a87bffc78
 MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
index cc2b0688f896..6cf4ced20962 100644
--- a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit gnome2 python-single-r1
 
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 8eba8f5c8302..88a19adc7435 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -6,7 +6,6 @@ AUX xmms2-0.8_p20161122-cpp-client.patch 2326 BLAKE2B a59da287dafafe8a3a177c1167
 AUX xmms2-0.8_p20161122-faad.patch 724 BLAKE2B d7e11332341c2e1d4b19e31b19db9f577a41aee9172e886d885ae6a9518383c861537f6cc2eba2314839a000a2216828a176de9095ec45050b8621da9db9aa88 SHA512 2bed6ce756c0bbf21413485b336e4e33d8dc261c214c51bc6a0c7d310ae6e885526b8f243763f6c3ec665024e94acc55a46b26dcadf9a9cc0b5bf77b9306c1ed
 AUX xmms2-0.8_p20161122-gcc-10.patch 222 BLAKE2B a198b2e69081253f299ff1c7f94f0a2d3572a31caf4b7ec7de20e8d9a9bc404c58a98b31f0da6560034fe09599ae2e9f03b97728f45ad2fc30061b384c9fb13d SHA512 44685777b04e46e236104a74e654162a85b5c76c9838572921cc78b4775a7c2d5127566202415bfab10bb17261e242b034dde8aaf44024b66daa55a150ed1352
 AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af18269b784360bbbcaef33b1db4b880704f88e8dad06168e3737a43fcdb71ba722da1ffb5ba77f3f61ecf07674e1ad0988f5a SHA512 d2fe5f9a0c59205c787386e7b219c3fa9a334c30787b9a343214cc1c4dbf9f5d47f5dad9b2efd7deac1e96a227c827cc66198215a89b0e788c9d856cff51b16b
-AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-perl-no-local.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-perl-no-local.patch
deleted file mode 100644
index af18825ac007..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-perl-no-local.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Install perl modules into /usr, not /usr/local.
-
-$ perl -MConfig -e 'print "$Config{archlib}\n"'
-/usr/lib64/perl5/5.24.3/x86_64-linux
-$ perl -MConfig -e 'print "$Config{sitearch}\n"'
-/usr/local/lib64/perl5/5.24.3/x86_64-linux
---- a/waflib/Tools/perl.py
-+++ b/waflib/Tools/perl.py
-@@ -75,7 +75,7 @@ def check_perl_ext_devel(self):
- 	env.EXTUTILS_TYPEMAP=cfg_lst('$Config{privlib}/ExtUtils/typemap')
- 	env.XSUBPP=find_xsubpp()
- 	if not getattr(Options.options,'perlarchdir',None):
--		env.ARCHDIR_PERL=cfg_str('$Config{sitearch}')
-+		env.ARCHDIR_PERL=cfg_str('$Config{archlib}')
- 	else:
- 		env.ARCHDIR_PERL=getattr(Options.options,'perlarchdir')
- 	env.perlext_PATTERN='%s.'+cfg_str('$Config{dlext}')