gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-sound
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
214 files changed, 2655 insertions, 2701 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index a19acdad57c4..0199fca2758f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest
index c472c95ebad5..e64cc13889f9 100644
--- a/media-sound/a2jmidid/Manifest
+++ b/media-sound/a2jmidid/Manifest
@@ -1,4 +1,3 @@
-AUX a2jmidid-link.patch 981 BLAKE2B 137be987dd55e3d929e3e7fb165c164b23ae322444f8f9ff9e4138b88e586064ba5428d8af3c3edb8e0e6e4939905b1016cf42236c23c21171e7d920dd99ae74 SHA512 63e9d127ce6aab4e075cdfdf33835dfd3d96fead9c0383231ffa0aa731d339e487857e6fd8e085c2a4e520de6a739adae42be930d062b8b05a6e739ad5625175
 DIST a2jmidid-9.tar.gz 47925 BLAKE2B ad079e76a54f56ee8f82150c306f91aead52f86632978ea6f3376a0bf163744379210b34701b39da4ee14fc4d8a1c6be82d1052abeb8ccf79410bc242d174d62 SHA512 5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c
 EBUILD a2jmidid-9.ebuild 721 BLAKE2B df5f2785de192c4e35f2ede9ac66579ab9c7c331b72e738e4979ec595ed4f6bb568dde84e0bb05ec8a3a3f9601c4731161f88580c40a12e0653897ce3930ac40 SHA512 e260ffc7b9a2570fb5f6903d516ea5056c3165c9e28ca479111add14c0a957fe9ec6038df8aea62ca796033b360bd13f3a2fef97ed1883d25766afdde46b4f2c
 EBUILD a2jmidid-9999.ebuild 696 BLAKE2B dd6e045e6c9e3de4077fc5b460d327b690e144e5d34690bccb8371b87ba82ae76cc5801eb9198e9881c3c1d6f3e1a640fc29f6755b029c503cdf21b955ae51c1 SHA512 3a8bb0cf20126b77dca5accc82540e43e5bc5e4a4c930e7b7efe48bba59b7cc92664ad468ceb3c8bf0afd0851098819da6c7ca6a6cdb8a813f3da7cc413fdc03
diff --git a/media-sound/a2jmidid/files/a2jmidid-link.patch b/media-sound/a2jmidid/files/a2jmidid-link.patch
deleted file mode 100644
index 8b41f6ec1a41..000000000000
--- a/media-sound/a2jmidid/files/a2jmidid-link.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7f82da7eb2f540a94db23331be98d42a58ddc269 Mon Sep 17 00:00:00 2001
-From: Nedko Arnaudov <nedko@arnaudov.name>
-Date: Tue, 10 Jul 2012 07:25:12 +0300
-Subject: [PATCH] properly fix pthread linking. Patch by Orcan. sr#2934
-
----
- wscript | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/wscript b/wscript
-index 36710e2..66a532a 100644
---- a/wscript
-+++ b/wscript
-@@ -66,7 +66,8 @@ def configure(conf):
-     else:
-         conf.env['DBUS_ENABLED'] = False
- 
-     conf.env['LIB_DL'] = ['dl']
-+    conf.env['LIB_PTHREAD'] = ['pthread']
- 
-     #conf.check_header('expat.h', mandatory=True)
-     #conf.env['LIB_EXPAT'] = ['expat']
-@@ -152,7 +153,7 @@ def build(bld):
- 
-     prog.includes = '.' # make waf dependency tracking work
-     prog.target = 'a2jmidid'
--    prog.uselib = 'ALSA JACK DL'
-+    prog.uselib = 'ALSA JACK DL PTHREAD'
-     if bld.env()['DBUS_ENABLED']:
-         prog.uselib += " DBUS-1"
-     prog = bld.create_obj('cc', 'program')
--- 
-2.3.3.GIT
diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
index 872d34561080..3ab284d3bb5d 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1,6 +1,4 @@
 AUX aeolus-0.9.7-fix-Makefile.patch 1102 BLAKE2B 9e8daec4fde583e3605ac9159bcd9e101f33b2fcb766f696a167ddef65e933d70ea1d93fd15f663f92b8861d529b3668c4673ffffbea7d713d96ab8bb282c89b SHA512 87c70d21dc104b64cbd7f52e73425de6d2a0671936e14afe21a28f9af8f5d9c1e9dc8164db1e702a78c335ce00097b0edd3b2626e54b68914c4baa562963c370
-DIST aeolus-0.9.5.tar.bz2 69139 BLAKE2B e8f1f768303938cc134d1c3bec7e15f4af03150a6c572b5a9502bae41ee1d2c750f7e3a40161554d5a15c68bb96928cb41a019fa77088f05dfed56f422eb550a SHA512 e80e7a861934b287afefe0186bd78c2d51662c29d3b7292469244c52b4949698c512dff72bebe1f76cf98e17e3f9183d3ce7a7da4856bf936dab091d3b9f4b0b
 DIST aeolus-0.9.7.tar.bz2 66532 BLAKE2B 611d48724b0b85afb8b82e5c2c9590a1da5d22154a5f8c228bdc4f83490113115132c08b79d07d0a5b9a2c66e0b5f9776504a3e919f00f75202ec43d0c7da193 SHA512 ea81b784a26441e93535c9e3cd7b8c9c6b4f9946bd8aac0b84adc89e986986fd7f45b9b45d70f211323a4c616de8b8d8d16508e9553c694a4a6a74aeaf833ec2
-EBUILD aeolus-0.9.5.ebuild 1407 BLAKE2B 881cbcf1ffd733ff3ccd7f76433f13e54bb91f2ded2634213180f6bb079f3859e5a6fda740cbda8414e4fb4d613f8cecb35214f37df453823ff21c0b8f70fe1b SHA512 7fd6130db089fd24301ed4b5af3b29221d9de57d39f387f4399855eb2dda53e1b02c3528d25cf208763fc0b4bf2d7d7de59e49547fc616f4c160e87779ec96ff
-EBUILD aeolus-0.9.7.ebuild 1270 BLAKE2B e3248bdba66bc40b92598ce05db0737bf6863c383ead6e99716665e7fc7f394c1d276b0055fdb6fb99581867a8cf09d1b37a866bb4c259479631d6b96db2a7fa SHA512 47c4bd1c4d269fa793136166972c2b30dadf7ea94cd71c6cafa3aab799cb1823e9d6e33d8a7fc0d99afc48655ad51ad5efb290a40cfe0fd34e10abc4255d9329
+EBUILD aeolus-0.9.7.ebuild 1264 BLAKE2B de204bfc1e48679936e5d5877814d4fcea91b9fedddc0e64981f740c79007304c30711b19d2b6104da60c21530ddaedea7eb05f621e22f18a7dbe92746b11b9f SHA512 a6608a62e95fdcc73e5adcf375711e16637b49decdc49a4b241d6ba85933804ce8c819623c5e9d5836b3c216f505019b741c479701890b18aa05e6b91ae3a3b0
 MISC metadata.xml 826 BLAKE2B 4862927f235f598d16eed170670412d275420eda966c7ae740cdc2c30201a277b8c46b9a67978ab32d28b8486dbcaa896a88eb2ab68b4ec3b442aa031fdc525e SHA512 2b7e3f8ca98741ea01169a8c901b75509be285edbefec13eec449cb59fb0548158aed46054aac2a9095098e123a6cced745bc74b07b105ad9909a66de4a05368
diff --git a/media-sound/aeolus/aeolus-0.9.5.ebuild b/media-sound/aeolus/aeolus-0.9.5.ebuild
deleted file mode 100644
index 878c3e13c97a..000000000000
--- a/media-sound/aeolus/aeolus-0.9.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator toolchain-funcs multilib flag-o-matic
-
-MY_P=${PN}-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A synthesised pipe organ emulator"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	media-libs/zita-alsa-pcmi
-	>=media-libs/libclthreads-2.4.0
-	>=media-libs/libclxclient-3.9.0
-	x11-libs/libXft
-	x11-libs/libX11
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	media-libs/alsa-lib
-	sys-libs/readline:0"
-
-RDEPEND="${DEPEND}
-	media-libs/stops"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)/source
-
-src_compile() {
-	tc-export CXX
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
-	sed -i -e "s/-O3//" Makefile || die "Failed to remove forced CFLAGS"
-	sed -i -e "s:ldconfig:true:" Makefile || die "Failed to remove ldconfig call"
-	sed -i -e "s/g++/$(tc-getCXX)/" Makefile || die "Failed to set correct compiler"
-	sed -i -e "s/-lXft/`$(tc-getPKG_CONFIG) --libs xft`/" Makefile || die
-	emake PREFIX="/usr" LIBDIR=$(get_libdir)
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	dodoc ../README ../AUTHORS
-	echo "-S /usr/share/stops" > "${T}/aeolus.conf"
-	insinto /etc
-	doins "${T}/aeolus.conf"
-}
diff --git a/media-sound/aeolus/aeolus-0.9.7.ebuild b/media-sound/aeolus/aeolus-0.9.7.ebuild
index a7d82f406ef9..d67d9e69d32f 100644
--- a/media-sound/aeolus/aeolus-0.9.7.ebuild
+++ b/media-sound/aeolus/aeolus-0.9.7.ebuild
@@ -11,19 +11,19 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
 	virtual/pkgconfig
 "
 CDEPEND="
+	dev-libs/libclthreads
 	media-libs/alsa-lib
-	media-libs/libclthreads
-	media-libs/libclxclient
 	>=media-libs/zita-alsa-pcmi-0.3
 	sys-libs/readline:0
 	virtual/jack
+	x11-libs/libclxclient
 	x11-libs/libX11
 	x11-libs/libXft
 "
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 9d89195878f1..84fea2b38555 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,3 +1,3 @@
 DIST audex-0.95_pre20190721.tar.gz 179903 BLAKE2B 4260130eba3b1b30e94b0af5535beed6ce73b2a1a46ff91fd808f7d224b363474e02ef6592ac6136361b871cd91a7a4371faad6769f1ab74bd21d1fd2d793876 SHA512 3eec37e3396408c0ce753ed4c315830e542f3ae17fc4000b3c790be22ed74208bc2a956da4248250932e5b7fceac11802d731cf4d65709c207521bcdbaed5957
-EBUILD audex-0.95_pre20190721.ebuild 1143 BLAKE2B 9bef8e8ce523e764a954eaff6b359b4cc5e7c86d3611e534c3c0589f260e9c504a21a616094f9afa1b2f15f88a7b08cd9a1b492c4ca130ee62390f7e017376d5 SHA512 5e3bd65fabd4f7ff970d98e216dbb050d66ccf0b046caa1f41b3a65bc586971a58791d93c77a32fdebf307988878ba76ea1933dbc203a019b19f2959ea7f56f6
+EBUILD audex-0.95_pre20190721.ebuild 1307 BLAKE2B 28868cba19f03fc2e3f2b211bea3e26478ee470fdf0a76918cd9a0d5d2c25695556e5ffda45a247de192a07598daf5debc97a09df2e3971ba0883c89aa559d7f SHA512 d8f4256bc7402e51b55d5e69f6638b3943b07e6f09a2716e69037b7778fefb90937b1a1697571c56aa12981ad18e2930d5cb9d4a68462c19b64df9dc55e69a70
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-sound/audex/audex-0.95_pre20190721.ebuild b/media-sound/audex/audex-0.95_pre20190721.ebuild
index e35263ea42f3..61100f1c3b6e 100644
--- a/media-sound/audex/audex-0.95_pre20190721.ebuild
+++ b/media-sound/audex/audex-0.95_pre20190721.ebuild
@@ -3,40 +3,43 @@
 
 EAPI=7
 
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
 COMMIT="1389389e7341a749f95b313045f9d0cd809748b4"
-KDE_TEST="true"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Tool for ripping compact discs"
 HOMEPAGE="https://userbase.kde.org/Audex"
 SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
+SLOT="5"
 KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/libkcddb-19.04.3:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
 	media-sound/cdparanoia
 "
 RDEPEND="${DEPEND}
diff --git a/media-sound/audiotools/Manifest b/media-sound/audiotools/Manifest
index 25cb63281a04..929a5b778895 100644
--- a/media-sound/audiotools/Manifest
+++ b/media-sound/audiotools/Manifest
@@ -1,4 +1,4 @@
 AUX audiotools-3.1.1-libcdio-paranoia.patch 1337 BLAKE2B 2594bf98a09df1064009dfa27764f64aeda7d92e43c82aaff3e44f6742db28f6fa2e87bd19d1f7eba8b82ac8ab338c9d7e7e7817817d49985809b927383d218d SHA512 cabc5f86e2977171c6616722640fa271d3c339bb223e229ec31697c81bd2c06c620a4b3d7a9057d7a90e05a2db7e2c7ca4d26403d60612ceebaaca0370845e10
 DIST audiotools-3.1.1.tar.gz 6325408 BLAKE2B 065b5dc23796ea8d1dc72dc581a8929fe26e08180af2f0719470d80d5c82be2455ffda28fe8fd5ca63ae078f7fa5c6b5153e8fae496736da8f97a4eae38c4876 SHA512 dfba0dab8ef1573a12366bb4d46552eeb6c23c4abde34d9df51238fc97f573135b564cc3e5dbcaf7691c4502d8173dc926d8eb5ecd169fe619278ae89ff24c3a
-EBUILD audiotools-3.1.1.ebuild 1895 BLAKE2B 1114ec6ec3f67fbabd52ea288f36ddc42c4b043c9cf946520f620895ed237f52e305c1f850738b5e1a8c14246a562ad01c29f64f90f9c7a4d995ace5d233eab8 SHA512 bdd66316f877c9af0741ef3b8744dc2410b25abb010ca3a99dc8e756baf2e35af91370a42ee638ef9bf51d9601c52b81f9f5bed8f7058d38e775f52c11d7c269
-MISC metadata.xml 588 BLAKE2B 54e5abae3b9af738c32845f8ac3390948b89bc1781668a997b73fdb726f8e02c14e7e02bda930cd1e5615d42c58923c5a9535ff873764f6629409f374cd4fa36 SHA512 ea55e192d295d61967aa415d2f7520531f1d53be60357cf682f1863358275fdb9cbb28919f321ba8be8216b52317325b5926942c1c5f0167b2eac20aea81eaf2
+EBUILD audiotools-3.1.1.ebuild 1893 BLAKE2B 87e6e7d4242ffd3f9693b62c8fdd70fd17545067dcaabaced10e80dd543308497193a81271019f90359cfab2e856e1309ca41182d7f1768eb3a1aabf3495640d SHA512 9b663b487a482a8f303edfd791410511654ffdc8edc43a23084b2c7efe606652e10660148fe4722a2f0abd2cd504c4dea8ce7c6a38fdc1dc5f7daa6b4dbfdb26
+MISC metadata.xml 533 BLAKE2B 6939a9b7aad9be3e1311136836118f5ef36b1b7a84edf2c7e8c5b859de02d46691fa74f1ed2e275e86964978d4da48247b0fd77a8aea0ad42d96293d7d26b7a0 SHA512 c28cd3c4297b399e7ea934b965abecd06dd3150827e7a5976d3ddd22f586c31ed08b1bbd46ac8ede21c362c2df3742ec58f524b0060eb94a4c18f5528abc1cab
diff --git a/media-sound/audiotools/audiotools-3.1.1.ebuild b/media-sound/audiotools/audiotools-3.1.1.ebuild
index 6b5fa12fc8a5..16e75ef9155c 100644
--- a/media-sound/audiotools/audiotools-3.1.1.ebuild
+++ b/media-sound/audiotools/audiotools-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/media-sound/audiotools/metadata.xml b/media-sound/audiotools/metadata.xml
index 6e38a80b6a68..1e51d3f4604b 100644
--- a/media-sound/audiotools/metadata.xml
+++ b/media-sound/audiotools/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="cue">Enable CUE sheet support</flag>
 		<flag name="dvda">Enable DVD-Audio support</flag>
-		<flag name="gui">Enable support for GUI tools</flag>
 		<flag name="twolame">Enable twolame support (MPEG Audio Layer 2 encoder)</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index b4b1d64eee84..6a021a31b42e 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
 AUX cadence-add-skip-stripping.patch 2184 BLAKE2B 61db0094b2ae8059c1cf162d553db9624cf84e0d92483bd42678b6be8dd0e25aaf7eb5cde6983e65c54cbe61d2f0f1a507d74a73572662c64e489e8c30b7cc56 SHA512 dda75f3b7f23c9303206fde30ca9c90eaf3999edd8b1d02f5cd3e0680d72dc59b0966ce9100d4274490595f7aa6df3ed6ef6f91ed672840341f9d5083805b239
 DIST cadence-0.9.0.tar.gz 2202265 BLAKE2B 03d38f611df05597d2b4016f263d36f2386be421383a38b51dee519514e6d1ed79bf92ea2a789ea868a25d4c805e9e94cd0971f479b772799bf6bf3170349b4a SHA512 381c9c57c1d96452a91969e134420d63ef06f5ec144050779d0a06a1098e8ed1693c70165b6640e04acc448d382e717e71ead1b29ba5043f0668675850cad7d1
-EBUILD cadence-0.9.0-r3.ebuild 2130 BLAKE2B 9005e7559a7240592f8d73c90b1cd4c2d57cc3af381a28a717968583b228232ba850ed4a57242591b2456205ff1ba112b78033d286f197de622af642216cce79 SHA512 f0ab2d5fcead875e1736e785d6383f745a3ce78fb7afe090144a61c8a05e5290b770dcc84fc7420dbb1fffe56adf23b97c11f3c165aa3e1722ac85e153e9e86f
+EBUILD cadence-0.9.0-r3.ebuild 2129 BLAKE2B f9c241a53e6c0d37ab25e2268a0259e33801af9d902f94cfac93f09f85f551412c320212b3b639aabfd847330ebd07eb3f22614afcf9bf83c42483aad3a42599 SHA512 794d20385844b6778339f7796050e7565852fa2c20cfd42bbe1ac495a574257101082e271912b6a71e20e55b8cfad5b7be58839c3cb319147d84d4bfc384b6b3
 EBUILD cadence-9999.ebuild 2016 BLAKE2B 5fec7d48d618086a76a5defaa53f39494c51585280180286dbf178294fc003d9a79c4bcba459b57d170f8fc74779ffdddfc0839ca9f14bfd33d0bac335285b94 SHA512 1fb6b9e9d22f5f893684f4e6d7c35c55263ce18a4421df5318abe10a197e8fe9c2a11d6934d41683f95fb332f265d3fd8117dd1aa8edb96c1fabfebb6dd869cd
 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-0.9.0-r3.ebuild b/media-sound/cadence/cadence-0.9.0-r3.ebuild
index ed7a5e91ff18..6eb22cdfc3f6 100644
--- a/media-sound/cadence/cadence-0.9.0-r3.ebuild
+++ b/media-sound/cadence/cadence-0.9.0-r3.ebuild
@@ -9,7 +9,7 @@ inherit python-single-r1 xdg desktop
 DESCRIPTION="Collection of tools useful for audio production"
 HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
 SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 965b87427eb4..a8b9e542e0de 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,5 +1,5 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 AUX cantata-2.3.3-solidlite-static.patch 994 BLAKE2B 66b4a6a0325f0f7cb4f3886bca68c88e45aee4eb08947f422f07d7e43b585d6d3661f92152dcdb2c0fb243978fe3fd203bf14d88cfd7b472031e87f8d83430d4 SHA512 395b9d8968c2be12561ac595c99cd821296722598d33916328823137538d174f9dd2953146eee24263cc8f0485e3e1627eab678890ea6b5c6141472e4ae9aaeb
 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
-EBUILD cantata-2.3.3-r1.ebuild 3140 BLAKE2B 8b8b6f5d9521d65201913808b5aae3a14de5858e7715b6473bd3c1981eb57cf4ebd84f576c23f4d765be9db5d03a407cea09d7d78bdda68d60572de912454c85 SHA512 1444bf3b32ffb13bc92337b9b871449b444cc9d11cbdbc9f7ef87aec8b67119adfe9f32aaa109b04114a85e41fb547198ecc0757fd9424af71a5c955400f5ecf
+EBUILD cantata-2.3.3-r1.ebuild 3122 BLAKE2B 703fc71f6ae30d6667849d33e9f1e1500c9fa518f036541816ec0cdb7a4b1ff830c7887efb238dd377440ffaab2f5cf5a66b313f6639500cb4b34985772e2320 SHA512 aa1d225b9d6abb1161171e33cab208afaed48f0fe361e7bce9a401010740beaaaa7c9ee7b3b1c36bb98cdadb1d9c8a805bd8c8b8d1f8e10de486d3e1a31ce4cb
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild b/media-sound/cantata/cantata-2.3.3-r1.ebuild
index 05ee35f51094..b29c21cf2734 100644
--- a/media-sound/cantata/cantata-2.3.3-r1.ebuild
+++ b/media-sound/cantata/cantata-2.3.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake-utils l10n qmake-utils xdg
+inherit cmake l10n qmake-utils xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
 HOMEPAGE="https://github.com/CDrummond/cantata"
@@ -77,7 +77,7 @@ src_prepare() {
 		rm "translations/${PN}_${1}".ts || die
 	}
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Unbundle 3rd party libs
 	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
@@ -106,7 +106,7 @@ src_configure() {
 		-DENABLE_UDISKS2=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 5741757036c5..d372d5e550e4 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -2,5 +2,5 @@ DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a
 DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
 EBUILD cdparanoia-3.10.2-r6.ebuild 1321 BLAKE2B 30833fc15e666cd3268bc6c93119e664eb2b70735f86d151411700094675ad5bd9665d74ac446dcd0fe668d4e6249a3b67a0dcfc9d05d9ec3d3e778c2896c1c1 SHA512 669c340b310ad79f0fb659d36bfaf06d27df486cea58bb9aaa2b5a312eea3399a95f07ff7e25a9719f041adf378f49d1fb7f2891b398d416e2e9e9bb3ccce41d
-EBUILD cdparanoia-3.10.2-r7.ebuild 1376 BLAKE2B f531b54f81938fe003840a5f7c6c1abca2eaf61736c2cef8cf3bda5ffd27e37f1fdddaf795a10c5e2182ce3699af5b960e066b205771fe46607988e2f09ccd76 SHA512 941051de125f63192bf588a98506cbd4041ab0191056b1de9931c35cce2475f6d24c6f26e420ca0d8cacbede4d889fffe2ad9698dbe5a2ea9e6a432fa61f251a
+EBUILD cdparanoia-3.10.2-r7.ebuild 1375 BLAKE2B bdaf0f434270474fb1ce3b24c05efaea4cc29781bdc25161517e07744355e21827b66d6fc53bb53027ff585fc130732afebef856b80235146ce635dc4d5e16d5 SHA512 b7c5715cea664e4b9909933318f145ad6ca274553e0d56fad7ae17be891db8dd76477e014cfc1d96922adcbfa4faec5fcdc1d02100a3676413459086f3dee72d
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
index 02084be3366c..28424c9dd2bb 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-eselect/eselect-cdparanoia"
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index ec80fbaa2c4d..13894ce3145b 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,9 +1,9 @@
 AUX clementine-1.3.1_p20190609-fix-restore-from-systray.patch 1235 BLAKE2B 9904a6df024998d4268ca952fc2c17cebec01873b93aa141ac6db193e1a69481d4f7f5f02cf9fec6174eb390fce66b443ef86de8b2379c6c9192c6d5eed5edd8 SHA512 86be2b64b38347d5f0bd086dd35970d6f2c1fcffe315a116d68251193e91a05a0fe02f029d558290d4ebc09175067f0f2bb4e59bb58984150d52d219a8c9503e
 DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
-DIST clementine-1.3.1_p20190609.tar.gz 8516585 BLAKE2B a02e473703da5cfa3a7fb702f3ff90f3aa0fd97faf8b10b2c080b4a9a052f514f67fe40dcd0fd435c1681bd8749b0f4d731b21e4b842979e9dbe516cf7a19e76 SHA512 d72d29a01920bfe74d1a51b419cdbb5bd096cfd816edec4e7325bf43cc5b75a893c273b131539ae362f2a804cbb4ca57002737e4833ef6e5c1adc1b7f142dd57
 DIST clementine-1.3.1_p20191004.tar.gz 8528437 BLAKE2B 11c7bd7ac4ad4cdc75e2c5e54651832c1aa31448341230917df973227fcb1cd659309bb361f0b62a12dc38ce48e1f25697742df478650f4c10996938a7093acf SHA512 eb755d47f2e518c4e1bb28596e6554184d9fb6bab594e2f16b73c0bdecaa7c19692d368e9ec6a91e5012b786368eb7d3b2d051db11f3b5934233ba3e5b488679
-EBUILD clementine-1.3.1_p20190127.ebuild 5045 BLAKE2B 1a5413ccdf502d0c56cf09c4067161b128e5f8a2fe960e9c3b0dc2b7ed05e13b59fac2a866c11d5d53a715a4d3557b8ce84050e94c5974a9aa357a3dededae1b SHA512 88d87ecba083252f52a4aac810680ea088c49b70216dbe1d9a51f1a7b7d8912c35e8dbcee3879a8475f53fb8db3a5f95449d22b2f185cd179a077b57f6804b92
-EBUILD clementine-1.3.1_p20190609.ebuild 5110 BLAKE2B 2ace372f4b6ba4969d075e8954f0a5bfa5ea78037cb1dfb129b1a4d726990df4a862925a3b901da2ef1d5de088a20d720e4b3a59d5b66778e2bb4a860850daa5 SHA512 3689915216cebe991bd0d5ae9596ea0844f0583ec39f287f9487bd859e6e95d4dcc8c075efc94a69af52df3fbf4af222b2d430e7dedc002b92c0f38b067bf810
-EBUILD clementine-1.3.1_p20191004.ebuild 4615 BLAKE2B 310536c020206dc6754799dc80261ebe2fbb18304923fb61a241484f0bd019c4310e2d3fead5eabd07e89369d3aab54eb87fbc6d365e1000730a47afe453074b SHA512 edca69e331d5547b8e274b5151713ad45bb171bddbe9f3558142be4e6d8da05525297688a0b8f5c1ae2283c9bd364b0297154c5483c323886da694b3d5198965
-EBUILD clementine-9999.ebuild 4552 BLAKE2B 9a41188b10607092a1e6689e490bc835997f79cb5234228a854f041d70d4119b1a7ba550f0139773fb61f46ce7cafaabfc6367a4e41a57ff5693a572899ab306 SHA512 040b8ed1f7381a23900fe17bf29b238716337b457c5579f21a4d610fbb32f23d0aa8932c29b06b5f24189aabed5de3b3764597fa1e2dadeb0b66f9ba12e38cba
+DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
+EBUILD clementine-1.3.1_p20190127.ebuild 5027 BLAKE2B 5b9fb6dbbf5b57be7c610e882afc7f5e0bbfebc164b66d471092475106ce9b11e2dafb12d3f383320fa41c0c411c8cceb9644a940e4947b024d48ffab6bf2705 SHA512 1c85a20de5367dae202e44ae93845b5333e89c72f135a180c3f25c8218eb122209a8076a6f72266b242f619ad1c45cd5ac06102f37d0b7b8be90641b85403299
+EBUILD clementine-1.3.1_p20191004.ebuild 4597 BLAKE2B 92e229aa5164fff33e1f099eca0d92dc235b72798a28b524e1588b66e0693fbc1f0050fdc59a454f90eeafcca5fcd0f2625f06c9b391c01cbae3b190b2875537 SHA512 8166d382f4be0047e6423f5f9105a40aed4d617565f3fd019356774ab320a9aa346fef67ec722d673719c238e68f2083f7d57cf271bb2a690b732fe4d89777b3
+EBUILD clementine-1.4.0_rc1.ebuild 4837 BLAKE2B 03f253d587282b49f18abb0cb13d4ef6a2e368e738e9a6bec180d1554d9b17cfbfcbd128c94fd82c1b3f7073dbcea9d5ca520971c513e3ee38b59e2c70bf6b71 SHA512 1250358eeeca2fafb93cc749f9616385daed37129f82a5ec41e21a8984358ba4eb4ea7e7f22a283507fa2707added4d307b006e9f77b1e7360bbe22ce474b88e
+EBUILD clementine-9999.ebuild 4820 BLAKE2B 2fe724b22cc8b7b60e6b71a82fc39c9975e722690905b223f19d910f35ddcd238987dfd5a6cebc63169ee952cd1214e68e1e11768ff281b0ae230a11d0eaf373 SHA512 969c6a71948ce2d59b3074fbe481853ef269168f59a1f9dc74cc1f4cf1508b6c6b726f0b64e4f8c55fdbab14f6c3201064be4033aa4641afd9b1fa53f621a495
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
index 9aa4ffa1983b..a2bb0b39fd2e 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic l10n virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -108,7 +108,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
@@ -158,7 +158,7 @@ src_configure() {
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-sound/clementine/clementine-1.3.1_p20191004.ebuild b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
index f2d1766fb153..4e52840045fa 100644
--- a/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic l10n virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -101,7 +101,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
@@ -151,7 +151,7 @@ src_configure() {
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index c1abcfd676e4..8d5ccbe101be 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -1,29 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
+inherit cmake flag-o-matic l10n virtualx xdg
+
 MY_P="${P/_}"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_BRANCH="qt5"
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
-	COMMIT=9af827b6acaabb2331246f58436cd34b11548b6c
-	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P/_}"
+	SRC_URI_BASE="https://github.com/clementine-player/${PN^}"
+	COMMIT=""
+	if [[ -n "${COMMIT}" ]] ; then
+		SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN^}-${COMMIT}"
+	elif [[ $(ver_cut 3) -gt 90 ]] ; then
+		SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
+	fi
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
-
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -43,7 +51,7 @@ BDEPEND="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++:=[asm]
+	dev-libs/crypto++:=
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
@@ -73,12 +81,6 @@ COMMON_DEPEND="
 		virtual/opengl
 	)
 "
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-soup:1.0
@@ -104,12 +106,10 @@ RESTRICT="test"
 
 DOCS=( Changelog README.md )
 
-PATCHES=( "${FILESDIR}/${P}-fix-restore-from-systray.patch" )
-
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
@@ -159,7 +159,7 @@ src_configure() {
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 3efe963fe1b3..edb23f4f60da 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,21 +1,30 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
+inherit cmake flag-o-matic l10n virtualx xdg
+
 MY_P="${P/_}"
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P/_}"
+	SRC_URI_BASE="https://github.com/clementine-player/${PN^}"
+	COMMIT=""
+	if [[ -n "${COMMIT}" ]] ; then
+		SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN^}-${COMMIT}"
+	elif [[ $(ver_cut 3) -gt 90 ]] ; then
+		SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
+	fi
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
-
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 
@@ -98,7 +107,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
@@ -148,7 +157,7 @@ src_configure() {
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 01caf0ae26eb..1faef3350734 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,8 @@
-DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab SHA512 f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
-DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
-DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
-EBUILD csound-6.10.0.ebuild 6030 BLAKE2B d75bf31734fb280ec29e92b3cbb99df558a8cb7cabe4d3a3faa3a83d3d0559e337f054711350535ef102d5dd9ccc4f3009dc753f3caf9de4a882a5c706bdcdc8 SHA512 2fce2d37b7584833d84b51c791c8a41a5164bd2bb5f24abb97232a7c1b4ddec7d8f0eb5195241208477285f3b371bf98aa31b95548ebe493bc816200e736db8a
-EBUILD csound-9999.ebuild 6981 BLAKE2B 3b0405d259fb32061af330f15f69d7953b0f8f2ef75a279851bc22cc7a0e3b624eab825a8b278ae76ba43a3927624d5d6421ef6443d60503de2777032b337ea8 SHA512 37da0b6c89a0a6e15c5cf1d2daca0102b7f9d7d9f9fb47a655a5ea5f6cc87b23dcc05884e728fd28b4cfac658c288ec54e69bbc436d13099b7afd26d2bd442e7
-MISC metadata.xml 1487 BLAKE2B e94fef343f96f5fe68a0fb486b7f8bd9f8af7fb3f585696a4b6d909cc1e87f2da66ab73b24ad1b3c809db472877febb8fbde2c3fc5b2abfab35c3efe9eddf321 SHA512 215f491284f409a299d5c4ef8d9df6f377a4a5e032bce40870fb72c7c6bbcdaa8ea0879a86c3379207e0b69df7f735254936e97ed68ebd2aeecf9498c646037e
+AUX csound-6.13.0-xdg-open.patch 982 BLAKE2B e6643fc554feb8b0fd4cbb4d96e6ca727bf04da998b61df515e090fc0784ce9c2fbe0b67ce45da83d36838cc57de6de5f176d38c322b1586264a527b1b44fe09 SHA512 e141beafdd2a93bbd7bd0a12c71e1dc3ffd2c67558c3e7e47a24298aefe6197bbde179d2bfc7e82e78bdffac1c889d43789a17e364785e9892bd35306fa07c6a
+AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1
+DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B 4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab SHA512 87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5
+DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82 SHA512 30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa
+DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566 SHA512 b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40
+EBUILD csound-6.13.0.ebuild 7310 BLAKE2B 95ff707d04e049346933503d1a4a1556b7a91ef0a9f8c3633989288249d5427d429ea7c79b6e4f741f8bd6ed97915c07bdcafe9c4994646a908acfe5c15ea67a SHA512 91da3b9efc6695c23bf2c4376baa91e317aa9ee129d3587643c80201c919a9b8f70dd031cea6e690fe62f13788c1981c3a0419a799277aa8373012a7bf921683
+EBUILD csound-9999.ebuild 7346 BLAKE2B 060b23eac2cf5a927fb242bdae49a8463423ca1c295a543ccfb5465932365c5afddf9a253e6adb227f072917a35dcede9bd1891fc206a1ce3d919a8f24b930fa SHA512 7b80fe443eba1ab29ff7640be453d1d3b598e48291cabca93832ccc803e91734f3b38d0e88840b043529e7cbd0359b422cb2b3555251a6110a8148e0b4f3b2d8
+MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.10.0.ebuild b/media-sound/csound/csound-6.13.0.ebuild
index 2c61ca708be8..e7d1d96b3f99 100644
--- a/media-sound/csound/csound-6.10.0.ebuild
+++ b/media-sound/csound/csound-6.13.0.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+# 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
 
-inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+	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
@@ -19,47 +23,59 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A sound design and signal processing system for composition and performance"
+DESCRIPTION="Sound design and signal processing system for composition and performance"
 HOMEPAGE="https://csound.github.io/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
-
-IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+# java doesn't work atm as it needs to have some variables specified to work, see src_configure
+# mp3 doesnt work as media-sound/lame does not install cmake file
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
 
 REQUIRED_USE="
-	csoundac? ( || ( lua python ) )
-	java? ( cxx )
 	linear? ( double-precision )
 	lua? ( cxx )
 	python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
+#	java? ( cxx )
 
-RDEPEND="
+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:* )
+#	mp3? ( media-sound/lame )
+CDEPEND="
+	dev-cpp/eigen:3
 	>=media-libs/libsndfile-1.0.16
 	media-libs/libsamplerate
+	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
-	csoundac? (
-		x11-libs/fltk:1[threads?]
-		dev-cpp/eigen:3
-		dev-libs/boost:=
-	)
 	curl? ( net-misc/curl )
 	dssi? (
 		media-libs/dssi
 		media-libs/ladspa-sdk
 	)
-	fluidsynth? ( <media-sound/fluidsynth-2:= )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fltk? ( x11-libs/fltk:1[threads?] )
+	hdf5? ( sci-libs/hdf5 )
 	image? ( media-libs/libpng:0= )
-	jack? ( media-sound/jack-audio-connection-kit )
-	java? ( virtual/jdk:* )
+	jack? ( virtual/jack )
 	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( sci-mathematics/gmm )
+	linear? ( =sci-mathematics/gmm-5.1* )
 	lua? (
 		luajit? ( dev-lang/luajit:2 )
 		!luajit? ( dev-lang/lua:0 )
@@ -70,23 +86,13 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
 	stk? ( media-libs/stk )
-	tcl? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
 	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets )
+	websocket? ( net-libs/libwebsockets:= )
 "
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	csoundac? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
 "
 
 if [[ ${PV} != "9999" ]]; then
@@ -96,93 +102,133 @@ fi
 # requires specific alsa settings
 RESTRICT="test"
 
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
+PATCHES=(
+	"${FILESDIR}/${P}-xdg-open.patch"
+)
 
 pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
 	if use python || use test ; then
 		python-single-r1_pkg_setup
 	fi
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
-
-	has_version ">=media-sound/fluidsynth-2" &&
-		eapply "${FILESDIR}/${P}-fluidsynth2.patch" # 680062
+	cmake_src_prepare
 
 	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
 		-e '/-O3/d' \
 		-i CMakeLists.txt || die
-
-	local lang
-	for lang in ${IUSE_LANGS} ; do
-		if ! has ${lang} ${LINGUAS-${lang}} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_ALSA=$(usex alsa)
-		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
 		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_CSOUND_AC=$(usex csoundac)
-		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
-		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CUDA_OPCODES=OFF
 		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DUSE_CURL=$(usex curl)
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DUSE_DOUBLE=$(usex double-precision)
 		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FAUST_OPCODES=OFF
 		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DUSE_FLTK=$(usex fltk)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
 		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
 		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_JAVA_INTERFACE=OFF
 		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
 		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DUSE_GETTEXT=$(usex nls)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_OPENCL_OPCODES=OFF
 		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DUSE_OPEN_MP=$(usex openmp)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		-DBUILD_PADSYNTH_OPCODES=ON
+		-DBUILD_PLATEREV_OPCODES=ON
+		-DBUILD_PVSGENDY_OPCODE=OFF
 		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DSCORE_PARSER=$(usex score)
+		-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_STACK_OPCODES=ON
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
+		-DBUILD_STATIC_LIBRARY=$(usex test)
 		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
-		-DBUILD_STATIC_LIBRARY=$(usex test)
-		-DBUILD_TCLCSOUND=$(usex tcl)
-		-DBUILD_MULTI_CORE=$(usex threads)
 		-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
 		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
+		-DNEW_PARSER_DEBUG=$(usex debug)
+
+		-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_LRINT=ON
+		-DUSE_JACK=$(usex jack)
+		-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)"
 	)
 
+	# this is needed, otherwise it sets LIBRARY INSTALL DIR: lib
 	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
 		-DUSE_LIB64=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc -r Release_Notes/.
 
 	# generate env.d file
@@ -210,7 +256,7 @@ src_install() {
 	fi
 
 	# rename extract to csound_extract (bug #247394)
-	mv "${ED%/}"/usr/bin/{,csound_}extract || die
+	mv "${ED}"/usr/bin/{,csound_}extract || die
 
 	use python && python_optimize
 
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index b0de613cfe23..f29357886e45 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2019 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_{6,7,8} )
-inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs
+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://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+	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
@@ -27,12 +31,10 @@ SLOT="0"
 # java doesn't work atm as it needs to have some variables specified to work, see src_configure
 # mp3 doesnt work as media-sound/lame does not install cmake file
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio
+fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
 vim-syntax websocket"
 
-IUSE_LANGS=" de en_US es es_CO fr it ro ru"
-
 REQUIRED_USE="
 	linear? ( double-precision )
 	lua? ( cxx )
@@ -41,7 +43,6 @@ REQUIRED_USE="
 #	java? ( cxx )
 
 BDEPEND="
-	dev-libs/boost:=
 	sys-devel/flex
 	virtual/yacc
 	chua? ( dev-libs/boost )
@@ -70,6 +71,7 @@ CDEPEND="
 	)
 	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?] )
@@ -85,10 +87,13 @@ CDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	stk? ( media-libs/stk )
 	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets )
+	websocket? ( net-libs/libwebsockets:= )
 "
 RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
+"
 
 if [[ ${PV} != "9999" ]]; then
 	DEPEND+="doc? ( app-arch/unzip )"
@@ -97,6 +102,10 @@ fi
 # requires specific alsa settings
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+)
+
 pkg_setup() {
 	if use python || use test ; then
 		python-single-r1_pkg_setup
@@ -104,36 +113,28 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
 		-e '/-O3/d' \
 		-i CMakeLists.txt || die
-
-	local lang
-
-	for lang in ${IUSE_LANGS} ; do
-		if ! has ${lang} ${LINGUAS-${lang}} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
 }
 
 src_configure() {
 	local mycmakeargs=(
-		#-DBUILD_BELA=OFF
-		#-DBUILD_BUCHLA_OPCODES=ON
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
 		-DBUILD_CHUA_OPCODES=$(usex chua)
 		-DBUILD_CSBEATS=$(usex beats)
-		#-DBUILD_CUDA_OPCODES=OFF
+		-DBUILD_CUDA_OPCODES=OFF
 		-DBUILD_CXX_INTERFACE=$(usex cxx)
 		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		#-DBUILD_EMUGENS_OPCODES=ON
-		#-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
 		-DBUILD_FAUST_OPCODES=OFF
 		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		#-DBUILD_FRAMEBUFFER_OPCODES=ON
-		#-DBUILD_HDF5_OPCODES=ON
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
 		-DBUILD_IMAGE_OPCODES=$(usex image)
 		-DBUILD_JACK_OPCODES=$(usex jack)
 		-DBUILD_JAVA_INTERFACE=OFF
@@ -141,27 +142,26 @@ src_configure() {
 		-DBUILD_LUA_INTERFACE=$(usex lua)
 		-DBUILD_MP3OUT_OPCODE=OFF
 		-DBUILD_MULTI_CORE=$(usex threads)
-		#-DBUULD_OPENCL_OPCODES=OFF
+		-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_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=ON
-		#-DBUILD_SELECT_OPCODE=ON
-		#-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		#-DBUILD_STACK_OPCODES=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_STACK_OPCODES=ON
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
 		-DBUILD_STATIC_LIBRARY=$(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_VST4CS_OPCODES=OFF
 		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
 		-DBUILD_WIIMOTE_OPCODES=OFF
 		-DBUILD_WINSOUND=OFF
@@ -172,16 +172,16 @@ src_configure() {
 
 		-DUSE_ALSA=$(usex alsa)
 		#-DUSE_ATOMIC_BUILTIN=ON
-		#-DUSE_AUDIOUNIT=ON
+		-DUSE_AUDIOUNIT=OFF # Apple specific
 		#-DUSE_COMPILER_OPTIMIZATIONS=ON
-		#-DUSE_COREMIDI=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_LRINT=ON
+		_DUSE_IPMIDI=ON
+		-DUSE_LRINT=ON
 		-DUSE_JACK=$(usex jack)
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
@@ -199,16 +199,20 @@ src_configure() {
 
 	# set the library that we want to use
 	if use lua ; then
-		local package
+		local libdir
+		local libname
 
 		if use luajit ; then
-			package="luajit"
+			libdir=$(pkg-config --variable=libdir luajit)
+			libname=$(pkg-config --variable=libname luajit)
 		else
-			package="lua"
+			libdir=$(pkg-config --variable=libdir lua)
+			libname=$(pkg-config --variable=libname lua)
+			[[ -z "${libname}" ]] && libname="lua"
 		fi
 
 		mycmakeargs+=(
-			-DLUA_LIBRARY="$(pkg-config --variable=libdir ${package})/lib$(pkg-config --variable=libname ${package}).so"
+			-DLUA_LIBRARY="${libdir}/lib${libname}.so"
 		)
 	fi
 
@@ -216,15 +220,16 @@ src_configure() {
 		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
 	)
 
+	# this is needed, otherwise it sets LIBRARY INSTALL DIR: lib
 	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
 		-DUSE_LIB64=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc -r Release_Notes/.
 
 	# generate env.d file
diff --git a/media-sound/csound/files/csound-6.13.0-xdg-open.patch b/media-sound/csound/files/csound-6.13.0-xdg-open.patch
new file mode 100644
index 000000000000..19d428fabf34
--- /dev/null
+++ b/media-sound/csound/files/csound-6.13.0-xdg-open.patch
@@ -0,0 +1,24 @@
+Source: https://build.opensuse.org/package/view_file/openSUSE:Factory/csound/csound-6.08-xdg-open.patch
+Index: csound-6.12.2/installer/misc/vim/cshelp
+===================================================================
+--- csound-6.12.2.orig/installer/misc/vim/cshelp	2018-11-07 16:05:23.000000000 +0200
++++ csound-6.12.2/installer/misc/vim/cshelp	2019-04-05 15:32:23.670308342 +0200
+@@ -3,7 +3,9 @@
+ BROWSER_CMD=""
+ 
+ if [ "${DISPLAY}" != "" ] ; then
+-    if ( which links | grep -q -G -e "^/usr" ) ; then
++    if ( which xdg-open | grep -E -e "^(/usr)?/bin" ); then
++        BROWSER_CMD="xdg-open" ;
++    elif ( which links | grep -q -G -e "^/usr" ) ; then
+         BROWSER_CMD="links -g" ;
+     elif ( which konqueror | grep -q -G -e "^/opt" ) ; then
+         BROWSER_CMD="konqueror" ;
+@@ -38,5 +40,5 @@ else
+     OPNAME="${1}" ;
+ fi
+ 
+-exec ${BROWSER_CMD} "/usr/local/share/doc/csound/manual/${OPNAME}.html"
++exec ${BROWSER_CMD} "/usr/share/doc/csound-manual/${OPNAME}.html"
+ 
+
diff --git a/media-sound/csound/files/repackage.sh b/media-sound/csound/files/repackage.sh
new file mode 100644
index 000000000000..fea97d24a46f
--- /dev/null
+++ b/media-sound/csound/files/repackage.sh
@@ -0,0 +1,35 @@
+#! /bin/bash
+
+# Adjusted from OpenSUSE script
+# Source: https://build.opensuse.org/package/view_file/openSUSE:Factory/csound/pre_checkin.sh
+
+VERSION="${1}"
+
+if [[ -z "${VERSION}" ]]; then
+	echo "Version must be specified"
+	exit 1
+fi
+
+rm -f *.tar.*
+
+wget https://github.com/csound/csound/archive/${VERSION}.tar.gz || exit 1
+
+echo -e "\n\nUnpacking tarball\n"
+tar -xf ${VERSION}.tar.gz
+
+echo -e "Removing undistibutable files\n"
+rm -f csound-${VERSION}/Opcodes/scansyn*
+
+echo -e "Creating distributable tarball\n"
+tar -acf csound-${VERSION}-distributable.tar.xz csound-${VERSION}
+
+echo -e "Cleaning up\n"
+rm -rf csound-${VERSION} ${VERSION}.tar.gz
+
+if ! test -e ${VERSION}.tar.gz; then
+	echo "success"
+	exit 0
+else
+	echo "error"
+	exit 1
+fi
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index 9cea2aaf92d9..c5216b6e38c5 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="beats">Build the beats score frontend</flag>
 		<flag name="chua">Build the chua opcodes</flag>
-		<flag name="csoundac">Build the CsoundAC extension module</flag>
 		<flag name="double-precision">Use double-precision floating point for audio samples</flag>
 		<flag name="dssi">Build the DSSI opcodes</flag>
 		<flag name="fluidsynth">Build the fluidsynth opcodes</flag>
@@ -17,9 +16,7 @@
 		<flag name="linear">Build the linear algebra Opcodes</flag>
 		<flag name="portmidi">Build the PortMIDI I/O module</flag>
 		<flag name="samples">Install the HRTF datafiles for use with hrtfmove, hrtfmove2, hrtfstat, hrtfearly, and hrtfreverb</flag>
-		<flag name="score">Build the alternative score parser</flag>
 		<flag name="stk">Build the stk opcodes</flag>
-		<flag name="tcl">Build the tcl interface and clients</flag>
 		<flag name="utils">Build stand-alone executables for utilities that can also be used via `csound -U`</flag>
 		<flag name="websocket">Build the websocket opcode</flag>
 	</use>
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 00bd8d08018e..9110f33a218b 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -4,5 +4,5 @@ AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d2
 DIST denemo-2.2.0.tar.gz 17032009 BLAKE2B 66732fcdaa5d5119ca2a45e5a8c6829e05092a4f0e18e3c8a991bddaaf863ea05889654af47150650d2c67397afa957de0fc3ce0ada86a22be00ae91d4add993 SHA512 74bef7b888abd86db42cee7ecb404e1b9211f9965207366c99980137194acd2afa6ec8b1c18da8a12fe4c6951d8a1bb873b313f5749ea629bb7eaeedf12368ef
 DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
 EBUILD denemo-2.2.0.ebuild 2930 BLAKE2B 65c16eb446dbeb906ce8fa5f3190bf3f62c0e4b8647a76937720fb5251028d66d34399cb6b759742895f6979e46ec97703eaedc5d6ee027469886b4487b7b39a SHA512 73ac587a3c715b27bbe04ad2ee6e66c538ec08f6a64c860adb9a102d6fc3627a22184fae20453530b2ea8e5c9a191a97bcdc6a403ad8ca6f5b82280d6b6bc172
-EBUILD denemo-2.3.0.ebuild 2923 BLAKE2B 2a4f7562ad164b6035a168f57371163465b77222d834bb7822ec1f9e172817793c717d9e6413d5640303f6b871c6aa9f5199095bdf721d6d863db812006cefb1 SHA512 b45cfd04366e27a88811b17665269168988c28d98fa4cae6563abfd75547f84d8a3a4bb76714e28f871958d47c3459d7cf39c944999965508f164e96b7194719
+EBUILD denemo-2.3.0.ebuild 2958 BLAKE2B e45c620cc93f7d1123a506bbb516ac7f844388b28db04aa9094ec98c654df9f9b231e0fff1a2fc146682a6aa216e2bfc8cf3b5e34ea8f60d90220a5208c97a05 SHA512 44922d8c7b25fc889b69d7222e827baffe589ca3782e82bf574a9608dc1a15578ec771ab5e571dc422dd1c9f370ed2d6c95d6a968dba6719efd81d1e656f0a55
 MISC metadata.xml 1587 BLAKE2B b20d6c43ea998e867ac1fbb84faab58cf3901b40700b36485d9de57336b8616117bae28e712b061dc49a80c9b27637b43a6b08d01535597ad7cf4d5a935dc72d SHA512 f14e3e591bc4824b8a9a872e3574a2e5e73a70451a02d85c021ff77eddc9034c6eac1238c968ee637fa5bb9fc4f98d71486be379faede67b462818534b392ecd
diff --git a/media-sound/denemo/denemo-2.3.0.ebuild b/media-sound/denemo/denemo-2.3.0.ebuild
index 6bc0a16e9940..08918be3f6da 100644
--- a/media-sound/denemo/denemo-2.3.0.ebuild
+++ b/media-sound/denemo/denemo-2.3.0.ebuild
@@ -57,7 +57,10 @@ BDEPEND="
 	>=sys-devel/flex-2.6.1
 	virtual/pkgconfig
 	virtual/yacc
-	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25-r1
+		>=dev-util/gtk-doc-am-1.25-r1
+	)
 	nls? ( >=sys-devel/gettext-0.19.8.1 )
 "
 
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 893e23a30620..a133dfa25058 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,7 +1,11 @@
+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-5.2.1-desktop.patch 226 BLAKE2B 808207d496c746029eceb300c2a4b3d4746bf704f0fa93976623d11f47ea063a8ca0a7422a01cb324e869f2054ee6bf47e4cf5814092f05ac1abb4505c74f231 SHA512 fe6d1e8774232077cfa585f79fcfcf4ac441a61b5f9d3f556e526094fd7a049530ebd028ec0d18807335038d0e65809726fe59ee4b7c1f32811b4b349d00e76b
 AUX din-5.2.1-makefile.patch 691 BLAKE2B e6ccb4ba6b3bc8ef2f318e88f9616c6740950f2b0c0f82ca1ffab458655437e57a18d95cff30637a8e68ceca9d10e28f4b91a384140e171e58545819fc9c03f5 SHA512 dbb0390dacd7aed6320955b9573e9c09ce88b0297ffd28e38fd6f1d9ab0b875dde6e2bbc8b38e87eefd5aa790cd2a6c817dd39a3d5919cb2e1404ace99cf4cff
 AUX din-5.2.1-tcl.patch 644 BLAKE2B 7d990afaa5d770dee87c2723c763ab178d89e54479f5688907aa5ce5082fdc2bb9097a85c47f3a7e0f6e73bded0af4bdb2209520147c694adc5492957963b60f SHA512 ac7f1b63bd90c04ba89651c9932b25368db57e143177d14a93c7b750426c60f91a8127d576562b3e61af855ef7f8c352a149dcbff6469a27dd05774d133d21ea
 AUX fix-random-constants.patch 1279 BLAKE2B 87532e2f2be8caeef60c6852dd74480718324cdfab45d9e123c0d0a39672b4bb6a2cc0ee1ac81aebcfc8e8d937b6094d52be401ed0d1f2531f4f00c8399c7e8d SHA512 0cf71beed7e46fc83fdf7360b4cc7fd2c8f26f5d3a2c7a43d39454b79f3d63b71dbf056b3f61b8b53c363e50e2506a92b891715667bf32b251b668251da5e058
+DIST din-43.0.1.tar.gz 3644254 BLAKE2B 6b441ce93b3bd68e3bad5d7a6fea1914f250a5e35410f12c64da7ab1f530aa74b4a8f624a7b6ec70e26b62f5b3f8ada674ad7286b89e2569bbec9f3f29cccac6 SHA512 14df7f52a80801f062ed1a81c5625d8730e7bcc21cfa5256ecce9b478494828a3d0877c37434f30883aa519f767a70ba1cee4d203ec57c5bc72de1c47d2d848d
 DIST din-5.2.1.tar.gz 321269 BLAKE2B eb3b3ebad7a973dfc9bd4d6edbcc83e545c5e11c564a4f592ddef996e971c52fd8b4508933d76dd6964fcbaf5eebe5f0230171eef6466d63540c01918a946379 SHA512 0fa7de383c869f9f55ee055f821f3b541ca7df83d61f9bdb6b9e0227a724abe098073985cb4f3eb381199d4baa84d9ee2b86b74614e11cb8b58b119230ca3c09
+EBUILD din-43.0.1.ebuild 1129 BLAKE2B 7cf6804cb88ca8b101a13083316377cd845737469eacf2c2c5382f4ddb8f7e0771858620e14a762d17a272bfd280ac2e7141642972ac66c5ecd1fb32d6b56817 SHA512 bded33507a5b15c1688a8c61ba3b114a5c7a48f0edc57646f7940e4c652d9c2b2f5e3edbb16e48f3ece033637351206c08f2a9200e10c2f37725fa128ad85c5e
 EBUILD din-5.2.1.ebuild 842 BLAKE2B 5e7177cab16b45d5049bbf7cbfe3c65f905429f1b7101d894d18bc6ab98765332e9c7b3fe64d55ed948a7e4c2289a2393dd435d03e263aad1732bccfd256ca53 SHA512 f01c83f185bf3a08e4bbf66de498849b16e05e96a081228b33a0237ad964c439f367307615115a64081d47babf2c81cd379f9b72258b641415f4aaa958c02e4d
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-43.0.1.ebuild b/media-sound/din/din-43.0.1.ebuild
new file mode 100644
index 000000000000..1dda28bdfe0a
--- /dev/null
+++ b/media-sound/din/din-43.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="http://dinisnoise.org/"
+SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+BDEPEND="
+	app-text/dos2unix
+	virtual/pkgconfig
+"
+CDEPEND="dev-lang/tcl:0=
+	media-libs/libsdl:=
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-fix-random-constants.patch"
+)
+
+src_prepare() {
+	default
+
+	dos2unix pixmaps/${PN}.desktop || die "Failed to fix desktop file"
+
+	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
+
+	eautoreconf
+}
+
+src_configure() {
+	# Jack takes over alsa.
+	local sound_engine
+
+	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
+
+	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
+}
diff --git a/media-sound/din/files/din-43.0.1-fix-random-constants.patch b/media-sound/din/files/din-43.0.1-fix-random-constants.patch
new file mode 100644
index 000000000000..29f75d35f496
--- /dev/null
+++ b/media-sound/din/files/din-43.0.1-fix-random-constants.patch
@@ -0,0 +1,15 @@
+diff --git a/include/random.h b/include/random.h
+index 99d79fb..91ed250 100644
+--- a/include/random.h
++++ b/include/random.h
+@@ -16,8 +16,8 @@
+ const int N = 624;
+ const int M = 397;
+ const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */
+-const int UPPER_MASK = 0x80000000; /* most significant w-r bits */
+-const int LOWER_MASK = 0x7fffffff; /* least significant r bits */
++const unsigned int UPPER_MASK = 0x80000000; /* most significant w-r bits */
++const unsigned int LOWER_MASK = 0x7fffffff; /* least significant r bits */
+ 
+ static unsigned int mt[N]; /* the array for the state vector  */
+ static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
diff --git a/media-sound/din/files/din-43.0.1-makefile.patch b/media-sound/din/files/din-43.0.1-makefile.patch
new file mode 100644
index 000000000000..f3a8116571cc
--- /dev/null
+++ b/media-sound/din/files/din-43.0.1-makefile.patch
@@ -0,0 +1,12 @@
+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/drumstick/Manifest b/media-sound/drumstick/Manifest
index 20461ead6320..0ad114c1bbbb 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,5 @@
 DIST drumstick-1.1.2.tar.bz2 1012371 BLAKE2B e60a5678d33db1831130037bb4a6df6da8de815a6a0ca33a167f85596f45a1d420ca4c689c756c1fd3f794fb2a097bc19878d78bfe0789a40f9eae1b306b769f SHA512 6e84fbf2ce717cdb3c669a477de65d2f32c277073d812546267c0a9556f7ead612e3140cbc412fcd560786ca024f201a1eb3ba9de4b037e3ba8d4db89e0e2e29
 DIST drumstick-1.1.3.tar.gz 1358468 BLAKE2B af4cc923d380a1da66c835a6302e47e31c17ff90ba9277fe6063e6029c3d4d087e85905487a4dae657cdbfb743d2ac6e6c5a30c0905c9bc736d8666105e52099 SHA512 41990c269c41dc011e14c9bf008b983cd3722ea52429ec7eabaa5689a6f69b1760fc766604378c30bb1dfab537b77f7522a13377b873308835a0e7701d24448e
-EBUILD drumstick-1.1.2.ebuild 1466 BLAKE2B 1875c3fc6df6afcda35ff243fecdde7e30558a11096976d18a9f22ef595bd32401d72a63182c3ae28a0da9905c99862338225f0d545b10bc3b1153d36db9f710 SHA512 6fadb06cd83001be43e08c5e468935333d6ad045618b407ce84133ac949b083089789f5ff366a26aeda5774ec63d74eb30bcf0553f60db9e9a75b488cc4b91d7
-EBUILD drumstick-1.1.3.ebuild 1465 BLAKE2B c7fc251ba557f7abf8a26a23396d6136d54f2954ee159ab881537eba46713648f9e8fa4d5d15549ef586a3ffee62a947b3280ce0ff99f96888d8321beb73df21 SHA512 29985315147ea82f2a09d4816475ca85e356c5ace072663356ee389092e15fce71d4bdfdda5bcd635e2b43e408cc0baec8227b6132c0965f6c7b85b89f274e8d
+EBUILD drumstick-1.1.2.ebuild 1424 BLAKE2B 6447b06e614bf565e5800f11be66e2078c89e35912496c309838fa3e23ace4c9d079a10db39cc69474f810077c58250fd93cb69895ebcfffff18c992f637936c SHA512 7e5b5eab789608a56acca698a72b95f45003a6758d16cd867ecc948d589534a10af779c091ea54768a9877500a28ba68788dc957b8e37ec6d54e656b7d38e580
+EBUILD drumstick-1.1.3.ebuild 1423 BLAKE2B 275235e1c697144a056c1fde8845b5e1dfe11fc91ab5d6e0bc601ba9fdda5a0cd6f34e0215a1c96736f89191a64b70e69790e8ccc5cf1154decb4daa60caf861 SHA512 f9111df83ca27d48c15c35b8adff813a05591c4cdadde60a7e382b7f0da1a24e3ab0802c0df21129b6135b035357c0a6709a83045039f04532a1eeda00272978
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.2.ebuild b/media-sound/drumstick/drumstick-1.1.2.ebuild
index c76b61480434..cf6137ec098e 100644
--- a/media-sound/drumstick/drumstick-1.1.2.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -41,7 +41,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 RESTRICT="test"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use fluidsynth ; then
 		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
@@ -58,19 +58,19 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=OFF
-		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc Doxygen)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doxygen
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc ; then
 		dodoc -r "${BUILD_DIR}"/doc/html
diff --git a/media-sound/drumstick/drumstick-1.1.3.ebuild b/media-sound/drumstick/drumstick-1.1.3.ebuild
index f6de2bd3fcc8..fbb7e14743ec 100644
--- a/media-sound/drumstick/drumstick-1.1.3.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -41,7 +41,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 RESTRICT="test"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use fluidsynth ; then
 		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
@@ -58,19 +58,19 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=OFF
-		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc Doxygen)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doxygen
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc ; then
 		dodoc -r "${BUILD_DIR}"/doc/html
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 5e38086156df..4d7c4516714e 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
-DIST elisa-19.12.0.tar.xz 1386020 BLAKE2B c16e27fd85f7a73e264873a2b8926c9bc820885b5e40b88f271c6e70303365f34380d880d972d0bfca67d2c49f57c4ef6e895e798aeb844e729a475b3a398d40 SHA512 bac5693e10d0db4389aeb7fcf555914d5613ec29549b5de6dbcc16b4d2d07d513157c819525f2fad61864adf7da37ad1b0ee1294e09eda79a2953e199767b14f
-EBUILD elisa-19.12.0.ebuild 1621 BLAKE2B 23db01fd5105ce769e85e740adcf1f85239efce7fec5ea874c22133936dd6896c3fda875d16fdb3d1820a0283977d85822765dfb029343f7aa6b089cb48f5bb9 SHA512 71acf6539c622b24430aa93753113ed511fdc06ceacc0462f14e7e14c5f3ad0d3bfd2632c8976219c82934d959de8386faa5f5c8ec4a052b2c57c6f335f53fde
+DIST elisa-19.12.1.tar.xz 1385248 BLAKE2B 3c3aa474e58abc5e5a379c7eedef8064e77cf62c183ab01adf5d4023d73ba906ad8c3ec8ef1fe9c1e717b578150f06f55a8ef7bba0cc3d7a5e5e5535f8310393 SHA512 5ce68c523ae6406dda0e8a04c520a7b4a0c7c8085fec95e24a69021eddd5d57a62cb300e22416d0e0184a52d7000328da072c640f867bb8ad1612adf12b32d2f
+EBUILD elisa-19.12.1.ebuild 1621 BLAKE2B 9c963d5c2519b2d0c49fc8f42db788d10313bf565a165d0310ad4d4ddd1ff2f5742db5f2fad009d735d0cb9f92b89a87c1417f8b92e59c70517c6b2bf6a106dd SHA512 a287195025775ef5044acabc671e50d9fa6a3ce06a0241aba21ab06758f48082f0db6382cb4ac60d67deea3963cab886209e51febe0db208d11a7b80a2c7e4e2
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-19.12.0.ebuild b/media-sound/elisa/elisa-19.12.1.ebuild
index d353e579539f..59056aeac442 100644
--- a/media-sound/elisa/elisa-19.12.0.ebuild
+++ b/media-sound/elisa/elisa-19.12.1.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/flacon/Manifest b/media-sound/flacon/Manifest
index f7f5e97eb402..48b0cdd487aa 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -3,5 +3,5 @@ AUX flacon-5.5.1-no-man-compress.patch 1089 BLAKE2B e4757b39f3ccbfb60e0298ed0917
 DIST flacon-4.1.0.tar.gz 1579869 BLAKE2B 6e0bf31f0eb47bf594d74e0f058f333daa9ee84f9313e75e059f1568386c20f79482926f6f786d332ecfbb72c3991e346a7b98ab8f27a2a4b4ce5c195c23d6bb SHA512 4e786571ba3e157aad2dc27523f8b9de259b44b84c7b054124a610199ef19855832000e4499d18bd6f725f2133bbbbf8d0d75f1cafbdce918605c3b407f6b0ef
 DIST flacon-5.5.1.tar.gz 2336502 BLAKE2B 524fe5fa28126f56452515ca1ce1572343dad8b06c28fc8e3a22a11e9ad8f3a51a25b3c19ddd29a7e3c658f1d7fb3316a2554a12a4ba3dd22370fc1394d38022 SHA512 36900b011135b61cf3cc1f05d94f852fc7e127972f3fed09e0fb7e66fec944ed1c3bfc61307494aff87c2fe24e16479605043a79e0634bc23940d01fc337c6c1
 EBUILD flacon-4.1.0.ebuild 2511 BLAKE2B 92ca36c74b7f0ce0db0c6bb8fdb4f6dfd04335e13e5fa7d7b952d1c89e8b8313744eb20b62c6c4043183c36936ad855ada0b7f9062667e53834ae744a20a22a6 SHA512 5de628e97ae4f9d2e7a7f746d9835e96c1451bb3eb5a3bfb93f0628d2ae7e7013152163f74caa09c38a8c49036bef4cca4b9b2c19fb083f021e90fe677d53002
-EBUILD flacon-5.5.1.ebuild 2064 BLAKE2B 35467ab737b7db36875d3b7c9c244da2ec9f187f96dd45b658096b5ce534ab3c86023c760d8f36b09f2c145e673962340532e507e23256ed23d33966b551c57e SHA512 ff565ccca8a127ac4b7fca1785b47e562c3cd10409d45d73b63e1496d3fcc60c8dca0e3cf2bb380d2ed4deb0ea7afa80dc052fa8388633151993c35bc31026e5
+EBUILD flacon-5.5.1.ebuild 2052 BLAKE2B 4881087954f0850645888349ce392b86fe017c0d031011d23c16f879e99659dbe1f6c2f77008a384ec07dd90c66733bf3a4aff9c674393f94f6ffc542ef98edc SHA512 d1a21e4238df16de39b054ee3d6f3570d00c44651f5fc16f91501387f044c359b8f6e1f78efbb5c4849ef9bb5a07d75b5b534d5a4f838ff55c3d04f7047ba125
 MISC metadata.xml 245 BLAKE2B d65195b37ab70bec146facd788d5a6239a7795c578130cb5703bf89e7a92da8acf8f4840e7f867d61359b57f0b002396a9e959cb9d2bbee2654003bc8ee061ff SHA512 be2b5dde02a39ab7345c9918796ce93c2356899fed6beb96b43f93b81eeb96a74020d2e606a5a33f95dfafa1bdef23620ab3214c2744c5e418beb7e8df1e9ae1
diff --git a/media-sound/flacon/flacon-5.5.1.ebuild b/media-sound/flacon/flacon-5.5.1.ebuild
index e6310352d358..ccdd9a6a41dd 100644
--- a/media-sound/flacon/flacon-5.5.1.ebuild
+++ b/media-sound/flacon/flacon-5.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # Tests require lots of disk space
 CHECKREQS_DISK_BUILD=10G
-inherit check-reqs cmake-utils eutils virtualx xdg-utils
+inherit check-reqs cmake eutils virtualx xdg-utils
 
 DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
 HOMEPAGE="https://flacon.github.io/"
@@ -58,7 +58,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS="$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 758a1127dd8b..86dae483fa76 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,9 +1,7 @@
-DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
 DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
-DIST fluidsynth-2.0.6.tar.gz 1315138 BLAKE2B ce6d1717d56d61b83bef6c30254c584ddb9ee3e74fa49422881c96c969068ebe7965de507547e8bfa025da4376f52499413ff66b56607aac107576754980a0de SHA512 c160e3d7c6ad62d5cc014642eb18a0f65eb90b5ad91db4049e1b45446034e989a4f9e5b805270967d4eaf47a6e2da0e81bdb5ae95500cc80d7021e8e61cd7107
 DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e67061647c83cb9479630333b0bbc5878682d5d19d9050403875ac49f66f756947d48928e3367efef537408e86c4c4a00 SHA512 c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e
-EBUILD fluidsynth-1.1.11.ebuild 2183 BLAKE2B ea383b393777556778f5a59e54e2c203ad8e0e201c46f3ed02bdf2c9182b00c6e81258af43b712f67f2b9ce50772bf86b6c208bcedac65bdddd3b8ef98bcaf98 SHA512 c721d50a425d74dcf74e19c8e4b1aa369dfb6e49f0772cf8461c7f8d19eaaa49c5182cc749d3de36276e7e802f8d5f0db000584962195fb9ecd354658c2535da
+DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
 EBUILD fluidsynth-2.0.4.ebuild 1960 BLAKE2B 3c837ac65f448c3706e9e12e34c39c6bace524b33e521e36a2d8c86c34a57e6d6361ec4fec27c585418b91e399ba502cf076e6f45442673db9b793f11b47bc6f SHA512 6d092fedb5994a354d0002412775d3ef5729394692ee944248d2e89e0bc15d76dd17259b7391bece108a11cd956808573c3d68a44dd0529b555cca6ff4269a44
-EBUILD fluidsynth-2.0.6.ebuild 2544 BLAKE2B a8a92dbf91b00ff77143de85d8c4062556d3a37964eece7dc6f0c4eb4ab6e9304fd2782086654a4757069907e4f0576996c1c3b4493b504d4cfc2b9b0f12b148 SHA512 9b94f048581866cc82522c5dd7798c37e10b777b79419f937130179e63e7e95c2b2d692dcb83fd09e75b2dd0bb0aa581090cdb65c553fd1d1a4677b50a377c28
-EBUILD fluidsynth-2.0.7.ebuild 2544 BLAKE2B a8a92dbf91b00ff77143de85d8c4062556d3a37964eece7dc6f0c4eb4ab6e9304fd2782086654a4757069907e4f0576996c1c3b4493b504d4cfc2b9b0f12b148 SHA512 9b94f048581866cc82522c5dd7798c37e10b777b79419f937130179e63e7e95c2b2d692dcb83fd09e75b2dd0bb0aa581090cdb65c553fd1d1a4677b50a377c28
-MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
+EBUILD fluidsynth-2.0.7.ebuild 2538 BLAKE2B ce7275797d9a3fb38ff3b95e753d4ba81d5c11f3cb84c9213cf96847d2c6dd408f3039eb928218e999b9e358f2e92c2b79f3f12dd85174eb53ae6eaf5ed9822b SHA512 9529008829a8d0829404d1ef85aa622cd833d034bafba538d527a9c0a380513ef8483eb8c8d4e40b096ecc16841ec70381546e0f0f06e165240ba8f5d93e15a1
+EBUILD fluidsynth-2.1.0.ebuild 3309 BLAKE2B dc57c8cfc6e0118e3cb4d8f5f0c8dd1ff705cab6bc48e53294d92b581dbb70c3d0f84fa0c0537a277f1792f76ae66ef8cc7c4399a642ad1403b05b8157d3e889 SHA512 671ee7daf9c7f650dcaeec5674a79e47c477e6243305e1c88f8de29656dde31e14b60e80f1b958d0c8e4f93282d49ee557af2a998cd9622c9a97aa99f512ca5c
+MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
deleted file mode 100644
index 04d9ec34ac1a..000000000000
--- a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
-SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash portaudio pulseaudio readline sndfile"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	alsa? (
-		>=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}]
-		lash? ( >=media-sound/lash-0.5.4-r2[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		>=media-libs/ladspa-cmt-1.16-r3[${MULTILIB_USEDEP}]
-		>=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
-	sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v11-devdoc,xtrafluid}.txt )
-
-src_configure() {
-	# autotools based build system has AC_CHECK_LIB(pthread, pthread_create) wrt
-	# bug #436762
-	append-flags -pthread
-
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladcca=OFF
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
index a7d802e7d595..59d74664cf3a 100644
--- a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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="
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
index a7d802e7d595..48e460715cb6 100644
--- a/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
@@ -7,12 +7,12 @@ inherit cmake-multilib systemd
 
 DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
 HOMEPAGE="http://www.fluidsynth.org/"
-SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
@@ -32,26 +32,44 @@ DEPEND="
 	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v20-devdoc,xtrafluid}.txt )
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
 
 src_configure() {
 	local mycmakeargs=(
 		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
 		-Denable-dbus=$(usex dbus)
 		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
 		-Denable-ipv6=$(usex ipv6)
 		-Denable-jack=$(usex jack)
 		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
 		-Denable-oss=$(usex oss)
 		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
 		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
 		-Denable-pulseaudio=$(usex pulseaudio)
 		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
 		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
 	)
 
 	if use alsa; then
diff --git a/media-sound/fluidsynth/metadata.xml b/media-sound/fluidsynth/metadata.xml
index 81333c2546c1..d337d3746e33 100644
--- a/media-sound/fluidsynth/metadata.xml
+++ b/media-sound/fluidsynth/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">FluidSynth/fluidsynth</remote-id>
 	</upstream>
+	<use>
+		<flag name="network">enable network support (requires BSD sockets)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index a443acac198a..9bad6ca6b27d 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,3 @@
 DIST frescobaldi-3.0.0.tar.gz 4895317 BLAKE2B 6a9a2b92d075742f54b3148761f1946c4dd73616482aec9278c0326d5597773ce6eb714f8d31d49f79051294d23d4e43552ce29bde0f464d1a677900b8a276f6 SHA512 e33cbcb70bec74239cd84691725e9978b6c6fee391848c7de8ea32dd5459d953ddda120eeea25a602154d94a84947b6c151237b859450162db0822ef58fd7787
-EBUILD frescobaldi-3.0.0.ebuild 1034 BLAKE2B 402296da2aee931089552b7b872f5a7a1a508d69d785ff5624210dc1587ce32a7abe69deeef31578212bffd258a2db4a2c064b67499bd8a5540854d2cfb95e5f SHA512 9ecadd4a3f1e31f2888c94a17e7b23dd178783e285b34bdbd040d901f57e72af72860cdfb0c93b48c100d23f98ed888b3f048a8d70cce6ae2dfc6c33788c3727
+EBUILD frescobaldi-3.0.0.ebuild 1030 BLAKE2B b6aa4e14ef27494c28554cb31a0ed96036a4287f556d8041bbab954de677ba20b086ac210c9f9714f859bb5478618ffd05efd64f328184f33b08c350d6a3260c SHA512 44f7e7fb23f738e65fe9664fa68bb55665ef07c0451f5cd9d2e518d71d530d9d952f51da504831e09259b1bd11c9a38b6440cb3d4049069cf30b69b80081d352
 MISC metadata.xml 437 BLAKE2B 5df0dcf6f211964427c34070f126b8a7b65f4341d5ca0edc899e413d112eb3920197086981537847506148b11b58cfcba80213839e5171baf8c16f05781765f6 SHA512 fee7fc00ca40615d9470bcf15ac3df4541864f825f55021c4b8d59891ea1fbec88f4e5133cceef05791cee1d95be320c7405cdfa67446863bdd2b23e86ca2940
diff --git a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
index b33d3acef51e..29f2edc3b28c 100644
--- a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="A LilyPond sheet music text editor"
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 7a5ea68ba761..0dcf0e50b0ac 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,4 +1,4 @@
 DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964
-EBUILD gigedit-1.1.1-r1.ebuild 1117 BLAKE2B c15ccf312b1c77059612918838603a991cdea09e288eb764a8665677d34b609e4bf90b7a19f8288f19f752608cd41192627a6d959abcace73ddb187a636f2b45 SHA512 36087dfed26f0c719cfc10ffad147eac8215f45001fde959366540c6adb1dc51e9ac355fadfe8ca5f22b9ab2a128cef0442f4e159bbe06174364c761a214a89e
+EBUILD gigedit-1.1.1-r1.ebuild 1116 BLAKE2B 274572fed4429f566a2c4ab27bab6820ae18b5235debe07980939c6b13a4e546cac316e79c3431fd1182a2af18e2ceb95f7eed6767ccc1418486027a590b2084 SHA512 52824350b02d5d3ac6f63148a18db5ecd8cb2426c4ff869fd00a8f76bc5624503b2dffd56776e776fe0f8858e52c9bb9782a77754d88c9362144b9518d02202b
 EBUILD gigedit-9999.ebuild 1115 BLAKE2B 0d6810d5be6f9fd11a455ead8309fe8162e60b65248bdf65e54c5dc8102cb19a6ab8e46cbeda46f076990fcfbc2e0fbc2225671e363a0b83195d11f2c648c8de SHA512 3473db34c63055bfde0fae8c713117a9334a08b4a683673217d482fc13896701d8c546b16b3f42f2b1c64a6ea94ff96fe8d79eb36cf37679e0bfb0eaadac3529
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
index 0a060c062b8d..966ad8a9da59 100644
--- a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
+++ b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 7db14288211e..aac6966d4d3c 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,4 +1,6 @@
 DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 BLAKE2B e67d239a4483624d298814c75442ecdbe6f243549e77ac73e511a123aa038c78dc1c7bd6a707df6a4085d66e6ffe720fc518babe29d382f960e95fb47cd56f29 SHA512 980446a873fab39c5b880e289e2ff61df112f5336dfd19b0ac3b3b6a346ddebaaca8718f169926404f38cc518817f115a38ab210ae7f4eab05962506d70d3f3b
+DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e
 EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1739 BLAKE2B 013e8256f27e0b9f4ddd9640d85d87a50a10d9f92cd14636bbda07e370cb4a08daca6658005a1fb1bb9f49aad5a7a2f933a3540cce86fd47bcae8aa0baaed956 SHA512 b52b905916fbed1875c74222626150f8a2bcee8552aee9515d2e854cc4898015312d3520c14b78696d6d09b5b3fc57817848dac77911f4ee85399a8bbb83bb6f
-EBUILD gmusicbrowser-9999.ebuild 1735 BLAKE2B c2548f44165b32fb7937a1174e0a7c370ff1718cecabb6219f7e358f743a9fb415107ef56732f9b38bc1d80dd323b34b497b7698cea29f7ff3c79b80761fdec7 SHA512 5b3b4a4e109816a1071577bb4977c15b3b0f4b56317307b5cc3eea93be55d76b31640c16157ff487df4653b26bf5afe99412f70096068dd0e91d05b994a5ef84
+EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1453 BLAKE2B 8350e2a87669cbc53ff9aa29860d2ffc876ac28e9454bb0b023382870a570bd0832d1099466c4e3c88f63173b58e40e9515124c574c0e34074cead10c3d34077 SHA512 1a6bca106241c1361228586cf13b229d2cfc34cf27f993ac1872e0e60675673f7ca68998266d747b6675e147b7391bd0d411ccbafde6af067358d8d2e54c6a92
+EBUILD gmusicbrowser-9999.ebuild 1453 BLAKE2B 8350e2a87669cbc53ff9aa29860d2ffc876ac28e9454bb0b023382870a570bd0832d1099466c4e3c88f63173b58e40e9515124c574c0e34074cead10c3d34077 SHA512 1a6bca106241c1361228586cf13b229d2cfc34cf27f993ac1872e0e60675673f7ca68998266d747b6675e147b7391bd0d411ccbafde6af067358d8d2e54c6a92
 MISC metadata.xml 465 BLAKE2B 53caced65e537cd80208bd2dad2853b72efb79925ddbf4009153483207f17bc7337312870d47e65ea971b3c944286875882d06d1bfc7b7e9c0bb88695d5f8ce3 SHA512 ff760d056bb2f67c021cfca327ad1f7f5be33264a6f03ec657e83a4ea7c14800d6f51340cb6ecad895bf2dfb8db38767982e63b030a9923de16820b7558f8497
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
new file mode 100644
index 000000000000..e3ecb295b17b
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils gnome2-utils xdg
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
+	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="https://gmusicbrowser.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="dbus doc extras gstreamer libnotify mplayer"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Gtk2
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	dbus? ( dev-perl/Net-DBus )
+	gstreamer? ( dev-perl/Glib-Object-Introspection )
+	mplayer? ( || ( media-video/mplayer media-video/mpv ) )
+	!gstreamer? ( !mplayer? (
+			media-sound/alsa-utils
+			media-sound/flac123
+			|| ( media-sound/mpg123 media-sound/mpg321 )
+			media-sound/vorbis-tools
+		)
+	)
+	extras? ( dev-perl/gnome2-wnck )
+	libnotify? ( dev-perl/Gtk2-Notify )"
+DEPEND="sys-devel/gettext
+	doc? ( dev-perl/Text-Markdown )"
+
+src_compile() {
+	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		iconsdir="${D}/usr/share/icons/hicolor" \
+		install
+
+	use doc && local HTML_DOCS=( layout_doc.html )
+	einstalldocs
+}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index 3d144fcc11c7..e3ecb295b17b 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils gnome2-utils xdg-utils
+inherit eutils gnome2-utils xdg
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
+	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
 	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
@@ -24,23 +24,20 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="dbus doc extras gstreamer libnotify mplayer"
 
-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
-MPLAYER_DEPEND="media-video/mplayer"
-MPV_DEPEND="media-video/mpv"
-OTHER_DEPEND="
-	media-sound/alsa-utils
-	media-sound/flac123
-	|| ( media-sound/mpg123 media-sound/mpg321 )
-	media-sound/vorbis-tools"
-
 RDEPEND="dev-lang/perl
 	dev-perl/Gtk2
 	virtual/perl-MIME-Base64
 	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
 	dbus? ( dev-perl/Net-DBus )
-	gstreamer? ( ${GSTREAMER_DEPEND} )
-	mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
-	!gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
+	gstreamer? ( dev-perl/Glib-Object-Introspection )
+	mplayer? ( || ( media-video/mplayer media-video/mpv ) )
+	!gstreamer? ( !mplayer? (
+			media-sound/alsa-utils
+			media-sound/flac123
+			|| ( media-sound/mpg123 media-sound/mpg321 )
+			media-sound/vorbis-tools
+		)
+	)
 	extras? ( dev-perl/gnome2-wnck )
 	libnotify? ( dev-perl/Gtk2-Notify )"
 DEPEND="sys-devel/gettext
@@ -53,19 +50,9 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		iconsdir="${D%/}/usr/share/icons/hicolor" \
+		iconsdir="${D}/usr/share/icons/hicolor" \
 		install
 
 	use doc && local HTML_DOCS=( layout_doc.html )
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 0b6802118841..41ab07442a59 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
 DIST gnome-music-3.32.2.tar.xz 1391112 BLAKE2B ec64d48bcc137c69df77d9d9fadb3fa5c1809850e7a434d501cf6fd680500e57a4e6946ab591db9b715e728f0274f37b659afce53fd9213b3cf74f329f4373f3 SHA512 633748dcb5cf839f29059fd9bdd5283c455a4157d6c004168d9ef80352b83be3db547377034d0d78af0b6a84fec6fb941888bd53aa14c8bf51da880f04170a23
-EBUILD gnome-music-3.30.2.ebuild 1875 BLAKE2B f3152d6664dc5f7b9166d86d3adf88be1eb5d87454a50729451eb0a55fb4951057202f086549b6a7cdaaf439a7751f7dc16dc3f67918bae2cd53fa79d05a7a58 SHA512 00716b316ea3af6cd4928a2a9d659bae0d2a94b44807eca9cc1b6470b9334fd029000a03569e9fd16cdc3671156b342da0c1eeba02fa1bb078186c10eac669a0
-EBUILD gnome-music-3.32.2.ebuild 1969 BLAKE2B 15e5ad9e12c8610fc7ba52690a607ee283087fa45534ac69a8439433d9cdecdfa38a8f21ec5ee569f3ba6ad5b9fcca8005937128b9749dde4034c59ad083a937 SHA512 d5997aed49f389d1a44538d5a82bc9371838d6f93bb1da3f6209ed0eccb15b5c5e745c3320c06db6e883f1186e6b88771ee1cd9d2ede78f55eb981ea6c52dbd7
+EBUILD gnome-music-3.32.2.ebuild 1967 BLAKE2B 777989a351397cb5bd4341c4428c6821ac891c9467f2ffe288be41f325f6452a65b67650c7dd07df82f88b79fd313b41131ee31016ce8c6622b18a4cc61d3629 SHA512 cc130173d52de4d8f6823e5dfec8c5d0a6b0452fe6b5251afe4e59329c4423b4f89daea093410115bc6b7e98314132e69ee2602d8f1f5b3bc6a644fee1beb204
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.30.2.ebuild b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
deleted file mode 100644
index 04d88e333422..000000000000
--- a/media-sound/gnome-music/gnome-music-3.30.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	net-libs/gnome-online-accounts[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.19.3:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-1.99.1:=[introspection(+)]
-	>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	>=media-libs/grilo-0.3.4:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.8:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		>=app-misc/tracker-miners-1.99.1[gstreamer]
-		>=app-misc/tracker-miners-1.99.1[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-3.32.2.ebuild b/media-sound/gnome-music/gnome-music-3.32.2.ebuild
index dacfd8ea8571..827ced270df9 100644
--- a/media-sound/gnome-music/gnome-music-3.32.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.32.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index a524526445f7..9c236d14c767 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1,3 +1,4 @@
+AUX gogglesmm-1.2.1-use-fox-1.7.67.patch 5107 BLAKE2B 3f2099cb4839b4b8c7807c34f1d80508426890fd80fa88160fdea7842846dd18af21aeeffe50bc4d1adb8f223ec14b8790150c319855e5173691a05e6343da7a SHA512 270cd9c28ca026196025b57791ff3d77bb93ff0650e643cdca8f2b19e81a3dcb05248b5ca1dbf33a641663caccb1c0ee3633b8cc8cb6d7ec7a55e2a2da8d6c34
 DIST gogglesmm-1.2.1.tar.gz 3015072 BLAKE2B 6a33ba6b678bc23e449898e4f492064301ca9c37239d713fa5ccb857d51bb4c4cf5dc1d4576f2f6dc745eaff607f4400e5600f45c4cbdde8c43cee5ca1fc34f4 SHA512 c165ddde463afcf863b74f00dfa1566077007f51617fa00a95dfcdeeab49da9ee87406f6bdc7779c597002d1e587886c7992e9e892ce4988f3bb14f015336547
-EBUILD gogglesmm-1.2.1.ebuild 1054 BLAKE2B 849e203f8510809c8e9d4fdd053b0052c62d20f842738cd94b1e52d3df1cbe60c0952ba5793154fe1d46b0d5354ebbb097c41f616e62d8c12996de2951a50f38 SHA512 7636616b6395079653257fd90c9ffada53f40ac6e584d948e69cd9b5e3e38e5c13c425cc6dedb59692cf56c4537c8975d9a3ffd4fc3d0588bca797f44f007f1d
+EBUILD gogglesmm-1.2.1-r1.ebuild 1099 BLAKE2B 581bd73cf3fcb83e0f21e19b40f93e9c414db9743f9b917acef7bd52909b046a74b657fa6108f4b00111c1f83f0b9f8fbc7be5e079e465abbb277f5b8f6f6da0 SHA512 affa38da15bd48dc39f7b83a0fca55e57386a8074c1f0de81581f74c8a917650222657f404abc4e9a49c2b83faa6d40ef77744f8a0d57a66b76659fe573b2dd7
 MISC metadata.xml 448 BLAKE2B 4a31050a18310ba35f5357159e9ada1671feda06dc71635617acf8825073a3a822aa95a3d3110545ff9ccdd809d317ab45000f5aaab5d8f52a8dad0c6133a03a SHA512 349f8b931b5a24ea7b588f63f67b38ac00e752491031cf434802719bd4d4d62aa5c7d277cf5e6a3dee72c570c121606b6a108e080262b1070de538c384552858
diff --git a/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch b/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
new file mode 100644
index 000000000000..44ec564e6f2d
--- /dev/null
+++ b/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
@@ -0,0 +1,100 @@
+diff -ru gogglesmm-1.2.1/gap/ap_http_response.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/gap/ap_http_response.cpp
+--- gogglesmm-1.2.1/gap/ap_http_response.cpp	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/gap/ap_http_response.cpp	2019-12-16 19:21:06.596524627 +0100
+@@ -341,7 +341,7 @@
+         break;
+ 
+       parameters.insert(str.mid(ks,kp-ks),
+-                        unescape(str.mid(s,p-s),'\"','\"'));
++                        FX::FXString::unescape(str.mid(s,p-s),'\"','\"'));
+       p++;
+       }
+     else {
+diff -ru gogglesmm-1.2.1/src/GMDBus.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMDBus.cpp
+--- gogglesmm-1.2.1/src/GMDBus.cpp	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMDBus.cpp	2019-12-16 19:27:05.072866638 +0100
+@@ -60,7 +60,7 @@
+   void setuphooks() {
+     for (FXint i=0;i<connections.no();i++) {
+       if (!connections.empty(i)) {
+-        static_cast<GMDBus*>(connections.value(i))->setup_event_loop();
++        static_cast<GMDBus*>(connections.data(i))->setup_event_loop();
+         }
+       }
+     }
+@@ -532,7 +532,7 @@
+   /// remove any pending proxy replies;
+   for (FXint i=0;i<serial.no();i++) {
+     if (!serial.empty(i)) {
+-      GMDBusProxyReply * reply = static_cast<GMDBusProxyReply*>(serial.value(i));
++      GMDBusProxyReply * reply = static_cast<GMDBusProxyReply*>(serial.data(i));
+       delete reply;
+       }
+     }
+diff -ru gogglesmm-1.2.1/src/GMFilename.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMFilename.cpp
+--- gogglesmm-1.2.1/src/GMFilename.cpp	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMFilename.cpp	2019-12-16 19:24:44.801263832 +0100
+@@ -167,7 +167,7 @@
+     else if (Unicode::isPrint(src.wc(i))) {
+       if (codec->wc2mb(&c,1,src.wc(i))==1) {
+         if (c==undefined_character) {
+-          FXString dcm = decompose(src.mid(i,src.extent(i)),false);
++          FXString dcm = FX::FXString::decompose(src.mid(i,src.extent(i)),false);
+           for (FXint j=0;j<dcm.length();j+=dcm.inc(j)) {
+             if (Unicode::isPrint(dcm.wc(j)) && codec->wc2mb(&c,1,dcm.wc(j)) && c!=0x1a) {
+               n++;
+@@ -190,7 +190,7 @@
+         if (c==undefined_character) {
+           /* If codec didn't contain a mapping to the required character,
+              do a compatibility decomposition and try mapping those */
+-          FXString dcm = decompose(src.mid(i,src.extent(i)),false);
++          FXString dcm = FX::FXString::decompose(src.mid(i,src.extent(i)),false);
+           for (FXint j=0;j<dcm.length();j+=dcm.inc(j)) {
+             if (Unicode::isPrint(dcm.wc(j)) && codec->wc2mb(&c,1,dcm.wc(j)) && c!=undefined_character) {
+               dst[n++]=c;
+@@ -208,7 +208,7 @@
+ 
+ 
+ FXString TextConverter::convert_to_ascii(const FXString & input) const {
+-  FXString src = decompose(input,false);
++  FXString src = FX::FXString::decompose(input,false);
+   FXString dst;
+   FXint i,n=0;
+ 
+diff -ru gogglesmm-1.2.1/src/GMTrackDatabase.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMTrackDatabase.cpp
+--- gogglesmm-1.2.1/src/GMTrackDatabase.cpp	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMTrackDatabase.cpp	2019-12-16 19:26:29.609893508 +0100
+@@ -1372,8 +1372,8 @@
+ void GMTrackDatabase::clear_path_lookup() {
+   DEBUG_DB_GET();
+   for (FXint i=0;i<pathdict.no();i++) {
+-    if (!pathdict.empty(i) && pathdict.value(i)!=nullptr) {
+-      free(pathdict.value(i));
++    if (!pathdict.empty(i) && pathdict.data(i)!=nullptr) {
++      free(pathdict.data(i));
+       }
+     }
+   pathdict.clear();
+@@ -1424,8 +1424,8 @@
+ void GMTrackDatabase::clear_artist_lookup() {
+   DEBUG_DB_GET();
+   for (FXint i=0;i<artistdict.no();i++) {
+-    if (!artistdict.empty(i) && artistdict.value(i)!=nullptr) {
+-      FXString * a = (FXString*)artistdict.value(i);
++    if (!artistdict.empty(i) && artistdict.data(i)!=nullptr) {
++      FXString * a = (FXString*)artistdict.data(i);
+       delete a;
+       }
+     }
+diff -ru gogglesmm-1.2.1/src/gmutils.h /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/gmutils.h
+--- gogglesmm-1.2.1/src/gmutils.h	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/gmutils.h	2019-12-16 19:22:25.340787153 +0100
+@@ -26,7 +26,7 @@
+   FXint remove(FXint name) {  return (FXint)(FXival)FXHash::remove((void*)(FXival)name); }
+   //FXint find(FXint name) const { return (FXint)(FXival)FXHash::find((void*)(FXival)name); }
+   FXint at(FXint name) const { return (FXint)(FXival)FXHash::at((void*)(FXival)name); }
+-  FXint key(FXuint pos) const { return (FXint)(FXival)table[pos].name; }
++  FXint key(FXuint pos) const { return (FXint)(FXival)table[pos].key; }
+   FXint value(FXuint pos) const { return (FXint)(FXival)table[pos].data; }
+   void adopt(FXIntMap &);
+   void load(FXStream & store);
diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
index 683ddf4f799e..de8b8d6c52df 100644
--- a/media-sound/gogglesmm/gogglesmm-1.2.1.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Fast and light music player"
 HOMEPAGE="https://gogglesmm.github.io"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+dbus +flac +mad +vorbis +ogg +opus +aac +pulseaudio +opengl nls"
 
-RDEPEND="x11-libs/fox:=
+RDEPEND="x11-libs/fox:1.7
 		x11-libs/libSM
 		x11-libs/libICE
 		dev-db/sqlite
@@ -32,6 +32,8 @@ RDEPEND="x11-libs/fox:=
 		opengl? ( media-libs/libepoxy virtual/glu )"
 DEPEND="dev-util/cmake ${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/"${P}"-use-fox-1.7.67.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_DBUS="$(usex dbus)"
@@ -39,5 +41,5 @@ src_configure() {
 		-DWITH_NLS="$(usex nls)"
 		-DWITH_CFOX=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index 411113d669a0..728a83c8ea2f 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -1,4 +1,5 @@
+AUX guayadeque-0.4.5_p20170110-missing-aui-component.patch 404 BLAKE2B 9c17048796afe328fb136808c2cb88f8f9a7cada5a4f6cd8a01c0a398e8b93cc0d6158792097cf88e600beebd6105bd9036e9aa3ddf8da16878e7d5f82746ea2 SHA512 539fac802c3e91217f4eb6c5adf456f7e5bc2d53e1103cf54255514b0793e3ed17de84048ea31c5a03ea6121fae01ef712339dcc8e269d678e1272f757976029
 DIST guayadeque-0.4.5_p20170110.tar.gz 2070855 BLAKE2B a8783a61df636e3ddf1473ba20450c89eeb977e06491e840743e7b8a7aa1a7515138ecf8f6c92a27f0c762363ef12c094927192b254ae238196ac6d967fd84d1 SHA512 57215ba47574fba615b33d72f45279c3726035bea38746f7d927a39866fb3fa8a3fb1dbd13fe672c7daba16a2131fbf4b89afed6a3bf8d9a584e5112d926f518
-EBUILD guayadeque-0.4.5_p20170110.ebuild 2108 BLAKE2B 39684e5d91fcd1ac6c6524040be5a8f89c796ee4629d47c84fd96b41f2382a5048e156cf482a177eb5ae7e01f312768b22cb9a3c0b41574b8a2d6c87c45fae8b SHA512 316020a7b032846b6ca2b5750bd5362f3ea8d62539dde3e40f865133b75c493ed5f7d05c4c751587ba9c12cb67ba30916e84e0c0c102a688fe592a758fe8c08b
+EBUILD guayadeque-0.4.5_p20170110.ebuild 2167 BLAKE2B 9702c317ad2759ae5aafca6c3970b546230e83ba95c543a4245d01b4b2d2c5a1330308712312bf3ac229630af00712b35dc571922071221e472025abd75c8a31 SHA512 648cfe48ef60e37dc943662fa106c18e720dfe6e390bea6f0f3f0ad383b85d03e5b3e702cbe1554425786e3771545b475b6c13ed0285f9d17eb93151accad669
 EBUILD guayadeque-9999.ebuild 2428 BLAKE2B e92ecaf16b437f552a7eb7e48671dab5cb660163b399b5e14a0e293f7b28e7ef25d20dc5995fcfa64c5157b794a031f7cb46fc5ad9c36cc63d258503aa9bd6c2 SHA512 0d4f6f4887a010455a0fc5c80eb76495c1bbd8e7352f810e23d004eb767d8701f153279e2f7d202ec8ce304f2abaed73a1fb2ec7746de53a3276a00946030b3f
 MISC metadata.xml 410 BLAKE2B d61d13faa8d5bb87bf8ef99b6841a4a05091db82d5961c69d5d922782d091639aff1919f843a92da39ee7181dcd1a8d94d63b83b9c80f1c17cc6c55fc79bf985 SHA512 826a540e373fdbe9027eb0bf9f66a6e7fd61c1b355a5b0cdbc00e2517e3b2e1b23224e6f0bc6025553c49135f4851422ff2055a2c681c9d42fa11f2fab905f3c
diff --git a/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch b/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch
new file mode 100644
index 000000000000..69a6e8b673a8
--- /dev/null
+++ b/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e46d921..13e4ffa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ SET( SEARCH_LIBS
+ 
+ SET( wxWidgets_USE_LIBS base core adv net html xml aui qa )
+ 
+-FIND_PACKAGE( wxWidgets )
++FIND_PACKAGE( wxWidgets COMPONENTS base core adv net html xml aui qa REQUIRED )
+ 
+ IF( NOT wxWidgets_FOUND)
+     MESSAGE( FATAL_ERROR "wxWidgets not found!" )
diff --git a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
index 53d52ddcc332..72dbae26c334 100644
--- a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
+++ b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,6 +48,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PF}-missing-aui-component.patch"
+)
+
 # echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
 LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
 
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 6f4cea197eb9..55565b0038e9 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,3 +1,4 @@
 DIST guitarix2-0.38.1.tar.xz 80768608 BLAKE2B fd745955d8b44da72c669e69c36294d4a2131f2b5868e7e254a0b33768852ba9fcf9302f2a7ebd962c8a6dc02a543f70574466c51341a371c9fb988989123e50 SHA512 54d08b4ed20b9df4c69d0c86e4d668c53fffde8919f5570f376cee903926bd01945169d177d0d45976569ea55b28f8dca7884ac6dfe2f063df6583467559c5b7
-EBUILD guitarix-0.38.1-r1.ebuild 1714 BLAKE2B d61e321fa0e1083f1a21a278f061f578188e7ac0a9d4486500c210e895cdc563031e1e9cc78a24da7e6aed81adf9fe9f3cf8ffc293fadaf623aba6d70e30c1a5 SHA512 d06d7eb88b3cfe10e1a5de7564a173de61abc3497480880828f028c27342430b596180dc2d5c31051a704d3fde282aa076a9df3f44dd73fcb6a8e9ea44ec8832
+EBUILD guitarix-0.38.1-r1.ebuild 1713 BLAKE2B 3ad1114341e087c23c93c6e2254c5a421db7b70bb142d4d21c9785baedadabc8e1c107eafc7b8e762c6fb4e3364590b6f2ccf8d0ee62a39d01d8b0dd02e85be6 SHA512 c50aa18d3ee47b2c865415c259f925a7bf3d0a78737e779f2c9790ab62c099a40826cb82254456b00379486e45c5c20c7643d62bfe4b8c4962183c2421f523e9
+EBUILD guitarix-9999.ebuild 1739 BLAKE2B 852d66f82f19f896a39b2353a6421ac2de9b8ac4887554dd35c9f585ace40e11809d1fee8f6a1f9a2d1377bc1754c35be27875f7f58bc40a319dd2c9155fb3c6 SHA512 bd525153a675570d3d08922cb8434c8dedfdca76ba4be39296488d06ddabd90ac943b840c3544aef05181e4e5b2fe016cb2452393944afeee5261758fded390a
 MISC metadata.xml 622 BLAKE2B 390ed1150f373c73c5bbcd5e5193e8465ac348bebae4a5f8484fb214172717d5166c0a17be6afb4e5091c4318cd3a3e30bcc05c70fff78423347298acbc64c61 SHA512 b18db16b6af5381331418267660822972be42997065eed2182c6305ce84bd61fb6d3ee01de195f3f8f01570deed7f97b93ca31916986609a374c1f5962c45dce
diff --git a/media-sound/guitarix/guitarix-0.38.1-r1.ebuild b/media-sound/guitarix/guitarix-0.38.1-r1.ebuild
index b8e71bf7171b..86dcaacde860 100644
--- a/media-sound/guitarix/guitarix-0.38.1-r1.ebuild
+++ b/media-sound/guitarix/guitarix-0.38.1-r1.ebuild
@@ -15,7 +15,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 +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"
 
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
new file mode 100644
index 000000000000..a459bbec550b
--- /dev/null
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg git-r3
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="http://guitarix.org/"
+EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="bluetooth debug lv2 nls +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+COMMON_DEPEND="dev-cpp/eigen:3
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	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+:2
+	lv2? ( media-libs/lv2 )
+	standalone? (
+		dev-libs/boost:=
+		media-libs/liblrdf
+		media-libs/lilv
+		virtual/jack
+		bluetooth? ( net-wireless/bluez )
+		zeroconf? ( net-dns/avahi )
+	)
+"
+# clearlooks gtk engine and roboto fonts are required for correct ui rendering
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gtk-engines
+	standalone? (
+		media-fonts/roboto
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+
+S="${WORKDIR}/${P}/trunk"
+
+DOCS=( changelog README )
+
+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 standalone "" "--no-standalone")
+		$(usex zeroconf "" "--no-avahi")
+	)
+	waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 7d0ac712cd55..1da3238b7209 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,5 +1,5 @@
 AUX hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42
 DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
 EBUILD hydrogen-1.0.0_pre20180301-r1.ebuild 1937 BLAKE2B 1338ca9bed21852edf5219f68a1584b4d2ac7ae46fc63f47ae209f261aeba6c69990a773974e5d7eceb7baf34461aa272bb11837b7b9d642b6972104b8f17bbf SHA512 4c5411a87f399211430ad30c94d933494b919bf0ac62e23bda32aadd7af7988c11f1bb924b5cd3ece46a61b743ff6aa65786eab91e319174560b1129a54312cc
-EBUILD hydrogen-9999.ebuild 1741 BLAKE2B e6be5818f19da7dc4e8671d9781ccbb0eea72f4ae4e82211ba42955b193b214690912a078be74df6e1e6cc52698dced9cc2eb77bc030af76e27382c3e7d64974 SHA512 67f86d40c7efbec7d8416443d212696e4492b0af4cb98d3e34834b7c568b3ca2b0aab577e38d5eccae4efa94a628eaa05c640ec27fcd4f460ae964c0d01b2fee
+EBUILD hydrogen-9999.ebuild 1711 BLAKE2B e00443f6825529a90d069c2fb0b5de5bd228bf958ca2b755925a582a06002ca83bad6974a0ca32651b21cf71822077adfca176db6989e286b4bc60ff30a0ad94 SHA512 41f79035ba9441357312aaff23b5fd8b51a7009aea1e822796f4d03ae9ed842827e441afb94e10c9dd6d90cfebc8923cd6b0bfa95d441072006899962d159dc5
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index db964f614256..9245c1140a0d 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit git-r3 xdg cmake-utils
+inherit git-r3 xdg cmake
 
 DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/"
@@ -62,15 +62,15 @@ src_configure() {
 		-DWANT_RUBBERBAND=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
+	cmake_src_compile
+	use doc && cmake_src_compile doc
 }
 
 src_install() {
 	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index 70c78e85f7ef..f9d9756272e1 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -1,7 +1,4 @@
-AUX jaaa-0.8.4-makefile.patch 649 BLAKE2B 55eb43842ac70b21dd1028f643524daac61c90de94303da813129efb91d91c292aeae015556224b322997384fb8ada5cdbdb02c9eb1612debe7d58ef27d3657e SHA512 10576c2d2266eb5d793ac322784627b55fc4c2a3f72c11e5117b035215f5df2569717e0a1c20be33b8dd63874d257a51298dbba0e5741b0f654341f5b793a442
 AUX jaaa-0.9.2-Makefile.patch 536 BLAKE2B caafbb1842016a295787cf9682427c02ea68613b2445606f7550e7d7e8498eac3e07fa323f55f6ae242533deb54f61530a3a4049f8138bb4222cc32403e41cd0 SHA512 92bf2c8aa8e49eebdc5c379275d7c8a3a0a355e9b4990503735f6043fc7bf704a80c706a3afacd72583a7e83beb56a232935dab81b22c900dec4ce7939cfaa39
-DIST jaaa-0.8.4.tar.bz2 25282 BLAKE2B b42d5f21fcdcc522724bb609e4e0d2c151a23d10368d7db1ba7b4d34fb648b924a623ed1d21501733af236be1b73a819d2b4cdfe6075047e6f709b4ecdfa6416 SHA512 d83dad995d4d6919e719671e19610be9cc6b9c14d922eabc6892f3427584baaacc212b37f0466373a38f1fcc65838851c09bb2ae72d9dfdc9c52921b594cbe8d
 DIST jaaa-0.9.2.tar.bz2 23839 BLAKE2B bccf8fd7e4d25c0cc32ea999bd997c98cc57be01dd1f098b22c09310e29e38da2eb411f252ab1b1da41ce35aa57ec75d10984c3fbd2addca05d9a0b48f4d490a SHA512 bddc08774891e7cfda11a58b87b4150131577c8a4a200b7420e20937cb9fea264b9d3c335e56456d0040ec0d4ff0324821606dca85c96e43b4e3b0afe50ac83b
-EBUILD jaaa-0.8.4.ebuild 891 BLAKE2B e777b57b846021cb6a4d464363dd13484a93db111b4bf3c4de7b7b46a62b09dc25870d387a9df14a3fb0d30d1da1f6f1b85601ca00c1f756cf58293383019c49 SHA512 5edc2de6318abf7a54287c05506a87dc0efee81085ec0f46feedd05003afc9b286315a407a6d6daaaab7b5756e9903d7d060738eec1c428735a0af70403da721
-EBUILD jaaa-0.9.2.ebuild 837 BLAKE2B 5277f95029c5469ad4b7455310a7b8c65cf9600deedd17fedc497fe97c7176fcb8b4e1a985644c067b7035da836fae01aaba0d8898619c9fafc19cb6863e9ccd SHA512 9b8b0db318546eee5afd8d0d2d2e1a6e3c0c554fe46e6b7a4a74a0f804c967662b1f244fd7c1dee98c6a668127198ea5e5a259b744cf53c6828c551011886eff
+EBUILD jaaa-0.9.2.ebuild 831 BLAKE2B 1b09bbe4ec852e993dd30c5db500127c445606b5012e5361c03e13b203319fed59cddeccfbb8602d647e3c1163d49503f29769d72b0c1003d145892ddf84837e SHA512 ceb79376d24dc1bda8842c139261943250de9194f7d8bac2848b33e0c91e3631f2b562c12d4e9743d965fbbd6a7bdb2f7f080fcac89d4e450900064ebc14b15e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch b/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch
deleted file mode 100644
index 8cb54698d488..000000000000
--- a/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- jaaa-0.8.4/source/Makefile
-+++ jaaa-0.8.4/source/Makefile
-@@ -24,15 +24,14 @@
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.8.4
- CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
--CXXFLAGS += -O2 -Wall -MMD -MP
--CXXFLAGS += -march=native
-+CXXFLAGS += -Wall -MMD -MP
- LDFLAGS += -L/usr/X11R6/$(LIBDIR)
- LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
- 
- 
- JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
- 
- $(JAAA_O):
- -include $(JAAA_O:%.o=%.d)
diff --git a/media-sound/jaaa/jaaa-0.8.4.ebuild b/media-sound/jaaa/jaaa-0.8.4.ebuild
deleted file mode 100644
index c14055e896d3..000000000000
--- a/media-sound/jaaa/jaaa-0.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/zita-alsa-pcmi
-	media-sound/jack-audio-connection-kit
-	>=media-libs/libclalsadrv-2.0.0
-	>=media-libs/libclthreads-2.2.1
-	>=media-libs/libclxclient-3.3.2
-	sci-libs/fftw:3.0=
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8.4-makefile.patch )
-
-src_compile() {
-	tc-export CC CXX
-	emake -C source PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake -C source PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/media-sound/jaaa/jaaa-0.9.2.ebuild b/media-sound/jaaa/jaaa-0.9.2.ebuild
index a7ac6d797963..b6575ea56713 100644
--- a/media-sound/jaaa/jaaa-0.9.2.ebuild
+++ b/media-sound/jaaa/jaaa-0.9.2.ebuild
@@ -11,16 +11,16 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 CDEPEND="
+	dev-libs/libclthreads
 	>=media-libs/zita-alsa-pcmi-0.3
-	media-libs/libclthreads
-	media-libs/libclxclient
 	sci-libs/fftw:3.0=
 	virtual/jack
 	x11-libs/gtk+:2
+	x11-libs/libclxclient
 "
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index e6c9721799a2..a336a9fa142c 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,4 @@
 DIST jack2-1.9.13.tar.gz 6485870 BLAKE2B 7acc0a1389af133dafa7368b4285c2a06607d84015601f2d8afbd63a9a08f40210f8206f2febbd0e5cc651513a59419e1d948a56163d2074c4b77da5edd84a52 SHA512 dd83a6535cf92a3c45b5ed31edda5f1cb4a6c1db2ac683d4ea709e226bc30d55b366ce80ee543dfaa600f871079f3754e9314124093e230dc7deeceb828de8aa
-EBUILD jack2-1.9.13-r1.ebuild 2331 BLAKE2B 0de07b59986cee15647d4026fb1fa1c89bda70a95d5706edf1d95afd421e62e8b4b37f008abb46a760db3c748700fdc573d50c01692b4118eaec2da23ddded41 SHA512 f94e6a0f15389c7d8b9da9f28dae757d77513d4f6cf6e2b7f3b7d96122554038de89d4cc0aefd5cf27f5b4c40686fb7c0e602abd0f3a4b28a10bb50c9bfb2a2c
-EBUILD jack2-9999.ebuild 2351 BLAKE2B a226227c67bd6b7630b8dbab44b33a50a5732dbe4181f64d630fd03bc613d78429cab6d07ea91b34e5adecb4f693e341c0b3d88c92a52b1e8f65954a1959d4c3 SHA512 ba3e3abe0a631e4d275d9f13b9bbe32bdd35925914c91c0f16d6426609ac1aa0c901bed47c483870ebfde97b81a74e4704f3fcf06f2c76e2b7f9affc93211ada
+EBUILD jack2-1.9.13-r1.ebuild 2321 BLAKE2B 7c07fec34cefdef500ec7ed3f3ac4e49aeffde1ea4898a27d0924b123f5a0019d29ae9ca946cb5d9c8a6e3bb693f3b2e3f1fdd6809faf4ddb8cc4d806945a0e4 SHA512 11e267b078eaca192b93409767edd091647ed04c9662838298bd4006368c169b7bbc9419b1c14308cb10de86e2ce92def814a88ad2bcbd92f58b9073cdf07783
+EBUILD jack2-9999.ebuild 2341 BLAKE2B 106530d8e45b59df47f06a88a9b9be47d7ac2dd7348fa36d5f6617caf6c1d5b0538ff0e4dd91c1dec20d8cd70752fb3407934b1fafb7b4c4d28b112bfc0ab8dd SHA512 88e1908c3882a56b47534c44d345467ad903ad4f32e0cc23264818f7f1622bfc1402774a0ff00e985d0d18b7ea0ed0375f35d77d18fd0ba31b75b540454f54a9
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.13-r1.ebuild b/media-sound/jack2/jack2-1.9.13-r1.ebuild
index faa8575e4689..33700572b3fe 100644
--- a/media-sound/jack2/jack2-1.9.13-r1.ebuild
+++ b/media-sound/jack2/jack2-1.9.13-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 9293ca615b0d..4b1b8633232c 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index e1a05942e8ee..cc786e0da790 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,6 +1,9 @@
 AUX jalv-1.6.0-qt-5.7.0.patch 906 BLAKE2B 86d7f74c8a80dd4308c5ec4c67d866ae1c6917bfe429d32a92bdc03ec0ab5342e4f3bc957f773dadb943e7dc9d69f7209e0e4ec7a998edef067448dd5dce5a7c SHA512 b5ddc63afc7340a0d2d14bd924c7adc1393d469031c3d1c37210e21090b1159c2fd3879e627f8c8e611452d9ade40a9fe18de9e63880bdbd2f05caf96209b163
 AUX jalv-1.6.0-stdin.patch 2008 BLAKE2B 0fca98631638a2713cf9caa127ca4dce715d81441071fbe695654d9902639c9836398de5adc878f242c45fd52af73238621065cceb4ec0cf685c25debe1b02e5 SHA512 aab7ccb29a63ebaafe1c05852a9533930181e2c34c6015aff9b4d608bfa95a6d4218849736e960adcaef635f4ecb0c3188bcaf2c1f3feb02a5eaff8866a1cacd
 AUX jalv-1.6.0-suil-qt5.patch 1159 BLAKE2B 8e319a59d00946f42586ea9b048b78725ed295d5ae55f6c87bf1739e5aad7319aa9eb7624aee7638b07d45dd757b7859745030d0419ac446367cf8a16bc024bc SHA512 22fd7452af3fcfd2c71a24cce218ce2fbcfccc2eaa224d54594a014ca184a72e80fb5489a868c298ff4ac3884805f2fd2bc827dd63eaa22df081804f0b355fc2
+AUX jalv-1.6.4-qt-5.7.0.patch 462 BLAKE2B 54918c977485c0c420a3f23dbcbf4638def779429b6bd7065c79b0ddffc0263b1a65402b3ec0a7d8678f0ccba694a758d211d9d5fc589b6723cd728bcb4d29ff SHA512 048352f5355aa957a6d88026374555a9dc4b33a4aef972fa39de5ca772b1ca77298f81ae938482d43a41da513594255ae37c57bd2a3b70fe6b22b03f46d80ea7
 DIST jalv-1.6.0.tar.bz2 157726 BLAKE2B d1d35ccc3c0234d0005b83fca89ba0570f747f65568da6b5ea4ef0a0974bbd729540555e3cdcd77f3f5b7a8de9f987c7743e258d7544c8d70c7c51aaae84f9a5 SHA512 70453404788846774ef88b43653379f97140301e09e8de61779683df9ee85120485bebf03c959624639dc4d8dd71ce83db2a89b14b66be17696a88d1820ac1b3
-EBUILD jalv-1.6.0-r2.ebuild 1433 BLAKE2B 63c1abc9787cc22d35ccda185a5da4a115fd8cdb83357cc0f60f4edf75788373983c975cd8c261b24d779e407bfb67fa927a436bfdbcc82caab40b77a7fe9971 SHA512 86b383075924d48fa789cd7ec7554300f1b30984df200490ce9d82b6d99ff618e978b2a52cb16cab82fb89bd74f4ab5a8dcb139ee6bed0c994d0293ae893c449
+DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b
+EBUILD jalv-1.6.0-r2.ebuild 1425 BLAKE2B 242e7f6c38d3df41107833fd68dc1d57f967985e4a600ca24730eaab49bef3ce87f2d44b43a1d3f563bb9f61464f732341780f8af87ca69bba3ab29d479916fe SHA512 7f07f817ad34ea0f7161e87046ca0229c712f3a2c3b8f1e63b4bd7fafb017a384d0e1a113076207ba50559d229472fe8ff92f781270d258ddac007707e94bc65
+EBUILD jalv-1.6.4.ebuild 1363 BLAKE2B 3aebc3187b3d8a3e9ccc4b1da8d4caca9a33b1f730aff6b6a73d796bd5479ff376750560ec6f4ef97ad96c176f48848a0a75293fa9a08a7cb8befc781e3bc003 SHA512 269a72dc46e2385c81fd5a41fb7918cd3a90a2ea01cf73d3b8fcdd005fffce5135beb2dd7d610f6743348bdd73f90bcf5097b4c2f939ac45add22fafb6e999c6
 MISC metadata.xml 1152 BLAKE2B c5969351b829ace0f2e54d452526a3f77939f99f721acd846c34ce84ca2264ca2c6996725969c034721df7de41abbf9dfbfcbdde9ade5b375f845479ec66d3ac SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c
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
new file mode 100644
index 000000000000..1f9b6147a219
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
@@ -0,0 +1,13 @@
+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/jalv-1.6.0-r2.ebuild b/media-sound/jalv/jalv-1.6.0-r2.ebuild
index ea94a195346e..a2fdff30c7c1 100644
--- a/media-sound/jalv/jalv-1.6.0-r2.ebuild
+++ b/media-sound/jalv/jalv-1.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 qmake-utils waf-utils
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gtk gtk2 gtkmm portaudio qt5"
 
 RDEPEND="
diff --git a/media-sound/jalv/jalv-1.6.4.ebuild b/media-sound/jalv/jalv-1.6.4.ebuild
new file mode 100644
index 000000000000..a11ca9d1bd66
--- /dev/null
+++ b/media-sound/jalv/jalv-1.6.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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}
+	${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/kid3/Manifest b/media-sound/kid3/Manifest
index 072199e01e83..5f36603193d3 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,5 @@
 DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
-DIST kid3-3.8.0.tar.gz 1509430 BLAKE2B 492690f4e9ba70a981c273f6fc93912d24b8e9ecf6e4d95473baee2ab581ca8a6939a88d9237ae985f34cb0a599e80c5fd9a6af7588ad35ec928089b5e205748 SHA512 ff4d5533ed9538c589d2e8a75bbbabd21add38b51d6a442987ee70f3721eda8aefb597f51e82033c2a04fd19c86d5e57c194409ec71bbf77da405626b5484d44
-EBUILD kid3-3.7.1.ebuild 1678 BLAKE2B ba1c3630a8ceabdf0e85564a714a8a7383f3627eab3757600cce110c5c4bf62befb0d560bf4039ca47ef929e07066562606dd556037b255f434711b448d5fc3a SHA512 1b03581e83c83748d027088b8ab358800d462a4ac699d1023ce938ebc747f4ed04598886327beca6a970d522dc293919468a7d41bab1e6e25f57da3cce8bbf03
-EBUILD kid3-3.8.0.ebuild 1680 BLAKE2B fa795f01b39326776e2a5fa53270ac3d9bc3abae7638bc967d9d420963b81de580ba365b9890668b6ef1fb0598b923c3f75fbac3fdb57c6069ff2ba05ade4833 SHA512 4994c5dec92a220dfc1ca1d37d3f2e8c1747ce5bb70e0f721e45ca62b8aa1ce2f21d2de95b710bbc97e17c2669b89faffe7d1d9f0f84f6076b81d0711e93bce0
+DIST kid3-3.8.1.tar.gz 1516211 BLAKE2B ab07ffddd5c8b2780d910eefdf71a4f290d1d354b1d73faead0d268a6d795a6963ec678a4dcefbd8aa18ce8b8bfecb84f949f63a5adea950d4cccb2de5647bdf SHA512 b625753a40f3290b5aa26fda5c20270b5e428c5b383ddb06e81d515f016f475c41bad92fff3fdfd5f6228c017ba18f547515bd8e948832831f9daa501222168f
+EBUILD kid3-3.7.1.ebuild 1660 BLAKE2B 981b960e888c8072870b68a397180149beed99440cb17df12181609f838b750ac73c3ca72ad29448da48a7b040e428e97f7f1fa5be67b2d3e511bbe7c7ef46fc SHA512 7aa3b748afd9e1f3b4b468a6c8fceec462a2190eebfa64c8de24dd51ba747433746cf40bd24cb7ca6c60c01d04bc929c6424f583d9fb287ee4a241d5084f42c8
+EBUILD kid3-3.8.1.ebuild 1709 BLAKE2B 3d32fc69b9340e7729d43d687e46c97d60a39a4272986b48b2b1890abc3f933585f9c014fa4a9df3bdee982f82cd1afc886df7e5933f4c75d2f52f520f6e72e2 SHA512 9924e8068ef9e79853f343b0bdc57320ff6e9edd5f6ca13a24a99343feacb2529dd6078ce928a9a3da4baefe8ff900ad48734802506488d16b562269138cb9b2
 MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
diff --git a/media-sound/kid3/kid3-3.7.1.ebuild b/media-sound/kid3/kid3-3.7.1.ebuild
index 87343373f369..172085a01f3f 100644
--- a/media-sound/kid3/kid3-3.7.1.ebuild
+++ b/media-sound/kid3/kid3-3.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
 HOMEPAGE="https://kid3.sourceforge.io/"
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	# overengineered upstream build system
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# applies broken python hacks, bug #614950
 	cmake_comment_add_subdirectory doc
 }
@@ -80,5 +80,5 @@ src_configure() {
 		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/kid3/kid3-3.8.0.ebuild b/media-sound/kid3/kid3-3.8.1.ebuild
index 3ce477229e93..5fdb33123072 100644
--- a/media-sound/kid3/kid3-3.8.0.ebuild
+++ b/media-sound/kid3/kid3-3.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
 HOMEPAGE="https://kid3.sourceforge.io/"
@@ -18,6 +18,7 @@ REQUIRED_USE="flac? ( vorbis )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
 "
 DEPEND="
 	dev-qt/qtcore:5
@@ -58,7 +59,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	# overengineered upstream build system
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# applies broken python hacks, bug #614950
 	cmake_comment_add_subdirectory doc
 }
@@ -80,5 +81,5 @@ src_configure() {
 		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index 7a63d8246ba9..d6a17db1c555 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -1,5 +1,5 @@
 AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d68ac5160e962e0178637a3406221019c07d4a4035aa4baba00c4d883c005f6190f92cd81888277531ed232c41 SHA512 15d5fadd81f5dcb837ac4f91d62b99834fd192a508d5df9647df994b65807fc3de25eaceccad9b39535dc56abb83feb2f48109cf46d95d1ddb68a8212d096ad3
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
-EBUILD klick-0.12.2-r2.ebuild 1088 BLAKE2B 941df16e88b13a62eeef5ba0b5af0c6dc96d7a4817e9d3d1413f0e444ad06e6e3f6c0e390c30b6335254975be634d6f9c958b345766d285ca4a258ff3129075c SHA512 583aaaf49426c003ca1657d24eae09a304859f7258df6c2b527374090c2aa55d7331da857b51df320d69dfd39b6ca41516341b65147ef25da15931e5968fd3d8
+EBUILD klick-0.12.2-r2.ebuild 1084 BLAKE2B d30ec67ccf5c22d13aac41363d2e5e923d2d51fcaa92e0276afd0a3fd7d79fbe86fc73d883c5ff54c38b83ac772aacaf2e0aac84cd28886105b167523fc54459 SHA512 82ea618508069d17bd3682835a723c55450ef025898a22a5ad16e5a75c1d456483135db7501e667baeeed6b775c1aa200ac9af2adf7ca1f9ad71b2eb6ac18767
 MISC metadata.xml 515 BLAKE2B 2a74e5109388a6bf402aeb0a96682b562a53d50aaec99a52163cc3b6744eafdd8be790af99399871af1d87c20afebc80d900304769303301f26b30df2551441b SHA512 fe2a6ca368b2aa748ba1064bbe484849a502a43f7616456c966fd011999ea73aa607c5ffe8cdb1e53e4400c8276fe3e732733f55b0f0143e140cecffaba8522a
diff --git a/media-sound/klick/klick-0.12.2-r2.ebuild b/media-sound/klick/klick-0.12.2-r2.ebuild
index 25f94d2fe96a..6bf7cadb96b2 100644
--- a/media-sound/klick/klick-0.12.2-r2.ebuild
+++ b/media-sound/klick/klick-0.12.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index e1ef5b966e30..cbe1918a04c2 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1,3 +1,3 @@
 DIST kmetronome-1.0.1.tar.bz2 226758 BLAKE2B 9a9e7070f78fe109dce18d3fb66c29e1819f443bc578f03ec31670c994377d7f760367c0c6eb8edc40b2f64b58f2b461beed19b02eadc6dfc9762be537f9f196 SHA512 b5d4c290bb92cdc531ad432dda6ad21ea6c7ec9a144e0482aa4219293e2bc515dbb68ffdbbd4e552daf425c5206636c378e587adfc7029f7bc67d902b591897a
-EBUILD kmetronome-1.0.1.ebuild 620 BLAKE2B e6c234996e4f34733bcf1f36151beae296d2e2fc4dd1e0e0fbb91e25f796880edde58db8bff7408e8cfd8123cc572e277b799703cd337197385019d6be28a031 SHA512 6a6e5d4c9c4ded7cd9b91ed603e72339843a7eb599d0fd28f2f78e6c1b434fdcb531a8a3965f710080e29ad9d0f9aade9049003ff71e8f62685bce58d56bb56e
+EBUILD kmetronome-1.0.1.ebuild 608 BLAKE2B 063de9949ef07234e60361ff368f4930e9c42f7ea1d1f0e5f9e88fb73b52b7364521519cb789c4b744f274c9f174b612fb1d4df5de19dd72bf5875bc27373083 SHA512 18dcd2b85a2c28dd0eeff3010fe01e17e3f725184dd9857eef8b0ec1ebdf128eeb12c0721eff716318240d9d6beb7c9431c1374d2e6e03b6e8f56aac1db11b03
 MISC metadata.xml 443 BLAKE2B 876e9d079153472e0e765f0071063bd904b9ca42252af016611512091634add2a7adf2742217c424f8b7280eb11569f3cb97bf26b4f0652d1d072fa5c7b23739 SHA512 7c8104d0ad8340cea75364d5688924517c6b1f3d9ef7c71b73d8c9f6188ebc7aa22f366777a3e7395e55493a630610e674b5bd2e26f4d6a0fed13cedc4dac38b
diff --git a/media-sound/kmetronome/kmetronome-1.0.1.ebuild b/media-sound/kmetronome/kmetronome-1.0.1.ebuild
index 8adf01c87da4..d690d4807621 100644
--- a/media-sound/kmetronome/kmetronome-1.0.1.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="MIDI based metronome using ALSA sequencer"
 HOMEPAGE="http://kmetronome.sourceforge.net/"
@@ -30,5 +30,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 8fe45979b12d..a33c6957853a 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,5 +5,5 @@ AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
 EBUILD lame-3.100-r1.ebuild 2105 BLAKE2B e4531b3ab55b89738a81c2fd62f202134ef55929395de7612df961cda81b8e680fb5be002bacb9dc11722d5168a1b5975cf629bbbcb675aa2e7227c26a944056 SHA512 2c5e77d2fe681c742d5da11dec93ae688d29acfb9280a87513989b8100f2e586c6f4daa8662b2da9959b0c6f612daa99333c4bd36308547cf5400f592d84e070
-EBUILD lame-3.100-r2.ebuild 2220 BLAKE2B c0facab7481f68f6ff8fa5aeea5f3ded8f6344d0042d8f02f1af07b84ab1ab7453096079791ffe2d4d9c946ed3601aaf513131d554c4e808c46009988e7ff98e SHA512 54d8896ff09131c48b69b20ba01fa4acc982c4488e90935da3f9b987112fb10dc670fb64cb28745ebfac075b82e6b8f6ca393c578fa8318bf9169b7ee0d65578
+EBUILD lame-3.100-r2.ebuild 2219 BLAKE2B 60a544f3c3c0e0ab98e7f622addf77b2ccdebaab4c2d178d9bc014d667e479b5fb01196e35f18b10ca4300ab41e0ab3bb3b7948685878a9e17e79aec93873294 SHA512 ba39cd70dcf721defcefb4649daa7722e90fd06f4cd0a30868cbf8f12a2a6027d09c2829f49980c03ea9f2e9fb3b891018697f6dc4744177ecf8d50f1b947992
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r2.ebuild b/media-sound/lame/lame-3.100-r2.ebuild
index 680c136642db..1942d0ed7c8b 100644
--- a/media-sound/lame/lame-3.100-r2.ebuild
+++ b/media-sound/lame/lame-3.100-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index a4fd3140250a..1137c410c33f 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -6,7 +6,7 @@ AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c
 AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b8f1a5f106642c9edff2dd35ccb5793e88cd5bc512bbc47ce9636d2536cef18b76bbf5e38325c635377405a277ac405d741c6ed SHA512 4ef02c68b919792199142e83607409f6e3037367e090540a257d611ce7ebe1620c586bbeaaef2d5a953e71074ecbf92cef9710bd4bda9ebfee0ab93ca6f59c9d
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
-EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a133ad46f71668a0d02102c09c9f73b799c5d370d6ed788434901da5217524ee7675a3a10338831f5d2df44ef95525b9f SHA512 3f8ad4d240e1df1ed32c1b2fcfb2755dc4aa9f1c018693df543074cf776034bf4b4b89c7129952004ea72ef7f053dadfb9d9bf696be9e6ebd04951b6f366677b
-EBUILD lilypond-2.19.83.ebuild 3377 BLAKE2B 13d7efc403fb44ab97f69cce5b42c10e2361d82a8cf3f6d5476b460b7f3b60291446381585168590e8d819295fb289a00883ac35ded5d7d1c0b6a4774cc51dd8 SHA512 f0a71bdb7b8163c677d724a5069cf35d89b20b1a1c78506af84af47d7e8565affeadbd5493b9bad671c85390538a3614c8bdcbea4cf01a90c94527cb0a2d29a2
-EBUILD lilypond-9999.ebuild 3521 BLAKE2B fba802b73675eed22ebb2d9bdd05a8fa7ff7ccb66c7d8cf7f70d141b540234b1bf21fd74d19d740fe04ba345f4d5dc263eba2710663651f43ac59ad92a25c90f SHA512 28f0b9038116fc5eae0c0b35e7f353ce14fea0aee7fa9f09f503e9582ab1de06dfe48fa2c6fb97ad5362b30eeb5d4b4dc02f017cc19a5135c77b5ba0f1be7393
+EBUILD lilypond-2.18.2-r3.ebuild 3221 BLAKE2B 6fcd41c3be787631614fbe2c28853235059eb7924bdb32cea1ffa674469b3186d3448c99a37d8c7276e17061445f7d694678974266b1b6100fa7b65664ffcd93 SHA512 735e1a2c43d913b382336e9da1fe548965c5bdf70e88104d2a0c431f4a35c76e4d6fc902ae03a3cb9f83604a737c5e17c9f65dcaa5e9e620e3adb1a21ea8cce1
+EBUILD lilypond-2.19.83.ebuild 3390 BLAKE2B de7d56199884ff98ab4dde65d786e96716dfb6f9d96adf501d7784d5d673484f163f22811622249fe87f402d6e3438e300b37f552ff2460464b2c050d038beef SHA512 a68323e25fc7d06a3c153989148e64ef22e65960feb5e7ea0429598a7c07a87988972d58e452d35e437b9c1ddd858bccdcedb8299aab60694d67b64c94547b31
+EBUILD lilypond-9999.ebuild 3534 BLAKE2B be1e58df24af25dc1b92c0e5739376be422dfef14a3519ec23d440b89ad261e1633e61ffb3c9bf229ef4222cfdf4ac86669c6389aef194ab73f0d1d27b206ea3 SHA512 f73f8e3c5dc948e0ba7d3bc78aef948afe684bccccf533fc351b23e6c05fc57afdc69327ecac5f5a185b7d9717029541fe05623ee8b567d8bca34e8b81652280
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
index 3c3dc3ec94a4..b983bd993895 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	media-libs/fontconfig
 	media-libs/freetype:2
 	>=x11-libs/pango-1.12.3
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	app-text/t1utils
diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild
index f4e9eb984de2..4f98510dccee 100644
--- a/media-sound/lilypond/lilypond-2.19.83.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.83.ebuild
@@ -29,7 +29,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	media-libs/fontconfig
 	media-libs/freetype:2
 	>=x11-libs/pango-1.12.3
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	guile2? ( >=dev-scheme/guile-2:12 )
 	!guile2? (
 		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 4d591c81e099..2ae50f180475 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	media-libs/fontconfig
 	media-libs/freetype:2
 	>=x11-libs/pango-1.12.3
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	guile2? ( >=dev-scheme/guile-2:12 )
 	!guile2? (
 		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 70b0bb445d30..6d6590bad2a8 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,6 +1,6 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9cfbf60defe7c3fdcac0f3e943c54dfc38e152df3beb71c5453c7e1df126a3415aa9ea9d75b2abba80efbbf65e64b10388f195c4 SHA512 4d7204b567e578efb3370e11ae69c631c49b01e864c7fb59d6eed309c7ff9ad9d2aa7832ef233f4c5b8e6a26af06c2d9d239cb361d69966e2556cb2816415de2
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
-EBUILD linuxsampler-2.1.1.ebuild 1678 BLAKE2B fd23baae3cb8bb26635e960bee6a2e3703970e50c117fc3078d4f0135aaabf3347753a6e489d99f134546249cec019963b0411239a7346ab4107b1ed378e93e2 SHA512 e18cdfbd824290b269081552f30bd72a3de4f2b0afeb3514c252cebb7413ebfb31ac2ad18d69cb0e3087283cef1d5a8e7077f392410f362b84de873ecad0cda6
+EBUILD linuxsampler-2.1.1.ebuild 1677 BLAKE2B e785675ce4bc7d89a54cf54bebc3b5b95dc5a4d149071faabb3c6931cc1012c3e0f1ac7d6fb47c1918fb26dd4bff614f876f87122f0b2f648415c6856eeb2716 SHA512 e4eca747db52e94147a2baab1c628d2a8370525b462eaa014cb0eab2d71a2c743821fd032b6d3a4ed8c43d8a8fe1effc1428143f6063a2afb3431fbe55b5227e
 EBUILD linuxsampler-9999.ebuild 1577 BLAKE2B e79cae44e8560f0e4790e595d77e34adf9d9c74f2ad99ac20c681a632adc5bb0ee38faf5d2af8c4893322548fb0d2ea4a1b3a25bce439ca766f679b493ff53c0 SHA512 016ac964bfb4eac8d3f32596d684e1e7432eabf53f4f8968ee33eec7a311fdbc71311c4040f1597ecee0a1a3487ec36cc313939c38a22938358fbfa3003cd8da
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
index 0bde237a6cdf..3361f3661694 100644
--- a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa doc jack lv2 sf2 sqlite"
 REQUIRED_USE="|| ( alsa jack )"
 
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 73b49c97a33d..8a8ae197521b 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,6 +1,6 @@
 DIST lmms-1.2.0.tar.xz 14541000 BLAKE2B f53206c2a78104d250fd7eda06ea1c646ad40c2db66baa9ed333213900e33bcab5312c95d5864636930be1b798ac1a79754035e3aec3a3772976aefb80dd8191 SHA512 7d3476fbcbda49d75efee4161f6478656e38a517b6a3b24740ea354e223fba51210f45ff74b46fd1ac73fc6e65409226088b12e29558c91eb818da58734ab6cf
 DIST lmms-1.2.1.tar.xz 14543092 BLAKE2B 23cdc201b32295634c5f50f258e5f63fb995cc4bbf7283c8230b35bc0c6ab26e36097860f574747747966e267c36b43d67b6e9e836a026351c48635c66a00aeb SHA512 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6
-EBUILD lmms-1.2.0.ebuild 2319 BLAKE2B 660549b54242179f82ec39495f9600883252642a6b00acc75e4a1bcb8520c65364daaeaf583fa63014cf6d2ef5b9d8189e667d48eeb6d0082a7e0619b3cc64a3 SHA512 c599583adbaffcdca3bb5387a40a785047a44ad9267b71108a1c38f03ef051d934069e3e40726c371b0869affd42520e3eae857031e0ad1555b677b5c1da5246
-EBUILD lmms-1.2.1.ebuild 2319 BLAKE2B 660549b54242179f82ec39495f9600883252642a6b00acc75e4a1bcb8520c65364daaeaf583fa63014cf6d2ef5b9d8189e667d48eeb6d0082a7e0619b3cc64a3 SHA512 c599583adbaffcdca3bb5387a40a785047a44ad9267b71108a1c38f03ef051d934069e3e40726c371b0869affd42520e3eae857031e0ad1555b677b5c1da5246
-EBUILD lmms-9999.ebuild 2312 BLAKE2B 4ff386189219b087a28849b5eaa9821705b9e58497206a0e1d29ed4d2a67893b222562ad36e85c6e62569c1689efe7d10c0bd01cf3a6cf118ed9526e90b871ae SHA512 e2880190ea5731e948b72b4a1f2d06f6992486f7e0d3b7a521d2723b070e611143d686b37fe43f110b52cdf40a16f9a08fb6938915b80cd27b256ad7869894db
+EBUILD lmms-1.2.0.ebuild 2295 BLAKE2B 269a4f054b882c89a79509db4ac38e2304ca75d7d2b46bab628d226a90d37d98a866b14913bc298a2256e1011dff2b3a52e1d3d65be3bdcd1e4255d3b813e4e7 SHA512 f541e9a0747b1f8f5e0c95f833550d2c656d9e2c67c9f4f94fdb820a957e5436efd3b7641d56792870c9ad40a4d5553085203728f410c68523fdffbf96746ced
+EBUILD lmms-1.2.1.ebuild 2295 BLAKE2B 269a4f054b882c89a79509db4ac38e2304ca75d7d2b46bab628d226a90d37d98a866b14913bc298a2256e1011dff2b3a52e1d3d65be3bdcd1e4255d3b813e4e7 SHA512 f541e9a0747b1f8f5e0c95f833550d2c656d9e2c67c9f4f94fdb820a957e5436efd3b7641d56792870c9ad40a4d5553085203728f410c68523fdffbf96746ced
+EBUILD lmms-9999.ebuild 2288 BLAKE2B 96405ec7db1d97fa503934b6cbc4288a1331b45521c2b1668c2185dc616f323a274883036770140e05f24f87f04486139d9accaaf0bf6f3666047f5d3e2b377f SHA512 e0fb43cc8653aa1a07e3cc1a7950b36c628a6ffa6d31e48ed7e2db7762186e5ebd6276ca70a23460d8d6483f0db4358551c5ad68e431b3f776d61b802bc005bd
 MISC metadata.xml 956 BLAKE2B 9bda57bcbb5b4f6c0831ca465ed48bb27f0c86f8de7908369140b0e7865dc4b44cf0c7b9225bdd8ba786dd4ef22af4a338134e89b23163e0f872519f2e0becfc SHA512 4a3c3bb120894acf50733e003dfdf3132201ad9d9cab21fbde39aca76c38d1e4784d70f2f01c9b889378fc8156271e0e216100dee85d028caef1eaa6dc49a3e0
diff --git a/media-sound/lmms/lmms-1.2.0.ebuild b/media-sound/lmms/lmms-1.2.0.ebuild
index d5f82bfff2a3..e489666c90fe 100644
--- a/media-sound/lmms/lmms-1.2.0.ebuild
+++ b/media-sound/lmms/lmms-1.2.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-# The order is important here! Both, cmake-utils and xdg define src_prepare.
-# We need the one from cmake-utils
-inherit xdg cmake-utils
+# The order is important here! Both, cmake and xdg define src_prepare.
+# We need the one from cmake
+inherit xdg cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -90,7 +90,7 @@ src_configure() {
 		-DWANT_VST=$(usex vst)
 		-DWANT_SF2=$(usex fluidsynth)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.1.ebuild
index d5f82bfff2a3..e489666c90fe 100644
--- a/media-sound/lmms/lmms-1.2.1.ebuild
+++ b/media-sound/lmms/lmms-1.2.1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-# The order is important here! Both, cmake-utils and xdg define src_prepare.
-# We need the one from cmake-utils
-inherit xdg cmake-utils
+# The order is important here! Both, cmake and xdg define src_prepare.
+# We need the one from cmake
+inherit xdg cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -90,7 +90,7 @@ src_configure() {
 		-DWANT_VST=$(usex vst)
 		-DWANT_SF2=$(usex fluidsynth)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 66d6fbe1e437..376874f97b14 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-# The order is important here! Both, cmake-utils and xdg define src_prepare.
-# We need the one from cmake-utils
-inherit xdg cmake-utils
+# The order is important here! Both, cmake and xdg define src_prepare.
+# We need the one from cmake
+inherit xdg cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -90,7 +90,7 @@ src_configure() {
 		-DWANT_VST=$(usex vst)
 		-DWANT_SF2=$(usex fluidsynth)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 367000bf1fb0..122d3db1210e 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.1.4.16.tar.xz 455312 BLAKE2B 358fae45a4332c10ba59d65d09ae51f28fb7fc026e137289c47951536753796e0b7efa9f3713bccde68e6260f79b1132eb00357be8c53fba04f3c827e97851cf SHA512 08b8ec7c1fbe5f1b8f95f95677012eeb9bd83951ee320470a0da852e0a446818e48ede7de045f6d7b98dff8be139fa69d780dbf03e65904c773f8ec1493f9915
-DIST lollypop-1.2.16.tar.xz 484704 BLAKE2B fd6c37690301eff22b52865df1e2d65108c0a25c3ff08d0960e5b09213cb21b2af62886e6cbcaff051a01c5084129dbe38832ac25ff4bb9a60d00566e60e7d38 SHA512 5912f7b09ec166f9680815293be3e7b3cc9ceedc9e12156715b908f4905ee937afb7eecc2b32c70108cfdac4a06abe450415b7c90e6a3e3ef641a1f846ef39e2
+DIST lollypop-1.2.19.tar.xz 483188 BLAKE2B 3c727878b90c8c48505becb47575d295c7623a086ab965def468554c385b956fd346ec22b460fa74964231e04d1310af93b286c6896b34e90104386b8d768536 SHA512 ef73fd592e2375456099365b429b04d5239d913f0c7e7f969b8d06352de8d4f8b8580ea1f0f43a5a0ca420324873c78e48d4f35cc791514b18461a744ecbcd02
 EBUILD lollypop-1.1.4.16.ebuild 1402 BLAKE2B 5481a031876dea76a7591479fc79cf6af819ac55c0cbb8a1fab2ffa6dcee1efa24f72fb6b3e51e6f6184de2f2a31aeb92b93323e8a0cb51396b540708f75a985 SHA512 31f72c147a4c921475bff48dab39bc4adeed3df559775138ed378d0cba64b965af88c8d985cc7b35b0bb9e101d2c06ca5a54d03bb3291db101551911e8772f03
-EBUILD lollypop-1.2.16.ebuild 1403 BLAKE2B 98b707d63869dc0f48059800a549c35b8fd75f7446a769f76766152008d5e17f587efda6e8247487d4bd550a1e9b54f21c1c6ea6641a5063837f807f03708fd5 SHA512 6e55a150616e355c6c2487953d36bdf3fe390b2804417c2f2c4c24c1c666f43d4e2d94400e031eae255a7cbe00775365362eedc70af196595613367068f778b2
+EBUILD lollypop-1.2.19.ebuild 1478 BLAKE2B b694642c23b3fc34386ead63872ccf0dad07d19cc2673716028497a5f03bc1f8942f83cc19adcf2d29e4ffdea760809e37ab2637db446fde36998110b7397432 SHA512 100c1ef897c1d77bbb4cacf113aa26c4df1d76e175b5575d27c1342dff02e73f53268babc258d001208c20022dbaa5975c0fe370ae9bd966ecfbd0043573bbad
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.16.ebuild b/media-sound/lollypop/lollypop-1.2.19.ebuild
index d7e95275746a..fe1a81740e3c 100644
--- a/media-sound/lollypop/lollypop-1.2.16.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.19.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
-HASH="70aab11cf17a8966a5bb188b4173b240"
+HASH="5918e6040337c71b8b88932301c7de0e"
 inherit python-r1 gnome2-utils meson xdg-utils
 
 DESCRIPTION="Modern music player for GNOME"
@@ -48,6 +48,11 @@ pkg_preinst() {
 	gnome2_schemas_savelist
 }
 
+src_install() {
+	meson_src_install
+	python_foreach_impl python_optimize
+}
+
 pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_schemas_update
diff --git a/media-sound/lyvi/Manifest b/media-sound/lyvi/Manifest
index 7e86046e3613..b42278070b17 100644
--- a/media-sound/lyvi/Manifest
+++ b/media-sound/lyvi/Manifest
@@ -1,3 +1,3 @@
 DIST lyvi-2.0.0.tar.gz 19307 BLAKE2B 009af146f917ed7867c737a78c50261b688b4b78e104518338462b3f1372656298bcda5ef0b70f8a84db800488a57ba4c665884ff5fa2f992d53d3940e204f47 SHA512 0248ceb16436be427ab38769824ce4be48998997b1997f90ddef751105e7449cff7d865e9a5895fb67c79da0eaf394baefe1a77bdc9e6c5e2b6498d64128b045
-EBUILD lyvi-2.0.0.ebuild 833 BLAKE2B 4c27b22251fa23d07031360e98614ab90ea97d583969c8893413634a210299b1ad9b70274c6650bd2bf28f2059375729bd3fbdd2bfa0cfe5edaae67504ae81f1 SHA512 7e1bf392dc7f6c15a2478f090cd66947542dbe2f1822e5e0ee6e82fcdb61b88b114c07e11b3e3ae8e65746b8521b2c16f9bc959fe405152d526e10df027d1e73
+EBUILD lyvi-2.0.0.ebuild 829 BLAKE2B 6b16dee0c2d27000258f803c482172a383dc6b187753521131fbfc114e9b20eca28d372c03dcd4c0f114044c4952e8e2dd2f5956161013f80f5b2bc80b461b7c SHA512 91d20ca364512109117f7f4933515417a9dd9a5f0a886e5145e699d0070c1d0740a8a1719d512406a90bc2e3a32dc278df72dc96024a44b5ed40b887e5f68888
 MISC metadata.xml 475 BLAKE2B 553ea1293e265b8b077fe66eb6a3ba954fe417a83b802820ce2d10d32b126c780ac6290729137851628a81bd6f69fe4508e67449db42fa3c41ecfaa1b5a8d6c8 SHA512 563ae54e16871f78847fdb8ca7ca1dcc392994acd6726850730ee664af2a0e404ed7e9572fb1574dbd260f41c405349df0cbcb5623c70e0168c54786c03a2134
diff --git a/media-sound/lyvi/lyvi-2.0.0.ebuild b/media-sound/lyvi/lyvi-2.0.0.ebuild
index 3b940f27a26d..8ce633a5a346 100644
--- a/media-sound/lyvi/lyvi-2.0.0.ebuild
+++ b/media-sound/lyvi/lyvi-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index f029f438bd8a..74a9706a5e24 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,5 +1,5 @@
 AUX milkytracker-1.0.0-cmake.patch 6172 BLAKE2B d0ee8dd866ff5d9b7c7558f5ca5d7b2f75a4b3e37abba2b7798816a8131ea24e250fccdd405bb48f1effb363d437115f89d7b44aae87fdbe21234b1ad08c544c SHA512 395d93dab58a9a5a7c000382ea946b1e28eecf55d3867a7acf07cef7ee2bbb7ea90ff5946125c5bf16c2ecd658f7711859e02b7058c19dbaaea39c9b3ee8c881
 AUX milkytracker-1.0.0-docdir.patch 2319 BLAKE2B 256f8f2eba611e2a6f19df117e2b4ccf6057f4de380a2098f48b0cbf4a136f7b5d45eb203990b8de36407765b6f4a9547f1801d50dec7400a55917bf286a9193 SHA512 f5e44258717a9b84956c29506c27e97e72cd50092ac179c328f3773f07f0573ac77aa50e4a27cea62f23b4f6318e1132fac2a0a039e3cf604efd1d595b357173
 DIST milkytracker-1.0.0.tar.gz 3749140 BLAKE2B 5bf1e374c8d51e7f65a222c46b4cb3e26dd88ba5be304af540d3af4f5123179a2496d0b5eb87021d2dc0f12e7fab3f55e9ad06573aa5fb3a8842d9b743e6c948 SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4
-EBUILD milkytracker-1.0.0.ebuild 1111 BLAKE2B b3f5fb99df3a3f5efe9342b832f961ad9543c4112174087bdc155b00348f4f4a0f1974489aca694315a29c02c94f27e0203c30d070074e948c9d8ff4ab1e9546 SHA512 71d67645d2c7460e5a8ca871e4d635ea47d854d06b4dc220d9a1d1afde77c7bdddbc2cd72b81a3f1edce1dc0953ba451b1bb54ac3521ee15faa5840c2cb54ffb
+EBUILD milkytracker-1.0.0.ebuild 1040 BLAKE2B 6905982d6a4af69065592125f6e7fbd38b1a03068af4b9ac7f51719b3e3aa4c3b3e411846d56dbb5ad83841c42f30468df3b891e1d066bd4752ce583184c6f8b SHA512 49024655173f65bc0c88172478848e7f742a5310bc348eea46bf27ca17660177ed489948f1fb9709c4f7352cc913b1554ec2bd8520058ff73cb7ce50b138f2f4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
index f2fac2cf6422..3d5f9f04861d 100644
--- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
 DESCRIPTION="FastTracker 2 inspired music tracker"
 HOMEPAGE="https://milkytracker.titandemo.org/"
@@ -31,15 +31,14 @@ S="${WORKDIR}/MilkyTracker-${PV}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package jack JACK)
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package jack JACK)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	newicon resources/pictures/carton.png ${PN}.png
 	make_desktop_entry ${PN} MilkyTracker ${PN} \
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 2ff7f540e874..a2e8c6d9d7fb 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -2,5 +2,9 @@ AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.21.16.tar.xz 673732 BLAKE2B ed43ae9d5d40fcac0d035c24161c4db3a1b6df2b05f6a006a47beb7f7ba8ec198cbd20e34c9fcaf4e9832dbf13c57a77a9e5864d7f16de2bdd1c414d41ce391c SHA512 bb7587acd03d675ae3127ab4e196d549170551ac643e5134baa2bccaf8d7c9bba6c9a9edec9bcb61a2ec3a6ce26f4d77190323ef0329033d0cd8c1f8964be05c
+DIST mpd-0.21.17.tar.xz 675000 BLAKE2B 708ad03104529294b92e88aa0c29560b64301417a478b93dfaa922bc257920dad7cc687e3cc06c72c7c07a91237571c55fc0e3b05746e38a804df64cc69e3e5d SHA512 71a53ec7262d7292a7227878f3d6187563727a0fabb8716bd6df70d4b96990e2d0da0ea5e59a84530cdb1b5e3046f08118c6409cc67c731c191095bd66f256ec
+DIST mpd-0.21.18.tar.xz 676084 BLAKE2B f55ea278da4b50bf24da476ed9e3ff50a8130215702fb5c4a0accdbfeb00ed734983034ce6ee0542623e42d488555b1c709acefbba026f0e01f17f25f749b833 SHA512 68b4d9dc4be8454d7ef92df2a7b42513dc2d97bfd6b11ba99bce6709fc58ccbeab05419863bacb7a3427f1325bc88da74f9f4b48206222349085f02d0135e1a8
 EBUILD mpd-0.21.16-r1.ebuild 8088 BLAKE2B d720d1fe08a6e71366459e04a16a085bd3ea81e4d0ca621e17d59a0e582f6f74eb4909de6180dc54a353aef6c8b8dfdaf33622d86813202d9a4619a0eac96d16 SHA512 c1fe6b917446381be31131b8773950bb10b4379d77072e6fee5d982e95091cefb9841504e8971bc493a1d751fcdcdfe2e6de33da573ddbbcb7c92be9eed79db5
+EBUILD mpd-0.21.17.ebuild 8091 BLAKE2B 1b2ce0dd6f6b23a8eb1e233138deaba58d94203d13a65186bdaa2999d6e2ad18edd1cde2494a4f5f4633109ac80a5c40e69d15936ece4c901f8218778cbe004f SHA512 c57c53083e3071a1984dd91d2bfc9c7f98d6c843aba0178b41cb0d1ca228de0a23bc581c9810e8e532433a363dc744ef710e09417d6449d26721481c7163213b
+EBUILD mpd-0.21.18.ebuild 8091 BLAKE2B 1b2ce0dd6f6b23a8eb1e233138deaba58d94203d13a65186bdaa2999d6e2ad18edd1cde2494a4f5f4633109ac80a5c40e69d15936ece4c901f8218778cbe004f SHA512 c57c53083e3071a1984dd91d2bfc9c7f98d6c843aba0178b41cb0d1ca228de0a23bc581c9810e8e532433a363dc744ef710e09417d6449d26721481c7163213b
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.17.ebuild b/media-sound/mpd/mpd-0.21.17.ebuild
new file mode 100644
index 000000000000..e3d021775ebd
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.17.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/mpd/mpd-0.21.18.ebuild b/media-sound/mpd/mpd-0.21.18.ebuild
new file mode 100644
index 000000000000..e3d021775ebd
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.18.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index 6a46c78bb34d..8e1cf75f69f8 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,6 +1,6 @@
 DIST mps-youtube-0.2.7.1.tar.gz 78128 BLAKE2B 1883ac93ec06b657f72463291d4844b4cf5c1edfb14088769d32bb7590ea676c06a1022724c40b94230ee5469864b402a07c56e535ac3001d57c87cf6937d370 SHA512 760bd6ef6c04606e6e70e4d7f985482c5d5f1f33481a69398d20c2518ae7a1b0371501e31b6d0bcb46e702c53d8b2311e4556700c7d2ae4011006ffe9582de9b
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
-EBUILD mps-youtube-0.2.7.1.ebuild 585 BLAKE2B 1f7ca5abaa37e23c285be9a5f181bbd9b7e2682786dfe70321c223139b258e9d7620cad2221199b395e07f054762c906e9a1c8a6dacc53affbc598fd365eff93 SHA512 e3d5fc7c825ade522aa6fc55d38ca9355ece977fa81bd1d489913d83ef2028519554431c8a07f16b85a884ca21499af297afac85e7a6bef8c87b6296223ee697
-EBUILD mps-youtube-0.2.8.ebuild 708 BLAKE2B f8317ac35c1b83926dde60b1c7f0253b929bc2df6814603414c9e9a20a635ebb687a400d9a60d47215e15213ebd6f431419dc06efb78f7fd890b1e3b0c03a515 SHA512 fa88d3b0632ad2ea146b2c85c673e20822f7204556d60fbf92de31e35e57403d62ccea7fdd8abb491e02e51236c590a06a18b2c39e4934093ec16c724d68b643
-EBUILD mps-youtube-9999.ebuild 708 BLAKE2B f8317ac35c1b83926dde60b1c7f0253b929bc2df6814603414c9e9a20a635ebb687a400d9a60d47215e15213ebd6f431419dc06efb78f7fd890b1e3b0c03a515 SHA512 fa88d3b0632ad2ea146b2c85c673e20822f7204556d60fbf92de31e35e57403d62ccea7fdd8abb491e02e51236c590a06a18b2c39e4934093ec16c724d68b643
+EBUILD mps-youtube-0.2.7.1.ebuild 579 BLAKE2B a3210425b8599a12ab92e086edf779acd016e83aad5cdbceb7277fc554b6532bbe83df309ae02798c728d1b5237c09fdce3b8aaf34a18e49323b0b1423fc8b95 SHA512 a416bf9b5d239bc44ac9a8a7681dd9ae4d194f4780691394d37fa3874937e7b6c2b3edbd60422d0bd0b159793e209102f86a09471f565aad391bc05f65b33f73
+EBUILD mps-youtube-0.2.8.ebuild 702 BLAKE2B 07d8d988d0e340ba83d5e28cecba61aa7c16b15df60ab93fa6b56907fbe655340bad89490eb3f12369be79fa09967f86b85b6d2197f0d737a98e3bd54c602f4a SHA512 6a601bb8c461af327696de09d6d70a8b1018706a48a84c3c26303de795996abcaa399bdc1aa084dfffd9f2e58185b4dff21ddd590aa7257c0383c96f3f6b04c8
+EBUILD mps-youtube-9999.ebuild 702 BLAKE2B 07d8d988d0e340ba83d5e28cecba61aa7c16b15df60ab93fa6b56907fbe655340bad89490eb3f12369be79fa09967f86b85b6d2197f0d737a98e3bd54c602f4a SHA512 6a601bb8c461af327696de09d6d70a8b1018706a48a84c3c26303de795996abcaa399bdc1aa084dfffd9f2e58185b4dff21ddd590aa7257c0383c96f3f6b04c8
 MISC metadata.xml 390 BLAKE2B a451cde37ad9b1809005675d0dc8233c760f0ee1678474d60c74990a4ef07da572947498a0da14577072a4f14e57da7b008251ff551f4bcb9ee966957344bf83 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
index 401901a6be89..fd0ea3a2ed5a 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
index 5ecfdc287fac..7f9ca71d825c 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index 5ecfdc287fac..7f9ca71d825c 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 90bef7128fbe..f5afbd09d7eb 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,11 +1,10 @@
+AUX 5583.patch 8876 BLAKE2B 5a338bed4da06311561dc2ff8bf41317d9e8d2a9218ab570e4396840637a7a4aef3d52b15eb87d388fb9ed76f8a9685036e2c758640c69cd65f910c2408bf4e8 SHA512 464e8dd526f39c2f253d2f3b5a6f932c50a17c7774df0ae076e7b8ae5379e3e5588359fe15ca73825ea56156b5a663178e48ef0d950dcef53ce60808c324ca72
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
 DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d SHA512 81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
-DIST musescore-3.3.3.tar.gz 62820760 BLAKE2B e6daf1ba4ea62dc04598461ca31290548ef14d0252084ddfd6a9945d0850cf8700fc1eadea683a67415fe5a71a61310cd7bf08640b354e8e4d60967ad8ca0605 SHA512 ed2b29e450ca8440e8073b9f7b1c3ae2c373d6f26963bd3bf5032156f6ed30100f4993c4c6637e292b6939c69cd592ec2d2f008d37b917f6af3bcc640ccf2910
 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
-EBUILD musescore-3.3.3.ebuild 2456 BLAKE2B 08c1527c0ef8177bbb6993d0bca83bb1b3b2daa20c1267945c9d18ccf77181ae03dc6cf9ce63c9aedb4d8ba6c9ac90e627cc37c52644780b0e7f698e63f69eb7 SHA512 2103096bbb8e39127f5eb13b1d0c110587ba07e3a294bfa2a288b42df9152dd75e5664b723e61241ea2ae0f9c2ec46f91a0f0b9fbe8849177e9f6b0c49617058
-EBUILD musescore-3.3.4.ebuild 2456 BLAKE2B 08c1527c0ef8177bbb6993d0bca83bb1b3b2daa20c1267945c9d18ccf77181ae03dc6cf9ce63c9aedb4d8ba6c9ac90e627cc37c52644780b0e7f698e63f69eb7 SHA512 2103096bbb8e39127f5eb13b1d0c110587ba07e3a294bfa2a288b42df9152dd75e5664b723e61241ea2ae0f9c2ec46f91a0f0b9fbe8849177e9f6b0c49617058
-EBUILD musescore-3.3.ebuild 2454 BLAKE2B 3c8ab351b7e781448b3ee732c31e70f37e1f01bcc8ac418fa233f9d12c66a50b748971bef2c427d5dee5c9fd42d1a2a047fcd1a296f8148d721defbaf8fc97af SHA512 d2be78de11ec4756bb35466476d01a33b87d209a647f93542df6142c44e6c9c7bdc54f6e5876b8ffb7c04c0462b38b9b445af90e1ccc98b7210c10622a5a70ab
-EBUILD musescore-9999.ebuild 2448 BLAKE2B 477b9897f891b5c885f8485eac6d545b6c5c5e2e6d4ac59108b4ba77df3f36a0169078732ced3f55ede4792b7597480a1c1d7d979e35e824d68f8e244975f66d SHA512 2c7bd0523e4b14f601437ec0fa2d1bbb090da1702137d8ca7ff74aff27da817b63b57a6070e1171c03fac418fea34a6eb45980da5eae5e483e409311fe2b6ba6
+EBUILD musescore-3.3.4.ebuild 2449 BLAKE2B 93b00e73bb9e230a1fa5be81fb504fa18b092960136b6921bfc85bfe693a41c39061c72286b5367911a922faf84fd1c8dd3ebeea255f690e4e41be78cb4b281b SHA512 c72fc45cb8999c50a07fec94d953526948f9ed8e2ce2a2286e0ee9543c80cc8d8dee02b2c55c98c943c1b606f0eb598ad4875467c9bc70ccd702fa2713e378a1
+EBUILD musescore-3.3.ebuild 2421 BLAKE2B 71b05ee46489698fa8b8e723360f886f372d900a8bf18a7a8a1deaf9e0c91bc14c6b8a377b00f0122a426e057e070fd35678b492040e6dc57e0cabd17a5514cd SHA512 ae93fd993c1315310f08536a4a822a1fb755332ca09d867cd0053536c98403954832e420168159c8888e69c0a75aa60ce32f5027a08140b6a893ddbb7351e77b
+EBUILD musescore-9999.ebuild 2415 BLAKE2B 01288251aa9647b9eba9a23bee1679ce016611691b487ce57ccf5445e687711844a8ce7d943749226b9306adeb32645776010c5411e7eb16ee2b88d165c6a554 SHA512 05b779c77f3253c2f4ccdeb6682615899e17ca1ba8bd9039e896c3aa220af068798bbdc99af3e1be123b727147828ffeca5788c7dceac981c37c360981e22f8a
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/files/5583.patch b/media-sound/musescore/files/5583.patch
new file mode 100644
index 000000000000..da4d0c52d041
--- /dev/null
+++ b/media-sound/musescore/files/5583.patch
@@ -0,0 +1,212 @@
+From 09d138946aad53962ce23298093747f0ce52304f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Tue, 31 Dec 2019 17:39:34 +0100
+Subject: [PATCH 1/2] Specializes template routines.
+
+Qt 5.14 introduces serialisation/deserialisation for enum classes,
+this results in ambiguous templates between qdatastream.h and preferences.h.
+we specialize everything to workaround this.
+---
+ mscore/preferences.h | 41 ++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 36 insertions(+), 5 deletions(-)
+
+diff --git a/mscore/preferences.h b/mscore/preferences.h
+index bef3df8536..8c3ac9b0ed 100644
+--- a/mscore/preferences.h
++++ b/mscore/preferences.h
+@@ -233,21 +233,52 @@ extern Preferences preferences;
+ 
+ // Stream operators for enum classes
+ // enum classes don't play well with QSettings without custom serialization
+-template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
+-inline QDataStream &operator<<(QDataStream &out, const T &val)
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::MuseScoreStyleType &val)
+ {
+     return out << static_cast<int>(val);
+ }
+ 
+-template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
+-inline QDataStream &operator>>(QDataStream &in, T &val)
++inline QDataStream&
++operator>>(QDataStream &in, Ms::MuseScoreStyleType &val)
+ {
+     int tmp;
+     in >> tmp;
+-    val = static_cast<T>(tmp);
++    val = static_cast<Ms::MuseScoreStyleType>(tmp);
+     return in;
+ }
+ 
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::SessionStart &val)
++{
++    return out << static_cast<int>(val);
++}
++
++inline QDataStream&
++operator>>(QDataStream &in, Ms::SessionStart &val)
++{
++    int tmp;
++    in >> tmp;
++    val = static_cast<Ms::SessionStart>(tmp);
++    return in;
++}
++
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::MusicxmlExportBreaks &val)
++{
++    return out << static_cast<int>(val);
++}
++
++inline QDataStream&
++operator>>(QDataStream &in, Ms::MusicxmlExportBreaks &val)
++{
++    int tmp;
++    in >> tmp;
++    val = static_cast<Ms::MusicxmlExportBreaks>(tmp);
++    return in;
++}
++
++
+ class PreferenceVisitor {
+    public:
+       virtual void visit(QString key, IntPreference*) = 0;
+
+From 6b759bb5ee7b83fd8a82429e4cdb74279c5d33b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Tue, 31 Dec 2019 17:42:04 +0100
+Subject: [PATCH 2/2] fix warnings: replace QString::null, with QString()
+
+---
+ mscore/capella.cpp               |  2 +-
+ mscore/importmidi/importmidi.cpp |  2 +-
+ mscore/instrdialog.cpp           |  2 +-
+ mscore/musescore.cpp             | 12 ++++++------
+ mscore/musescore.h               |  2 +-
+ mscore/network/loginmanager.cpp  |  2 +-
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/mscore/capella.cpp b/mscore/capella.cpp
+index 7144414e32..6243c8cca6 100644
+--- a/mscore/capella.cpp
++++ b/mscore/capella.cpp
+@@ -2708,7 +2708,7 @@ Score::FileError importCapella(MasterScore* score, const QString& name)
+                   QMessageBox::warning(0,
+                      QWidget::tr("Import Capella"),
+                      QWidget::tr("Load failed: %1").arg(cf.error(errNo)),
+-                     QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++                     QString(), QWidget::tr("Quit"), QString(), 0, 1);
+                   }
+             fp.close();
+             // avoid another error message box
+diff --git a/mscore/importmidi/importmidi.cpp b/mscore/importmidi/importmidi.cpp
+index a5d8894686..8091a83369 100644
+--- a/mscore/importmidi/importmidi.cpp
++++ b/mscore/importmidi/importmidi.cpp
+@@ -1200,7 +1200,7 @@ Score::FileError importMidi(MasterScore *score, const QString &name)
+                         QMessageBox::warning(0,
+                            QWidget::tr("Load MIDI"),
+                            QWidget::tr("Load failed: %1").arg(errorText),
+-                           QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++                           QString(), QWidget::tr("Quit"), QString(), 0, 1);
+                         }
+                   fp.close();
+                   qDebug("importMidi: bad file format");
+diff --git a/mscore/instrdialog.cpp b/mscore/instrdialog.cpp
+index fa7bacd622..8d81fe9e20 100644
+--- a/mscore/instrdialog.cpp
++++ b/mscore/instrdialog.cpp
+@@ -138,7 +138,7 @@ void InstrumentsDialog::on_loadButton_clicked()
+             QMessageBox::warning(0,
+                QWidget::tr("Load Style Failed"),
+                QString(strerror(errno)),
+-               QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++               QString(), QWidget::tr("Quit"), QString(), 0, 1);
+             return;
+             }
+       instrumentsWidget->buildTemplateList();
+diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
+index dd4a4b95ca..07cb596abe 100644
+--- a/mscore/musescore.cpp
++++ b/mscore/musescore.cpp
+@@ -4013,7 +4013,7 @@ bool MuseScore::readLanguages(const QString& path)
+                 QMessageBox::warning(0,
+                    QWidget::tr("Load Languages Failed:"),
+                    error,
+-                   QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++                   QString(), QWidget::tr("Quit"), QString(), 0, 1);
+                 return false;
+                 }
+ 
+@@ -6753,7 +6753,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
+                   QMessageBox::warning(0,
+                                        tr("Encoding Error"),
+                                        tr("Unable to open target file for writing"),
+-                                       QString::null, QString::null);
++                                       QString(), QString());
+                   }
+             return false;
+             }
+@@ -6792,7 +6792,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+                   QMessageBox::warning(0,
+                                tr("Error Opening LAME library"),
+                                tr("Could not open MP3 encoding library!"),
+-                               QString::null, QString::null);
++                               QString(), QString());
+             qDebug("Could not open MP3 encoding library!");
+             return false;
+             }
+@@ -6804,7 +6804,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+                   QMessageBox::warning(0,
+                                tr("Error Opening LAME library"),
+                                tr("Not a valid or supported MP3 encoding library!"),
+-                               QString::null, QString::null);
++                               QString(), QString());
+             qDebug("Not a valid or supported MP3 encoding library!");
+             return false;
+             }
+@@ -6829,7 +6829,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+             if (!MScore::noGui) {
+                   QMessageBox::warning(0, tr("Encoding Error"),
+                      tr("Unable to initialize MP3 stream"),
+-                     QString::null, QString::null);
++                     QString(), QString());
+                   }
+             qDebug("Unable to initialize MP3 stream");
+             MScore::sampleRate = oldSampleRate;
+@@ -6996,7 +6996,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+                                     QMessageBox::warning(0,
+                                        tr("Encoding Error"),
+                                        tr("Error %1 returned from MP3 encoder").arg(bytes),
+-                                       QString::null, QString::null);
++                                       QString(), QString());
+                               break;
+                               }
+                         else
+diff --git a/mscore/musescore.h b/mscore/musescore.h
+index 434072a12f..d8089a345c 100644
+--- a/mscore/musescore.h
++++ b/mscore/musescore.h
+@@ -142,7 +142,7 @@ struct LanguageItem {
+       LanguageItem(const QString k, const QString n) {
+             key = k;
+             name = n;
+-            handbook = QString::null;
++            handbook = QString();
+             }
+       LanguageItem(const QString k, const QString n, const QString h) {
+             key = k;
+diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
+index 7bcfd892e0..4abf7e3e4e 100644
+--- a/mscore/network/loginmanager.cpp
++++ b/mscore/network/loginmanager.cpp
+@@ -680,7 +680,7 @@ void LoginManager::mediaUploadFinished()
+             QMessageBox::warning(0,
+                      tr("Upload Error"),
+                      tr("Sorry, MuseScore couldn't upload the audio file. Error %1").arg(e),
+-                     QString::null, QString::null);
++                     QString(), QString());
+             }
+       }
+ 
diff --git a/media-sound/musescore/musescore-3.3.3.ebuild b/media-sound/musescore/musescore-3.3.3.ebuild
deleted file mode 100644
index 3055267da6e9..000000000000
--- a/media-sound/musescore/musescore-3.3.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 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-utils xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.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://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis 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/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024
-	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 )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DSOUNDFONT3="$(usex vorbis)"
-		-DBUILD_WEBENGINE="$(usex webengine)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
index 3055267da6e9..e0e03cdcb56f 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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-utils xdg check-reqs
+inherit cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -54,12 +54,13 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+	"${FILESDIR}/5583.patch"
 )
 
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -81,11 +82,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/musescore/musescore-3.3.ebuild b/media-sound/musescore/musescore-3.3.ebuild
index 0533ecb9ffba..f697f3706776 100644
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake-utils xdg check-reqs
+inherit cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -59,7 +59,7 @@ PATCHES=(
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -81,11 +81,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index f55fab5973b2..5d3ba673cd37 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake-utils xdg check-reqs
+inherit git-r3 cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -62,7 +62,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -84,11 +84,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 8312dd8c77c8..e7f024a6d305 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,6 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-EBUILD ncmpcpp-0.7.7.ebuild 1467 BLAKE2B 07f776a3c433b8ede9e741e74a9ee6a50e0a01865da5a2eaa5eb2193fb4eb5f19b694849739fcaf7593d931e967baeabc2e0ca908bb6e00beae1fcdd89cd36da SHA512 6e6f00aae80ccd97f4ec32b37e5f72ec5e782d0155edc9f6a85b752d26e09c749bfa31cc4b4f86a993caad09b866fdb891e987fded319d58e7c5ad0f0428bd47
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1396 BLAKE2B fa0f50a4d870ccc0c7d02f899fdb1fecdfc60bd04af8a59f6640690c8a20b5ed6b729cab9e1d5ff711a36897b5e54c7aa2da0c474ed8791f9a26cfa156aed6a0 SHA512 9a59f7900c619b557421c54b832d123b70a4d08a3ba25c73e8e548ad6c981f971fbb23942b61bf66bb1e69194b1c08b717bbd07e97bf65d97ef5da6624e01531
+EBUILD ncmpcpp-0.7.7.ebuild 1484 BLAKE2B a3bdb788d5d1ad145db6e341f86b5354c6fe58c90504673016562ea7bc71e9049ce739547289808781913ef9690ffe372df921985503069097f2dde6296beb13 SHA512 9e48ff463669670a81cc3d12bbd6097339a8214cbf7bbf0a671e103622996bebc5616c665636f2ccbd65657d99c8bf6e98f4a2f3cf269891a43f49c046f678fb
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1413 BLAKE2B 724998d2c9a0d20df7f119c7f5761c8e939c441762f1889dd3011ff0f9903537d81837e61def1cc0bccb878e818065fdf91c2509074608b8aa53372243ac1c64 SHA512 df70a57df1be7191c37a8e38c8f1372a9014103d147cd072b51a2eb001266c6e03d40c6ecf9a18a945f221d181905179bf84545037953eee6fb30083aa46b570
 EBUILD ncmpcpp-9999.ebuild 1391 BLAKE2B bb70ae4ce0ffa9d9234b76f57ce1a5ef638c2fef6b1efca502c8dc92191748ce52f98b80043362861fd51475d8c6b14344e37d8b70a25f2053ee93f607b5ecf7 SHA512 c073659170e5cf5c554c7f3ed8fb9b101d4275af1ec6eb3eb38e295ee2e1e8023aef5a6d5c9f79d8734d994765933b5413ee47d2a53403d8c65077c746f0ce8a
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index fac787897fba..9f15e360a639 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://rybczak.net/ncmpcpp/"
-SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
+SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index dbdf6c5d16ca..de4e926c5037 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://rybczak.net/ncmpcpp/"
-SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
+SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 7d78dba225eb..4907ba636dbe 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.4.10+release.autotools.tar.gz 1471662 BLAKE2B c20ef4d26b583f5cbbed5e6d108ce6f55fef74726997267a56d16b8508fb46f26f62f934a98bcc20749da2ed2aef0bdd22931cc785806ec0b6c5daef593d196d SHA512 d7c46016eea59c21e3f948d8538a747d5fa6b29f160841b688878d8ce48859d014c3a036738074b3d260af6e662c36b03391aef511c1817a5ace81f60bf27dfc
-EBUILD openmpt123-0.4.10.ebuild 1722 BLAKE2B 1a46c7b124b4f082126240ca40cad681da9cbe6efaa75f2bef54b11d1f00efe759451ad4d15c28a6557e53c21dc395bc339084fff989d8e3c850f1a2e7fdba52 SHA512 524a929b41feb0b335bf57774d4b42a28badd6a8dc13e9334265e7131d72be05935e60107d83545fe396d965617abc36b79496fb1ca5f4d19fd7daa80f4e108b
+DIST libopenmpt-0.4.11+release.autotools.tar.gz 1471760 BLAKE2B fa6fd53974e235c9efb01dd7498067be9eb90a06906785d05257557c4c7faafbd0136f63e46f76638b46362cad02849fee45a21ed1c65603134c387d1c064d12 SHA512 d720a0c04984f624f7ecd1ee8648045cd09ced2cc8b1cf3546404b9e73b2781493076391c1881e0d0eee72cf829a38365313efb9852448cd1cfe5f7b7f535e99
+EBUILD openmpt123-0.4.11.ebuild 1722 BLAKE2B 1a46c7b124b4f082126240ca40cad681da9cbe6efaa75f2bef54b11d1f00efe759451ad4d15c28a6557e53c21dc395bc339084fff989d8e3c850f1a2e7fdba52 SHA512 524a929b41feb0b335bf57774d4b42a28badd6a8dc13e9334265e7131d72be05935e60107d83545fe396d965617abc36b79496fb1ca5f4d19fd7daa80f4e108b
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.4.10.ebuild b/media-sound/openmpt123/openmpt123-0.4.11.ebuild
index e7c6d6f4b4b7..e7c6d6f4b4b7 100644
--- a/media-sound/openmpt123/openmpt123-0.4.10.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.4.11.ebuild
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 20443cc9973d..19139b79cef1 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -3,5 +3,5 @@ DIST pamix-1.5.tar.gz 16902 BLAKE2B 4f7612cb870f84110b8cc31a061afecb7c2aeb8d0738
 DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
 EBUILD pamix-1.5.ebuild 773 BLAKE2B 57ab9145fcb6998a9c03ae50109cb9a65dbdae0e2a7578dfdf8f3287deea336948774c37059bf4f6ae39cee5e71d66c1827eb0c09b6adf0c1377a9915be79865 SHA512 4041efab6a1ee3d34d39a8dfd2f4353516eec4dcb937d334c6e7113700a9ceb3cb82b8f29a834093732c9b97f37f92509313eefd38ecbe0cfbd779f9e90a963d
 EBUILD pamix-1.6.ebuild 845 BLAKE2B 177ff961b13d3008f5a45ad81aac87ed31e256e4114a07a3402e88034424c8c72295a41422ef8fd9d956a6f652a8466a785b4bed54dfec9dc6b1e6f442bbad42 SHA512 e063b58c9bd13b3640cd29aa2d5f3d9eed262a031aaf791b96aac88d9847836ad42509043fdf1489d9ae1348a98bd07ef06181d324636724e3bfa237bc5671b2
-EBUILD pamix-9999.ebuild 765 BLAKE2B 8526b7d2c78f6fc7435fc9618cb1f5642f907e3f44d3f6e35a88f9d87de250e150331a701aaf1a8da438e714e231903d44eaf479a82df1a3d51ce6e028c20857 SHA512 8ae303675cd3cb93c994b637f349d6b94b7d3bcefc7220ad938acef4cbd34c7505143f39b0d2d19439795faf6c8b9328f9fa79492cfaac23c6ce3e4d805e6cc0
+EBUILD pamix-9999.ebuild 753 BLAKE2B f0a0fd50d60ae57dff4e7ef22a739ee62694dfb5e207c7af97c50e2a6b8ffcff837c7308b1084a5c26e406a4acb4577f13f7d63c07585eb58834d00fe815aa13 SHA512 655e7c7ff7131255837c6c5bdb6a4e2613d46a2c5038d2dede0af0d64bff3f0d6e589c707bd1285120f9033fece73c59f4a0452aa19a7ac9b0638105c6e94fee
 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index b4f4397507df..1e8fad344924 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
@@ -34,5 +34,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DWITH_UNICODE="$(usex unicode)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 0b9d78045f13..27ae2568dafb 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pavucontrol-qt-0.14.1.tar.xz 94948 BLAKE2B e0bbbaa2410220c0e34ff77cb84c783ba682587311eaf20eca286a142e122827b6294e9d0409f2ea5b18d80c06d822bbaed49d60d1402a4a97b7f7210ee2cacd SHA512 55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494
-EBUILD pavucontrol-qt-0.14.1.ebuild 716 BLAKE2B db27a4a19eb4694b63fdb1b81c7e0f4630c6ac8f76b791d2f39406559e6913c18bac146290cd50f0c6b00ceaba285b0e1c89866d1943de27ef058ab53d67c188 SHA512 f08c1ffaf41cfa5f9d96ec5d72a630a9fc08ac4e7416a12948cd5ea7f463322d8e616ddbf005b7e3ecf2e2b30faddf356e557c422717308abf21d413c2ccb53f
+EBUILD pavucontrol-qt-0.14.1.ebuild 710 BLAKE2B 6471b6b79576380bb8f170a454eef39c73789af59bb2ced3fcafb8c8bf668c337961d52291aa3aef1013699e443eab2d6d340a5ba8f16e707f01f1679d6395e1 SHA512 e8bcae74963d12f2360eff74b428112eeac9734327356e8350d51e1f506e6e909fc1a13a64a7f03242dd70582ab2648d8d00d3ac9dce26534ca2c51f08c27859
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
index 7d4e8ea7116a..2a9dc38b6d65 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A Pulseaudio mixer in Qt (port of pavucontrol)"
 HOMEPAGE="https://lxqt.org/"
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index ac9e4645f9a3..dd4a4f5f29ed 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,4 @@
 DIST picard-2.1.3.tar.gz 2995390 BLAKE2B dcb81cad62aba7915aeff321775452cef70819194a76530eb96a0a7b0009f7185d7652f77d07bb795b24939a3feb56b73a59d7377574b2c8f09f406ca7a88d81 SHA512 f082216a1a669ba689725c93859116e8a56991861219adb0e7c6ed4e5d621055268652820688de762f55b8672f19ff01afe5ac1ab7f79a640ea381272de9516f
-EBUILD picard-2.1.3.ebuild 1623 BLAKE2B d12a91115d530491bcc1f4193baa28458a96418055f35d8189861921542ff8820955d485e20d158f574f7ea75b3fc1832db6d83552601255c3a17975f83a4167 SHA512 f2c1aa2fa117afdc83394cf079285ea6df29e43e05c56ac0caff33507d7efdb6927eb7536cd5470cc778c899365cbf94866281315e38eb6f4a1a3c213822e33d
-EBUILD picard-9999.ebuild 1704 BLAKE2B 74df8c8bbde14f9399da4a4bf837d47982244f5f4294c2478fcd2fc2ddee9b2fd905533e74a5930833056f7cf5d3c82f17d2f99d719632b0def87211c0c5dfdc SHA512 8a743c0a66a747387d52b7eed15e5f0e90f2007f5926a87a69162cf0b60fe8a73efbbf9c6be554cb74641162f6959a8e1e3ab41deb971f53b8956707ce5da1ae
+EBUILD picard-2.1.3.ebuild 1621 BLAKE2B 1c8be81ae8e25e5d2138d0d2312ffd559ee3c69339de19158b5d791cebc5d26d3174b8822c72beafac6a1717d63fca43a1500e7a607d5908a4dd265920b1e0ac SHA512 f7240b3dea11f56d608237932c3355dd79700aa38eedb4c11a70bdbad84c1ade7ae379731bc79cc288467ae50cf12aaa5958321c11a543e9b89c8085c730c29d
+EBUILD picard-9999.ebuild 1702 BLAKE2B afac69ba0f408f2cd9df2d939552dff799239bcda6d8d482da30d06336fbe50e6b8df229ebe7a257462317987087f6bb11449ea151a4f004686900fc3e2d7a91 SHA512 300fff51cecfc3adce011451636025168e91d5edce5c58060b7d5fc88a0fb5328fdb1b76fd827a4374accf054d83de90f84c1bebd18ca57130626989e8d9ec76
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.1.3.ebuild b/media-sound/picard/picard-2.1.3.ebuild
index 030e1709208d..f995845bc002 100644
--- a/media-sound/picard/picard-2.1.3.ebuild
+++ b/media-sound/picard/picard-2.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
 inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index 17fd6142062b..a937a75ec7a2 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
 if [[ ${PV} = *9999* ]]; then
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index 924341b9fb8b..73c501af1b8c 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,5 +1,5 @@
 AUX pithos-1.3.1-dont-try-to-update-icon-cache.patch 584 BLAKE2B 9127f728cd0da41a490fdcaa3c781d9137099507192f9301e6237d7f3b833ccce81429efcf8aaa67c04945cf0af16d47829582968b7d72850446c7ced93fd3cf SHA512 cc30b733388a9dea61ea4ab23c4291c11656a117e0f9aa98e3b286b6698ec38242154da21af9dc840bc697a34a1e604f86e489a2c5d6fcb76ac6f3e1bef750e5
 DIST pithos-1.3.1.tar.gz 119658 BLAKE2B 0d6e1c4e48a4beb1082f8788d4e016371660667dbe32ee925aa4b904f60a25e6664a94cefbc62dd9323a6e69338c03fc4080517e842102fd6eeca144f568c984 SHA512 c06715516992e4aa8bb3b200035ee10ef8dcec9491d32af0fb3f4e176d0ad5313a437f228747d5d716a29d2fe5b93ddd3704aa4fe674ce3be5a17eaad13b0da4
-EBUILD pithos-1.3.1.ebuild 2032 BLAKE2B 0e4fdbb9d76ebbbb0a9543607f669b88d45c983e80220031390e59d9021dbaa07fb18d197851045f2be06df6ceeb74b8157160a5db13cf100fec95f83f2f028e SHA512 75dc820f19c9c51f627b395c4f9741313fef219c5c476f9cd158d98bb4dd68ea0df14db7ec23ad79c8c2be408a425cd9c7d0be9d073719be39e8af9cd76aa40b
-EBUILD pithos-9999.ebuild 2027 BLAKE2B f39aabcb215b959a1fe8c82bee8653d4c129cbf1796c13706cada3bd21a8c5fa25fb651eecb131ea6da47c493dc496056529a4fc5d529ca53d9f6b010035c7b9 SHA512 65b119f8b42d7b87596e35ce8c280361951311bcdf243045168d1ec5f1269bc71c66a6f03688bb3c81e0463c2cc0d4fe361f8a336f47cb968e91f9a8ac347abd
+EBUILD pithos-1.3.1.ebuild 2028 BLAKE2B 983a55b505b4e58e32f99eefd1fb4fe34496e15591bc7280ca2f43e6384ebcb4be54c8d3d1dfe0879f0099b35f8406dc33d1febcc136bf4fd4edeb3cbce258d6 SHA512 0129b8ed80200daab5d416e62bafc06e982dc8d33623cd4d30645817cbc7cdc3a2b46d6595ad15ccb96056d8463bf55446890c72c60e019630cba84d15b0eb4c
+EBUILD pithos-9999.ebuild 2023 BLAKE2B e1118278c43d6b560320e480fd022f5c3f54545064bcdc956f12e8af06b1466415bcd4d07799d992488f642c94b9f1976cdeb6eaaa3cea49272f19ed3129476b SHA512 531975652ccd1c80e44ed7ba4b34cfa4a03944baad2048493dfe035a13afc7de7de26231008cba1fc53c20d534f5cd5e8ef202553ca12d3a2fd87ee93011c2e9
 MISC metadata.xml 517 BLAKE2B 4d18a3f149c2ffc3b87206cd67a7d87978f36c9f45f6a99c3240e77458c3c2bee1ee9eb7cc64e22414eded3f44ba5da5cf8a680b16975759b0027e90fcd6e5bd SHA512 1922b0145e076b849061072c03eafe7354bf79ab32d7f2a5bab219db6a9caa92074423c5bf1196b91ff1e183bd8fab2fcbad583f20b02b9916c3e73140a97367
diff --git a/media-sound/pithos/pithos-1.3.1.ebuild b/media-sound/pithos/pithos-1.3.1.ebuild
index 10c9b5c1741a..102dfd5bf500 100644
--- a/media-sound/pithos/pithos-1.3.1.ebuild
+++ b/media-sound/pithos/pithos-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit autotools gnome2-utils python-r1
 
 if [[ ${PV} =~ [9]{4,} ]]; then
diff --git a/media-sound/pithos/pithos-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
index 5aa0541cec71..1f2906dd601c 100644
--- a/media-sound/pithos/pithos-9999.ebuild
+++ b/media-sound/pithos/pithos-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit autotools gnome2-utils python-r1
 
 if [[ ${PV} =~ [9]{4,} ]]; then
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index e1b62b71727d..0c67af948fab 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,5 +1,3 @@
-DIST pragha-1.3.4.tar.bz2 691256 BLAKE2B af1455633a4f9d3c40f6b97051692fa301cfb763d0ca5f03c3ae932513556ff7a6fed5c68cdd3f7e86dbca305598cb9495221e1b2c841f7e1cb56905fa742130 SHA512 65aadf68f427f03ea7ca07d2002806eb94019c8091a80320da7d8ff4c2f0cd912e9c346956188b42d2b7a68c56c79ee5af8e8327c69ad69f4a1fa5b9e3b3ca58
 DIST pragha-1.3.99.1.tar.bz2 804701 BLAKE2B ae68c01706d593defc4ee357e1bdd1e832fb6d6720f723149c752c98f16502e1254553b404f53b40a4e126b647e6de478e7929b7715c0f9815d23b2e62e5475b SHA512 1c92bf7b2d1d1d6b3f8616b1980b60c6c688844d0bf9f80bc86185035a05971f3b8f5aa73d230b01fa5d14e54db38b356df41781e4a5da73b0adae82829c8c31
-EBUILD pragha-1.3.4.ebuild 2311 BLAKE2B 8fdb4c4d4675a77e540b4dbec42e8eb9ea25363d1433251f8ed0725dd9f2a0ad38c1c493bbf270e8834f55efcf2283794c44ab1a7ccb23d68989f9bc1bf9d5b7 SHA512 a5d800c276c0da3eb781ff92472c1aa7dd08477b64ecbc849d1348240c59987973cc6127be07c447550557575e514709c022cf296862e010df278eb8193971fe
-EBUILD pragha-1.3.99.1.ebuild 2556 BLAKE2B 43d9cbcc86a67aeb76f76b438d841ded5e193135e069b19deb04bf1859cbb73011dfa9ec254abf87beeebd474d6d2cb92c7a8040bb519ca9f2066e7bb8da9a20 SHA512 73f5178af2c82094ac599bb8096caa56d0f14ad5c506aab806dade8820d2b466c96b7e0e5af771365e7110b100a0c5a73ce6dfba98f7f0d5a1b0dda6ec06bc37
+EBUILD pragha-1.3.99.1.ebuild 2554 BLAKE2B e12a0290f7b4c4cf10961de3db7f7fff677e941ef46364971c972c10807ec6f23f464438a91bc6e2310202287a7a0ca38106f5b31d73a5d03bc32ca8b8fb200e SHA512 a84e6a4715f4ba541824d7919448ef1e5f8e81582d81aa0ba9fcb9c5b1d16d9acf4eb8fbd5774b851776db2052dd5fe9ce093d263c4a12552f116a496603d1df
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.4.ebuild b/media-sound/pragha/pragha-1.3.4.ebuild
deleted file mode 100644
index 723eee3c53bf..000000000000
--- a/media-sound/pragha/pragha-1.3.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight music player (for Xfce)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdda +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.36:=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	>=media-libs/taglib-1.8:=
-	>=x11-libs/gtk+-3.8:3=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	cdda? ( >=dev-libs/libcdio-0.90:=
-		>=dev-libs/libcdio-paranoia-0.90:=
-		>=media-libs/libcddb-1.3.0:= )
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( media-libs/grilo:0.3=[network] )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.20:= )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( dev-libs/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable cdda libcdio)
-		$(use_enable cdda libcdio_paranoia)
-		$(use_enable cdda libcddb)
-		$(use_enable playlist totem-plparser)
-
-		$(use_enable libnotify)
-		$(use_enable keybinder)
-		$(use_enable udev gudev-1.0)
-		$(use_enable mtp libmtp)
-		$(use_enable soup libsoup-2.4)
-		$(use_enable rygel rygel-server-2.6)
-		$(use_enable grilo grilo-0.3)
-		--disable-grilo-0.2
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/pragha/pragha-1.3.99.1.ebuild b/media-sound/pragha/pragha-1.3.99.1.ebuild
index c05a03a33111..b9bca3f47fd0 100644
--- a/media-sound/pragha/pragha-1.3.99.1.ebuild
+++ b/media-sound/pragha/pragha-1.3.99.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/$
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 1ed8b1f75b54..1e73ee35a60c 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,14 +1,8 @@
 AUX pulseaudio-11.1-disable-flat-volumes.patch 1992 BLAKE2B 1ffbaf129d57abc7c02f430bdd59a76384456d7ef020e9765bc0541327279dcf7d005d87fe989fd0c89b2767564f99af87ece8c374e1d67c5d1cae1695f0819c SHA512 603f60ef38aeba83038fe5dc9e5f6a82e42d10a7f057f158b489dd04857c3bc8203b728d9df6736314ee3002648390cd564fdce347f2e6791e901a47041dd1fc
-AUX pulseaudio-12.2-alsa-header-path.patch 3790 BLAKE2B 90c8819024828ac6fb872d5cd910543daff0dd53258cc5bf7af57327555fa159a3850fcee0f5b1cd6727fac30005dd92da51cbbe77044dc40e684d96e7e4ae81 SHA512 0ea2764e931bc7524c6ea8e784aef127f669795558429c36ab80d14685f28ffdf0c01f7b323587e839b618c19d9288f9630e8c469e99b2cc82bb3905d28754bd
-AUX pulseaudio-12.2-alsa-header-path2.patch 1502 BLAKE2B 7fc2eea0cc32899dd0a306a01076bf97f83372a52f181f31bd545be54bbc844b77aecf4c25f1e939b704cd1506daed043ce3c358004a8e1746f6d612ea52882e SHA512 eeeb2d4b9c8ecefd56cb6977226386b3ab4735af2e6d832359886f8f6bb7404e9c4ef2787fd6fdea9d2038a5f75ad8bddb9206303f2ff4a992e7154fc70d9d38
-AUX pulseaudio-12.2-exit-time-session.patch 8244 BLAKE2B c68e2d418756d3ae6e0b11633f0dbae1769cbab75082236e52a5245a2a199fcfb229b3aa5850c6adf1e7dda79ac073b37a12862f7d3c09a8eb7a8237c511e739 SHA512 019dd1db1d2485ab0e5a46aa410206c0bdbd3652e0a8e4cede8e79751aa10eb199bb7b13554ddaa16b755d21f6adc7e8455936e8dca0c6addb3c9189efbeeaf3
 AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d06af4b298ad71d9c577dd6b3f0d9097fc95184b14193d0d55252987465ebd93bd0005849a68ce9b428d SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b
 AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7254455b9ff19128c2fc69f176368976d835503554eb60a80a8f4b53797cf46ba11b55c82bc742bf03551f SHA512 d0e1519fc97208c2d42c7d9d8f2e7d4658e741e8063102713da361748b6deaeae475619a65b3d3d1893c107a4511e17d4245264b5430190087f1823899c0f64b
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
-DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-12.2-r1.ebuild 11551 BLAKE2B 71e97675f3754cdb2e423eddb94b0a5d2dceb18915487616ad63a44a925d7fd294fc70dc242839f3340d015ade8d4488d28537c12d29a5efdec35b841f6b3b4b SHA512 d223d8d86e896e614469e829bfc86a160ae3e77311118dce91648feca6e6b29cf0d653e7867dd502ea57df85579950d984afeaf40d6cfe134ba6672ea96a4eed
-EBUILD pulseaudio-12.2-r2.ebuild 11731 BLAKE2B bba3e3d5e16eaaf9db831cc85e1c2e2c9538bf8a57ad7aac56fead074ed8c5f46c3354e817b549a59f183eacedf3694486cb0585087ecb04e75bc88edf0f5a79 SHA512 379e4b83adee85b8fffeab8378216501085cfc21507777e28b261383f23d61614db469d2f01310328c47a1fbc4e5e475e3335c713c6674765a6e8113f9230f22
-EBUILD pulseaudio-13.0.ebuild 11566 BLAKE2B 6f913726cc54432176b0f89c4d2a8d5664d2dfa675c1522a0de4833a2991a767daaf1ef034633f2daa573670cbcec6aaf3f0765b43df35e321f29f83db41e82b SHA512 21be09963def71c08150c8dece1e7bb0fd9ba83f0f6eefc336994b1ac2f19b638c74e25d7a9f15d594e33872a783d5e43ccd4924a80dec9c96fb47c2ad82e562
+EBUILD pulseaudio-13.0.ebuild 11564 BLAKE2B 382848ee5036957c5185473e038be1df071e5436a3eaf3e9089ed411fe44a599d83ac5e64f53f763d0b2e39d087b979aa2785abb60c9bd7b87a2aca5a16e6399 SHA512 7ea56402745dd8c6fb9b79aa5afb49d236ab96072ffb1f2297e4c9e9dd04b0695d77d78de785ad52c32dccf5072c4a952221f59940f0069b1fbc6de1f1a6e792
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch
deleted file mode 100644
index 334af3ee7552..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 993d3fd89e5611997f1e165bf03edefb0204b0a4 Mon Sep 17 00:00:00 2001
-From: Olaf Hering <olaf@aepfle.de>
-Date: Wed, 27 Mar 2019 09:35:05 +0100
-Subject: [PATCH 287/375] alsa: Use correct header path
-
-Consumers are expected to use <alsa/asoundlib.h> instead of
-<asoundlib.h>.
-
-This is in preparation of an change to pkgconfig(alsa) to
-not pollute CFLAGS with -I/usr/include/alsa anymore.
-
-Signed-off-by: Olaf Hering <olaf@aepfle.de>
----
- src/modules/alsa/alsa-mixer.c         | 2 +-
- src/modules/alsa/alsa-mixer.h         | 2 +-
- src/modules/alsa/alsa-sink.c          | 2 +-
- src/modules/alsa/alsa-source.c        | 2 +-
- src/modules/alsa/alsa-ucm.c           | 2 +-
- src/modules/alsa/alsa-util.c          | 2 +-
- src/modules/alsa/alsa-util.h          | 2 +-
- src/modules/alsa/module-alsa-source.c | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
-index 5cb99c8fd..cd99a75f8 100644
---- a/src/modules/alsa/alsa-mixer.c
-+++ b/src/modules/alsa/alsa-mixer.c
-@@ -23,7 +23,7 @@
- #endif
- 
- #include <sys/types.h>
--#include <asoundlib.h>
-+#include <alsa/asoundlib.h>
- #include <math.h>
- 
- #ifdef HAVE_VALGRIND_MEMCHECK_H
-diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
-index 3ea4d7329..65b071165 100644
---- a/src/modules/alsa/alsa-mixer.h
-+++ b/src/modules/alsa/alsa-mixer.h
-@@ -21,7 +21,7 @@
-   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
- ***/
- 
--#include <asoundlib.h>
-+#include <alsa/asoundlib.h>
- 
- #include <pulse/sample.h>
- #include <pulse/mainloop-api.h>
-diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
-index 28143402a..4b46708ce 100644
---- a/src/modules/alsa/alsa-sink.c
-+++ b/src/modules/alsa/alsa-sink.c
-@@ -25,7 +25,7 @@
- #include <signal.h>
- #include <stdio.h>
- 
--#include <asoundlib.h>
-+#include <alsa/asoundlib.h>
- 
- #ifdef HAVE_VALGRIND_MEMCHECK_H
- #include <valgrind/memcheck.h>
-diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
-index 8129220b0..c8bf649e1 100644
---- a/src/modules/alsa/alsa-source.c
-+++ b/src/modules/alsa/alsa-source.c
-@@ -25,7 +25,7 @@
- #include <signal.h>
- #include <stdio.h>
- 
--#include <asoundlib.h>
-+#include <alsa/asoundlib.h>
- 
- #include <pulse/rtclock.h>
- #include <pulse/timeval.h>
-diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
-index 341c8012e..0a40ca8fe 100644
---- a/src/modules/alsa/alsa-ucm.c
-+++ b/src/modules/alsa/alsa-ucm.c
-@@ -27,7 +27,7 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <limits.h>
--#include <asoundlib.h>
-+#include <alsa/asoundlib.h>
- 
- #ifdef HAVE_VALGRIND_MEMCHECK_H
- #include <valgrind/memcheck.h>
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index e8d712e72..bd0a47e50 100644
---- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -23,7 +23,7 @@
- #endif
- 
- #include <sys/types.h>
--#include <asoundlib.h>
-+#include <alsa/asoundlib.h>
- 
- #include <pulse/sample.h>
- #include <pulse/xmalloc.h>
-diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
-index 6b27339ec..4ceaa06ee 100644
---- a/src/modules/alsa/alsa-util.h
-+++ b/src/modules/alsa/alsa-util.h
-@@ -21,7 +21,7 @@
-   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
- ***/
- 
--#include <asoundlib.h>
-+#include <alsa/asoundlib.h>
- 
- #include <pulse/sample.h>
- #include <pulse/channelmap.h>
-diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
-index af6800dd2..747ba9342 100644
---- a/src/modules/alsa/module-alsa-source.c
-+++ b/src/modules/alsa/module-alsa-source.c
-@@ -24,7 +24,7 @@
- 
- #include <stdio.h>
- 
--#include <asoundlib.h>
-+#include <alsa/asoundlib.h>
- 
- #ifdef HAVE_VALGRIND_MEMCHECK_H
- #include <valgrind/memcheck.h>
--- 
-2.21.0
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch
deleted file mode 100644
index c592da2205ee..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Sun, 21 Apr 2019 11:59:30 +0200
-Subject: [PATCH 304/375] alsa: Fix inclusion of use-case.h
-
-The recent change in ALSA upstream stripped -I$include/alsa path from
-pkgconfig.  We already fixed for this change in some places but still
-the code for UCM was overlooked, and this resulted in the unresolved
-symbols in alsa card module. Fix them as well.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- configure.ac                | 2 +-
- src/modules/alsa/alsa-ucm.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c004bd70d..b44ed1595 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
- AS_IF([test "x$HAVE_ALSA" = "x1"],
-     [
-         save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
--        AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
-+        AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
-         CPPFLAGS="$save_CPPFLAGS"
-     ],
-     HAVE_ALSA_UCM=0)
-diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
-index 53abf3f90..c926f3cc3 100644
---- a/src/modules/alsa/alsa-ucm.h
-+++ b/src/modules/alsa/alsa-ucm.h
-@@ -23,7 +23,7 @@
- ***/
- 
- #ifdef HAVE_ALSA_UCM
--#include <use-case.h>
-+#include <alsa/use-case.h>
- #else
- typedef void snd_use_case_mgr_t;
- #endif
--- 
-2.21.0
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch
deleted file mode 100644
index 045ab5567d8d..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From de705a0eeaa27a8ac1abdc2625e639340323595a Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanuk@iki.fi>
-Date: Tue, 6 Mar 2018 15:09:06 +0200
-Subject: [PATCH 08/77] set exit_idle_time to 0 when we detect a session
-
-As the comments explain, this fixes relogin problems on some systems
-that remove our sockets on logout without terminating the daemon.
----
- man/pulse-daemon.conf.5.xml.in     | 15 ++++++++++++---
- man/pulseaudio.1.xml.in            | 17 +++++++++++++++--
- src/modules/module-console-kit.c   | 13 +++++++++++++
- src/modules/module-systemd-login.c | 14 ++++++++++++++
- src/modules/x11/module-x11-xsmp.c  | 13 +++++++++++++
- src/pulsecore/core.c               | 10 ++++++++++
- src/pulsecore/core.h               |  2 ++
- 7 files changed, 79 insertions(+), 5 deletions(-)
-
-diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
-index f0550f3b..f49fa9b0 100644
---- a/man/pulse-daemon.conf.5.xml.in
-+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -292,9 +292,18 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-     <option>
-       <p><opt>exit-idle-time=</opt> Terminate the daemon after the
-       last client quit and this time in seconds passed. Use a negative value to
--      disable this feature. Defaults to 20. The
--      <opt>--exit-idle-time</opt> command line option takes
--      precedence.</p>
-+      disable this feature. Defaults to 20. The <opt>--exit-idle-time</opt>
-+      command line option takes precedence.</p>
-+
-+      <p>When PulseAudio runs in the per-user mode and detects a login
-+      session, then any positive value will be reset to 0 so that PulseAudio
-+      will terminate immediately on logout. A positive value therefore has
-+      effect only in environments where there's no support for login session
-+      tracking. A negative value can still be used to disable any automatic
-+      exit.</p>
-+
-+      <p>When PulseAudio runs in the system mode, automatic exit is always
-+      disabled, so this option does nothing.</p>
-     </option>
- 
-     <option>
-diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
-index f732b8ae..824eddb4 100644
---- a/man/pulseaudio.1.xml.in
-+++ b/man/pulseaudio.1.xml.in
-@@ -189,8 +189,21 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-     <option>
-       <p><opt>--exit-idle-time</opt><arg>=SECS</arg></p>
- 
--      <optdesc><p>Terminate the daemon when idle and the specified
--      number of seconds passed.</p></optdesc>
-+      <optdesc>
-+        <p>Terminate the daemon after the last client quit and this time in
-+        seconds passed. Use a negative value to disable this feature. Defaults
-+        to 20.</p>
-+
-+        <p>When PulseAudio runs in the per-user mode and detects a login
-+        session, then any positive value will be reset to 0 so that PulseAudio
-+        will terminate immediately on logout. A positive value therefore has
-+        effect only in environments where there's no support for login session
-+        tracking. A negative value can still be used to disable any automatic
-+        exit.</p>
-+
-+        <p>When PulseAudio runs in the system mode, automatic exit is always
-+        disabled, so this option does nothing.</p>
-+      </optdesc>
-     </option>
- 
-     <option>
-diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
-index c7938849..c8fe2ed2 100644
---- a/src/modules/module-console-kit.c
-+++ b/src/modules/module-console-kit.c
-@@ -118,6 +118,19 @@ static void add_session(struct userdata *u, const char *id) {
- 
-     pa_log_debug("Added new session %s", id);
- 
-+    /* Positive exit_idle_time is only useful when we have no session tracking
-+     * capability, so we can set it to 0 now that we have detected a session.
-+     * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
-+     * immediately when the session ends. That in turn is useful, because some
-+     * systems (those that use pam_systemd but don't use systemd for managing
-+     * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
-+     * services that depend on the files in $XDG_RUNTIME_DIR. The directory
-+     * contains our sockets, and if the sockets are removed without terminating
-+     * pulseaudio, a quick relogin will likely cause trouble, because a new
-+     * instance will be spawned while the old instance is still running. */
-+    if (u->core->exit_idle_time > 0)
-+        pa_core_set_exit_idle_time(u->core, 0);
-+
- fail:
- 
-     if (m)
-diff --git a/src/modules/module-systemd-login.c b/src/modules/module-systemd-login.c
-index 87981592..51401575 100644
---- a/src/modules/module-systemd-login.c
-+++ b/src/modules/module-systemd-login.c
-@@ -84,6 +84,20 @@ static int add_session(struct userdata *u, const char *id) {
-     pa_hashmap_put(u->sessions, session->id, session);
- 
-     pa_log_debug("Added new session %s", id);
-+
-+    /* Positive exit_idle_time is only useful when we have no session tracking
-+     * capability, so we can set it to 0 now that we have detected a session.
-+     * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
-+     * immediately when the session ends. That in turn is useful, because some
-+     * systems (those that use pam_systemd but don't use systemd for managing
-+     * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
-+     * services that depend on the files in $XDG_RUNTIME_DIR. The directory
-+     * contains our sockets, and if the sockets are removed without terminating
-+     * pulseaudio, a quick relogin will likely cause trouble, because a new
-+     * instance will be spawned while the old instance is still running. */
-+    if (u->core->exit_idle_time > 0)
-+        pa_core_set_exit_idle_time(u->core, 0);
-+
-     return 0;
- }
- 
-diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c
-index 0238e516..6f801237 100644
---- a/src/modules/x11/module-x11-xsmp.c
-+++ b/src/modules/x11/module-x11-xsmp.c
-@@ -206,6 +206,19 @@ int pa__init(pa_module*m) {
-     if (!u->client)
-         goto fail;
- 
-+    /* Positive exit_idle_time is only useful when we have no session tracking
-+     * capability, so we can set it to 0 now that we have detected a session.
-+     * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
-+     * immediately when the session ends. That in turn is useful, because some
-+     * systems (those that use pam_systemd but don't use systemd for managing
-+     * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
-+     * services that depend on the files in $XDG_RUNTIME_DIR. The directory
-+     * contains our sockets, and if the sockets are removed without terminating
-+     * pulseaudio, a quick relogin will likely cause trouble, because a new
-+     * instance will be spawned while the old instance is still running. */
-+    if (u->core->exit_idle_time > 0)
-+        pa_core_set_exit_idle_time(u->core, 0);
-+
-     pa_modargs_free(ma);
- 
-     return 0;
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index 79abbc04..da42a13e 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -426,6 +426,16 @@ void pa_core_update_default_source(pa_core *core) {
-     pa_hook_fire(&core->hooks[PA_CORE_HOOK_DEFAULT_SOURCE_CHANGED], core->default_source);
- }
- 
-+void pa_core_set_exit_idle_time(pa_core *core, int time) {
-+    pa_assert(core);
-+
-+    if (time == core->exit_idle_time)
-+        return;
-+
-+    pa_log_info("exit_idle_time: %i -> %i", core->exit_idle_time, time);
-+    core->exit_idle_time = time;
-+}
-+
- static void exit_callback(pa_mainloop_api *m, pa_time_event *e, const struct timeval *t, void *userdata) {
-     pa_core *c = userdata;
-     pa_assert(c->exit_event == e);
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index 213964ce..38622f61 100644
---- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -258,6 +258,8 @@ void pa_core_set_configured_default_source(pa_core *core, const char *source);
- void pa_core_update_default_sink(pa_core *core);
- void pa_core_update_default_source(pa_core *core);
- 
-+void pa_core_set_exit_idle_time(pa_core *core, int time);
-+
- /* Check whether no one is connected to this core */
- void pa_core_check_idle(pa_core *c);
- 
--- 
-2.17.1
-
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
deleted file mode 100644
index 10ddfaa15a63..000000000000
--- a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh ~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
-+gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon
-ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
-+udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	?? ( elogind systemd )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	realtime? ( dbus )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-CDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-RDEPEND="${CDEPEND}
-	realtime? ( sys-auth/rtkit )
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
-	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-bluez4
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use elogind && multilib_is_native_abi; then
-		myconf+=(
-			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMDLOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
-		)
-	fi
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	else
-		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
-		if use elibc_glibc ; then
-			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED%/}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
deleted file mode 100644
index d4986cdfa889..000000000000
--- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh 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
-+gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon
-ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
-+udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	?? ( elogind systemd )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	realtime? ( dbus )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-CDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-RDEPEND="${CDEPEND}
-	realtime? ( sys-auth/rtkit )
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-	# Backports from Fedora
-	"${FILESDIR}"/${P}-exit-time-session.patch
-	"${FILESDIR}"/${P}-alsa-header-path.patch
-	"${FILESDIR}"/${P}-alsa-header-path2.patch
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
-	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-bluez4
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use elogind && multilib_is_native_abi; then
-		myconf+=(
-			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMDLOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
-		)
-	fi
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	else
-		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
-		if use elibc_glibc ; then
-			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED%/}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index 471f5342c275..f53237cb8b9a 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.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=6
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh 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 b069263942b0..77bbde5d4594 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,8 @@
 DIST pulseeffects-4.6.8.tar.gz 1882449 BLAKE2B 57a93eeb32304628efb51473912a70485e054ef50e9e9aec9731ba761dd7809ce0a8c3838fc74a04c6a29537bf182a74c6e6715c722ce76670c8be71dc4a5608 SHA512 672204ad90534ad45228b3473902eb8489c8306c7850f2b2a6f983aa89955529fb5381d6a7d703de94dcd658ffd5b560cce17291a0b23654b225ebd301659e74
 DIST pulseeffects-4.6.9.tar.gz 1925035 BLAKE2B f059169721e643cb3e3a6db42d3a0fef0bb7696c6b2a5583e69573e7620f87d4a06ed448e298e0ca4e9868dcdd8cec8bbf71e7fb83c094d3840a9f90919ea571 SHA512 c767508ae3d9fb8df3e8d27a05bfa908e6c0862514a20b81fbc3ea8680c9d6ca20bac8d90d513494aaccbda29104e0dc015b81dab0bee5a40b708c415246ce3e
+DIST pulseeffects-4.7.0.tar.gz 1931247 BLAKE2B 88545378c55c968e5973973593c8cf8e5ccfbca60c28af5f4604be247dbaeba25f68dd21be77b9160dfaa7dc633127c7a0066615d607d2e5adc8e5608d6132d0 SHA512 9d47a61abaa851b83344437d12d0c674459c0dcc27096f1ce8d22fde8dd56c0819f81cee56a9ef13c93d476ed02195743b2fec1a66794b6878ed796da6c166bd
 EBUILD pulseeffects-4.6.8.ebuild 1855 BLAKE2B feb368814eb1124176505d2db6589d1177afe8dc09c8c4f44baddd24984c4f41c89b1e77c3159e7c9eeff4379c3a77e23e409ba1d85ec6a116dd713f9adff1e6 SHA512 c3a45f3c2ae1d3ac82b58110c1529f596e1c367bf66efa5692702e877d11af596da62bb20fb20a69ebb4e0edc6120f8652b801ad6eb43e40238d4297dd630691
 EBUILD pulseeffects-4.6.9.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
+EBUILD pulseeffects-4.7.0.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
 EBUILD pulseeffects-9999.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.0.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.0.ebuild
new file mode 100644
index 000000000000..ab95a499cd73
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.7.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 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
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index bcbd74c796fc..d6ff68f13850 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,8 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
 DIST qmmp-1.3.4.tar.bz2 1246048 BLAKE2B 8108e1b5f0098ee1338ccb72889614d6876855f22159e48cb54a3000a855e843d623a3a491ebcb2e7b627c014946190117bfed586729b424dd5a3564cfdc5ba0 SHA512 520a7b50a3e0bd17418bd3137a4e73a52f644ad38d7fe86647a8781ed3036cdbbd14d5311b9471443f8a2cb42422b5fa11e22acee72ff5b670a7508b55364bb5
-EBUILD qmmp-1.3.2.ebuild 4270 BLAKE2B 51832e8de7fa487b4893f91d7d9b1f8f16f4210884e36a5b5fadbcf9a0c119ccdb98c5dfd298be67bca33d627cda31b1e3ec6f1e68074d05bbc6b27f5d898e86 SHA512 0ce1c2846df26fc86c5484a3b4fe9895fff0c9c275165404e5423dd6dbe624bb6a880655b4c4bfa7832cba5aaddf831330e0294980e6ee9d6775d35eb4bffa01
-EBUILD qmmp-1.3.4.ebuild 4244 BLAKE2B 15e37b4bb38482719bac69121e988390b4ac3ed8a1cb6983ec55217d50fd6e2838efacca979cd19e9a8c4140db28df11b1ece307d4f5173c3416deb1d2d0b576 SHA512 f8e827f560757cc6db9a12ccc62bf6953bdc40d3c843f06c1dd6fb1b6ed639cb7e1aabafde767bb6d3580765c5c874d62b6a79a23f2691c5395f523c81cc23b2
-EBUILD qmmp-9999.ebuild 4244 BLAKE2B 15e37b4bb38482719bac69121e988390b4ac3ed8a1cb6983ec55217d50fd6e2838efacca979cd19e9a8c4140db28df11b1ece307d4f5173c3416deb1d2d0b576 SHA512 f8e827f560757cc6db9a12ccc62bf6953bdc40d3c843f06c1dd6fb1b6ed639cb7e1aabafde767bb6d3580765c5c874d62b6a79a23f2691c5395f523c81cc23b2
+DIST qmmp-1.3.5.tar.bz2 1248522 BLAKE2B f59b948fc2805b376784cef429693bf2d70ba21af8699959a31b74e2c4aad2499927b48f4e5ae6166c9d9f35132418717dff8f3f9d9d447af411d97700932236 SHA512 fbf4173e6dcd78e02ee52e53d80f4477bd840047f96ef8c0bd23f56eec5efa11ac52cc458cfeae65b46cda357b986ba30e1ec4e06d35f4f96cab9a915095d735
+EBUILD qmmp-1.3.2.ebuild 4252 BLAKE2B 5561eaa7842a14c91dbd9cb598070a50e49e5dda9ad0ba8fdab3375bf5488b8b0228f8ee7be75be545b550dbc3300efafde5debc5ee2f4bad37ce9fd6850c654 SHA512 ec4cec2bd3cc50f17ccd0c0458ee5c3ebc1fd9c12bfb8570d84bb551a2b97f50d7aaeb2d2865c164695cd9a9c03c0bd9331d427a7073984587cdd4febec9104e
+EBUILD qmmp-1.3.4.ebuild 4226 BLAKE2B 60498c6cf02b25e503af9823d6202e41aa5948f15ef3e136ed2aea58eb9292a627bb6a760fd86ee7c9bbba6126107556468b6907f7e7dfdec0e763c4f1393868 SHA512 ffd356b2f86e658164b327d4f2877745c8ac1bdddf4aa04362f27786857da3a8ddbd597fbd32063d069c7c542fbedfde4191dbfd4b2b7a11c51512efe5b2a8a8
+EBUILD qmmp-1.3.5.ebuild 4226 BLAKE2B 60498c6cf02b25e503af9823d6202e41aa5948f15ef3e136ed2aea58eb9292a627bb6a760fd86ee7c9bbba6126107556468b6907f7e7dfdec0e763c4f1393868 SHA512 ffd356b2f86e658164b327d4f2877745c8ac1bdddf4aa04362f27786857da3a8ddbd597fbd32063d069c7c542fbedfde4191dbfd4b2b7a11c51512efe5b2a8a8
+EBUILD qmmp-9999.ebuild 4226 BLAKE2B 60498c6cf02b25e503af9823d6202e41aa5948f15ef3e136ed2aea58eb9292a627bb6a760fd86ee7c9bbba6126107556468b6907f7e7dfdec0e763c4f1393868 SHA512 ffd356b2f86e658164b327d4f2877745c8ac1bdddf4aa04362f27786857da3a8ddbd597fbd32063d069c7c542fbedfde4191dbfd4b2b7a11c51512efe5b2a8a8
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
index ba1cd14b3f13..f3bc7b03bda3 100644
--- a/media-sound/qmmp/qmmp-1.3.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -104,7 +104,7 @@ src_prepare() {
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -156,7 +156,7 @@ src_configure() {
 		-DUSE_WAVPACK="$(usex wavpack)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/qmmp/qmmp-1.3.4.ebuild b/media-sound/qmmp/qmmp-1.3.4.ebuild
index 88c814b238e9..b403c47023bc 100644
--- a/media-sound/qmmp/qmmp-1.3.4.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -103,7 +103,7 @@ src_prepare() {
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -155,7 +155,7 @@ src_configure() {
 		-DUSE_WAVPACK="$(usex wavpack)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/qmmp/qmmp-1.3.5.ebuild b/media-sound/qmmp/qmmp-1.3.5.ebuild
new file mode 100644
index 000000000000..b403c47023bc
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.3.5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( || (
+		media-libs/libmad
+		media-sound/mpg123
+	) )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 88c814b238e9..b403c47023bc 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -103,7 +103,7 @@ src_prepare() {
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -155,7 +155,7 @@ src_configure() {
 		-DUSE_WAVPACK="$(usex wavpack)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 80ae1ac1fc36..ce50665830b8 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,5 +1,5 @@
 AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
 DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
-EBUILD qsampler-0.5.6.ebuild 1019 BLAKE2B e27455ebbc11e71e5b6434b3874f47450ad52b220e6c3e976bffb45e228f123f2cd20d2351334e329596110514e546611c881f1cac9686ef23500cdec7d8f7ff SHA512 e241032ee18e36c5f0a8436757159656ac8d98b35b881511bac38f41636e6c70334250d6590aff6b79d4283c8a7be5e820fe708a3b691927568d2dabb5c34317
-EBUILD qsampler-9999.ebuild 1487 BLAKE2B 9f32ce93540c9d950cdf387fc1f56adb06d8355a03460c82825eaed29063a8803af61b6af0fe038a7ccecf307f00ad272bb5f61714335ef452cbc03d468b43f8 SHA512 9fa25733d27e38651250277e2c8206da6c9f480c3fedfc712458f713af2a1ab45d0f004c90af12415ea2e1a9f2beb2133c7f14279bf3e3519f44218137a9ec07
+EBUILD qsampler-0.5.6.ebuild 1018 BLAKE2B 8a350360a4d6bc54ae75a3f2e895a4711cc50532f62cf3d260a38a25142ee7531b4641bbeb539e41b35864ad5d37834d7fda94f827eb8c3dbac3a34057cf6c36 SHA512 254e07e7188f7fa5a381e04826f2a5aa0c636c74fcbbcec66cd144b3575c1d813021309acc8843ddd31f62677054d5ecd71d915195ccd611c64cab9a8bf4a004
+EBUILD qsampler-9999.ebuild 1487 BLAKE2B e08a0d113ed1f8c4e09c19731fc270b8f8c0e1ddd62082cf57da5cd63f508b6a77ab2ca08d0d55fd070905506d61f53e4e67ad38fd2cdf1c92a03d9450513b9b SHA512 b0c155feaa5a7a50ad51634626ea3701cdb0ee6a6d93f6ffd0ae928348370f5362bf1ce58f188fc87530b7fc55913f156881854189fcb7cde02bf0574317b5a9
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/qsampler-0.5.6.ebuild b/media-sound/qsampler/qsampler-0.5.6.ebuild
index 4a59d0b57e01..ab5a0073a2c5 100644
--- a/media-sound/qsampler/qsampler-0.5.6.ebuild
+++ b/media-sound/qsampler/qsampler-0.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +libgig"
 
 COMMON_DEPEND="
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 1aa007e1579d..968945ad9b52 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
 src_prepare() {
 	default
 
-	emake -f Makefile.svn
+	emake -f Makefile.git
 	eautoreconf
 }
 
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index af76cc31f112..d4800261b5e3 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -2,5 +2,5 @@ AUX qtractor-0.9.4-dont-compress-manpages.patch 801 BLAKE2B 27ee7fd8711b87e8e8b3
 DIST qtractor-0.9.11.tar.gz 1849813 BLAKE2B 747916fe45285b00c837af5868ebdaa6b9bf5812b8fa58c4bfbd8662c5519106cbb0a9708121f3391ca4f45bf0af0715994ad8400edf01fa8bd0dcec848aa438 SHA512 8c6cb7ce5f5b5162c4a233aa733f0cb8424f4f84a91546fbbe7af35d534ffc3db6a583712d8ca906adc7edd5e92d28cce6927b340ec4750eafe14500eb8dd8c6
 DIST qtractor-0.9.9.tar.gz 1831016 BLAKE2B caef9b7a29ae30661dd08c302b16a2f12c66e2f1ffd63ca847ffd4272bcd114ecf74f1dddde1c37788e635896f25ca62283adc773734754d65ea12618248368b SHA512 151a3a92cfb98b9c9b19d18730109bce83744d4c24d3ca200f53a04938cbab1f33dd8080d3faae47b5026eebbbb750a74f64a5a046b0967278e848f424ff962a
 EBUILD qtractor-0.9.11.ebuild 1551 BLAKE2B 665ec33050b6cc226278b0b06a12c0d219fac871d5a9fe45f58e34e3bbea0ca0f82919196ad33caf00ee48fc111d732cd2767bed53212db2fb21cf919f2137e6 SHA512 2f06e4884397579384388c96e72d40bfab3e2cd0d1d8ba5ec12d1245e651b064029ecde89fb2e9e7266135ffef778a15caf5f5ccd75605f655f94e598ec84a4d
-EBUILD qtractor-0.9.9.ebuild 1758 BLAKE2B 0caf6a27abce6c3a8c6642d7cd05127007f8723cbd94dd2750923e6c4118728d0b6fb847e5daadfaa18f47de65e182e14d04a338ed980741449555ab15116119 SHA512 340212f098de8d29e69caf2e5f635d038a2411a72b91b9008a2ee533959db2e71e3d0c86caeaa5c7b4dfa18138e659dcc7ea08216363d5d39b6c994bc3f0d6d7
+EBUILD qtractor-0.9.9.ebuild 1757 BLAKE2B 8aa9ac5e63fe90e2f4eabf36edeaff039db8e9deee4cae6e4b34e36e23b5b8233786f695372303d5292248a8c2b8382d3b674a3beb18867a795eb10838e1371b SHA512 a7df58679f54bca3ae7d4e6644155327381ff0c0962fb466dc3af495594e0d442b87b29e5258d255a388a432d26668678a11c978d50fa7eb784601069ef7ec5c
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/qtractor-0.9.9.ebuild b/media-sound/qtractor/qtractor-0.9.9.ebuild
index fe6da1df5a68..44ee88d9cae0 100644
--- a/media-sound/qtractor/qtractor-0.9.9.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.9.ebuild
@@ -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/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 354240c1d8b3..a16a70715640 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -5,7 +5,7 @@ DIST quodlibet-4.2.0.tar.gz 4894320 BLAKE2B 0109322ee845e0ca99d620f396c937c0c340
 DIST quodlibet-4.2.1.tar.gz 4908102 BLAKE2B 0c1535e925842d42aafd5ff819b33a5d4527995977dd5d56b84b26462c677d81fcfb6d1de60ce50004a4b4a3eaa69896e430d36d31d904175c38f9deb23c044b SHA512 3817611c887b7c1878ccf852311020ded0a813feec1067f861d1157de6331760166c34992a6e4fe225552ae6ed4472000585fe58a3397faf277ae250f6f3c138
 EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
 EBUILD quodlibet-3.9.1.ebuild 1760 BLAKE2B 441b5af4ce9f397b30bc58bed0416c85417b28c55123d1d93c9ecd502e4ebdb0782d5a3eb8eb62c3861d768481e8103fdf0395cf310d0e801044321a20d7746b SHA512 76648bb9945ec27282302ed8e35cb9dcfde7fa0e98860f88ef66b112f6537499296f835c11e9890de642f00de884263af15edad2396feba5d02602cbdd7ace8c
-EBUILD quodlibet-4.1.0.ebuild 1550 BLAKE2B ecaa5941dcac07a6e86fbad686b3e6be721e98db5a36c2c49562f616a572b053b058b9c970a203148fcad6c2648eea199d90c858296b38f1881ef11639f0f926 SHA512 5ca620d75d367c8ecb5a6fad045c3a728a76bc18ccb9b757b84a76b5cf8ed77af747377f496ec9eb4df998d4b2cbf88b43aaa23536f701a32c5a915567e41428
-EBUILD quodlibet-4.2.0.ebuild 1525 BLAKE2B 2b368d6d99184408acefa51ed6c1372a97266ff811012ab3b47b531f134d63123735443f6a85f7e64b56716cef66c3c061c585d1eedc763147cce4a00cc14fe1 SHA512 8b8fcc86b5601f4c9ec40ad73660acaaea23bcaf0570c07804265d9f75956e1dae774cb5dce8cd0cb43aa7ef1390e40fa50e05514015afcc4b7954096861e7b1
-EBUILD quodlibet-4.2.1.ebuild 1535 BLAKE2B d5720c3f93092f0933abafeca0a61d71dc7adf034043dd3940300114a7b4f3110069368dae71a6f64d473f0239530831ca948cbaa611a4ce61ee97b007399b3b SHA512 4de95468b01a7ecaf695862a59b1f08a639d4b1b5f3e63fa7c8604dff75fd9c02dc07713c8f23a2e49f756a8a242cb7955183ff54ab70b4b762f23ee8b6f5792
+EBUILD quodlibet-4.1.0.ebuild 1546 BLAKE2B bc786a0765f3c48ea4b9e7f324ec31bac4d5311b160ae39d258230a2556d548387d670b1d917652586533b0e0f4ed6b0c63b95bbd5ee2d18832eb138f9f4e51b SHA512 a7c1888841baf12cb8d241e459a444eb4cb74ddfdb09cddb961cb0a9025308fab97b2eb7990c9d2644b83a48ae1a674cd921f82f8a4411d58f1123c9626910fb
+EBUILD quodlibet-4.2.0.ebuild 1521 BLAKE2B 7b743e10a71a65f2d888defc0569862a87283e937c61fad07ec9f0c78c2f4a0bc74a481f33dae2282b17a5a882c0e8098229f3f5e87d23ce3af9ca1e64c05664 SHA512 fbf5bb1e626e65d7925d37b6662167e35dbf3d3dc7258cb7dfe5785127450b1a924a3398eef3ae782a53d8b1859ab1e2c27ee1f9d731b6699c07e2e6b264358b
+EBUILD quodlibet-4.2.1.ebuild 1531 BLAKE2B 44a2ae1be468efe05d4013c01434a01545320dae4f037f873e962f47fa55e7a36b2af212a53f317c190c38c82d5d39f77b37aade77f60db6d018d90a7aca07fb SHA512 071c29c1e067e1c0c32a4684f58e4a241388c3cf8515305c54a3d64b5669a99aab40ec9eee7bc404d682d630250b148727384a453f3fb911e6c5101dd575d65a
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.1.0.ebuild b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
index 1150e8a6cbe4..b0728b3ed327 100644
--- a/media-sound/quodlibet/quodlibet-4.1.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="audio library tagger, manager, and player for GTK+"
diff --git a/media-sound/quodlibet/quodlibet-4.2.0.ebuild b/media-sound/quodlibet/quodlibet-4.2.0.ebuild
index 94c2aea2dab4..357f7330deca 100644
--- a/media-sound/quodlibet/quodlibet-4.2.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="audio library tagger, manager, and player for GTK+"
diff --git a/media-sound/quodlibet/quodlibet-4.2.1.ebuild b/media-sound/quodlibet/quodlibet-4.2.1.ebuild
index 572436972ada..59df25cc966a 100644
--- a/media-sound/quodlibet/quodlibet-4.2.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 xdg-utils
 
 DESCRIPTION="audio library tagger, manager, and player for GTK+"
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 67902bff33ff..2640aa8af298 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
-EBUILD rhythmbox-3.4.3.ebuild 3403 BLAKE2B 31afe5440371ae7a20488a95a6830902bbf541dacb7711ebe6cb3cfb622284f9a00f76f6c0c1757a362efb051dedab1e61bf74f4911d0153cd37b896f65ee6cf SHA512 ad1feace9a565d5d4af334354150cbfa34dbed00928bf5aee14e9a89d0c381373ae8ccb9c3bf99443d384548aaae5bb179dfa0a4f86d664943434a8232149eed
+EBUILD rhythmbox-3.4.3.ebuild 3401 BLAKE2B f841ec2be65c595fb0cab80b367ab797ab8da957c44bfaa27dba5d60c8c7a55a70b285b061e0b013ce28aed07510e7a37c87a88791d244ed6b03a2bc24cbcd89 SHA512 4e90ff6bf6fa85569ec1e01edd92c62374f6ba00b64829ff84e482badaf13255808701096971c5a2513dd65ea6e9365a6050e36440025115196677c28ecf1cc3
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
index 60e0573eb65d..b018eac61025 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome2 python-single-r1 multilib virtualx
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index cd2bd74023e0..55c0bb34e348 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,5 +1,7 @@
 DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495
 DIST rosegarden-19.06.tar.bz2 6667374 BLAKE2B c204a99dd46a0dcbfda6afc361ec31b7f211d2b95a8d171ff3fb06e37b3dbabc2b36fdbc04a3dfc821a9e331681d2a1e2395e91a86fe9d9fecd3af173f5b675b SHA512 13eddd4ec88662f3275d83bf40471ca0a34d43b3c9c9f07cf46b891c74f087ec7fe0d4b8ffe8204f2f3a30829352f4d952bb035a5bd09a7b6bdeb41ff5d1e8d8
-EBUILD rosegarden-17.12.1.ebuild 996 BLAKE2B 955ae5c825df0b675211d7fae021280f7ea8896bd3dde778fb847d02cae59291e8ed6f382d87e1bf39f125564626e5b72aa68fbe477bbd7e5bd745f1a0627a39 SHA512 52527e0803bc198cc7f6167091aad55317e6dfcda6d2322e90932b4ef8d66713455bc57117c6fd83212955243fe52c98aeb5faf7993c2c87bbddb5b76e962952
-EBUILD rosegarden-19.06.ebuild 1078 BLAKE2B 9a4739be44afd83a54f3443581472dfed2fd71914ffdee54edf96b143a0bfe48f0fcc7842eada3b68361d87988d8d0c5a7be4197210957213465bc80915b2f80 SHA512 7d97ea4c05943250bac50838bc82ecc2e8b8eac3124d527f7d5d6882a7a40710152bcebf9867d02df02812a521a60013f3f89dc18f5ffc4b37b3f14885178b01
+DIST rosegarden-19.12.tar.bz2 6672820 BLAKE2B f4541c894d0de7f4c5fc435ce463b9fc6940cf1c595e9d9b6c168f51b9e05e63a449b8f3a99456801baf864d0788130368ed87c81646af04a6f2891a6372e444 SHA512 22c45346b1a4d69f009e59091bdf5f5f68633241a48df7bd6ee73462cc281ee7182be3d48c3afc0843aa551145c203a8b881501891eb84b6d3f3def5f7650fc6
+EBUILD rosegarden-17.12.1.ebuild 978 BLAKE2B 7c57370632c64626aefa7d1c68f16c254d0674a6d3d3b5e8d2bc0e1fcc820fef2f9eb1791ce437841973f248ea07f938ebf2dec8a4bfe98fab394b19b77643f2 SHA512 5f1b554f6f7c602a390deb20015ba33813591edf3f43a014dfbd0703549bf4791323773438d990280ef618630310ce04b339288759f4a5798bda09f397d1946a
+EBUILD rosegarden-19.06.ebuild 1054 BLAKE2B b5f72dea27fe57c9afec4bf5377e31eb2ab705a8e08b260015557dde8f2ae8f5b7248ccd5b8a64302afd197f323f53119b7ead85dddf89214efce2c1638d7ae5 SHA512 a5b3d1431c58ca1dde4875217f328660d11913673e7d61b43f4b4a177ea53497596dcb1fa3372aa90e54763f4016141eee0ffa1763dd7dc6b0aa7ac2d7e25457
+EBUILD rosegarden-19.12.ebuild 1055 BLAKE2B f0f41218f8c351f42e7cf101798c502b820f7852a4bacd134f5ca3302372982248aa78b3cc056dabaa16d5d857f5b10b6922ae5f2f1ac79c0cdf9b8231b255a0 SHA512 bbbb8e0ac28266978036aba8cccbf859abca4e4bd6e22cfa4616ed990802e5d8c18acc211008e9b788e9d02948cc1cf988af09f3bdc12721161926d91defac34
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-17.12.1.ebuild b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
index 34f80417db54..dac7760081c1 100644
--- a/media-sound/rosegarden/rosegarden-17.12.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="https://www.rosegardenmusic.com/"
@@ -43,12 +43,12 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/rosegarden/rosegarden-19.06.ebuild b/media-sound/rosegarden/rosegarden-19.06.ebuild
index eaedb77e1951..a86fbbdda3ed 100644
--- a/media-sound/rosegarden/rosegarden-19.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-19.06.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg virtualx
+inherit cmake xdg virtualx
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="https://www.rosegardenmusic.com/"
@@ -44,16 +44,16 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	 virtx cmake-utils_src_test
+	 virtx cmake_src_test
 }
diff --git a/media-sound/rosegarden/rosegarden-19.12.ebuild b/media-sound/rosegarden/rosegarden-19.12.ebuild
new file mode 100644
index 000000000000..7ed9801029fe
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-19.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg virtualx
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	 virtx cmake_src_test
+}
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index b6cf79dbd175..7e38b4dd968b 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,5 +1,5 @@
 AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
 DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2-r3.ebuild 1199 BLAKE2B ab197ef138876fec5dff1a3f3ad33594fcb0c372c73c85a960b668d42d17a794138734c43982d75eab1be2832f206b38b6215ca4617fd2153eb5cf88abd6e917 SHA512 b199c330119034bec58fb50edc586d1e04ec2ec0f6fca95c59f1f6d12e90fb8e5a82c292506e25b79189dd0801b07764d2a3e798c2e50d0bf011d9e8fc76ba81
+EBUILD rplay-3.3.2-r3.ebuild 1210 BLAKE2B 5d2afa989c40eec2845f4e65675a81e4b08d3b17509770838047dbcded9ace48cb9cbea36296500a3634bb5b12b43daf02f9d25e2759c3797fff9137055edbfe SHA512 c12c77c5e90691ea00a08039967223b7d7a00c48fa8e50dca56da0e6bf7b6ca91a122419b3d4911c613f13b040876b8a174aaa34586ad9409f4f9f815130a278
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index 8f3e4f47ac28..ff0d91c44534 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -6,7 +6,7 @@ inherit autotools user
 
 DESCRIPTION="Play sounds on remote Unix systems without data transfer"
 HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="${HOMEPAGE}dist/${P}.tar.gz
+SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz
 	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index ecfc5d9d5049..550079742438 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,6 +1,6 @@
-AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d27590fc2bff746d2fb8511a75874e3bfbfd5c5563dd642534e904706dd029d057986344c207c900 SHA512 c3e9fbb8f1844d9faa35b318ffebfe6c64672f329ac584a101bf1e3c5736916666e7c100863de7db50f89b8f98b8a2e267e82e4aad457cbbaa875da0322bb0f6
-AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
-AUX sonic-visualiser-3.1.1-qt-5.11.patch 262 BLAKE2B 627bedb71bab01fefa7edaee88f1245f19f312eea257904b2d03202b52c975a546fae73985b5cb9be4b42e97da2f41f28a26c13246f34a8c303b30ada0b276d0 SHA512 60ac4c02507c23fd7ebec556770175ddef3132ae54b0ef3136767c476f86e0c01e518ef2939b2ed6ddc044127f4a7393a800cfe70bfa21c2c103e378c8ea5983
-DIST sonic-visualiser-3.1.1.tar.gz 5304359 BLAKE2B 79c9d1d55ea2ec939fdb7abe656ab81aae72862d139eda4e62037e0231c596cf725b4fd5741216e6413bc25e659798dee3b0e06f55063a9ad73f0d9204f76d84 SHA512 e83efffb62179e67a0e5fd7352f63f5a0210102a7fb38c5ad486479a3749f68a44fec2d1843d1c1ca826ba0004bf421811a270a0a50e3f89f71d956dc7a76ae7
-EBUILD sonic-visualiser-3.1.1.ebuild 2985 BLAKE2B 1f8cbc2238e384063ddd0ee507d16481075e2a8f6532a8520f0da6795eac57fbdd4dbfffb4e6d82140397bdfc15d74a264f0b2c22e05d3c8958699ded1cde878 SHA512 bfec9ac5e08c0b05a2b0c5937f3f1ee72be454744ffc5d4623c7f275ae395368af1916a23638a76c3c5566672ae1f853c96ed857ef362a3f37ade4fb45bd848e
+AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
+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 2754 BLAKE2B 3505ea9251477726805a756c7d771f9ec8ec28b6832fddca1638ddfb2c150305cc04e300269f6db4640d6edc44dc17e45cd412fc9c0e47e4734ce64cc08b1013 SHA512 187b031f996b4b6b00fc0c8c64b4a3b42d4937135f6a808a989d872d1ae65df5d5e44002a8d79c627e408bb260e10e0b750127c08d48ddcb305da8383a3d17d3
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/files/notest.patch b/media-sound/sonic-visualiser/files/notest.patch
deleted file mode 100644
index 59b4d04f9336..000000000000
--- a/media-sound/sonic-visualiser/files/notest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: sonic-visualiser-3.0.2/test-svcore-base.pro
-===================================================================
---- sonic-visualiser-3.0.2.orig/test-svcore-base.pro
-+++ sonic-visualiser-3.0.2/test-svcore-base.pro
-@@ -28,6 +28,3 @@ include(svcore/base/test/files.pri)
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
- 
--!win32* {
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-Index: sonic-visualiser-3.0.2/test-svcore-data-fileio.pro
-===================================================================
---- sonic-visualiser-3.0.2.orig/test-svcore-data-fileio.pro
-+++ sonic-visualiser-3.0.2/test-svcore-data-fileio.pro
-@@ -28,6 +28,3 @@ include(svcore/data/fileio/test/files.pr
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
- 
--!win32* {
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-Index: sonic-visualiser-3.0.2/test-svcore-data-model.pro
-===================================================================
---- sonic-visualiser-3.0.2.orig/test-svcore-data-model.pro
-+++ sonic-visualiser-3.0.2/test-svcore-data-model.pro
-@@ -28,6 +28,3 @@ include(svcore/data/model/test/files.pri
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
- 
--!win32* {
--    QMAKE_POST_LINK = ./$${TARGET}
--}
diff --git a/media-sound/sonic-visualiser/files/piper.capnp b/media-sound/sonic-visualiser/files/piper.capnp
deleted file mode 100644
index 6e99ff6849d2..000000000000
--- a/media-sound/sonic-visualiser/files/piper.capnp
+++ /dev/null
@@ -1,364 +0,0 @@
-
-# Piper audio feature extraction: schema for low-level operation
-#
-# This file is formatted to 130 characters width, in order to fit the
-# comments next to the schema definitions.
-#
-# Copyright (c) 2015-2017 Queen Mary, University of London, provided
-# under a BSD-style licence. See the file COPYING for details.
-
-@0xc4b1c6c44c999206;
-
-using Cxx = import "/capnp/c++.capnp";
-$Cxx.namespace("piper");
-
-struct Basic {
-    # Basic metadata common to many Piper structures.
-
-    identifier         @0  :Text;                 # A computer-readable string. Must match the regex /^[a-zA-Z0-9_-]+$/.
-    name               @1  :Text;                 # A short human-readable name or label. Must be present.
-    description        @2  :Text;                 # An optional human-readable descriptive text that may accompany the name.
-}
-
-struct ParameterDescriptor {
-    # Properties of an adjustable parameter. A parameter's value is just a single
-    # float, but the descriptor explains how to interpret and present that value.
-    # A Piper feature extractor has a static list of parameters. The properties of
-    # a given parameter never change, in contrast to output descriptors, which
-    # may have different properties depending on the configuration of the extractor.
-
-    basic              @0  :Basic;                # Basic metadata about the parameter.
-    unit               @1  :Text;                 # Human-recognisable unit of the parameter (e.g. Hz). May be left empty.
-    minValue           @2  :Float32     = 0.0;    # Minimum value. Must be provided.
-    maxValue           @3  :Float32     = 0.0;    # Maximum value. Must be provided.
-    defaultValue       @4  :Float32     = 0.0;    # Default if the parameter is not set to anything else. Must be provided.
-    isQuantized        @5  :Bool        = false;  # True if parameter values are quantized to a particular resolution.
-    quantizeStep       @6  :Float32     = 0.0;    # Quantization resolution, if isQuantized.
-    valueNames         @7  :List(Text)  = [];     # Optional human-readable labels for the values, if isQuantized.
-}
-
-enum SampleType {
-    # How returned features are spaced on the input timeline.
-
-    oneSamplePerStep   @0;                        # Each process input returns a feature aligned with that input's timestamp.
-    fixedSampleRate    @1;                        # Features are equally spaced at a given sample rate.
-    variableSampleRate @2;                        # Features have their own individual timestamps.
-}
-
-struct StaticOutputDescriptor {
-
-    # Properties of an output, that is, a single stream of features
-    # produced in response to process and finish requests. A feature
-    # extractor may have any number of outputs, and it always
-    # calculates and returns features from all of them when
-    # processing; this is useful in cases where more than one feature
-    # can be easily calculated using a single method.
-    # 
-    # This structure contains the properties of an output that are
-    # static, i.e. that do not depend on the parameter values provided
-    # at configuration, excluding the Basic struct parameters like id
-    # and description.  The Basic struct properties are not included
-    # for historical reasons: they were already referenced separately
-    # in the OutputDescriptor and ExtractorStaticData before this
-    # struct was introduced.
-    
-    typeURI            @0  :Text;                 # URI indicating the sort of feature that this output returns (see docs).
-}
-
-struct ConfiguredOutputDescriptor {
-    # Properties of an output, that is, a single stream of features produced
-    # in response to process and finish requests. A feature extractor may
-    # have any number of outputs, and it always calculates and returns features
-    # from all of them when processing; this is useful in cases where more
-    # than one feature can be easily calculated using a single method.
-    # This structure contains the properties of an output that are not static,
-    # i.e. that may depend on the parameter values provided at configuration.
-
-    unit               @0  :Text;                 # Human-recognisable unit of the bin values in output features. May be empty.
-    hasFixedBinCount   @1  :Bool        = false;  # True if this output has an equal number of values in each returned feature.
-    binCount           @2  :Int32       = 0;      # Number of values per feature for this output, if hasFixedBinCount.
-    binNames           @3  :List(Text)  = [];     # Optional human-readable labels for the value bins, if hasFixedBinCount.
-    hasKnownExtents    @4  :Bool        = false;  # True if all feature values fall within the same fixed min/max range.
-    minValue           @5  :Float32     = 0.0;    # Minimum value in range for any value from this output, if hasKnownExtents.
-    maxValue           @6  :Float32     = 0.0;    # Maximum value in range for any value from this output, if hasKnownExtents.
-    isQuantized        @7  :Bool        = false;  # True if feature values are quantized to a particular resolution.
-    quantizeStep       @8  :Float32     = 0.0;    # Quantization resolution, if isQuantized.
-    sampleType         @9  :SampleType;           # How returned features from this output are spaced on the input timeline.
-    sampleRate         @10 :Float32     = 0.0;    # Sample rate (features per second) if sampleType == fixedSampleRate.
-    hasDuration        @11 :Bool        = false;  # True if features returned from this output will have a duration.
-}
-
-struct OutputDescriptor {
-    # All the properties of an output, both static (the basic metadata and static
-    # descriptor) and potentially dependent on configuration parameters (the
-    # configured descriptor).
-
-    basic              @0  :Basic;                # Basic metadata about the output.
-    configured         @1  :ConfiguredOutputDescriptor;    # Properties of the output that may depend on configuration parameters.
-    static             @2  :StaticOutputDescriptor;        # Properties (other than Basic) that do not depend on parameters.
-}
-
-enum InputDomain {
-    # Whether a feature extractor requires time-domain audio input (i.e.
-    # "normal" or "unprocessed" audio samples) or frequency-domain input
-    # (i.e. resulting from windowed, usually overlapping, short-time
-    # Fourier transforms).
-
-    timeDomain         @0;                        # The plugin requires time-domain audio samples as input.
-    frequencyDomain    @1;                        # The plugin requires input to have been pre-processed using windowed STFTs.
-}
-
-struct ExtractorStaticData {
-    # Static properties of a feature extractor. That is, metadata about the
-    # extractor that are the same regardless of how you configure or run it.
-
-    key                @0  :Text;                 # String that "globally" identifies the extractor, used to load it (see docs).
-    basic              @1  :Basic;                # Basic metadata about the extractor.
-    maker              @2  :Text;                 # Human-readable text naming the author or vendor of the extractor.
-    rights             @3  :Text;                 # Human-readable summary of copyright and/or licensing terms for the extractor.
-    version            @4  :Int32;                # Version number of extractor; must increase if new algorithm changes results.
-    category           @5  :List(Text);           # List of general->specific category labels for this extractor (see docs).
-    minChannelCount    @6  :Int32;                # Minimum number of input channels of audio this extractor can accept.
-    maxChannelCount    @7  :Int32;                # Maximum number of input channels of audio this extractor can accept.
-    parameters         @8  :List(ParameterDescriptor);    # List of configurable parameter properties for the feature extractor.
-    programs           @9  :List(Text);           # List of predefined programs. For backward-compatibility, not recommended.
-    inputDomain        @10 :InputDomain;          # Whether the extractor requires time-domain or frequency-domain input audio.
-    basicOutputInfo    @11 :List(Basic);          # Basic metadata about all of the outputs of the extractor.
-
-    struct SOPair {
-        # A mapping between output identifier and static descriptor for
-	# that output.
-	
-        output         @0  :Text;                 # Output id, matching the output's descriptor's basic identifier.
-        static         @1  :StaticOutputDescriptor;
-    }
-
-    staticOutputInfo   @12 :List(SOPair);         # Static descriptors for all outputs that have any static metadata.
-}
-
-struct RealTime {
-    # Time structure. When used as a timestamp, this is relative to "start
-    # of audio".
-    
-    sec                @0  :Int32       = 0;      # Number of seconds.
-    nsec               @1  :Int32       = 0;      # Number of nanoseconds. Must have same sign as sec unless sec == 0.
-}
-
-struct ProcessInput {
-    # Audio and timing input data provided to a process request.
-
-    inputBuffers       @0  :List(List(Float32));  # A single block of audio data (time or frequency domain) for each channel.
-    timestamp          @1  :RealTime;             # Time of start of block (time-domain) or "centre" of it (frequency-domain).
-}
-
-struct Feature {
-    # A single feature calculated and returned from a process or finish request.
-
-    hasTimestamp       @0  :Bool        = false;  # True if feature has a timestamp. Must be true for a variableSampleRate output.
-    timestamp          @1  :RealTime;             # Timestamp of feature, if hasTimestamp.
-    hasDuration        @2  :Bool        = false;  # True if feature has a duration. Must be true if output's hasDuration is true.
-    duration           @3  :RealTime;             # Duration of feature, if hasDuration.
-    label              @4  :Text;                 # Optional human-readable text attached to feature.
-    featureValues      @5  :List(Float32) = [];   # The feature values themselves (of size binCount, if output hasFixedBinCount).
-}
-
-struct FeatureSet {
-    # The set of all features, across all outputs, calculated and returned from
-    # a single process or finish request.
-
-    struct FSPair {
-        # A mapping between output identifier and ordered list of features for
-	# that output.
-	
-        output         @0  :Text;                 # Output id, matching the output's descriptor's basic identifier.
-        features       @1  :List(Feature) = [];   # Features calculated for that output during the current request, in time order.
-    }
-    
-    featurePairs       @0  :List(FSPair);         # The feature lists for all outputs for which any features have been calculated.
-}
-
-struct Framing {
-    # Determines how audio should be split up into individual buffers for input.
-    # If the feature extractor accepts frequency-domain input, then this
-    # applies prior to the STFT transform.
-    #
-    # These values are sometimes mandatory, but in other contexts one or both may
-    # be set to zero to mean "don't care". See documentation for structures that
-    # include a framing field for details.
-    
-    blockSize          @0  :Int32;                # Number of time-domain audio samples per buffer (on each channel).
-    stepSize           @1  :Int32;                # Number of samples to advance between buffers: equals blockSize for no overlap.
-}
-
-struct Configuration {
-    # Bundle of parameter values and other configuration data for a feature-
-    # extraction procedure.
-
-    struct PVPair {
-        # A mapping between parameter identifier and value.
-	
-        parameter      @0  :Text;                 # Parameter id, matching the parameter's descriptor's basic identifier.
-        value          @1  :Float32;              # Value to set parameter to (within constraints given in parameter descriptor).
-    }
-    
-    parameterValues    @0  :List(PVPair);         # Values for all parameters, or at least any that are to change from defaults.
-    currentProgram     @1  :Text;                 # Selection of predefined program. For backward-compatibility, not recommended. 
-    channelCount       @2  :Int32;                # Number of audio channels of input.
-    framing            @3  :Framing;              # Step and block size for framing the input.
-}
-
-enum AdapterFlag {
-    # Flags that may be used when requesting a server to load a feature
-    # extractor, to ask the server to do some of the work of framing and input
-    # conversion instead of leaving it to the client side. These affect the
-    # apparent behaviour of the loaded extractor.
-
-    adaptInputDomain   @0;                        # Input-domain conversion, so the extractor always expects time-domain input.
-    adaptChannelCount  @1;                        # Channel mixing or duplication, so any number of input channels is acceptable. 
-    adaptBufferSize    @2;                        # Framing, so the extractor accepts any blockSize of non-overlapping buffers.
-}
-
-const adaptAllSafe :List(AdapterFlag) =
-    [ adaptInputDomain, adaptChannelCount ];
-    # The set of adapter flags that can always be applied, leaving results unchanged.
-
-const adaptAll :List(AdapterFlag) =
-    [ adaptInputDomain, adaptChannelCount, adaptBufferSize ];
-    # The set of adapter flags that may cause "equivalent" results to be returned (see documentation).
-
-struct ListRequest {
-    # Request a server to provide a list of available feature extractors.
-    
-    from               @0  :List(Text);           # If non-empty, provide only extractors found in the given list of "libraries".
-}
-
-struct ListResponse {
-    # Response to a successful list request.
-    
-    available          @0  :List(ExtractorStaticData);    # List of static data about available feature extractors.
-}
-
-struct LoadRequest {
-    # Request a server to load a feature extractor and return a handle to it.
-    
-    key                @0  :Text;                 # Key as found in the extractor's static data structure.
-    inputSampleRate    @1  :Float32;              # Sample rate for input audio. Properties of the extractor may depend on this.
-    adapterFlags       @2  :List(AdapterFlag);    # Set of optional flags to make any framing and input conversion requests.
-}
-
-struct LoadResponse {
-    # Response to a successful load request.
-    
-    handle             @0  :Int32;                # Handle to be used to refer to the loaded feature extractor in future requests.
-    staticData         @1  :ExtractorStaticData;  # Static data about this feature extractor, identical to that in list response.
-    defaultConfiguration @2  :Configuration;      # Extractor's default parameter values and preferred input framing.
-}
-
-struct ConfigurationRequest {
-    # Request a server to configure a loaded feature extractor and prepare
-    # it for use. This request must be carried out on a feature extractor
-    # before any process request can be made.
-    
-    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
-    configuration      @1  :Configuration;        # Bundle of parameter values to set, and client's preferred input framing.
-}
-
-struct ConfigurationResponse {
-    # Response to a successful configuration request.
-
-    handle             @0  :Int32;                # Handle of extractor, as passed in the configuration request.
-    outputs            @1  :List(OutputDescriptor);       # Full set of properties of all outputs following configuration.
-    framing            @2  :Framing;              # Input framing that must be used for subsequent process requests.
-}
-
-struct ProcessRequest {
-    # Request a server to process a buffer of audio using a loaded and
-    # configured feature extractor.
-
-    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
-    processInput       @1  :ProcessInput;         # Audio in the input domain, with framing as in the configuration response.
-}
-
-struct ProcessResponse {
-    # Response to a successful process request.
-
-    handle             @0  :Int32;                # Handle of extractor, as passed in the process request.
-    features           @1  :FeatureSet;           # All features across all outputs calculated during this process request.
-}
-
-struct FinishRequest {
-    # Request a server to finish processing and unload a loaded feature
-    # extractor. This request may be made at any time -- the extractor does
-    # not have to have been configured or used. The extractor handle cannot
-    # be used again with this server afterwards.
-
-    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
-}
-
-struct FinishResponse {
-    # Response to a successful finish request.
-
-    handle             @0  :Int32;                # Handle of extractor, as passed in the finish request. May not be used again.
-    features           @1  :FeatureSet;           # Features the extractor has calculated now that it knows all input has ended.
-}
-
-struct Error {
-    # Response to any request that fails.
-
-    code               @0  :Int32;                # Error code. 
-    message            @1  :Text;                 # Error message.
-}
-
-struct RpcRequest {
-    # Request bundle for use when using Cap'n Proto serialisation without
-    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
-
-    id :union {
-        # Identifier used solely to associate a response packet with its
-	# originating request. Server does not examine the contents of this,
-	# it just copies the request id structure into the response.
-	
-        number         @0  :Int32;
-        tag            @1  :Text;
-        none           @2  :Void;
-    }
-    
-    request :union {
-        # For more details, see the documentation for the individual
-	# request structures.
-	
-	list           @3  :ListRequest;          # Provide a list of available feature extractors.
-	load           @4  :LoadRequest;          # Load a feature extractor and return a handle to it.
-	configure      @5  :ConfigurationRequest; # Configure a loaded feature extractor, set parameters, and prepare it for use.
-	process        @6  :ProcessRequest;       # Process a single fixed-size buffer of audio and return calculated features.
-	finish         @7  :FinishRequest;        # Get any remaining features and unload the extractor.
-    }
-}
-
-struct RpcResponse {
-    # Response bundle for use when using Cap'n Proto serialisation without
-    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
-
-    id :union {
-        # Identifier used solely to associate a response packet with its
-	# originating request. Server does not examine the contents of this,
-	# it just copies the request id structure into the response.
-	
-        number         @0  :Int32;
-        tag            @1  :Text;
-        none           @2  :Void;
-    }
-
-    response :union {
-        # For more details, see the documentation for the individual
-	# response structures.
-	
-        error          @3  :Error;                # The request (of whatever type) failed.
-	list           @4  :ListResponse;         # List succeeded: here is static data about the requested extractors.
-	load           @5  :LoadResponse;         # Load succeeded: here is a handle for the loaded extractor.
-	configure      @6  :ConfigurationResponse;# Configure succeeded: ready to process, here are values such as block size.
-	process        @7  :ProcessResponse;      # Process succeeded: here are all features calculated from this input block.
-	finish         @8  :FinishResponse;       # Finish succeeded: extractor unloaded, here are all remaining features.
-    }
-}
-
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
deleted file mode 100644
index 5d62677128b4..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug: https://bugs.gentoo.org/664628
-
---- a/svapp/audio/AudioCallbackRecordTarget.cpp
-+++ b/svapp/audio/AudioCallbackRecordTarget.cpp
-@@ -19,6 +19,7 @@
- 
- #include "data/model/WritableWaveFileModel.h"
- 
-+#include <QDateTime>
- #include <QDir>
- #include <QTimer>
- 
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
new file mode 100644
index 000000000000..ec70849915ec
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
@@ -0,0 +1,52 @@
+diff --git a/test-svcore-base.pro b/test-svcore-base.pro
+index 275cb58..636129c 100644
+--- a/test-svcore-base.pro
++++ b/test-svcore-base.pro
+@@ -27,8 +27,3 @@ include(svcore/base/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro
+index 7b53ca1..a2aa3ce 100644
+--- a/test-svcore-data-fileio.pro
++++ b/test-svcore-data-fileio.pro
+@@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro
+index 3b45ac0..d08b14e 100644
+--- a/test-svcore-data-model.pro
++++ b/test-svcore-data-model.pro
+@@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-system.pro b/test-svcore-system.pro
+index 6ef7db7..685c1ba 100644
+--- a/test-svcore-system.pro
++++ b/test-svcore-system.pro
+@@ -27,8 +27,3 @@ include(svcore/system/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
new file mode 100644
index 000000000000..bf0bc76656b6
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
@@ -0,0 +1,22 @@
+diff --git a/checker/src/plugincandidates.cpp b/checker/src/plugincandidates.cpp
+index 2990905..8297253 100644
+--- a/checker/src/plugincandidates.cpp
++++ b/checker/src/plugincandidates.cpp
+@@ -37,7 +37,7 @@
+ 
+ #include <QProcess>
+ #include <QDir>
+-#include <QTime>
++#include <QElapsedTimer>
+ 
+ #if defined(_WIN32)
+ #define PLUGIN_GLOB "*.dll"
+@@ -231,7 +231,7 @@ PluginCandidates::runHelper(vector<string> libraries, string descriptor)
+         process.write("\n", 1);
+     }
+ 
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+     int timeout = 15000; // ms
+ 
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser.xml b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
new file mode 100644
index 000000000000..6daac7430022
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+
+  <mime-type type="application/x-sonicvisualiser">
+    <comment>Sonic Visualiser session file</comment>
+    <generic-icon name="sv-icon"/>
+    <glob pattern="*.sv"/>
+  </mime-type>
+
+  <mime-type type="application/x-sonicvisualiser-layer">
+    <comment>Sonic Visualiser layer file</comment>
+    <generic-icon name="sv-icon"/>
+    <glob pattern="*.svl"/>
+  </mime-type>
+
+</mime-info>
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
index 788100ee4154..f5736dea6a77 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools desktop qmake-utils xdg-utils
+inherit autotools desktop qmake-utils xdg
 
 DESCRIPTION="Music audio files viewer and analiser"
 HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2391/${P}.tar.gz"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2607/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
+IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio"
 
+BDEPEND="
+	dev-qt/qttest:5
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
 RDEPEND="
 	app-arch/bzip2
 	>=dev-libs/capnproto-0.6:=
@@ -36,27 +41,24 @@ RDEPEND="
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	mad? ( media-libs/libmad )
 	ogg? (
 		media-libs/libfishsound
-		>=media-libs/liboggz-1.1.0
+		media-libs/liboggz
 	)
+	opus? ( media-libs/opusfile )
 	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	portaudio? ( >=media-libs/portaudio-19 )
 	pulseaudio? ( media-sound/pulseaudio )
 "
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="|| ( jack pulseaudio portaudio )"
 
 PATCHES=(
-	"${FILESDIR}/notest.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-notest.patch"
+	"${FILESDIR}/${P}-qt-deprecated.patch"
 )
 
 sv_disable_opt() {
@@ -74,6 +76,7 @@ src_prepare() {
 	use mad || sv_disable_opt mad
 	use ogg || sv_disable_opt fishsound
 	use ogg || sv_disable_opt oggz
+	use opus || sv_disable_opt opus
 	use osc || sv_disable_opt liblo
 	use portaudio || sv_disable_opt portaudio
 	use pulseaudio || sv_disable_opt libpulse
@@ -85,14 +88,6 @@ src_prepare() {
 		|| die
 
 	eautoreconf
-
-	# Those need to be regenerated as they must match current capnproto version
-	einfo "Regenerating piper capnproto files"
-	rm -f piper-cpp/vamp-capnp/piper.capnp.* || die
-	mkdir -p piper/capnp || die
-	cp "${FILESDIR}/piper.capnp" piper/capnp/ || die
-	cd piper-cpp || die
-	emake vamp-capnp/piper.capnp.h
 }
 
 src_configure() {
@@ -106,27 +101,25 @@ src_configure() {
 }
 
 src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model ; do
+	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
 		einfo "Running ${i}"
-		./${i} || die
+		HOME="${T}" ./${i} || die
 	done
 }
 
 src_install() {
 	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
 	dodoc README*
+
 	#install samples
 	insinto /usr/share/${PN}/samples
 	doins samples/*
+
 	# desktop entry
 	doicon icons/sv-icon.svg
-	domenu *.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
+	domenu sonic-visualiser.desktop
 
-pkg_postrm() {
-	xdg_desktop_database_update
+	# mime types
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
 }
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 2739a6df0055..9ff5447eb0e3 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.ebuild 1795 BLAKE2B 9708f0fed867b06009862386e4c375292e70e9d5dd25507ee3ad2eb902ca6a58e5a83570e23a07ce1f6a3c138b62088ad47a24d0dd0c33e2b6a76779d8e171fd SHA512 69f83e8ef303fcd0432113eb39de60665471e7c8c8bd1c3080a34954fb031817101d4af7ebdfec0badfb9b46f1054a13ddf8f9a8de91c246ea321f9674be891f
+EBUILD soundconverter-3.0.2.ebuild 1791 BLAKE2B 6e3fc703928965af3e6ee7481dd26598868a61f4d9146be78c007d432efe0a071322bcb9635236e5845c50ca21fd8386f810a9f150947fcd9aa751d7de8b13b5 SHA512 35cfe6248eef590a209599a31a28cbde50958923c696d720c14cb36065ff2149a3d36fc31ac06342e2c00c5c86f4cf6a35f6d25e17e144323b568e789a8d2feb
 MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/soundconverter-3.0.2.ebuild b/media-sound/soundconverter/soundconverter-3.0.2.ebuild
index 58d2ba6e2c78..845b2d2ce3bb 100644
--- a/media-sound/soundconverter/soundconverter-3.0.2.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2 python-single-r1
 
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index 3f49e1211d8e..3eeddc6c6e6f 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -2,5 +2,5 @@ AUX soundkonverter-3.0.0-deps.patch 471 BLAKE2B 083b379ce0e3ecda5723095f5aa865a9
 AUX soundkonverter-3.0.1-fix-add-dirs.patch 936 BLAKE2B 93d19df6f74c46b5b5755c85fd548cbd5e654be6b0fbc1459db90358ce129ecf6f1afbe7b15528551e227edd61ffc4f6156c311f30a0939968b1dad86f86f7aa SHA512 2d692e3c304706b0cb135299da6d31ab1fcac352b055725e577435d44321f04ece3309ddbb3f9568dc11a85528348522cdc637ed195e7ff1c5e0710e85b1d513
 AUX soundkonverter-3.0.1-metainfodir.patch 1033 BLAKE2B d2c845bc2b5fc18ade9b7d689e291e088fa53c11d400fd1b598e74fd9da83e7082e406949722846013c413743ed672e40089ba0960086f3dcdeb2c8a2501f8b7 SHA512 d16314f12179a0caf9d09489c4dd838f814c468185f0c7bcb0eadc3078be4eedfa5ec0f76025216b3750cefe0b5a75039e645936e58a827ba10d6503442fec9f
 DIST soundkonverter-3.0.1.tar.gz 821278 BLAKE2B 3b54a0e8d728d15a1c0ae716e0d321fe37a866f755fee25dd284e46a04a514ace5e8b27fb612b928a3a6ddf32504d08ff0165ceb5c8d48ba1763fcd34994e586 SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911
-EBUILD soundkonverter-3.0.1-r2.ebuild 1547 BLAKE2B dfa49893b5daa640d15c9b0a2f8cfa2fe1a13f993b97e2b9a17cbfd076c669578f58a9244b088050c6c4ff63526038685eb9735e64cc70d286691d87c63a3a8b SHA512 b40b601e4c3654254df386af3eea1bd6e1e778992058770a16214a32518af17cc5ea95a05416b9539ff56e8bddf5ab426a925995dfd9034039e68ec7182441d7
+EBUILD soundkonverter-3.0.1-r2.ebuild 1670 BLAKE2B 8aea75224a197407269360dfb98ca23be9cc9ab8694772d150e46b96977fc8fcb436cd266f817147281dbc41e9321b4f40fe910c8e9deaf2acc387e49e87c8d2 SHA512 e27248b788dec7b2e866c9e51769cf1d6e9c499f26ea602137813ac6dc28987b878ab4674c9ba18d761a5b62bf309bb45552ed6ec63f508f65655b57c9d84683
 MISC metadata.xml 363 BLAKE2B 56ccd083e2b002a49f00ede22967d7c35a2ad7d765200a668876993780b243c30b8c77f162432c750e0f23b7f1310491854b7b070a426a518ccb47410a19d12b SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
index b930b9c11d26..0beceea2e00e 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
@@ -1,39 +1,41 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm
 
 DESCRIPTION="Frontend to various audio converters"
 HOMEPAGE="https://www.linux-apps.com/p/1126634/ https://github.com/dfaust/soundkonverter"
 SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/libkcddb-19.04.3:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
 	media-libs/phonon[qt5(+)]
 	>=media-libs/taglib-1.10
 	media-sound/cdparanoia
@@ -51,7 +53,7 @@ PATCHES=(
 S="${WORKDIR}"/${P}/src
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	elog "soundKonverter optionally supports many different audio formats."
 	elog "You will need to install the appropriate encoding packages for the"
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index ec4e4eb65aeb..0a1adc012f26 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4
 EBUILD spotify-1.0.72-r1.ebuild 3210 BLAKE2B cd775bd0a132bd9a32e64445f815e42fb271d4f30025b65d33efb6013049005749e60e309daea7031cbe1bbb1afc16fd94f5a12e283d28d3e56051541d60ba40 SHA512 d21a4c6bfa78352f3dc0679373fca05eaef3043c8d77611f9b9c6b789f42964f95492d8e6530f012df32eba364772abd9ce0d25f68ce1205003892beade2db81
-EBUILD spotify-1.1.10-r1.ebuild 3124 BLAKE2B 8f316d1b0786d13315791ef989eeec232a7cae2b0caabcd048dc2f3f9f6027ea72272cb23be13e66253e07e1b9d55c0d9a187904a414f3d31482a0ea7d8bc005 SHA512 baf29212dee7ec0336706e46f467c18f838e3fb3628aa1c13ef4ed418de21f22984cb35f295765ff2e36f14c8d44d192d8910cc8090247282e509b0ab1bb6ef3
+EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.1.10-r1.ebuild b/media-sound/spotify/spotify-1.1.10-r1.ebuild
index 56c8b2a3fa7f..8267b9da0b39 100644
--- a/media-sound/spotify/spotify-1.1.10-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.10-r1.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
@@ -32,6 +32,7 @@ RDEPEND="
 	|| ( media-sound/pulseaudio media-sound/apulse )
 	systray? ( gnome-extra/gnome-integration-spotify )
 	x11-libs/gtk+:2
+	app-accessibility/at-spi2-atk
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 "
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
new file mode 100644
index 000000000000..6bab1a34ef36
--- /dev/null
+++ b/media-sound/strawberry/Manifest
@@ -0,0 +1,4 @@
+DIST strawberry-0.6.8.tar.xz 9303276 BLAKE2B 852696846d0ce4632fc95482742ca244eda10462577c77d1bc333b3a5dcd0d5e51f6cdaaae0f8c791d2b72c86783a7a183dbde22157b522ff78e25041af73cfb SHA512 1e6ec4802188007b8624705af3ab1a4f48016a174762696e73c3fd23f0d16e88225a72962049819869237f25e630cf6f2cbefa31cec1fe15e415b9aa46e6631d
+EBUILD strawberry-0.6.8.ebuild 2827 BLAKE2B 73b82b1519762a8199eebdd02250ed34f544b94ada718bdf027154637fecfdc5807868888d93636c23798a1a583d0a97af17e04c5bd89dbf2466bae4f99e9661 SHA512 4a546a1227c3fab5bc7cedd6a1de97382ba233bd8ed9ab79ce77103aea7d088de8a622dd5cebc1d0521351eca458ef14bd4ce9f434875943446ce36f17d41229
+EBUILD strawberry-9999.ebuild 2827 BLAKE2B 73b82b1519762a8199eebdd02250ed34f544b94ada718bdf027154637fecfdc5807868888d93636c23798a1a583d0a97af17e04c5bd89dbf2466bae4f99e9661 SHA512 4a546a1227c3fab5bc7cedd6a1de97382ba233bd8ed9ab79ce77103aea7d088de8a622dd5cebc1d0521351eca458ef14bd4ce9f434875943446ce36f17d41229
+MISC metadata.xml 448 BLAKE2B b29c1b35e64c59667f04698cb2d1c039fc7557aa7ad99fb1a8625b68d960b0e7af62e016aaf1ec68d5c44c77126f71047b046164c29a0e80d49cdcda0973ca6d SHA512 2c5af38b8518b1de981bae14422bf5931b76831c0b52b1fce29e187d9ceb25a947d8d0f7db1e7844e90ec14657cc8ab484726b31c89667e89d9fcfb6d2e7dfe7
diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
new file mode 100644
index 000000000000..787d107c6034
--- /dev/null
+++ b/media-sound/strawberry/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jonaski/strawberry</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/strawberry/strawberry-0.6.8.ebuild b/media-sound/strawberry/strawberry-0.6.8.ebuild
new file mode 100644
index 000000000000..88653335f0ad
--- /dev/null
+++ b/media-sound/strawberry/strawberry-0.6.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic l10n virtualx xdg
+
+PLOCALES="de es fr id it nb ru"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	media-video/vlc
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+	rm -r 3rdparty/taglib || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
new file mode 100644
index 000000000000..88653335f0ad
--- /dev/null
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic l10n virtualx xdg
+
+PLOCALES="de es fr id it nb ru"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	media-video/vlc
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+	rm -r 3rdparty/taglib || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 39cfe9c58e1d..b321b1168851 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -3,5 +3,5 @@ AUX supercollider-3.10.2-boost-1.70.patch 1882 BLAKE2B 48fdf58789d37a296a28f1104
 AUX supercollider-3.10.2-no-ccache.patch 927 BLAKE2B 661610049aab5c077cbff57fa476d08ef7170440135362dafa96b4ab312d778154acdcccd93562822c7d6078d55c6c5eaf59eeadc85e61cc85f1e50a76c908e8 SHA512 5a1f6f074adcb77b9958ff47e855378f9ec180201e32cc417925320ee7fbeedd5b2a163b300286bf0344bb6bb47743598c59c95f28573f4a309696ca5e44af8d
 AUX supercollider-3.10.2-system-boost.patch 15055 BLAKE2B d6b3b2c9f13829ff5b2af037f4204fff519efe67bcb7b705090a2883d97738f0cc8b4a66fe39f88d5fe676081ed44fe3132d23e404c821353d1e9b31d1e0d764 SHA512 d9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae
 DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46
-EBUILD supercollider-3.10.2.ebuild 3055 BLAKE2B 3569094c88762fde957ff9c979f3d6bb777b859a0f4bbb4c7a893b14acae31b32bd5a319867407488fde390c00261591bded8143ead4835866e7b64dd2599eb8 SHA512 01e2f6979578cba5736c415594e805ce36db7c797b02fe22932ad7320a11fc7242fda2b87c09021797517a20b0f8353e4b6cea877b4f8990c603f45bc8d85277
+EBUILD supercollider-3.10.2.ebuild 3050 BLAKE2B 50f55324d896bb97345b98c2caa601d08abeea306c646459dabcc8f5d1999a25d4492d9144c41ae7c56e58c15e5d6e8bfa3220ba6ee042cb5c2f90856f5bb0ca SHA512 9efe9d6b063fb1476a5b0bc3adfbc87f77be88acad8d7e0c5d230bc04773365d1615473411847bd2f979161c3b59fe22bb5e6e3b0ab98188782e3e537052081d
 MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/supercollider-3.10.2.ebuild b/media-sound/supercollider/supercollider-3.10.2.ebuild
index 6ea80528297c..0d26b89cbf3e 100644
--- a/media-sound/supercollider/supercollider-3.10.2.ebuild
+++ b/media-sound/supercollider/supercollider-3.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils readme.gentoo-r1 xdg-utils
+inherit cmake readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="An environment and a programming language for real time audio synthesis."
 HOMEPAGE="https://supercollider.github.io/"
@@ -52,7 +52,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/icu
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gedit? ( app-editors/gedit )
 	qt5? (
 		dev-qt/qtconcurrent:5
@@ -99,11 +99,11 @@ src_configure() {
 		-DGC_SANITYCHECK=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	use emacs && newdoc editors/scel/README.md README.emacs
 	use gedit && newdoc editors/sced/README.md README.gedit
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 709f41cb1648..fa4c7c411f73 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -5,5 +5,5 @@ AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
 DIST teamspeak3-server_linux_amd64-3.10.2.tar.bz2 9242362 BLAKE2B ad275eac241182aa15410ba32983bc1e598f55090eb35559fe6cf3f18fd6b3a1395a36f320dd36ea3fa44390afd698f6734b034536cd48d049028e09943df7f4 SHA512 3be39004d557fb58efd272dac3e005c08db8ae05e04cc5cfdc146296bca7b0a02d7011bb77d6d45074056b458e14111dbd79882603b4be9fba58de7c9b384b84
 DIST teamspeak3-server_linux_x86-3.10.2.tar.bz2 9049720 BLAKE2B 86f854c2b18397bde3cbb02b9d0024af8d3fbbdc695dae0f7f950fb5670cc6c983e8eb20dee97409a87b6cd572772cf72cfddee0254857023aa4e8446ea71068 SHA512 5ad16efc1a0b8dad6696d4121560cc793a35b15473391fcb18a8edd72031415775fb10d0c686a2af550f36748c17db03ac8caae76b0ef7e4ffa528d3ab416951
-EBUILD teamspeak-server-3.10.2.ebuild 3084 BLAKE2B 6bc6609e73d914bb918110c5429481f0662e4474c2bd7965192466b11f44949e108fe66357b4904f25dc7320ef5bb4dcc4f1cdce382f42760b8d468b360327ef SHA512 894f41d0a5528b6172f07e2e754dadf61b4c5fe42c5df790b1abb5bb3798aa707c9479dd20cd9940f83c2b7aa483ca016f21ed903881468d718924222b376cef
+EBUILD teamspeak-server-3.10.2.ebuild 3083 BLAKE2B 7ff9e60bd939dc15804ce5912786a43f545d0a93c8b9f14b9a1c91dc544233f1e4274929d1d40054f40eaf448073e968787a26a1d92b338f8727464e57f9785d SHA512 971f19bfd38d0080d75329fc10163ffcb7f2f7900e7e922abe898032413abe20029b8f8054e50bf6b80c05a734374d28590c0384d4257b7db262c4d048868047
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild
index f44420257f34..50c92db4bba9 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="doc mysql tsdns"
 
 RESTRICT="bindist mirror"
diff --git a/media-sound/timemachine/Manifest b/media-sound/timemachine/Manifest
index b8cb21575ec4..263ed7a9850a 100644
--- a/media-sound/timemachine/Manifest
+++ b/media-sound/timemachine/Manifest
@@ -1,4 +1,7 @@
 AUX timemachine-0.3.3-underlinking.patch 713 BLAKE2B f1d4e9209009a59aa452a55cad9bf34a1b6d543c8e45bfe75d2317def1a13b3dc3655a832f6b42c8c6bef165ff2cf5988cd469a45badb7ceb35ea9384ee3464f SHA512 dc7e8c11e0633012a61d6a20a94046d624024b47e45ac32b1ec90740d4fbca9ba9928eaf6caab1a4e3dd4cb42bad41743e0481e91f41551b0ec5b89e7fa386a2
+AUX timemachine-0.3.4-underlinking.patch 680 BLAKE2B 78d03ea5ab14a059404de0f3326725aec856cff1699713ceb57ea431d1b8af77ffdd9b2224744b9e7455e533fb50d8961b1ec4d9529873418e912686ee5f2748 SHA512 6fbb15368bd8b9a02cfaa0febfe9f620a0f0ff58535f43e13b0a63bc57e9f6d232c8f37093c43b4bd5f1133ca036f991838ee9a31315d304f097c8cddb43ee10
 DIST timemachine-0.3.3.tar.gz 169021 BLAKE2B db94419dff0b3778e71296c9bc855714a0cc14e2d0c56d00eec53c7337ba6883aacb107d5da4310937b6bf520b65efd3874f652710020a30dcd25e828d399eaf SHA512 9fd079d3be2a22ebd7a8afe6eebef9d2adab743c8d3c0124adcbaed78fb1863c5a087e95763185745f1d2767a939583814d0c889147c29742c39ab860c96748f
+DIST timemachine-0.3.4.tar.gz 91171 BLAKE2B 047106d22f7659a223f8d2cad9dbf9c224850951e19336866dd312840c67a09b5326202b832aa29f859b5c8cbc8f644750772ad32d4d1785dd6aa61890611a18 SHA512 1469f91290ab10232b469b8320cb80cdc9e6c47e922251ab4439ecb0e10a1b18066eccb221269e966a11477d3cf0d4acafca3f5aa3db574d3d1d6385235abba3
 EBUILD timemachine-0.3.3-r1.ebuild 817 BLAKE2B b403770bd6f8dee11dfe68ca0742815c3db318970e0fe697fe04443bc85616e4420ddf6e9cdc1d43fbbc6bc3b8dd36aa6f9ed015a219b1181c0b52341648768a SHA512 3d2c293a55f1d96af7921ed9fc73561c00354d0983079c80eccf9f21d5eed76174cbc2633cb6b0befbe97106a59d82888dca84db5ad5413ad58dd0884cf51373
+EBUILD timemachine-0.3.4.ebuild 1006 BLAKE2B 810c0e859ef28e5cbb990c0b509bcef993aec394cd4150722380d56fd82289161cb85bd016b9b2219750f9a015ef0383f66ff590afa42742f4b50406d9ef056d SHA512 4a854c0be50ad41b1ca6c1d1620f91d1c2d5046e05bd3c75ae14a41d8c3bc4aed885a7158cbe358fb32143d0020fc464c20b66ffd8a7b1b40628baf62ff5770e
 MISC metadata.xml 408 BLAKE2B dc77a81f0c8692c4ff9540f1ebf8576dee0fad9c374c3dde1f39c401088cb32e12fe73a3840ce7db7ea2118d3e0e8c517a1049f9a23012e221126e991c33b8e0 SHA512 76c92f4068084f4e9f3112236d2b9161d64a2d8de33e17347a34d7b1e1453e7a0d599a6255e23fdf71b7ea625be7e4f54129b05ecc9f181ab7a2c3ef183097b9
diff --git a/media-sound/timemachine/files/timemachine-0.3.4-underlinking.patch b/media-sound/timemachine/files/timemachine-0.3.4-underlinking.patch
new file mode 100644
index 000000000000..50fe45e23bcc
--- /dev/null
+++ b/media-sound/timemachine/files/timemachine-0.3.4-underlinking.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index dfc8df7..0208487 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(configure.in)
++AC_INIT(configure.ac)
+ AM_INIT_AUTOMAKE(timemachine, 0.3.4)
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+@@ -10,6 +10,11 @@ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
++dnl Check for libm for log10()
++AC_SEARCH_LIBS([log10], [m], [], [
++	AC_MSG_ERROR([unable to find the log10() function])
++])
++
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
+ PKG_CHECK_MODULES(JACK, [jack >= 0.80.0])
+ PKG_CHECK_MODULES(LIBLO, liblo >= 0.24, LO_FOUND="yes", LO_FOUND="no")
diff --git a/media-sound/timemachine/timemachine-0.3.4.ebuild b/media-sound/timemachine/timemachine-0.3.4.ebuild
new file mode 100644
index 000000000000..459c251e230a
--- /dev/null
+++ b/media-sound/timemachine/timemachine-0.3.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg
+
+DESCRIPTION="JACK client record button remembering the last 10 seconds when pressed"
+HOMEPAGE="http://plugin.org.uk/timemachine/"
+SRC_URI="https://github.com/swh/timemachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lash"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	virtual/jack
+	x11-libs/gtk+:2
+	media-libs/liblo
+	>=media-libs/libsndfile-1.0.5
+	lash? ( >=media-sound/lash-0.5 )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
+
+src_prepare() {
+	mv configure.{in,ac} || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable lash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	newicon pixmaps/timemachine-icon.png "${PN}.png"
+
+	make_desktop_entry timemachine "TimeMachine Recording" timemachine
+}
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index bbe4b9923f2d..9537904323f4 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -17,6 +17,6 @@ AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cac
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.14.0-r3.ebuild 5307 BLAKE2B a4863b43b4ca2aac94b7b2b52bf0598369712ef1a7d993e2c49081724658571923c92791564f49aba74283a536949a3a228268c8220b5bf10620b3865fbf4bb2 SHA512 676cbf84c8861ac7ecc3c4a0de45fa1b6a7662327bfa6404d252121283fe6e380bfc6fad4812d2463c9832de51c942aa8e2f1ac94a31c836aaeb916b1830aa49
-EBUILD timidity++-2.15.0.ebuild 5193 BLAKE2B 7262e16db8ea52afb6d742625cec6028d25ecdd7c5b68de2dd767691b89ea0aa4bb76eb8194bd91812df54661b3dfba5f42beb054888db59facdb672beaa0450 SHA512 4e56e52ef1514dc1ac685651d2aa5ca6c7a0db216b3a9c6c1b9233b5780770ec6e3357cdbb55d581ef386602e686d6d03f9c62504045e0033a6c743c487ac0dc
+EBUILD timidity++-2.14.0-r3.ebuild 5317 BLAKE2B 33747f1b6fe1e63e037870e5e4a0268e173175c15849937d79696efd0ef8767f1db261fced6ee081b3845f81d12e0b33009b69b365f025c78b4ce260f8c677c4 SHA512 fa74f3574d706851649f7e902d7f6c38c49222f444737ba2a117cdff9531e2a24ae90c11d342f1214bd71732f58a82b30a52b73dab05d766793dcecbb7cd1369
+EBUILD timidity++-2.15.0.ebuild 5206 BLAKE2B e726e7354e4f46122794ad9432ab6c9b304282cf8c08f8dd997d0e46c6cc01b6b2543b0e5a71386e1cd1a1a4a5f8005e8442ea3155cce1ee1219077ef1c10a6a SHA512 13198dd6881e8ce3f0a159ef8ca2354e31484e8bfa3888c583423da3cf71165e9435aeb82daef1202e26791be4a27c4d87c76bd0e10e879ab4bcc948a9794161
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
index 11f7cc697dbd..6f7038afbfca 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ REQUIRED_USE="tk? ( X )"
 DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	ao? ( >=media-libs/libao-0.8.5 )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	flac? ( media-libs/flac )
 	gtk? ( x11-libs/gtk+:2 )
 	jack? ( virtual/jack )
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0.ebuild
index 3f93fcd10a9a..e0407f9c9533 100644
--- a/media-sound/timidity++/timidity++-2.15.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="tk? ( X )"
 DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	ao? ( >=media-libs/libao-0.8.5 )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	flac? ( media-libs/flac )
 	gtk? ( x11-libs/gtk+:2 )
 	jack? ( virtual/jack )
diff --git a/media-sound/timidity-freepats/Manifest b/media-sound/timidity-freepats/Manifest
index 38674a258f0a..87f878c6faaf 100644
--- a/media-sound/timidity-freepats/Manifest
+++ b/media-sound/timidity-freepats/Manifest
@@ -1,3 +1,3 @@
 DIST freepats-20060219.tar.bz2 25791733 BLAKE2B fcf512bf85bca61e29a32640a45e3dbb6132cdf4246baa54c7ed4540c955451b47d2e3d7f01219dfb1be5837dbe0d7e332583ce5b29918229718b22b237a6026 SHA512 6b24bf387a52fac9906906cb52fd5f9d02decdfcecb8d88acea136b200db962ba9beeb3e78bccdd6024b47453d7f093980b01cb0661e1b8d29fedc45ed61cb4f
-EBUILD timidity-freepats-20060219-r1.ebuild 781 BLAKE2B fb0b6418cc9eef9a8161eea9420c794bdf2bc7d7c42f921fe9541a8a7fc810e5d2d48ed0aeefa7ccbaaa1a805be9e47b4980d67cd2ae42b60e8d4cba64b7a04d SHA512 274a40f60296d3dae2b05be8722a47c65eba3bb1bb6f05e557df67fb8692ffdd8337c7ca14ea264af4d5ed076d2cec8cf92c8d481d4c91439f863b0d3dd08b14
+EBUILD timidity-freepats-20060219-r1.ebuild 797 BLAKE2B 0244e9a1b9e6152ea8175be63fba1d7c0b686ca91a178ce0e33084d5cc8e33cc9f1e59de56fac6cba6a2515c906a29e4e86e45aa1f8d3a6f6bb881aa268c3ea4 SHA512 e286c47a31c30ee90f2161d0f4b63000d00aaae558e1967b2dee66abe46fc06bf069c159ae24d5bd745c0a69c6d568b7efff1c18b6dc2a1b589dfdd8dc7daadc
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
index 575a8efa0c96..e617972fb8dc 100644
--- a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
+++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN=${PN/timidity-/}
 
 DESCRIPTION="Free and open set of instrument patches"
 HOMEPAGE="http://freepats.opensrc.org/"
-SRC_URI="${HOMEPAGE}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="http://freepats.opensrc.org/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 9f4ed505744d..5e299048bc05 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -3,6 +3,6 @@ AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc450752837
 AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-EBUILD umurmur-0.2.17-r3.ebuild 2623 BLAKE2B 4163646ffda96651ed9c88ae6e0bb8599f95d77abd9f4567d86fb63bd8cd19943dfd3ddf72a526368395a967c9a15931a7acfd5f925b9c35d5c7a9577acf0bb7 SHA512 667ab4fb2db0db3c92728b91354f78b1cbe80374db702b150a9cda3de732750b079917575b1a9c2c1e878bddd1d637b581d2cd42cf619e4bc4975e4cd8d644f8
-EBUILD umurmur-9999.ebuild 2625 BLAKE2B dc8ca273bc5b9d88686ef51ef9803d2c0e94e82d3c81e96fb4926077d0f7a8db79cf6f6f80e817cded610111b75e573c7d42dee532c8dcccf98a661cd63b42e6 SHA512 451bd9ed9f3f034992880ad81fb347a49b0d4750b0dbed044a9e54c112740024f16f6de0e0ca105df0dc130ac022b95bc0aa0fda7482dce0bb6d3e1a360bc176
+EBUILD umurmur-0.2.17-r3.ebuild 2625 BLAKE2B 4f2bbe73490e7afd848df792a4c3f24b261c212c37aaaf370bee1cc72f9cee236607c01a749d3d6d6231bd69d58cde0fca62405849f5f971b051ebe37b7e6cc8 SHA512 18db243228400f66dc3dc1de5603d27e7426b03f515d168a0d95f0c5e15aa049cd1fdce2c4c924a87c2b6362e5bae9575092d4de8a4d11e1c9ffcfe3e824ff7d
+EBUILD umurmur-9999.ebuild 2627 BLAKE2B 68faaf508f2c97cbe131e411a8197941b5cd63c488f9788946ea55362cef527107b102a9cfeab4d7be730d65a5e74682962c74ee2e48a75346b995d79ead4885 SHA512 21ec179a9000930e220a6a16f54a67bcf958342a87f303a703aa9e0cd38a9b7ec9b705751673962a6c82e9cbbd5040d69e1aaf47e311ae629f8e5b41738254f8
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
index 368646a5296a..49866ba51ee8 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r3.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
@@ -27,7 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 		>=net-libs/gnutls-3.0.0
 	)
 	!gnutls? (
-		mbedtls? ( net-libs/mbedtls )
+		mbedtls? ( net-libs/mbedtls:= )
 		!mbedtls? (
 			libressl? ( dev-libs/libressl:0= )
 			!libressl? ( dev-libs/openssl:0= )
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
index d01e6411f0f8..36c6e284b8df 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.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
@@ -27,7 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 		>=net-libs/gnutls-3.0.0
 	)
 	!gnutls? (
-		mbedtls? ( net-libs/mbedtls )
+		mbedtls? ( net-libs/mbedtls:= )
 		!mbedtls? (
 			libressl? ( dev-libs/libressl:0= )
 			!libressl? ( dev-libs/openssl:0= )
diff --git a/media-sound/vitunes/Manifest b/media-sound/vitunes/Manifest
deleted file mode 100644
index 4090ddd85d19..000000000000
--- a/media-sound/vitunes/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX vitunes-2.3-asneeded.patch 571 BLAKE2B a310f4f7e7314774cea1ace842b9f80afde44c6ff4af4a02ff2d85223e80e9b54fa844125471b47bdad0adc92e0673b1659d5919a25b47ddb5c0eee601460da4 SHA512 fb776fdd39fceca384a805c8ac0eae43c563a2799ce18adcd083534822f98fa00e5320266f9177f452ba63e8cab3bb709df50d027b31eb408eff2fde1b96af0b
-AUX vitunes-2.3-time-header.patch 222 BLAKE2B 90c724bcd281651dc5d300eda24ca35569c35ae21e1792611b6c2355a358abdbfb16f344a47a775514e3ccd7b98c52b3356d8cb6d8527dd46a404ec76a99bee4 SHA512 555b360cb82e5700ddabe0a6bfc1b50b5662fcbec1d24eb56679b146863e41fd9caf478261c103b1669bf08697c2490cf68b2a014ee6f930c5ae4957ad95e2d7
-DIST vitunes-2.3.tar.gz 77978 BLAKE2B 3c01cf1a52402421f672b8b84182a3ccca99c64995846f741996243b354e1280df92a0ed6892aea893aabb4712e3a584d4b70151bc0ceaa3d50785d073269804 SHA512 5e795d802937e2f529421b3c0c3df333298608b419fcf955f4ec32ff47b915f1b82082f283ded1879869d7ae9875e2699e70fde6ee5d953d13c2e39cc12b7a53
-EBUILD vitunes-2.3.ebuild 674 BLAKE2B b67bd890dfb10ab08014b944ed6bce1249bec104ede79adf5b2feafffdb0b628b16f32f81dca78397876058f583731b4babca4554fe80eee8d3bc6268aab2d69 SHA512 8bbb5ffaa7739e7551746cbd7cf95653e97fe128e9c507eedce229d7d9d5d8f441f7bb74849fc8cc6d3edc3605cb5da2d17e309dada865b39bf4974ae37df715
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/vitunes/files/vitunes-2.3-asneeded.patch b/media-sound/vitunes/files/vitunes-2.3-asneeded.patch
deleted file mode 100644
index ec152f395377..000000000000
--- a/media-sound/vitunes/files/vitunes-2.3-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vitunes-2.3/Makefile.linux.orig
-+++ vitunes-2.3/Makefile.linux
-@@ -12,7 +12,7 @@
- # build info
- CC?=/usr/bin/cc
- CFLAGS+=-c -std=gnu99 -D_GNU_SOURCE -Wall -Wextra -Wno-unused-value $(CDEPS) $(CDEBUG)
--LDFLAGS+=-lm -lncurses -lutil $(LDEPS)
-+LIBS=-lm -lncurses -lutil $(LDEPS)
- 
- OBJS=commands.o compat.o e_commands.o \
- 	  keybindings.o medialib.o meta_info.o \
-@@ -27,7 +27,7 @@
- .PHONY: debug clean install uninstall publish-repos man-debug
- 
- vitunes: $(OBJS)
--	$(CC) -o $@ $(LDFLAGS) $(OBJS)
-+	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
- 
- .c.o:
- 	$(CC) $(CFLAGS) $<
diff --git a/media-sound/vitunes/files/vitunes-2.3-time-header.patch b/media-sound/vitunes/files/vitunes-2.3-time-header.patch
deleted file mode 100644
index 169ff0516584..000000000000
--- a/media-sound/vitunes/files/vitunes-2.3-time-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vitunes-2.3/players/mplayer.h.orig
-+++ vitunes-2.3/players/mplayer.h
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #include <unistd.h>
- 
- #include "player_utils.h"
diff --git a/media-sound/vitunes/metadata.xml b/media-sound/vitunes/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/vitunes/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/vitunes/vitunes-2.3.ebuild b/media-sound/vitunes/vitunes-2.3.ebuild
deleted file mode 100644
index 51c9a8c5324c..000000000000
--- a/media-sound/vitunes/vitunes-2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A curses media indexer and player for vi users"
-HOMEPAGE="http://vitunes.org/"
-SRC_URI="http://vitunes.org/files/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/taglib
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	media-video/mplayer"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-time-header.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake -f Makefile.linux
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc DEVELOPERS.txt add_urls.sh
-}
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 68df1b254602..a6078b786b27 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,5 +1,4 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
-AUX whipper-0.7.0-src-Makefile-respect-CFLAGS.patch 1755 BLAKE2B 5b750690e20230528830a468b34d0a481dbf08af36b1b687121a57518613fabb5b298145b8f2693b21653749b3ed1e185864c6348b0adfb33810c1723fe640d3 SHA512 ccda4c1e97a841d8afec9ed68ccf87371e0883afa7b179010973925185fa58e6a21f4b488dba1891a416c22a8e0ee911318117a059c20989d673c5e5e214c25a
 DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7
 EBUILD whipper-0.9.0.ebuild 1281 BLAKE2B 694cedbf147e060019c23fa24ce13c1e02a202dc76dcf381cffaa84bb33910b8aabb9aeccea0c807f1bdcf1f91c2b26f41f8b1823225491e75b9fb26bfcbdd83 SHA512 29daecfa45df1ac6f021952f76ead81e8c3a37ec7fb9ea55eb1274f337e92b1a43cc9bf1040df3a103ee4918638191eee1a2f55f8e7119fa9b202a547a13fac7
 MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch b/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch
deleted file mode 100644
index 71ba1f5c7857..000000000000
--- a/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From a3f090d8ed55e5e2c0c595b9bf0e244a81ce1464 Mon Sep 17 00:00:00 2001
-From: Merlijn Wajer <merlijn@wizzup.org>
-Date: Wed, 22 Aug 2018 11:41:16 +0200
-Subject: [PATCH] src/Makefile: respect CFLAGS
-
----
- src/Makefile  | 19 +++++--------------
- src/config.mk |  6 +++---
- 2 files changed, 8 insertions(+), 17 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index f1c6d4a..ee8845d 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -5,25 +5,16 @@ include config.mk
- SRC = accuraterip-checksum.c
- OBJ = ${SRC:.c=.o}
- 
--all: options accuraterip-checksum
--
--options:
--	@echo accuraterip-checksum build options:
--	@echo "CFLAGS   = ${CFLAGS}"
--	@echo "LDFLAGS  = ${LDFLAGS}"
--	@echo "CC       = ${CC}"
-+all: accuraterip-checksum
- 
- .c.o:
--	@echo CC $<
--	@${CC} -c ${CFLAGS} $<
-+	${CC} -c ${OURCFLAGS} $<
- 
- accuraterip-checksum: ${OBJ}
--	@echo CC -o $@
--	@${CC} -o $@ ${OBJ} ${LDFLAGS}
-+	${CC} -std=c99 -lsndfile -o $@ ${OBJ} ${OURCFLAGS} ${OURLDFLAGS}
- 
- clean:
--	@echo cleaning
--	@rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz
-+	rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz
- 
- dist: clean
- 	@echo creating dist tarball
-@@ -44,4 +35,4 @@ uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
- 	@rm -f ${DESTDIR}${PREFIX}/bin/accuraterip-checksum
- 
--.PHONY: all options clean dist install uninstall
-+.PHONY: all clean dist install uninstall
-diff --git a/src/config.mk b/src/config.mk
-index 283d745..87fe219 100644
---- a/src/config.mk
-+++ b/src/config.mk
-@@ -4,8 +4,8 @@ VERSION = 1.4
- PREFIX = /usr/local
- 
- # flags
--CFLAGS   = -std=c99
--LDFLAGS  = -lsndfile
-+OURCFLAGS   = ${CFLAGS} -std=c99
-+OURLDFLAGS  = ${LDFLAGS} -lsndfile
- 
- # compiler and linker
--CC = cc
-+CC ?= cc
--- 
-2.16.4
-
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index d4c88215adc2..12c3d49da5a3 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -7,6 +7,6 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182
 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 xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r4.ebuild 7598 BLAKE2B 278c96fd9433e15f07c54f132c51d4073a5f0c5afb1140b630f074bff7b7984f86a3c76b57ecd640f4f8d137ac1c0c8445142af45e173c05d9377b9a78fdeb2d SHA512 1b9182a90b7ba652ebe75fd164952b4d055fe5f8f7831d18407ec608e863b3165672f18fa0d6f95b32cfc4fdb2c5272ec925a90470b0dcfdac42f8a8d9f106ef
-EBUILD xmms2-0.8_p20161122-r5.ebuild 7725 BLAKE2B 366b6cc06da399a83a19d58932a78a03856b15c568dcc4d0a888bd391969a166b0366a358900a769a451712447410f3e18c5743ee159d18af08916e3aea618fb SHA512 e30bcd17c146f6ca5b1d5010ccf6e9cbc7b4cdf9480ca56b9f171567ca112c61d3248a95b21728d08f202e149efde8d6bb1e304577cb926645a5209b0abd2e55
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7594 BLAKE2B 6e1893817399a44acb7b22b9212d853e437933a6c5d01ca976eba7d1befec1c969d908973cd8ea3fa040ca2e8594eb85fbe543a86e5220a9471a0c5dc2f523f3 SHA512 ff89979cb00f5c88914b1cb7fd2a960a7f8f58598973e490151942a29f980b08f0baf5312a9463743104aac63ef25aca4591e5d4b8ca8b86ff85846fa618cedf
+EBUILD xmms2-0.8_p20161122-r5.ebuild 7721 BLAKE2B 4e2a5cde7a143bc7ba5d495b2c085c105d869fc76bb07d5e9f07eb929c83a3acd4bba1b3986a37141c39859867d66b8c4125aa5bb784b27c2b33d5324a7cfd29 SHA512 d10ba3643ee6db0091dced8fc482f21bda8335ee19ec2256e1376bab8e810a3077dbd9d42c9fa1ab8d7c3b5a9e32a51b1a7e3ed8f7d05b3fb0c57293c69aaa59
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
index b19b7476b0ff..55cdd371a14c 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
index 2c519ca93888..68f9fc6c4c2e 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest
index f4caf6d3131f..36febee233e2 100644
--- a/media-sound/yarock/Manifest
+++ b/media-sound/yarock/Manifest
@@ -1,3 +1,3 @@
 DIST Yarock_1.4.0_Sources.tar.gz 735399 BLAKE2B e54e995a419e1837b746374d3d7c6655e750d5142cce4d573dc268010b7bcf9da1a15531991769c16693f8b587228da445d4a14a89499600708309876f83bb5f SHA512 39ad470cd53fef738166ca635ca96da0868db406b62be92d276062acc568724a62886b7779eb47fc6a3e6d2825fe417753e9e6b87a978b9009e09d7ea5866f00
-EBUILD yarock-1.4.0.ebuild 983 BLAKE2B b8ddce0cafd4d71bcaef43ed39adf933127d367f32d020d28a6c8bcb8b6fc038dbb251cc32288d2bcd956ff2df85e120f7e194aca77342c66973ae455dd50c87 SHA512 7a940a8126ec028b83cf8666bc5c3eacec7a723390c338a2084c22256971b8e7156bef77616b39aa65afb5cc77057c3b1246c2976a15f597211cc92a2adb66d7
+EBUILD yarock-1.4.0.ebuild 971 BLAKE2B a01418972cf0a4273b88c0439e23ce6133de02b7dc4f7f5fd261ee0bb68012245182da4991826833712a8d1bc0d2c82fbb4d8fd82c433262ca6c72064eb71e49 SHA512 0676e1046ef453f9e1d57e7d3cd8dfafd35ea79c2892166439d0b87f70a99c49b603c866e3b7166159829c63b5a31bfad83e8c7b6decfbbb0be30ac8086f9a74
 MISC metadata.xml 477 BLAKE2B 8f41c22740fb729d50042c0e06585fef7bfc1d17333d2a76357d11fe898d6b8deaebeba2b9c8f4242b6db8997d9f4c5b6661eff9a29b84d196f5295d32620e8e SHA512 17dbd3112993095260668fd1aa35dac9928ee1e44d2dac722ff78a6d901c21e15f586ffe0986f02c8c071ec3770bbd084cdb4448cb3cf6c01bb9d723f8f66a2e
diff --git a/media-sound/yarock/yarock-1.4.0.ebuild b/media-sound/yarock/yarock-1.4.0.ebuild
index 7d9acc2b0a02..27284bd85984 100644
--- a/media-sound/yarock/yarock-1.4.0.ebuild
+++ b/media-sound/yarock/yarock-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_P="Yarock_${PV}_Sources"
 DESCRIPTION="Qt-based music player"
@@ -49,5 +49,5 @@ src_configure() {
 		-DENABLE_VLC=$(usex vlc)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index fa84d07fd42e..1fcb168b897b 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,4 +1,4 @@
 AUX yoshimi-1.5.10.2-cxxflags.patch 2592 BLAKE2B 383784742913ad2a2d711a1999269438eea525da3ed54fdd24fbad46932e05e781b18b2cbad1bd1e5bbe3ef160762f865517bbcda9ea6f5c4df4eb413af8b278 SHA512 78c3e2a84f44e9220b2f3fcc1cbac1b243a4fd19036d32f0ded794c90f83e5797ff3cddcb57ae3612656be27954b1db69b92d4b2107d8c18ffbdbd984abb87bd
 DIST yoshimi-1.5.10.2.tar.gz 9668476 BLAKE2B 1b443a51e952123abaf54b992902113533461064f2fc99032ac89f28a25ba4687176a97013ea118283e8ca2b7d92f44c105380e3d6cecb66560db7a0a8ef6532 SHA512 a39ba123f304e43d70833648ce224733794cb43c160fd2e6cf29bb4a782bea355c4bbfa1c33bf20c98a8c1f5d049788154aaf906a3daa56f288719a0b019139c
-EBUILD yoshimi-1.5.10.2.ebuild 1031 BLAKE2B e85d3901df224cab2e75e96fd4a948560248a6e2de09968db84ba2d1143a905f123cb6f39b86a93a7cd9955a5bf285455eabaf23864a2c5839746c389cddebcc SHA512 dd071adf610f54381324379f0a52fb7c63b4479cbeb709590ef40df5ace03fb74415f9533c9947a5ffd4b21dc95a776e2a7c036d71827198cda52cbb9f16be7b
+EBUILD yoshimi-1.5.10.2.ebuild 1013 BLAKE2B 022fb8bc3c1fb2fe426bc977d6e3921e90f76e68f9312afd99f4a14193d74a00a5cd7927bac72f6a0b5fda37a788fe542c77e32b6482b0ad2c42ec8c63878793 SHA512 ddec3c3cc3ad93fcb577d93131839701be9b9c51f865800ec4425c6838e4da71f5199dfac255dd051f18a57c2f25f2ff67612ac25e119d73afaa1257f99bd059
 MISC metadata.xml 400 BLAKE2B b3d1fcfb88b7ec80023ff3ed78ddf0f31845cb4524402d7ebb24bd294857e4459f18b7f526687a163c6a2c08609325e60f85c17cd1055e32214fd415ab9968a6 SHA512 ba28fba7667eb3ef9f1e9b611c79b89e552f19cea6deefacd7bc7dc0bcc916c2d738adfa453e873ac7872d6a2d2a04aacba5a54c443d3009021940f944996dac
diff --git a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
index 4acbf0c9ea5c..442d7fa96369 100644
--- a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Software synthesizer based on ZynAddSubFX"
 HOMEPAGE="https://yoshimi.github.io/"
@@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
 DOCS=( Changelog README.txt )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# respect doc dir
 	sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
 }
@@ -47,5 +47,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DLV2Plugin=$(usex lv2)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 7c8b31d69bd6..5364b7e43532 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,4 +1,4 @@
 AUX zynaddsubfx-3.0.5-docs.patch 436 BLAKE2B 23724992b4ce5a58961984481bcf9782a7960ca033a6abe7f71f061e8c7e4026de470b71080e5eb58f67f882a6138824d893949acd44d95ed026df24eaf95e3a SHA512 958d4f7bbb6b267b4aae2295df99eaad5f41f574183c1bb03ed6499475cb8ac3a2c52edaae60fce5a552e8d53dbed9f6677fa6c67aec4ec4dfa4436e591eae84
 DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
-EBUILD zynaddsubfx-3.0.5.ebuild 2028 BLAKE2B 6599985b323d85d40af8cf731bf646315fe46c8b6be4021c0bef47d5339bf01031df85926d55e6881353ee08afa2f1a6bc5ce58d7a662d61abc031b7b59cb08b SHA512 cde23e5fa31b984bc84772fde0f56c6e4308f4e00405d54c46748355eebc8a6aa02d07169d046814f8895897abf6800400723a3007116cfb1bba5cd2d307549b
+EBUILD zynaddsubfx-3.0.5.ebuild 1974 BLAKE2B 93b5a9d92ddb3a7d010c067182464fc5b028f9f5bd62ffc71b4ae28af791aeeed16b5b2a1eb7c75e6f7cd825e2ab9dd58c51570258187517da358ead0c1a64c7 SHA512 274f265467663cc27f6a4740726b06b4a1964bb3b23cb2690a8a899bcd382bb66d0038b374d6eba700c02bec1d7654fddde57d79301a1889088232353d89482c
 MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
index 01b612a4bcdb..72b005731674 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
 HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
@@ -43,7 +43,7 @@ PATCHES=( "${FILESDIR}"/${P}-docs.patch )
 DOCS=( ChangeLog HISTORY.txt README.adoc )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use dssi; then
 		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
@@ -67,21 +67,21 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DPluginLibDir=$(get_libdir)
-		$(cmake-utils_use_find_package alsa Alsa)
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package fltk FLTK)
+		$(cmake_use_find_package alsa Alsa)
+		$(cmake_use_find_package doc Doxygen)
+		$(cmake_use_find_package fltk FLTK)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
+	cmake_src_compile
+	use doc && cmake_src_compile doc
 }
 
 src_install() {
 	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake-utils_src_install
+	cmake_src_install
 	insinto /usr/share/${PN}
 	doins -r instruments/*
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-sound
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)