gentoo resync : 29.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
commit: d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree: 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /media-sound
parent: abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)
83 files changed, 1086 insertions, 1694 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7e4e9edcef4e..1fbc02359acb 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 7dcc02c5995c..da57d7d3456f 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -7,5 +7,5 @@ DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
 EBUILD aqualung-1.0-r5.ebuild 2510 BLAKE2B 569242aeec1453ccbf040cc826847f27fac5e7e191054057308bf5b912d971a8b008020b7da76faf2bc225b38bae2b1533855bd909843ad2c813819350183f26 SHA512 f6d69930280c3d0068b1a960ccc8e968b2e9d476d4934edb94cc332f10ef805c834a12f062ec8567f839bb8663ce9d563c4deca51cafd800c48ddb7a6569e1c4
 EBUILD aqualung-1.1-r1.ebuild 2418 BLAKE2B ed3f80c963cfb65720f43a0d0f895b6323f3be1a06050bea5b20231c8431fb3c91124f14bdf9295744a7cc605d1f899a52826d4337404364145207af5b2c7d98 SHA512 fba638ffd7590bf25d0072678abbbe33d6c4121f0bd955ef830ad964089b956cb3672cee2e06e04c67bdf6997d67c1c1f815814f455da70ef18d5974d73100bb
-EBUILD aqualung-1.1-r101.ebuild 2450 BLAKE2B aab7324a19c7a6dfa4bdb005e54ef3d2a447480505385fdf08faf970880620d404d6c6662af7579d81134ec3c3dbdca08a0ab44880f8146f6e5f2ddd7ae996c8 SHA512 b9e4f45f9373c3a00beb26c31bc0b1dfddd8d546e8ae3412b31574423a4fac019d84e62227b827ae7cf1b1d1ddb0d528d064e8c19cf019f481b4377540d663e1
+EBUILD aqualung-1.1-r101.ebuild 2448 BLAKE2B c54d59927cfddbbbddd42e3ffb46af8273b2322475b1d253a7d7d92449f809ee60e5c72fb5e9e1e364baff3c4546f556d5d6c7542efb855ab8605023d92f3b74 SHA512 b78a609e43231ebea61b8e4af0d6d2c63ea02dcb73a120014c23736572520fe63b4ed53eb188800b682070a5ba00c3e50bd53c8e2a49cb03f5b4afc75efc9513
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index 2390bf4b1184..f497e1bb19bf 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index cb90e8d8b0ce..698cefe99c0b 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,6 +1,7 @@
 AUX 1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch 2123 BLAKE2B fea2eb593c8be68d3cd336a4bf56346c777ba651fdb98cfe6f9063a087428ce2749793ec61f109b2fea40dd8cc44ceb19b97d308c4c69c267b2993836b2b7ae6 SHA512 bf3ef299d66e7db79fcc0f7c4cd5abfbb041e6cea4bf06f02e498d3edf7495cd92f01191865af6a5bb40b064f0659d5cf80df7a42d14976e3e963ab94e113bdd
 AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4c3146b0e6fe343d4a437dfdb13aa60e0bbbf59f2959fee39f4d5bdb620fe57670e01a0963ad9eea3cf0309b3ea516e0931e9383c19 SHA512 2f6b5636ad3a16e70438fd2c1b62952416225dcc9acca686b1dc19ba4c2c5dbed4807f3f597e212d23ddf12de0fb0f315729da9ca86fbbc6766f4840dc83a524
+AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db51e53d70b6d30332c3f6e039873461931c5e4052136675013728792fbc98f561f6fcf62432f58bc7702e54f34d04c43586d9a07ecdc789019aec040 SHA512 3e3af6d760596a08fac6130912ed5780795975e0ade8c4f27f577453b82cbc588de9d23d9d2c1672841913d5627fe684cd8373670851e59b6fe1e0a57b138009
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r3.ebuild 4457 BLAKE2B ccb615ef9433434664715bc7fc0fa53d2acc83f490265f290fb39f9bb095abb6d0b28d1f3a989da7664297374351017500f7112aa94d910fd99d4320f10d1e85 SHA512 6ea2c348d84668cd897534a21f0265dd81af57c8b7d40aaa4fd2896cd55614f8eeee876af4ada7872c57bfcc964b0d8c6fcedf1410e61f36756a5b79cae146c3
-EBUILD beets-9999.ebuild 4457 BLAKE2B ccb615ef9433434664715bc7fc0fa53d2acc83f490265f290fb39f9bb095abb6d0b28d1f3a989da7664297374351017500f7112aa94d910fd99d4320f10d1e85 SHA512 6ea2c348d84668cd897534a21f0265dd81af57c8b7d40aaa4fd2896cd55614f8eeee876af4ada7872c57bfcc964b0d8c6fcedf1410e61f36756a5b79cae146c3
-MISC metadata.xml 2993 BLAKE2B f46b84984f6cfce8b0ce3e2589e127a5febe2536ae75eb4d7527c99cbf2bba6e155ecd4df3fd5b5348dae524287c8b542885a69a7b1790303352076ea29022c3 SHA512 28dc8f6044ccf6ceced2e9f29c1c4faba9bcaddff0608b1e3f8e14c612fac975c89bfbfe4368a6ff8e6f1f0ca2fbc2edbb25f8e7e1e7a2b1e3cf790587f39a4e
+EBUILD beets-1.4.9-r5.ebuild 4478 BLAKE2B 2b7b6f1b6392a616a54bb7080e3413d5b05acec0e5f91c6d55504957448c5ece756abf3721e4dd7b99071a383a51ebd1b935597d14367bc3d24e6dced7e6df03 SHA512 74ef800ba858523860d509d8fd0370bff59a5838daaaaa498317f4ebb6d8d675cb96f03861a6ed9b489cb43c56f2cecba3980dbcfc5075520fee9f681d3f38d6
+EBUILD beets-9999.ebuild 4478 BLAKE2B 2b7b6f1b6392a616a54bb7080e3413d5b05acec0e5f91c6d55504957448c5ece756abf3721e4dd7b99071a383a51ebd1b935597d14367bc3d24e6dced7e6df03 SHA512 74ef800ba858523860d509d8fd0370bff59a5838daaaaa498317f4ebb6d8d675cb96f03861a6ed9b489cb43c56f2cecba3980dbcfc5075520fee9f681d3f38d6
+MISC metadata.xml 1751 BLAKE2B 6bb63691dda759b84a5b5f7b407befa4a0773885c6cd7a70e39e68249fb807192673b4b91555b270d51d6783b5d55d0ca9d4d32058c1c9b7fdf51925d9a0df7e SHA512 435bfe841f81de86083a72319a45fd2d8daa5206c1f8442a3b4b30d5c0f5692a23a7d6d7003d5cc7441f204bc05be4bdfa9097ecb5dcec0be17ba5c72ee1b763
diff --git a/media-sound/beets/beets-1.4.9-r3.ebuild b/media-sound/beets/beets-1.4.9-r5.ebuild
index d07f7f6efe20..68328df9060e 100644
--- a/media-sound/beets/beets-1.4.9-r3.ebuild
+++ b/media-sound/beets/beets-1.4.9-r5.ebuild
@@ -4,11 +4,11 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 bash-completion-r1
+inherit distutils-r1 bash-completion-r1 optfeature
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
@@ -26,7 +26,8 @@ HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="badfiles chromaprint cors discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -39,54 +40,6 @@ RDEPEND="
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
 		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-		badfiles? (
-			media-libs/flac
-			media-sound/mp3val
-		)
-		chromaprint? (
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-		)
-		discogs? (
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-		)
-		ffmpeg? (
-			media-video/ffmpeg:0[encode]
-		)
-		gstreamer? (
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-		)
-		icu? (
-			dev-db/sqlite[icu]
-		)
-		lastfm? (
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-		)
-		mpd? (
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		)
-		replaygain? (
-			gstreamer? (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
-			!gstreamer? ( media-sound/mp3gain )
-		)
-		thumbnail? (
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-				media-gfx/imagemagick
-			)
-		)
-		webserver? (
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			cors? (
-				dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
-			)
-		)
 	')"
 DEPEND="
 	${RDEPEND}
@@ -97,19 +50,39 @@ BDEPEND="
 	)
 	$(python_gen_cond_dep '
 		test? (
+			dev-db/sqlite[icu]
 			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
 			dev-python/flask[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				media-gfx/imagemagick
+			)
 			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
 			dev-python/responses[${PYTHON_MULTI_USEDEP}]
 			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			media-plugins/gst-plugins-libav:1.0
+			media-video/ffmpeg:0[encode]
 		)
 	')"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
 	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
 )
 
 DOCS=( README.rst docs/changelog.rst )
@@ -119,6 +92,7 @@ distutils_enable_tests pytest
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Tests that need network
 	rm test/test_art.py || die "Failed to remove test_art.py"
 	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
 	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
@@ -126,22 +100,6 @@ python_prepare_all() {
 	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
 	# Not working and dropped in master
 	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
-	if ! use ffmpeg; then
-		rm test/test_convert.py || die "Failed to remove test_convert.py"
-	fi
-	if ! use mpd; then
-		rm test/test_player.py || die "Failed to remove test_player.py"
-		rm test/test_mpdstats.py || die "Failed to remove test_mpdstats.py"
-	fi
-	if ! use replaygain; then
-		rm test/test_replaygain.py || die "Failed to remove test_replaygain.py"
-	fi
-	if ! use thumbnail; then
-		rm test/test_thumbnails.py || die "Failed to remove test_thumbnails.py"
-	fi
-	if ! use webserver; then
-		rm test/test_web.py || die "Failed to remove test_web.py"
-	fi
 }
 
 python_compile_all() {
@@ -159,4 +117,19 @@ python_install_all() {
 	newbashcomp "${T}/beet.bash" beet
 	insinto /usr/share/zsh/site-functions
 	newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+	elog "Optional dependencies:"
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
 }
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index d07f7f6efe20..68328df9060e 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,11 +4,11 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 bash-completion-r1
+inherit distutils-r1 bash-completion-r1 optfeature
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
@@ -26,7 +26,8 @@ HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="badfiles chromaprint cors discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -39,54 +40,6 @@ RDEPEND="
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
 		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-		badfiles? (
-			media-libs/flac
-			media-sound/mp3val
-		)
-		chromaprint? (
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-		)
-		discogs? (
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-		)
-		ffmpeg? (
-			media-video/ffmpeg:0[encode]
-		)
-		gstreamer? (
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-		)
-		icu? (
-			dev-db/sqlite[icu]
-		)
-		lastfm? (
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-		)
-		mpd? (
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		)
-		replaygain? (
-			gstreamer? (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
-			!gstreamer? ( media-sound/mp3gain )
-		)
-		thumbnail? (
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-				media-gfx/imagemagick
-			)
-		)
-		webserver? (
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			cors? (
-				dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
-			)
-		)
 	')"
 DEPEND="
 	${RDEPEND}
@@ -97,19 +50,39 @@ BDEPEND="
 	)
 	$(python_gen_cond_dep '
 		test? (
+			dev-db/sqlite[icu]
 			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
 			dev-python/flask[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				media-gfx/imagemagick
+			)
 			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
 			dev-python/responses[${PYTHON_MULTI_USEDEP}]
 			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			media-plugins/gst-plugins-libav:1.0
+			media-video/ffmpeg:0[encode]
 		)
 	')"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
 	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
 )
 
 DOCS=( README.rst docs/changelog.rst )
@@ -119,6 +92,7 @@ distutils_enable_tests pytest
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Tests that need network
 	rm test/test_art.py || die "Failed to remove test_art.py"
 	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
 	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
@@ -126,22 +100,6 @@ python_prepare_all() {
 	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
 	# Not working and dropped in master
 	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
-	if ! use ffmpeg; then
-		rm test/test_convert.py || die "Failed to remove test_convert.py"
-	fi
-	if ! use mpd; then
-		rm test/test_player.py || die "Failed to remove test_player.py"
-		rm test/test_mpdstats.py || die "Failed to remove test_mpdstats.py"
-	fi
-	if ! use replaygain; then
-		rm test/test_replaygain.py || die "Failed to remove test_replaygain.py"
-	fi
-	if ! use thumbnail; then
-		rm test/test_thumbnails.py || die "Failed to remove test_thumbnails.py"
-	fi
-	if ! use webserver; then
-		rm test/test_web.py || die "Failed to remove test_web.py"
-	fi
 }
 
 python_compile_all() {
@@ -159,4 +117,19 @@ python_install_all() {
 	newbashcomp "${T}/beet.bash" beet
 	insinto /usr/share/zsh/site-functions
 	newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+	elog "Optional dependencies:"
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
 }
diff --git a/media-sound/beets/files/1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch b/media-sound/beets/files/1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch
new file mode 100644
index 000000000000..9833d3f3f006
--- /dev/null
+++ b/media-sound/beets/files/1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch
@@ -0,0 +1,25 @@
+From d43d54e21cde97f57f19486925ab56b419254cc8 Mon Sep 17 00:00:00 2001
+From: Adrian Sampson <adrian@radbox.org>
+Date: Thu, 6 Feb 2020 22:22:54 -0500
+Subject: [PATCH] Try to work around a Werkzeug change?
+
+---
+ beetsplug/web/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py
+index f53fb3a9..21ff5d94 100644
+--- a/beetsplug/web/__init__.py
++++ b/beetsplug/web/__init__.py
+@@ -169,7 +169,7 @@ class IdListConverter(BaseConverter):
+         return ids
+ 
+     def to_url(self, value):
+-        return ','.join(value)
++        return ','.join(str(v) for v in value)
+ 
+ 
+ class QueryConverter(PathConverter):
+-- 
+2.26.2
+
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 421001fc2f49..713634ce64ae 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -31,20 +31,6 @@
         If beets doesn’t do what you want yet, writing your own plugin is
         shockingly simple if you know a little Python.
   </longdescription>
-  <use>
-    <flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
-    <flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
-    <flag name="cors">Enable cors support for the webserver <pkg>dev-python/flask-cors</pkg></flag>
-    <flag name="discogs">Enable support for the discogs API plugin</flag>
-    <flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
-    <flag name="gstreamer">Enable support for the gstreamer backend</flag>
-    <flag name="icu">Enable support for the icu plugin to support non-ASCII characters in <pkg>dev-db/sqlite</pkg></flag>
-    <flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
-    <flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
-    <flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
-    <flag name="thumbnail">Enable album thumbnails generation</flag>
-    <flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="pypi">beets</remote-id>
   </upstream>
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 94b48475c227..eaf563229f77 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -4,7 +4,7 @@ AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d21898542
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
-EBUILD csound-6.15.0-r100.ebuild 7227 BLAKE2B b379e29cf689562d0b4699c125f1bb77849c926902adc4479717b4b9f3c697dc42d1eaae69e885bc8d56262729f60e1342ca42dc4802dcafbadc1e57e7570ac8 SHA512 c3e1b66f672493c4ccb6133c45abc776a4b9ea764955b3c079f419e99ad3be4101ffb6053f066e53d756969f6999912824968ac0e6c1122498627106d0baba3b
+EBUILD csound-6.15.0-r100.ebuild 7225 BLAKE2B ed18754175bf01f05185077a3c837ee707e4b88c321f584d5716f9225e3fd1cdf80a9541b28a512fa8dfb460e7e4ce7b64284154848d5121d63afaa330d55a12 SHA512 42604aca5d9e0275b14bba43b977997d591d9cef3f293e5244990a4e13de47b736791ed05cb516cb24e8a832ab57dc43875de498084893315092f6cc57981300
 EBUILD csound-6.15.0.ebuild 7354 BLAKE2B dbbf46fcfc64cb104696278cd59881c00da45d945a1b52239e8ee9e608bcb1df0b9344615d05b005120ff47fbfabd4bad18c66df8c29a3418018c3ef03296e1c SHA512 48cafb98a4646d7b56929bdb44ff0bb6ff6abbd1b47e99f460dc7151cbe0cccc3bc57db1d04ae94c2ad44a46823a2a347957ee6d4c655c90650cc90bc4784694
 EBUILD csound-9999.ebuild 7227 BLAKE2B b379e29cf689562d0b4699c125f1bb77849c926902adc4479717b4b9f3c697dc42d1eaae69e885bc8d56262729f60e1342ca42dc4802dcafbadc1e57e7570ac8 SHA512 c3e1b66f672493c4ccb6133c45abc776a4b9ea764955b3c079f419e99ad3be4101ffb6053f066e53d756969f6999912824968ac0e6c1122498627106d0baba3b
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.15.0-r100.ebuild b/media-sound/csound/csound-6.15.0-r100.ebuild
index 93b965bc7303..0d8a3b2b130d 100644
--- a/media-sound/csound/csound-6.15.0-r100.ebuild
+++ b/media-sound/csound/csound-6.15.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -22,7 +22,7 @@ else
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
 		)"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
diff --git a/media-sound/dcaenc/Manifest b/media-sound/dcaenc/Manifest
index 32adebef1dc2..392bdef1d685 100644
--- a/media-sound/dcaenc/Manifest
+++ b/media-sound/dcaenc/Manifest
@@ -1,4 +1,3 @@
 DIST dcaenc-2.tar.gz 351199 BLAKE2B 28e0dae58650fcbd9f68823ca0aa2dde121b2376b488067c0977863a22fb83d5b60d04f907cd6b564824a25cb45f25180034d4f9fead12b57805b1c997133443 SHA512 0029f7c3b06199fb8100ce933827013fdc58e5fddf984ddf1744849e5d6cc24ce76e09b868eef19a49e1036a142419c3304c1822492f64301ed4feaa6bea4910
-EBUILD dcaenc-2-r1.ebuild 636 BLAKE2B 9208e2e735f9472192ef840a633cf7c2aa7ec7311ef4394b231ffdc41f78f3388dd9b6592fe0eb4c0f38c551d1ca0e65bd2e30afb11c6e45db70ca41eeb940b7 SHA512 465b3080cf779a327364377e9209374cb20126ce92f6823508909e957b6900af852497ccde32061fe6ca2e98450c24656d6e16da073c92b8cc6a80b03ca99d9f
-EBUILD dcaenc-9999.ebuild 636 BLAKE2B 9208e2e735f9472192ef840a633cf7c2aa7ec7311ef4394b231ffdc41f78f3388dd9b6592fe0eb4c0f38c551d1ca0e65bd2e30afb11c6e45db70ca41eeb940b7 SHA512 465b3080cf779a327364377e9209374cb20126ce92f6823508909e957b6900af852497ccde32061fe6ca2e98450c24656d6e16da073c92b8cc6a80b03ca99d9f
+EBUILD dcaenc-2-r2.ebuild 746 BLAKE2B 9b04c1d1096decd658b3c73e3710363a9a65642b47659ce0f86e195306ebdfe2854559840e65168f524c7fb949725f843e0b4f48048fa2eeb40f0e902eb580bc SHA512 d2c5a326f3691165ef62ddf0112b8b4af4b381a173fdd360c85bcb3d8d7b5822b0c2fd7aabd1e72bab48e16528a3a92344499110e809b40abe263c5b1cb115d9
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/dcaenc/dcaenc-2-r1.ebuild b/media-sound/dcaenc/dcaenc-2-r1.ebuild
deleted file mode 100644
index 18cb16497e2a..000000000000
--- a/media-sound/dcaenc/dcaenc-2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999* ]]; then
-AUTOTOOLS_AUTORECONF=1
-EGIT_REPO_URI="git://gitorious.org/dtsenc/dtsenc.git"
-else
-SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools autotools-multilib
-
-[[ ${PV} == 9999* ]] && inherit git-r3
-
-DESCRIPTION="DTS Coherent Acoustics audio encoder"
-HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="alsa"
-
-RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-sound/dcaenc/dcaenc-2-r2.ebuild b/media-sound/dcaenc/dcaenc-2-r2.ebuild
new file mode 100644
index 000000000000..03cb57ac54c9
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="DTS Coherent Acoustics audio encoder"
+HOMEPAGE="https://aepatrakov.narod.ru/index/0-2
+https://gitlab.com/patrakov/dcaenc"
+SRC_URI="https://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable alsa)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-sound/dcaenc/dcaenc-9999.ebuild b/media-sound/dcaenc/dcaenc-9999.ebuild
deleted file mode 100644
index 18cb16497e2a..000000000000
--- a/media-sound/dcaenc/dcaenc-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999* ]]; then
-AUTOTOOLS_AUTORECONF=1
-EGIT_REPO_URI="git://gitorious.org/dtsenc/dtsenc.git"
-else
-SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools autotools-multilib
-
-[[ ${PV} == 9999* ]] && inherit git-r3
-
-DESCRIPTION="DTS Coherent Acoustics audio encoder"
-HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="alsa"
-
-RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 9c7561721895..34206c82aeb2 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,5 @@
 DIST drumstick-1.1.3.tar.gz 1358468 BLAKE2B af4cc923d380a1da66c835a6302e47e31c17ff90ba9277fe6063e6029c3d4d087e85905487a4dae657cdbfb743d2ac6e6c5a30c0905c9bc736d8666105e52099 SHA512 41990c269c41dc011e14c9bf008b983cd3722ea52429ec7eabaa5689a6f69b1760fc766604378c30bb1dfab537b77f7522a13377b873308835a0e7701d24448e
 DIST drumstick-2.0.0.tar.gz 1865424 BLAKE2B ee87dd222add121c8a6faaac5b8a755e2d6f7b257db890f6bbdbf5380d9771dc5b65a73d716f0cfd343a46c4227adcd2d85e4a359fcaa445b2291dc1ac188cfe SHA512 aacb4ca5a3354da6380ba146ee7ba57e646d19fe6a5d083e00b795221453a87d1baf25965784e7c8a97b9b00a3dda643bce144f62b6a27118f081c681089381a
 EBUILD drumstick-1.1.3.ebuild 1423 BLAKE2B 275235e1c697144a056c1fde8845b5e1dfe11fc91ab5d6e0bc601ba9fdda5a0cd6f34e0215a1c96736f89191a64b70e69790e8ccc5cf1154decb4daa60caf861 SHA512 f9111df83ca27d48c15c35b8adff813a05591c4cdadde60a7e382b7f0da1a24e3ab0802c0df21129b6135b035357c0a6709a83045039f04532a1eeda00272978
-EBUILD drumstick-2.0.0.ebuild 1559 BLAKE2B e5f96dd407fb9a222ec142bfd2628a4b3fa121e786e0a4e8a0ef632c7b98e6fefa0797b6bc2fd41c2255cce492e3d494f4fd5713498ceda184f6f99edd1213d6 SHA512 876fef2bfd96296b1c1c1f23b17a8c125dfbccf2bebcaa55416544a32740b54e4308ceea76bdd8640f0f3644edd6af6eee1ec2e8050477ceb8ed15f2ba3fda9a
+EBUILD drumstick-2.0.0.ebuild 1558 BLAKE2B 0363fc789a52f722ca337afffed6b8b217262ba117c7156fbcbcb431e49cef887f23c10b9089e6f6d14a222898d596a9aa23a66133f5e164570f31b9b52e509c SHA512 6889de16b6fb60bf14d589a419225242f50e2912639ad78dc15ea1e1e6419329102cb6400b3501743f7add671b523c0475a08598b510bf73f7470dd3d488e4f5
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-2.0.0.ebuild b/media-sound/drumstick/drumstick-2.0.0.ebuild
index 041eadd01f12..33495ef0ff59 100644
--- a/media-sound/drumstick/drumstick-2.0.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index cb146bc9092c..96d7ae8c5563 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -3,5 +3,5 @@ DIST fluidsynth-2.1.4.tar.gz 1363975 BLAKE2B 068a8a1722036a5a409331b1bdcf566cb9a
 DIST fluidsynth-2.1.5.tar.gz 1364924 BLAKE2B f5669f49db481ded6d953ee2cdaa8c59bb751f79210d993b69967cca1b71dce12b50fbf258512c144b1578441e78cc5299d96004da5fed44a40fc33858254bc0 SHA512 171ee6b1983ab9636086fb414ae464508f7a9a412cd2c1e7800a19a84d3dff21bbd86d1971f9bb5985e977f808b60e0d0cfbde4551b85fcc4aae4928a1abadbc
 EBUILD fluidsynth-2.1.0.ebuild 3305 BLAKE2B 1f9639e9454da96e7c09ca17d3b456293b5c405d47231851b1c1f549e24edcafc8ae4c98f1e60bb1e6962a98e46305241f7a9a3df6119b19d47e9f4b03468539 SHA512 6e897cbb09f4e42f67ebe34eec8059fccbde7d58b2cd442c5042903ec1b2d6ea38f5d5a38c98ac867a8d742630753fddc9707cbd5156a094ce938996aae6cb4e
 EBUILD fluidsynth-2.1.4.ebuild 3312 BLAKE2B 1c8a6afa7230da8a6873b141fd8d8e04c1bc028fa554e8fbb7ec0e22dcac7e4bc54f061276aa00d5ad68d95036ce45d17749b6158f6de6a0209d7eb448f9d46e SHA512 28eed5a1a2dc075479633380c28f4be8f46270b7244cb900b37a9d922e4e014da67aa690671a593b174f013799d9145281cabb9ac44c23cc34a7fda1700172bb
-EBUILD fluidsynth-2.1.5.ebuild 3312 BLAKE2B 1c8a6afa7230da8a6873b141fd8d8e04c1bc028fa554e8fbb7ec0e22dcac7e4bc54f061276aa00d5ad68d95036ce45d17749b6158f6de6a0209d7eb448f9d46e SHA512 28eed5a1a2dc075479633380c28f4be8f46270b7244cb900b37a9d922e4e014da67aa690671a593b174f013799d9145281cabb9ac44c23cc34a7fda1700172bb
+EBUILD fluidsynth-2.1.5.ebuild 3305 BLAKE2B 91b46677a39a776ac412e9494f0338d1ca74bd11c222492e52c01302c5713e3ccc51fa50f1b1bee457a0417a9c44af759a059c10334a2fddc4f759be845077f7 SHA512 1b06b9539b20fac1687e9751068cb9888b9625b3acf3b0ccb8c3ad9a5422394050c3c23653380506af4a5d2ccfe34f734e4dbd40a757fcadde8affb8a7959d12
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
index d5fdde4142d4..1e6ba4d38771 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 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 network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index 7d8be6d09efa..8f9ccc9cdde5 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1,5 +1,5 @@
 DIST kmetronome-1.0.1.tar.bz2 226758 BLAKE2B 9a9e7070f78fe109dce18d3fb66c29e1819f443bc578f03ec31670c994377d7f760367c0c6eb8edc40b2f64b58f2b461beed19b02eadc6dfc9762be537f9f196 SHA512 b5d4c290bb92cdc531ad432dda6ad21ea6c7ec9a144e0482aa4219293e2bc515dbb68ffdbbd4e552daf425c5206636c378e587adfc7029f7bc67d902b591897a
 DIST kmetronome-1.2.0.tar.bz2 227803 BLAKE2B 89d95f088ff038586ceee56315ae8172715a32e8b1c3c2b482fff4e072b523900016b2004b16d19e0e0210b743a8a6753552be8c0ca3e2873038cbbfd8fc5b9a SHA512 6bfba857661b031da37067a88a3ed07f687167ad218f924295d2b953ee555722d00bd5700d541207a93a43afce3f95ded11809630d15657b6d4b0df055792ead
 EBUILD kmetronome-1.0.1-r1.ebuild 604 BLAKE2B a22a7218831d884f68ea5dfbe4712830639c7d45ae029b8402d386e865a61f1e925ba90ccd41b505a6d78ad80a1b71a5be0d296c2688a3648bbc44963efdc125 SHA512 8eb66e02a2f23a0278edb48f6644d44d57e9369b7d0ce20782f5551901d7db5de11c53efd3741f8d288bb99970bab0a1167c2196cca9d725b972162ca30a07a8
-EBUILD kmetronome-1.2.0.ebuild 610 BLAKE2B 9358c095063eff10f1614662a4aa0aa3a42a8f3749558a176d3f0754baae8fe58a70130d5557700c4041f37e3798900ee9676bc26b49648df8aaa5ceb0a726ba SHA512 885daa3c2c06520759aebbc9255a781eebc20faab8051eb4995c80e0a96903ad81600754e1514d6b1414a99143043a886c6a0a3f2a37d86ed334c73a986542af
+EBUILD kmetronome-1.2.0.ebuild 609 BLAKE2B 7d16edca1b7603a206840d4e769340c9e8cfdf34e75b6ea2c263f4243f2fbcc76b4465ecc2c270335549080d38817ad602a4565ba650f3e951d5e1554651b408 SHA512 e9202e0008680fd00b4560e9991cf052de345ab73e26d7ca6c534221c50788ec5697dfbb9b7afb64514e7b4757897bc6d7dc4dac3e2f3301d3daf2deb170b5e9
 MISC metadata.xml 443 BLAKE2B 876e9d079153472e0e765f0071063bd904b9ca42252af016611512091634add2a7adf2742217c424f8b7280eb11569f3cb97bf26b4f0652d1d072fa5c7b23739 SHA512 7c8104d0ad8340cea75364d5688924517c6b1f3d9ef7c71b73d8c9f6188ebc7aa22f366777a3e7395e55493a630610e674b5bd2e26f4d6a0fed13cedc4dac38b
diff --git a/media-sound/kmetronome/kmetronome-1.2.0.ebuild b/media-sound/kmetronome/kmetronome-1.2.0.ebuild
index dc9fee36a96d..96eebf7733c6 100644
--- a/media-sound/kmetronome/kmetronome-1.2.0.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 BDEPEND="
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index adac9719f0a7..4665a5d7552b 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -1,3 +1,3 @@
-DIST kmidimon-1.0.0_pre20201003.zip 559637 BLAKE2B 57843d2718b8efb6d0be1174390bb21949e200efddc8a7ed65a67eef422eb0976f6008184bdb836bcaa3aabba9a1ea6e2ae848f931a26255a97cc11a29b85643 SHA512 0e6750196a0ecd138746602f6e9c2344aa3fe1ea49a0bb6a40d0626e7a428fb3c8fe51bed76b4df342eef32163c83deffd610bd3904108706943ee6e969b5b26
-EBUILD kmidimon-1.0.0_pre20201003.ebuild 786 BLAKE2B 94095ea9faf1548fe1e6721d66d4ccad2c5b8cd611092220a8b225d1a2cb9c4cfbb7d651c339a154e8db50f8db265e4592c6b8b13bba96ae30bc48c82a770dbb SHA512 d8525d0fcdbdca88ea7eee1163917ed6ff8b6af708a72063a24d9402df91d6f4bb67538b96893ea3330e0ce9697cc096f2bdb7563b1b6494b8d66cda5684f214
+DIST kmidimon-1.0.0.tar.bz2 322397 BLAKE2B 6c70e6b6162fe53fbaf7b7945035cb3974120501504c74c3fc0a0c607b2c38153f72cdefdc5f68b97c02148aefc3cd6e49ec0ea45f8b8f9ee6c11ab9383b813d SHA512 3c69fdc128bf5c0b7ec123b06ce3ef0e2220a04e8e721d8fbfa461dc8392b08250f2d333fc0f6080135107a97cd16736327648c4cb4cca72ea4d43c1007ad744
+EBUILD kmidimon-1.0.0.ebuild 692 BLAKE2B f4377cebe26ef311506cba8e6b1c58142f0ec4babbe9d849bbada819af45f6aa44cbd0c97ca8261898c52b70bfada6b505dc48edb508ac54757795af20d79669 SHA512 42a8574b2ae3910f11cdc4bf07a0e739270f4998cdd2dabd574c5e73a9c30bcaa1b009e4c44456ba315c6d9aca7f88badd93816eaf345063a9fac35878423a08
 MISC metadata.xml 441 BLAKE2B 195a2ad1c9248b2177c4bd699fe9c8bc5fa06544be5cb691958208d824ca5dc3ccb773bb21288811cc6a68c826b5a2b6d16bcee8120b01bc3f680d10df740d4c SHA512 808a8adb5fa17e514718fe01205c460ec78922a0db62f44e72aba02920bae36cef1731067931902b1632676380d1355df1c0087c6ac345434b87f8681573af06
diff --git a/media-sound/kmidimon/kmidimon-1.0.0_pre20201003.ebuild b/media-sound/kmidimon/kmidimon-1.0.0.ebuild
index 230e713785ec..3c9506e1889b 100644
--- a/media-sound/kmidimon/kmidimon-1.0.0_pre20201003.ebuild
+++ b/media-sound/kmidimon/kmidimon-1.0.0.ebuild
@@ -7,8 +7,7 @@ inherit cmake xdg
 
 DESCRIPTION="MIDI monitor for ALSA sequencer"
 HOMEPAGE="https://kmidimon.sourceforge.io/"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/k/km/${PN}/code/${PN}-code-r217-trunk.zip -> ${P}.zip"
-S="${WORKDIR}/${PN}-code-r217-trunk"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 2e1c301c7b0c..2c0f1f9ad407 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -4,5 +4,6 @@ AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c6468
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
 EBUILD mixxx-2.2.4.ebuild 3178 BLAKE2B 1e3c0021ae0f7f22cdaa690d3995638d863b2289c8366b49fcb5d80876898d10474983ad359d84802441008c106387bfc5b1343260a0ed2f464e46bb4299ddd1 SHA512 709ea52ec18f6aeb35c4abbe19ef7df24a6ed6e95218090048ffd5a9ad29e3bfc9d6741db7cd69733adb72a1b53789bbefb767a15f3469141797071e14a1192e
-EBUILD mixxx-9999.ebuild 2576 BLAKE2B f4a04d4500297dc2c2ff75d088127b1b09f3d1c9fd182a3e1695e6a3ae99b55e35ce4bc1dc73696cdab7006dc1c2ac617a582f2a10e7351d6500b9989941a329 SHA512 19b8bdae260828ff5b4203d5269cb60873765930d09e6c1ad9c6793d869ceabe415b492e2caf86cb71e91839cbf4fb232e2a4e02746503447c5ac4e6b8f6abb3
+EBUILD mixxx-2.3.9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
+EBUILD mixxx-9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
 MISC metadata.xml 849 BLAKE2B 7b6df4e7a68267848242fb26c50caf028960d3f3059ee74d0d0009be20b7385ca4fdfbc9a36b5cb5a7897e23085ddabddef6ea7a39a88874e3be8051753cfdb3 SHA512 e99a796d33b8a3b67993386565a61517b554b957548bcdef159a48571ce4cc5a1bcf2a4e4171c9a8d965418e2d469193f5682f1ce7068f50b958a3908a683fa6
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
new file mode 100644
index 000000000000..437d4ca2e35d
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg udev
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == 9999 || ?.?.9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+if [[ "${PV}" == ?.?.9999 ]] ; then
+	EGIT_BRANCH=${PV%.9999}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libebur128
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/libvorbis
+	media-libs/portaudio
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	virtual/udev
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	hid? ( dev-libs/hidapi )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	qtkeychain? ( dev-libs/qtkeychain )
+	shout? ( >=media-libs/libshout-2.4.5 )
+	wavpack? ( media-sound/wavpack )
+	"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5"
+
+PATCHES=(
+	"${FILESDIR}"/mixxx-9999-docs.patch
+	)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs=(
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DOPTIMIZE="off"
+		-DCCACHE_SUPPORT="off"
+		-DOPUS="$(usex opus on off)"
+		-DBROADCAST="$(usex shout on off)"
+		-DVINYLCONTROL="on"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DWAVPACK="$(usex wavpack on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DKEYFINDER="$(usex keyfinder on off)"
+	)
+
+	if [[ "${PV}" == 9999 ]] ; then
+	local mycmakeargs+=(
+		-DENGINEPRIME="OFF"
+
+	)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
+
+	if use doc ; then
+		dodoc README Mixxx-Manual.pdf
+	fi
+}
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index bbfbe57f1f07..437d4ca2e35d 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -7,7 +7,7 @@ inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 ]] ; then
+if [[ "${PV}" == 9999 || ?.?.9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
 else
@@ -16,6 +16,10 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+if [[ "${PV}" == ?.?.9999 ]] ; then
+	EGIT_BRANCH=${PV%.9999}
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
@@ -104,6 +108,12 @@ src_configure() {
 		-DKEYFINDER="$(usex keyfinder on off)"
 	)
 
+	if [[ "${PV}" == 9999 ]] ; then
+	local mycmakeargs+=(
+		-DENGINEPRIME="OFF"
+
+	)
+	fi
 	cmake_src_configure
 }
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 2c11fad8705d..10f44650618f 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,6 +3,8 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba
 AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
 DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a
 DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
+DIST mpd-0.22.4.tar.xz 729264 BLAKE2B d8060a205f94fa369ad8aee7a3e12f1389e7587aac7843eeec6ab3e6b39c2e063cfd5413bc7c9738ce6c68c56d3befefd48112c1c93f725a6940ff1889d882e6 SHA512 e169d6656b378d52798e822ffd47f554bd7c076ca8bc5a1119e3b2fad36bee79335dc392aa8d78d854689af62168625698c1777440e08a67075099898ee5fe34
 EBUILD mpd-0.21.26.ebuild 7986 BLAKE2B 24b791d8b86389dd6d4eb123e05c1bdc8ded128edf559e6a203220fcbbe043013cb44bbd185458755e5f1a8f225909b90f8a5b0c2ddb53a04b6f5e487dcac795 SHA512 1f385dbe89c5a91960426734f4a23827495afefe71817a09ef170877d546087e87df69e2e58257b1ce670a1d58c835cb0536dd5412d581ea303922e903a5c74c
 EBUILD mpd-0.22.3.ebuild 8043 BLAKE2B 7ad05f2cb5ac56d326c8f5ceee7772346ccfed4650cd4c94df5b572d4963cbf0f0955ed894dacac64c70736285c6bfe83b1eaf2017e1263282ef19c4ce0a3108 SHA512 4aa7fd6aba159d16bc2cbc6a4c2f88b04175e871da2ef48c0ea9cda004102e10308ea7dfba4ca53339c609038ef4f2b40791445d22c8879d07117fcd0212e768
+EBUILD mpd-0.22.4-r1.ebuild 8435 BLAKE2B c57089b82c7f78f9f870d22caa412586289cd2de9f51bf0e435fd695383af578eab9a4d226bafbc198c486047bd36b002f8cd7e19ffe2e2b1a2757bb3a944ec4 SHA512 cad3ae48000a0945c7388a16104ce6e3b5dd2222d0bf9f39e9da18c4a31e3dfd2b56f2caa7b89c68f3ca288efd9cca17801dbfab808e1fe805b6a4fbbb3d170b
 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/mpd-0.22.4-r1.ebuild b/media-sound/mpd/mpd-0.22.4-r1.ebuild
new file mode 100644
index 000000000000..2b67f0ccd3dd
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.4-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 8edbc8b634f3..375ffd203d56 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -2,6 +2,6 @@ DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b
 DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
 DIST mpg123-1.26.4.tar.bz2 1050563 BLAKE2B 1a057f8bf6171f78a2041637b8351ef124f58f160ca237f775ae1aeeee1eeb6e1898b113ca5958acb74d818e706b2825af0b1f93312073742a18134aacb6d5e9 SHA512 425162227aafb99b8723428fe9bd403739a2dd68828b86a2cff7f9928a9f0ab3f67420e56c0abe7c9deeb94bce6c6acd59acaa0606ce24c01716465640564785
 EBUILD mpg123-1.25.13.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
-EBUILD mpg123-1.26.3.ebuild 2765 BLAKE2B c3a25399f744567638073786c8a3b0adb1f73844885f3e81e6659669e40a5864479f9ffea932ccc476aea099ad3b3d07c5d6d1419b4f7efdb558c56ea5d49a2c SHA512 886dddf208ca4fc7d5404f6582a742398eb78dc96bb4ef144b3e2b14aa55846ebde08266312a5b691fe001537a92bfb154aec2bd12c6793a4b7213806a1e12f7
+EBUILD mpg123-1.26.3.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
 EBUILD mpg123-1.26.4.ebuild 2771 BLAKE2B 7721bbdde0b129453bf1b378048c05bd30d1e263bf34e78b472c0108cd449a7e223e35faa21af2c8dc464b998fd6e27428ff0974928565bd7117b0c726c8bd1b SHA512 4db32918d1f4c44f8eecd88a31d137a049f10ee0445cff76c83c266964752d15e1a6880fb2cd39f8fadec8af160cda4e0a30dc2006a93fa5364c9b2d9ac1fb28
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.26.3.ebuild b/media-sound/mpg123/mpg123-1.26.3.ebuild
index 44603fb0abd9..634c8ef13f42 100644
--- a/media-sound/mpg123/mpg123-1.26.3.ebuild
+++ b/media-sound/mpg123/mpg123-1.26.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index b4df00f0eb78..64bd075af608 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -4,5 +4,5 @@ DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d32
 EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba
 EBUILD mumble-1.3.2.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
 EBUILD mumble-1.3.3.ebuild 3814 BLAKE2B f59c05d68a56cee5f840d6991718bf10cee2fe10bd70d78eeea5a87aea4ddf545c96807ccc52bb1c01615348695cdc166d94ebc6dd651042c0945337621f37a3 SHA512 7d7d42d1ce7b90b4f25522f4ea71696218b2b8c4addfc8f8c927ecfabf1493ab08d811136b24bfaeb708928d3b6e733e0f40c65103cc11ed87071e04bec12577
-EBUILD mumble-9999.ebuild 3057 BLAKE2B 8e2614ae3c594f82c09860adaf34a9186874d44e78faec04a3c209d50f13985c4930e6cba0c700a1d65265bb96e67b2b5767ea7d6e4ea819995fbc09e5a232a5 SHA512 6cdb85d603f3b1303e1caef0369dda4e7b7ed8e09a70a72ddd5eb1e33bd21f9ce11c87899dee90ca99b3b832252215ec182676ca4fe2ec9a2ac08e6f0b797254
+EBUILD mumble-9999.ebuild 3043 BLAKE2B f6e699e41a172ce1b816cde9b30e021b0ea15579a29bed4037d272c65d0859dce1dfa4a2e14275c85a47cc6e2b11e39d62302df993bb48d85983fc20205c98b0 SHA512 5a643584e6202916ed620a899d77fb59088026ef96a0420e4bde721a68ee68174827b29dd776ea35274a89af6bb0645e9792fa1e8a39acf5efb3363f7bced9b6
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 1109a96055d6..a20c5f8b4064 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,8 +66,8 @@ BDEPEND="
 "
 
 src_prepare() {
-        # required because of xdg.eclass also providing src_prepare
-        cmake_src_prepare
+	# required because of xdg.eclass also providing src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index bef07b4c3ca6..75a9be38e532 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,6 +3,8 @@ AUX musescore-3.5-lambda-capture-this.patch 562 BLAKE2B 4443f04bc90e01dbca81cac5
 AUX musescore-3.5-remove-duplicite-declaration.patch 245 BLAKE2B 5d42790b4c1147a34bc75bdd46f3b3832007734702d1be5f81dc41537347574e5f0955a141f9d412ce00f95370717bcb31d272b0625e7462ce3f640e69d71ac6 SHA512 7f3cc05a05c208dedd18094639534131ffbde748da653e309c21fcc414d005ad744de82186cd7484a46cb230d08e643f52555d6fe371c237686b58a559947cda
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb SHA512 4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
+DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad SHA512 8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
 EBUILD musescore-3.5.2.ebuild 3030 BLAKE2B 4b8499c5ad5672c7994173558fffff771dd8885314e76970d8f5519aa103507984ebcd0606a335861ea636351b22d60291a45cb2fd7eae0575cd5f24adf8c9ed SHA512 273facf45e3e610cf52c0792c79e69deb5ef2ea6db549f4e026d3e64817cdbd20a23988998a3739ceeb2f3a7091abd928c2b477bda2973f71e9d1a527d22bcab
-EBUILD musescore-9999.ebuild 2865 BLAKE2B ff11218ad2852e26d1ed2564b42edbd7121256f25dc3bb426fdfca855aa601db2f5812cc11e75b0734f34b2fbbfbdafe07bb6a5ec779b293b11ce31170ba9f74 SHA512 48832d6214e473ff9e408d84276e7cc966508f9c49a23585bb7a4d18bf63a71500c8bcb6ea6285377c1df667a9217147123e809e059d9698e361a8553dad419a
+EBUILD musescore-3.6.1.ebuild 2940 BLAKE2B c758a38461d735aba0974360717bd9ae94fbe86fb38ebf65e2ec9ec1f99c53fda25f2aef5221d4204e145cd5df48c995158f1e4710d8ae56d4273c05bf5dcfce SHA512 f9e7f1664134ea10c2fa9a10e3f8df2c01c1a8b21f14d4f79003cc5d5283660906a54943e80aa48100ad37e5211950e04f17a2632c7e34beea34265197ac57a9
+EBUILD musescore-9999.ebuild 2884 BLAKE2B 733677224abc2be6cb04328339392069832574fa48e00fbeac1a0cec8f18add469d34cd9ba3cfd68bd83be88bd1fb8c6d82065d71d3378df4d71e6c89064b220 SHA512 829ed729aaedd2aff35466e4c286ac5274e39a46033ab173c2fff196a36e713a0a834cf01ea4d27d8839118f26fba0c4b8576451f0aa55cb963e189b251affe9
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/musescore-3.6.1.ebuild b/media-sound/musescore/musescore-3.6.1.ebuild
new file mode 100644
index 000000000000..bb23b9e040eb
--- /dev/null
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+else
+	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
+	omr? ( app-text/poppler )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	sf3? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		unpack ${A}
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAEOLUS=OFF # does not compile
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_CRASH_REPORTER=OFF
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PCH=ON
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PORTMIDI="$(usex portmidi)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TELEMETRY_MODULE=ON
+		-DBUILD_WEBENGINE="$(usex webengine)"
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DHAS_AUDIOFILE=ON
+		-DOCR=OFF
+		-DOMR="$(usex omr)"
+		-DSOUNDFONT3=ON
+		-DZERBERUS="$(usex sfz)"
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
+		-DUSE_SYSTEM_POPPLER=ON
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
+}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 42039a19c047..12a85f60de3b 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,7 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtquickcontrols2:5
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 3133a7b1e17b..f645f905a378 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,7 +1,9 @@
 AUX ncmpcpp-0.8.2-gcc10.patch 717 BLAKE2B 3edd29e89df2665b44e5b065aeca18c610c6ec1f4c7bd3d0f5f70af51103d40e1f42302277a6bc8013e0c26b17d1d7aa4fc868f9f96a3163cd7affd29aa4c634 SHA512 99298d813391c03fc70ab16ffe8dd57c6151b87f4cd84f25a1747691d8f9f41e5f647b59c0d2ca25808acb995c7df6c99f386a4cc1f3f133b722731ef99a8a3b
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
 DIST ncmpcpp-0.9.1.tar.bz2 474436 BLAKE2B 89f6a6d68baf54b0a0eca6d3df96dcd5bcd1346e6f93d0a580f2fbbe4b4246218b62e5332f3db2567c9a91ee30ceb367039a328fa7f491c2a756c2c03fed76c3 SHA512 8fa9f512ac09c144eab4e4721a9c54f3f411593fe13c26db12fbaa3ccf6b08d7cd54923e1e4148b2db45dc69431280611b2be2d153513c0d38eaf92af8ceb9fb
+DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
 EBUILD ncmpcpp-0.8.2-r1.ebuild 1460 BLAKE2B c8b146f78c34b24fc9daf1f236c9dbbe2f9c02c2da1f758dee18cdf010c7af7c8482d52516af87c843a809ede79dc4395becc57669d31be6c402c2b0430f32f2 SHA512 c781f50146bc50994010e116a9697ddd47efd13afd5ecc5c772530fce3f7308f14a3cfeb53979ba4fe5905109c6fa591422320873b54b8a5dfeded7c826c3d77
 EBUILD ncmpcpp-0.9.1.ebuild 1418 BLAKE2B 9088316711d5675c2e95d4f8755ca832a3a3487ccf84c40e7fdf219c51eb70fdcbf1cee7758f13f9163895e4ddbbfc4c8b4bb581e1fa306388ff6655b6e9cb2b SHA512 785451382a490c876f25bf5351fb5bbd1a0b62519522d491d7cf85cb3e887bc57e4a79f6100d09eb03a9e53ebff1885822c9d0f01b4cd51340c60f09289df815
+EBUILD ncmpcpp-0.9.2.ebuild 1418 BLAKE2B fca54614cb0895f83ee09ebda22e8ba7252e25663931141959b3c8791292c681a70247de0b6545ff2df65e6c4e282801c4b5350888ebffe3a3bf96d2aeb94914 SHA512 85e014a82123ce1f97484622313472d04073401298770889707aff6b0446472223c88fcdffde79e7f54623baebc7bce8cee0e41407ddd1b44293b378ae31c4f9
 EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B 02aa9bc5abdba9b6464e55f95fafee07937954523c0ecd8c39a03c1fbef6c371c477e6a4d0c0d5b3d71bc51e38d5d141973733de796721f219484a01422cd072 SHA512 bd3d7d50ff46bce31d075372002f9de5a2f977c25d4e68c06c8c1a4110fd9db8d0543542133f90eb279d20e7c36f461aab982cc4ad4e4238cf512b245a8af352
 MISC metadata.xml 1094 BLAKE2B 03f876dd9fec08222052e01b13575058faea3ed2a0295e6fa09a3975d0490b205b4f7ef11444d236a37ad05dac2ed13956417379fa553f699865a583fda8457f SHA512 7736907dab3e73de891816987b8254d41013ec44641ac0f206cee5c3d12d7312d94a32dab44ca072c0fa1a770a702c29ed535eecadb39cdd1b34c5ba4802bec7
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild
new file mode 100644
index 000000000000..9f375cc8a75e
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
+SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock outputs taglib visualizer"
+
+RDEPEND="
+	!dev-libs/boost:0/1.57.0
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/ncurses:=[unicode]
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable visualizer) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw)
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${EROOT}/usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/ogg2mp3/Manifest b/media-sound/ogg2mp3/Manifest
index 43ca04616121..0164ab83f6c1 100644
--- a/media-sound/ogg2mp3/Manifest
+++ b/media-sound/ogg2mp3/Manifest
@@ -1,3 +1,3 @@
-DIST ogg2mp3-0.6.1.tar.bz2 12424 BLAKE2B 6a43814adc2763bc4ccefdcbdbc6e1bcc4bb2d245af51be1f1c949c8fa29cefcbe3175d89a1a34299f7ae0b71b24e62a65e0f4ed8b0011f23a733960c549baaf SHA512 ba4be78b14c3647af52c0c64c95949e75998847391612f6d66fa281e15283929d6ae3e5df15b0c242d2930b3941e68653934261f6d9804c576f77c8304ef4f14
-EBUILD ogg2mp3-0.6.1.ebuild 547 BLAKE2B 7ff2b65054f175f78f2a8971878fd08428b6d4a29607d9505dedb3b82fafd877ca5ddbea37454faee81f4bac15e50234d5c4791561411f609b9f5deb916d9b28 SHA512 e238c4441b459eecec080a3d249304b451fd0077c4fe2b6e08c21965d66f584f6e89c07cc2ec0da984e9bedb70db6721dc4c631e7d356ab0acea77b882271755
+DIST ogg2mp3-0.6.1.tar.gz 13257 BLAKE2B e3cdfe4de8134a2dbb86615f96606befe985f8aeddf77bd7e3f62b9364596ccdf0c9e5fe542bd2c7e459cb12bcb8f6dbb4782cc4934391ef98edacca88c83080 SHA512 24f24ba342631fbb4743153dc8f4c2b809b744ce01ec99fda442d2a39bf3a774ad2540fd35b6b7940516e63353979fcc30a14214100bb80c9a486ea65ae95999
+EBUILD ogg2mp3-0.6.1-r1.ebuild 614 BLAKE2B 437ecac878793934653e2bd6877c8ba8389526744cc5c67e135387d3ed35ee62163655c38a7dc02786ff3347fd601ce43d9326d6e1fdd9994cfc44cdbb02b34b SHA512 96e647434e5110351c5fb61822bc49aaa324c2c16ab8cabde1b8b7787050426a72e9e313bae1a0da1a063693010a153c34d7180c2457373eabd0dd4ebfb94910
 MISC metadata.xml 780 BLAKE2B 234c25b6f649afbccae547a90da27d4414c4b357e0185513e73d86b3ce01eb99c36399fab8f62d6b840cbdf31558ed9d6aa7204b135a9c64936c623effcdc5fd SHA512 aef8bed925fee6d914dd3f1ab3315b40743715c2499f72459de8ff3765cdd774755ec3a31872228cb6a8da8726cd3aa4256079431641c188c26c0c0553b51342
diff --git a/media-sound/ogg2mp3/ogg2mp3-0.6.1-r1.ebuild b/media-sound/ogg2mp3/ogg2mp3-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..ce4c6570fe3b
--- /dev/null
+++ b/media-sound/ogg2mp3/ogg2mp3-0.6.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=f3bee47c3bce01a33b5bce88fa70bd9ecadca0ad
+
+DESCRIPTION="Perl script to convert Ogg Vorbis files to MP3 files"
+HOMEPAGE="https://github.com/fithp/ogg2mp3"
+SRC_URI="https://github.com/fithp/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/String-ShellQuote
+	media-sound/lame
+	media-sound/vorbis-tools[ogg123]
+"
+
+src_install() {
+	dobin ogg2mp3
+	dodoc doc/{AUTHORS,ChangeLog,README,TODO}
+}
diff --git a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
deleted file mode 100644
index e62c87864b42..000000000000
--- a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A perl script to convert Ogg Vorbis files to MP3 files"
-HOMEPAGE="http://www.gitorious.org/ogg2mp3/pages/Home"
-SRC_URI="http://www.jamesa.com/projects/ogg2mp3/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-sound/lame
-	dev-perl/String-ShellQuote
-	media-sound/vorbis-tools[ogg123]"
-DEPEND=""
-
-src_install() {
-	dobin ogg2mp3
-	dodoc doc/{AUTHORS,ChangeLog,README,TODO}
-}
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 33232e85e615..59b2ce26e7cb 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-qt-0.15.0.tar.xz 97480 BLAKE2B 183c3cbbe87b6867bb116041d41dd29f5ba72156e9078a4f09e5ffcbd3e123f6511cb06c99ce3cc8ce243a0551b132438bad7b14ae759cc775974c2ad3388bf3 SHA512 c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600
 DIST pavucontrol-qt-0.16.0.tar.xz 99952 BLAKE2B 926e248f61b1652af04f772c09bc000d0f368ba6449cade308275473e970068a58ca25cccea5e4bea289424b507e3d24f30d54d76c13096e0e8047c5ea996950 SHA512 781122b57321cf1e3eff2210e7cb949c819d0148050897d3a9673e846c28fae7a926b4d840c603dac9dace8126bfc49179a737101f4d5b6ad4fe5946d82bd0d5
 EBUILD pavucontrol-qt-0.15.0.ebuild 704 BLAKE2B b2a1d666b2849b8f11e52d605e29b002e96e52ddaeb91819ad95350df2b9fe87cad729adfcb600c4008b7b378cf433a5a4dbe042309c13dabdd906b7c5769928 SHA512 b0351da1c8083bcc130c4ff560185a4dae136eb5a45071de6bb8a07703fa1de9a390f7a28d1acc00ba235a800bd612bcc2a23fe7659adc3412c3c2c4eea058d3
-EBUILD pavucontrol-qt-0.16.0.ebuild 705 BLAKE2B d3379e578ef00fbc03da7677602aaa9bc61eec169a82dc771a4fa1e730e71441e8c0579152964496bd346df69312503f5cf247b1d9c79ddbc6a6c9d3478e66e0 SHA512 bdcfab7a4a817487bfd208f3e595a40e42e095f790882ba2746b4de55627d9d2caafc5fc9affbbe706d0930acea17a40192bc7318726e317930ee156c26441f8
+EBUILD pavucontrol-qt-0.16.0.ebuild 704 BLAKE2B 75fa0c724518984b4cc80a3f8caacfcd4eb134a45accd83ac1e1b4e4f1829af9937667c358361a58882d2d8731accf530f492142bf337ee14c5896fd8964d6f4 SHA512 1e563090713059c44963b63e05293d836f363e931185c1b32b8863ec09c04129f666b1df3f810d3a974de43d3e61535c9ebcceea7fa2624ba2729e4ae05679e9
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
index c7ea0d0740ed..8fabe2c80f14 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 3134408f5f2f..09352b2fb886 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -4,6 +4,6 @@ DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac70
 DIST pulseeffects-5.0.0.tar.gz 2030440 BLAKE2B 3d68f48ea6beeee308cc82dd3aa10a242587d2c5fdacdb89cf2618ae6ea537966e33e0c9454fab0258c64d05fa71ad196d462097d2abeae1e57a1bf1e7d89ef4 SHA512 f43e1ad22d243689b94d840dd71046079ff806a42606184918e2a28bc6a287d40e709a43abc51e4ea5ea36e99963db43486206a122cc89fe533afe1f9ee54e2f
 EBUILD pulseeffects-4.7.2-r1.ebuild 1903 BLAKE2B 50882416becc1e4545bcef6dcf5a245465064aa11b876ff4191d79bcd8e0723fc01d05b76f5d4fb6930f2a330edb4644d4a0b63ad1083c589e7e93c400494a3d SHA512 1726d0a7c5135c9423c4d85613d4b3b90854452e25a51ca2ada570d9c502d923eb4ddf89c481dccb4ba12f4583f5b42d74efc7b0e59833fc104452d468c003bd
 EBUILD pulseeffects-4.8.4.ebuild 1809 BLAKE2B 5494b4f6321de6d23d53b03c53d4c13af32506bc8590cdf1a19f81686f25657e507a8e7d798927fb7bf0644524c207bfe987a7a8f6a3aa7051a722aebac0a774 SHA512 3753055c7e014dab2b9bf5584e859a55232382e9cb447f0ec1488e9d387c1ccce21ed1b0d4a59ad3eaea46419cee31fd77fffdcb44f0c425ddeb3b28e47a3958
-EBUILD pulseeffects-5.0.0.ebuild 1762 BLAKE2B 15cc11ac200706b356f5fec1eaeebcb1c4fae67aba274191d59ad6e1a423478193caf9ddb8bcea7df734a0d485d92623718e161b279022894aef0269dc21d333 SHA512 0578c5c1bbfd8797b5be2c9ce7415a72b33562a7f8ef7ea611d7ca014938348bb003ac41337d52dc08669a08023603b323f6d0b6acc0e3fd73a10ec29f21b6d9
-EBUILD pulseeffects-9999.ebuild 1762 BLAKE2B 15cc11ac200706b356f5fec1eaeebcb1c4fae67aba274191d59ad6e1a423478193caf9ddb8bcea7df734a0d485d92623718e161b279022894aef0269dc21d333 SHA512 0578c5c1bbfd8797b5be2c9ce7415a72b33562a7f8ef7ea611d7ca014938348bb003ac41337d52dc08669a08023603b323f6d0b6acc0e3fd73a10ec29f21b6d9
+EBUILD pulseeffects-5.0.0.ebuild 2119 BLAKE2B 3a880f69cbb05777ba1f97cf0d3186b267037bd65c76d30210a02b139296e553989b0df7908184d93e7f54b1e593c0f7398c8e9d39f0b288c556179578d54b0a SHA512 b4616fbacb1466767d0cb694542517750b03287fd53a6c4a92080a964c6a81971276eabaee4c0b5d0e097e6fdbfb30a4880c13b6126952067e945b8e3735140c
+EBUILD pulseeffects-9999.ebuild 2119 BLAKE2B 3a880f69cbb05777ba1f97cf0d3186b267037bd65c76d30210a02b139296e553989b0df7908184d93e7f54b1e593c0f7398c8e9d39f0b288c556179578d54b0a SHA512 b4616fbacb1466767d0cb694542517750b03287fd53a6c4a92080a964c6a81971276eabaee4c0b5d0e097e6fdbfb30a4880c13b6126952067e945b8e3735140c
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild
index e717723570b7..bc49c613efc6 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild
@@ -61,6 +61,17 @@ pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_schemas_update
 	xdg_icon_cache_update
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt "5.0.0"; then
+				if ver_test ${REPLACED_BY_VERSION} -ge "5.0.0"; then
+					elog "PulseEffects has switched to pipewire as it's audio backend"
+					elog "See https://wiki.gentoo.org/wiki/Pipewire for how to use the new backend"
+				fi
+			fi
+		done
+	fi
 }
 
 pkg_postrm() {
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index e717723570b7..bc49c613efc6 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -61,6 +61,17 @@ pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_schemas_update
 	xdg_icon_cache_update
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt "5.0.0"; then
+				if ver_test ${REPLACED_BY_VERSION} -ge "5.0.0"; then
+					elog "PulseEffects has switched to pipewire as it's audio backend"
+					elog "See https://wiki.gentoo.org/wiki/Pipewire for how to use the new backend"
+				fi
+			fi
+		done
+	fi
 }
 
 pkg_postrm() {
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index a7aefeb786ad..9be5df706534 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -4,5 +4,5 @@ DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4
 DIST qsynth-0.9.0.tar.gz 383118 BLAKE2B d9464a2f122d7281ff69171c431fff72d05886ec130d20aae8d8f122e1cefd1180b8bcdc157f324c5cdbc7e2c524c82a9cc7f481efc8b69912ce61912e73ed58 SHA512 5cc0e099cd05f3639ded81642bde80205c8921b65d22dcb32d40ac874107043edeb672e69d7e4734e0fd37a498be2e5b787f0b8c1707be45e39cfab616fd522c
 EBUILD qsynth-0.6.3.ebuild 1356 BLAKE2B 2d396d07ec3843126aa2b5b71a052da811c8fa56629f45990b5b7e3fddbd6282595fce10e1df195964ff5576191fb63941608c50c28c6a611e0eb8a2001b2241 SHA512 17d3439d50c5352298faeb06c0065abb4c306372ebae87d933532c80b09fbe4a789109a7b776006f86319bf9012905c6ddc40303fba06e53cddceb82b7e6177f
 EBUILD qsynth-0.9.0.ebuild 1498 BLAKE2B 65b8adab715e5e13665cbc3c7a3f2007b809ccdd444a8c54707cf1a67b6aca3b181b2c016841a21cf9f178532026c635ed125bc9f86183d9f375510433d51bf1 SHA512 3a3dad1db15066763d3348e26e5ebe00384825c5e42e7729935cb3aee188d9f0affbd96ba7f60b0b86885bf733a8b82660f8d917660c2740b80618496114cb98
-EBUILD qsynth-9999.ebuild 1505 BLAKE2B 7d046b273b82d9c8b20000f58da63d4495558f7744b12519bd8e5ed62fd7e12f30d07e53398b664f9372449da1d64dea12db82d44fcd742ebd6096febbfd8cd6 SHA512 48ce86791a12d402d0c0bbd2c80345c25c4f2a84519bcc590a5ba6004744516075df2acbcfd106ebfbb47cd7145596371a96d3923c454fad3d7e3d45a133d46a
+EBUILD qsynth-9999.ebuild 1439 BLAKE2B 24b7614a5ce5485268c6848c6e069712dcfe1ef1e38911ab84c133d9984cd14fa682492c38a0e5dc7affdede1342bd1e4fcddaebe943228d0777eb892ead91c0 SHA512 d4e6304c00f18047a74972f61efc4be915b4fbe55f4143061133a8ad3a584d18b480894cbe8fcb22316b503778926a02fd932880a5a46c2979ed81517414559e
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index e7d76b663936..b0cfa6dfb05c 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -34,8 +34,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.9.0-cmake-no-git-version.patch" )
-
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 20d898496064..182ab39ff541 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,6 +1,3 @@
-AUX rosegarden-fix-qt5.15.patch 670 BLAKE2B 4c8eb957c80ddad78444ee484b11da94865e55d161a6bd3e5b4f08d1697a0bcc89e2b5c947df99b89840734a84cca773bb1f9252d444e6b39a8630235f7eddf0 SHA512 a13ced3528552e3c2609442f81696628ef93cbab3d31526cbc7d2d3c0f4d6d44a84171fb3824d6a662f297d792f27d62ccb2c9e89f074e0aca3fcc1dd3ed645d
-DIST rosegarden-20.06.tar.bz2 6821122 BLAKE2B 2c37729133f60524466c9eb6cb761e36698acc2addee802fa01b498c4450e0f87a8d02dc66f893e87c23484f7fc4f32e4e4e13f01a457a86363b4fa98bca4a1d SHA512 7f3892697b99344d47e2bf398f6fe82de9867a093f3396d571730a30f3442a923f16a5472a74bda865205696ff3834c0a188ceefae17e56b137d8df1a56e03f7
 DIST rosegarden-20.12.tar.bz2 6438971 BLAKE2B f03862a8523dd43cc7e2b146446bb943229cfa1c598bc36601695465566d1037d360b15ac78802dbcc51c601e605abc9199f3006b3072e5e0ad2b49da9e15c28 SHA512 a2901d35ef7dac9358350fa47e47b9314698790bb2e2a95c6cc444135f49a92e3fb6d6cbf8710194bca6e57e1c82218991ae3db4aa7b6acea311cb3b627d3dc2
-EBUILD rosegarden-20.06.ebuild 1189 BLAKE2B d7e10002805af53a13a51070d95768d63970ec161ba700dbb9397458d9cc8af3b18f9711a372a2a76d67f949a2ac3988bcd5c3e6b33554b8e90a8735fb89c84b SHA512 42f7d4363b59fe2313f2c056591dbe63d7ab2d50f53c36df3d9f3873fdf24fb2c0a273ebc1437d02160fc8c4d3c784a74467ddad173c8119f602e87402d1b4d6
-EBUILD rosegarden-20.12.ebuild 1134 BLAKE2B 4f42d5bfd9f1c2655db462d1e29d50bc25636ca185b3aa7e4801ab83efc7a39a00e459a713bf90d5183836cebeb7ebab3a061905f63e441ffeb49bbc72785df9 SHA512 7586f59b864f3dae5eefef483d9f4110a6dde6f50e06079471dca4b7c78eab37bb66b404431a6f3870ec99faee7715593ee79ff60a38581e4a5e15f77ebfb7e3
+EBUILD rosegarden-20.12.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch b/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch
deleted file mode 100644
index bb4244baeba9..000000000000
--- a/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/gui/general/ThornStyle.cpp b/src/gui/general/ThornStyle.cpp
-index 4374607..de426f1 100644
---- a/src/gui/general/ThornStyle.cpp
-+++ b/src/gui/general/ThornStyle.cpp
-@@ -34,6 +34,7 @@
- #include <QLabel>
- #include <QLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadioButton>
- #include <QStyleFactory>
- #include <QStyleOption>
-diff --git a/src/gui/widgets/Panner.cpp b/src/gui/widgets/Panner.cpp
-index ceba4ea..ead23fa 100644
---- a/src/gui/widgets/Panner.cpp
-+++ b/src/gui/widgets/Panner.cpp
-@@ -24,6 +24,7 @@
- #include "misc/Debug.h"
- #include "base/Profiler.h"
- 
-+#include <QPainterPath>
- #include <QPolygon>
- #include <QMouseEvent>
- 
diff --git a/media-sound/rosegarden/rosegarden-20.06.ebuild b/media-sound/rosegarden/rosegarden-20.06.ebuild
deleted file mode 100644
index 2042a29fe018..000000000000
--- a/media-sound/rosegarden/rosegarden-20.06.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 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"
-
-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
-"
-
-PATCHES=(
-	"${FILESDIR}"/rosegarden-fix-qt5.15.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_LIRC=$(usex !lirc)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# bug 701682, tries to open network socket and fails.
-	local myctestargs=(
-		-E "(test_notationview_selection)"
-	)
-	virtx cmake_src_test
-}
diff --git a/media-sound/rosegarden/rosegarden-20.12.ebuild b/media-sound/rosegarden/rosegarden-20.12.ebuild
index 2b7ce2c22641..8df3e4a0dfb1 100644
--- a/media-sound/rosegarden/rosegarden-20.12.ebuild
+++ b/media-sound/rosegarden/rosegarden-20.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index 8a4d21ed741f..e62306d02cf7 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -5,14 +5,7 @@ AUX ohnetgenerated.makefile.patch 1138 BLAKE2B a65ff04a64c64ad86625f635990615271
 AUX sc2mpd-1.1.5-werror.patch 4448 BLAKE2B d41c363b6db9ab7b3170e7adf6ebd9e72d94d8e708ecc5a273765ba922b8098f7f706a2245b9f23f8146d253d6c7ad2ac00b28199eb8609be6af121b42c32150 SHA512 ea7805a2a572bd8995418115ea5c256a6897d787dbacc7d31482b39672c78b3b25bc087acb6cf1d0945bacaebed4112e1de19e9484e556978c6c851dac2cac30
 AUX sc2mpd-1.1.7-python.patch 4186 BLAKE2B 8037ab9b33d25a65ec4b72b616de23c8ab12f3e93d6fe3b607039b0ad3f69f3aa37d6e7b39dc0b91767b953307464c7bd9066dc8210ef2a4c3090ad01ece220c SHA512 45b17410a6499cefd7b596c08e5fee288f16a3057e1c84da96e6388132a2fb56060f2010b65ffa38cbef0d179f8fe1c6f88da9d355f177e5524ca674bbdf0b75
 AUX sc2mpd-1.1.7-werror.patch 4237 BLAKE2B f3922de425df679e9b9e7c5249994a39e9fcda6a539f1b3d084ece8f44c8e81546b975375ca3fd8d0e81504bb712791bc99e1aa139d422805ef7dd16d79d8f16 SHA512 28d6ca71fc41ed11fab780f48861f04b28d853240107db2eed6911f3e58710e50e31bbc3f3d5c047599c1d1e544a921bc4ea4bc37e5900a02a4092c7de520fe5
-DIST ohdevtools.d35861.tar.gz 1187475 BLAKE2B 82138d9b64f3172d540402e99b716e9b56bde2133b2565b442bfe6ae6b0e2235226027c4b43b17e3eb005b6f52a4d6a278e0895d267222a63f910ea556e4d76c SHA512 25188c3ae837db12e5c7f349ab01a315f8c68909e3eaa530dc9ba09fb2bcb3cd0a671676b3dd4902ef019b7e331d2acac0978649bce29df585e54d13158ff162
-DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B 82724b7f2cd5cd0dcaa54786394a2560b965f5f16df7bb84037795f1334b8052a4cfeff8f5f39bdc5d7a0ccb2093190c38de987957463d10cac407d9694a6a92 SHA512 67ccdbee6d909df30acb7c89aeba75d3accdbb533dda5abc02c66f867e2fad9a360696d5e28dd1decdc575a1396d026824329450e85e3a3b3e4f7af2e144140a
-DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906 SHA512 9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811
-DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661
-DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
 DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
-DIST sc2mpd-1.1.5.tar.gz 219031 BLAKE2B ac8a3b4da6caff58db4948c32d643bf9244efa4ad77e29c18aa7e10036715a9a84c9f69478f5a2eabf6769112fb61ea15e1d7e8e613fbae05794cef609f21247 SHA512 8ea47b8bda62b8e97b95b0ddf0ab7979a54ae8bc599c67ef7bdd16ea876254446c8be440fade7355be93742c94c6f20b56e40a5756cc3c0dbe0409612dc3788e
 DIST sc2mpd-1.1.7.tar.gz 238674 BLAKE2B 35fd57797612e3883ad5cc04be3f5328dbf4ec9aedb0461a801fe79566ef20de4026ad653eec6e7d932ffcd0385bb618331a519ec54838fd856d09c20f1971b8 SHA512 0b39e200f013602c851bec1ba41210c40d1a984638c86bd8dd5d61286aff19b315f282182753426e4470c8e6ccb60265b16dc6ba2e5117f59a3d40194464b4b3
-EBUILD sc2mpd-1.1.5.ebuild 4603 BLAKE2B 7d06773dce9de0204ffa7c32663b4dd169236ebfafd08a5d7a0790c920d659303451b392ba7bb1b2365139cb520f75dc45fcb202c83942ae5dc1ac6ea251ee0a SHA512 2bb100f9816c88d41cb8f8c01d0d768c79426d63bb6a5e6eff3f99b1f8a6608d080fb6451a574cb3ff39711ad1a79331cbf68fe7c74013aa87843d8be4b11d07
-EBUILD sc2mpd-1.1.7.ebuild 3255 BLAKE2B 9d132bf0e35d92ead2f130fd377c080ebd29b01b9a1092d82ad5b92ad98a6c68f526053f8c7c599f3c87e9e1cd6981dd4c409063f9647e5826aa6eaa6e419f4f SHA512 2cd018f872c01aa7e2417e8d0e22b655bb5a8a3a3e3fbb14d57f7c2d5018d4c3aedfe96919ad45602a506e6830dc0ba59dd5a59258c8c8f889a79a12388d328c
+EBUILD sc2mpd-1.1.7.ebuild 3258 BLAKE2B 96b1a25e430ba86f2e0ff6c62c3d346958455f193d9150a0191b7c9b02a14bdf3a57c00e6a76e0e79417bfaa686c7b87daebfe1a50a8651a8cf642602737dcab SHA512 87eb0922ce245f8524f2f3b3587c28ae9c4506c17ab8323e705a8104748e2c5f0bb80b4a09a636a967f42702d7c784f0bb2ae2c88c9a8160ce24a29b23f2f1ff
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
deleted file mode 100644
index dd5733ae60e6..000000000000
--- a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-
-sha_net="1dd6411ffbe59fe09517162fb88e2405adb4990f"
-sha_netgenerated="e3edb912410d4c5a4d5323bb1e9c27660a42d78f"
-sha_topology="cc09c09da4be8d3d04adae5b8f0daaf8450906a3"
-sha_songcast="3299eaedfea34993b79e6d30444792d4fb12a110"
-sha_devtools="d3586187dfa5f0a8b0f3e35e3d1dc50d1c34943d"
-
-SRC_URI="
-	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
-	https://codeload.github.com/openhome/ohNet/tar.gz/${sha_net}
-		-> ohnet.${sha_net:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohNetGenerated/tar.gz/${sha_netgenerated}
-		-> ohnetgenerated.${sha_netgenerated:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohTopology/tar.gz/${sha_topology}
-		-> ohtopology.${sha_topology:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohSongcast/tar.gz/${sha_songcast}
-		-> ohsongcast.${sha_songcast:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohdevtools/tar.gz/${sha_devtools}
-		-> ohdevtools.${sha_devtools:0:6}.tar.gz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	media-libs/alsa-lib
-	media-libs/libsamplerate
-	net-libs/libmicrohttpd
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
-	mkdir openhome || die "Couldn't mkdir openhome"
-	mv ohNet-${sha_net} openhome/ohNet || die "Couldn't mv ohNet"
-	mv ohNetGenerated-${sha_netgenerated} openhome/ohNetGenerated || die "Couldn't mv ohNetGenerated"
-	mv ohdevtools-${sha_devtools} openhome/ohdevtools || die "Couldn't mv ohdevtools"
-	mv ohTopology-${sha_topology} openhome/ohTopology || die "Couldn't mv ohTopology"
-	mv ohSongcast-${sha_songcast} openhome/ohSongcast || die "Couldn't mv ohSongcast"
-
-	eapply "${FILESDIR}/${P}-werror.patch"
-
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	epatch "${FILESDIR}/ohnet.makefile.patch"
-	epatch "${FILESDIR}/ohnet.optionparser.patch"
-	sed -i -e 's/ bundle-after-build//' UserTargets.mak || die "Couldn't patch UserTargets.mak"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	epatch "${FILESDIR}/ohnetgenerated.makefile.patch"
-	epatch "${FILESDIR}/ohnetgenerated.commonmk.patch"
-	sed -i -e 's/ bundle-after-build//' UserTargets.mak \
-		|| die "Couldn't patch generated UserTargets.mak"
-
-	eapply_user
-}
-
-src_configure() {
-	econf "--with-openhome=${WORKDIR}/openhome"
-}
-
-src_compile() {
-	# Begin ohbuild.sh reverse engineer
-
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	make native_only=yes || die "ohnet make failed"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	# TODO: get from environment/make target
-	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
-	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
-	cd $deps || die "Couldn't cd to deps dir"
-
-	ohnet="${WORKDIR}/openhome/ohNet"
-	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
-		 -exec cp '{}' lib ';' \
-		|| die "Couldn't cp binary libs"
-
-	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
-	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
-	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
-	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
-	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
-	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
-	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
-	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
-	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
-	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
-	make native_only=yes || die "ohnetgenerated make failed"
-
-	cd "Build/Include" || die "Couldn't cd later to include"
-	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
-
-	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
-	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
-	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
-
-	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
-	make release=1 Receiver WavSender || die "Failed to build ohSongcast"
-
-	# End ohbuild.sh reverse engineer
-
-	cd "${S}" || die "Failed to cd to source directory"
-	make || die "Failed to make sc2mpd"
-}
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
index 5e598bc0f586..e8dba6b2c3a3 100644
--- a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
+++ b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/expat
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 54543fbd71a3..855b78e15e3b 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,11 +1,7 @@
 AUX supercollider-3.10.2-no-ccache.patch 927 BLAKE2B 661610049aab5c077cbff57fa476d08ef7170440135362dafa96b4ab312d778154acdcccd93562822c7d6078d55c6c5eaf59eeadc85e61cc85f1e50a76c908e8 SHA512 5a1f6f074adcb77b9958ff47e855378f9ec180201e32cc417925320ee7fbeedd5b2a163b300286bf0344bb6bb47743598c59c95f28573f4a309696ca5e44af8d
-AUX supercollider-3.11.0-boost-1.72.patch 1830 BLAKE2B b9a9f358199de97865fc0d8a2e55af2b3312797faa1cde25a2f7d110abf5dc7c14d755f4d2e21e99e1aba28cd0ebe96fa4bb15a190454745181c998ed6033b7f SHA512 cac02e7041dfd233a3624d1772a805bcb58a702195f0e4470f62e68834e494ca51b4719ba328c9de88669ae1b9dae5eb5bcc0bd162df12c6c5ea80829207bfb6
-AUX supercollider-3.11.0-fewer-qt-deps.patch 4412 BLAKE2B 433a51ca1e6b537811392891bec8f4de5aa289473c733c78567d4dddb3c5bc1b2b36c8a8f79222f2a70aa3eb6f0908b20d1cae5e87a9a57c1e56e3725b3787cf SHA512 742b4991c3402acb70ad731d4c535bea9671916360b9e0f17c6611359c1488c23599b613c4a0ff4846a74a55a7af7b5848865998bb4ebae4b0a4944f9caa892c
-AUX supercollider-3.11.0-qt-5.15.patch 2709 BLAKE2B ec9fd1241d6a5c244716434e0b1b44528f7c55a29dc9df09b47099685f5453e708edec6f106af9282ab31034bd1aa8f8e73c359e0228bbd9d63dc85ed41b4ddf SHA512 d26ae878b83f6cd5c7eca29893954bda1dd0adf70252e074f218851d931c97bd7b9aa6fd3ca9234ed7e7f0a52e26a28ad77ba3d5d08a7dee37bed2313d22a9b8
+AUX supercollider-3.11.2-boost-1.74.patch 1673 BLAKE2B c3eafd046222c43e06f83eb222da96bf5a4410fbe46894e1dda36c096a7656a56ef9a193b54767fd4eb835cefe56024e75ade31ed1d7721812bd0a471876a02a SHA512 e50660ec5ecd19464ecfe22a0a4cab2df58c9eefb3d19c71763b95d2a0e8fecd7feb4fa3722965e10c3e7f36151fc255c9a8af22caee9d00f1d29af3860569ba
 AUX supercollider-3.11.2-fewer-qt-deps.patch 4450 BLAKE2B 4f5c4515f674925724cf07d0ba233f909238de6cfe43c8ce333c92b7b95d182a9c08efaff7c9ca95c4fb261fcd272e15fb3b333724b87158f70f8f91cc9a98f1 SHA512 d7b41ba57249ffedc325e806f253b507124c255611224b531d50cdf506402f151476d29393d8c469b1eceea486c06da9549251e568d99cd739ec20ee258cf0cc
 AUX supercollider-3.11.2-fix-libscsynth-linker-issue.patch 10461 BLAKE2B 1037589e0210d4ca86986a44c657539d2ffb6ca1684777b5bd38dfe3fdadfcd3d14df4d16a4af29643ca15647e96915e99866bb04626e8947ab38ae4d303225f SHA512 9cf9f96c91f267a9f1a4ab423731d87c808acee84c06a81f58821caffab433d099d198df85f1e3829e772d59028907eb65fec155c6e31fee010e2573084b5c7c
-DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da
 DIST SuperCollider-3.11.2-Source.tar.bz2 18130954 BLAKE2B 3713561e5ebee6dd4c08baa8aaaf4a422ab983480c76b2176373ce3cd080128f9392b50482e02dc82dce235e928d058c42722e0863dad9f6d2dd086894cd85da SHA512 636062c6acf8be43260632287b587f167352079c4e86ede34d1c6056180bfdb3ae50d6a3ff4f349327a3ab6af0eb01ac503d6b22667b4799dfcddd9c6489a23c
-EBUILD supercollider-3.11.0-r1.ebuild 3293 BLAKE2B 3c9c99beb8780cdd5d1b98a14e8f788323dcc3c9709128e7961418e9cf559ee0dbc1e578fb54be2cc5b2bc0040c7cf16da9ba64e108a1dfdf81ec648224a1ec3 SHA512 ff2cc14e12060ab811878e841f576c282c31db2671696fd81c65c0bf9da9ba31b7a149b24fdbc9fd8fcf2212a3cbe9081ffed9eb0b67888ff140e9f9b018d9fa
-EBUILD supercollider-3.11.2.ebuild 3260 BLAKE2B 4fdf208f6c032be7f6c53a1880efa2d6acf76ed3eaa6c1aed1e04614b2daa7693f7487815ec8e712ed3047317124866bd909a2c9dab9f4b22502b24565dfb968 SHA512 b52ac31863306d15af9bf263882cef85b21e7c751114908b55b6fa7baf2953d82c13b082ba5b9869777284a9ba5a9bc7c99c0191c612df7673c359effffaf05d
+EBUILD supercollider-3.11.2.ebuild 3301 BLAKE2B 43877f8cd9f24c2ca329ba98184d28f1669f2510bfcfb49b3793235892ca9400740ea6315c57337e88708e98c5ef305b3a855634b33088929d0e11afdf785b52 SHA512 0f65d31ac50f47065eecb63023cdf86f6444773748abb978c2ae3705745b0e5ed02e4ac49166d0c62f1057981c320d12615d86a49ce034e6ff1efddc5322ae94
 MISC metadata.xml 1118 BLAKE2B f73fdd5fe30a105f5e408c713ec865322da87a1961d91a22d7689b217a3867e98a327f4a1f6db39c527b103a11ef3b624067baf3e380794cd412f58908c519bf SHA512 31731d66bcabc0a2227b89d769159c1b0c936c9a512e082780e71d4531dd9eed9be3e0d05859b92e84d8a8281a129151aa7ead133181c298f121e7fb1a54671f
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch b/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
deleted file mode 100644
index 94329b867915..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 43b2b27c14186a9a3eff917d7598751ed298ae20 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Sun, 31 May 2020 21:25:12 +0900
-Subject: [PATCH 2/2] Fix build with Boost 1.72.0
-
----
- .../include/boost/sync/detail/throw_exception.hpp           | 4 ----
- external_libraries/oscpack_build.cpp                        | 6 +++---
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
-index b5fdfabf8..a7d7fa7b3 100755
---- a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
-+++ b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
-@@ -164,11 +164,7 @@ BOOST_NOINLINE BOOST_NORETURN void throw_exception(const char* func, const char*
- 
- #endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
- 
--#if !defined(BOOST_EXCEPTION_DISABLE)
--#define BOOST_SYNC_DETAIL_HERE BOOST_THROW_EXCEPTION_CURRENT_FUNCTION, __FILE__, __LINE__
--#else
- #define BOOST_SYNC_DETAIL_HERE BOOST_CURRENT_FUNCTION, __FILE__, __LINE__
--#endif
- 
- #define BOOST_SYNC_DETAIL_THROW_DEFAULT(ex)\
-     boost::sync::detail::throw_exception< ex >(BOOST_SYNC_DETAIL_HERE)
-diff --git a/external_libraries/oscpack_build.cpp b/external_libraries/oscpack_build.cpp
-index 3a658f3d3..1f6283d1c 100644
---- a/external_libraries/oscpack_build.cpp
-+++ b/external_libraries/oscpack_build.cpp
-@@ -1,8 +1,8 @@
--#include <boost/detail/endian.hpp>
-+#include <boost/predef.h>
- 
--#ifdef BOOST_LITTLE_ENDIAN
-+#if BOOST_ENDIAN_LITTLE_BYTE
- #define OSC_HOST_LITTLE_ENDIAN
--#elif defined(BOOST_BIG_ENDIAN)
-+#elif BOOST_ENDIAN_BIG_BYTE
- #define OSC_HOST_BIG_ENDIAN
- #else
- #error please define endianness
--- 
-2.26.2
-
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch b/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
deleted file mode 100644
index 8b1014d99919..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 5b655fbbf44ff5e67709667242a5feff707e1a51 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Mon, 1 Jun 2020 18:43:08 +0900
-Subject: [PATCH] Remove spurious Qt dependencies
-
----
- QtCollider/CMakeLists.txt     | 10 +++-------
- QtCollider/widgets/QcCanvas.h |  2 --
- README_LINUX.md               |  6 +++---
- README_RASPBERRY_PI.md        |  2 +-
- editors/sc-ide/CMakeLists.txt | 13 +++----------
- 5 files changed, 10 insertions(+), 23 deletions(-)
-
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index de38afb908..6b9437b9c0 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -7,19 +7,15 @@ option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
- set(
-   QT_COMPONENTS
-   Core
--  Widgets
-+  Gui
-   Network
-   PrintSupport
--  OpenGL
--  Quick
--  Qml
--  Sql
-   Svg
-+  Widgets
- )
- 
- set (QT_COLLIDER_LIBS
--  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
--  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
-+  Qt5::Core Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Svg Qt5::Widgets
-   ${MATH_LIBRARY})
- 
- if(SC_USE_QTWEBENGINE)
-diff --git a/QtCollider/widgets/QcCanvas.h b/QtCollider/widgets/QcCanvas.h
-index 3acb00fc23..ff230b8139 100644
---- a/QtCollider/widgets/QcCanvas.h
-+++ b/QtCollider/widgets/QcCanvas.h
-@@ -28,9 +28,7 @@
- #include <QBasicTimer>
- #include <QTime>
- #include <QPalette>
--#include <QGLWidget>
- 
--// using QcCanvasBase = QGLWidget;
- using QcCanvasBase = QWidget;
- 
- class QcCanvas : public QcCanvasBase {
-diff --git a/README_LINUX.md b/README_LINUX.md
-index d5818e9106..532ad9cc5a 100644
---- a/README_LINUX.md
-+++ b/README_LINUX.md
-@@ -75,7 +75,7 @@ Depending on your Debian flavor and version, your distribution's PPA may be stuc
- 
- If this displays version 5.7 or later, installing Qt is easy:
- 
--    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtdeclarative5-dev qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
-+    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
- 
- If you are on Ubuntu 14.04 (Trusty) or 16.04 (Xenial), check the next section. Otherwise, you will have to use the official Qt installer. Sorry.
- 
-@@ -87,13 +87,13 @@ On Xenial:
- 
-     sudo apt-add-repository ppa:beineri/opt-qt-5.11.0-xenial
-     sudo apt-get update
--    sudo apt-get install qt511base qt511location qt511declarative qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
-+    sudo apt-get install qt511base qt511location qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
- 
- On Trusty, only Qt 5.10 and below are available:
- 
-     sudo apt-add-repository ppa:beineri/opt-qt-5.10.1-trusty
-     sudo apt-get update
--    sudo apt-get install qt510base qt510location qt510declarative qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
-+    sudo apt-get install qt510base qt510location qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
- 
- [Stephan Binner's Launchpad PPAs]: https://launchpad.net/~beineri
- 
-diff --git a/README_RASPBERRY_PI.md b/README_RASPBERRY_PI.md
-index 974ea1822c..aae8250388 100644
---- a/README_RASPBERRY_PI.md
-+++ b/README_RASPBERRY_PI.md
-@@ -42,7 +42,7 @@ Install required libraries:
-     # For GUI builds:
-     sudo apt-get install libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
-         libreadline-dev libfftw3-dev libxt-dev libudev-dev cmake qttools5-dev qttools5-dev-tools \
--        qtdeclarative5-dev libqt5svg5-dev qjackctl
-+        qtbase5-dev libqt5svg5-dev qjackctl
-     # For GUI-less builds:
-     sudo apt-get install libsamplerate0-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
-         libreadline-dev libfftw3-dev libudev-dev cmake git
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index 1ee9ae4f43..6248668594 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -6,22 +6,15 @@ set(QT_IDE_COMPONENTS
-     Concurrent
-     Core
-     LinguistTools
--    # OpenGL
--    PrintSupport
--    Qml
--    Quick
--    Sql
-+    Network
-     Widgets
- )
- 
- set(QT_IDE_LIBRARIES
-     Qt5::Concurrent
-     Qt5::Core
--    # Qt5::OpenGL
--    Qt5::PrintSupport
--    Qt5::Qml
--    Qt5::Quick
--    Qt5::Sql
-+    Qt5::Network
-+    Qt5::Widgets
- )
- 
- if(SC_USE_QTWEBENGINE)
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch b/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
deleted file mode 100644
index 37f803312c28..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 244e55632cef86ecd363eb8df3f2352569f804f4 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Sun, 31 May 2020 21:24:52 +0900
-Subject: [PATCH 1/2] Fix build with Qt 5.15
-
----
- QtCollider/primitives/prim_QPen.cpp       | 1 +
- QtCollider/widgets/QcGraph.cpp            | 1 +
- QtCollider/widgets/QcLevelIndicator.cpp   | 1 +
- QtCollider/widgets/QcMultiSlider.cpp      | 1 +
- QtCollider/widgets/QcScopeShm.cpp         | 1 +
- QtCollider/widgets/soundfileview/view.cpp | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/QtCollider/primitives/prim_QPen.cpp b/QtCollider/primitives/prim_QPen.cpp
-index 8d531214d..4ba24519d 100644
---- a/QtCollider/primitives/prim_QPen.cpp
-+++ b/QtCollider/primitives/prim_QPen.cpp
-@@ -27,6 +27,7 @@
- #include "PyrKernel.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QVector2D>
- #include <QVector3D>
- #include <cmath>
-diff --git a/QtCollider/widgets/QcGraph.cpp b/QtCollider/widgets/QcGraph.cpp
-index 70215ae94..79e71d1ad 100644
---- a/QtCollider/widgets/QcGraph.cpp
-+++ b/QtCollider/widgets/QcGraph.cpp
-@@ -24,6 +24,7 @@
- #include "../style/routines.hpp"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QApplication>
- #include <QtCore/qmath.h>
-diff --git a/QtCollider/widgets/QcLevelIndicator.cpp b/QtCollider/widgets/QcLevelIndicator.cpp
-index 19c7d4874..8a60f354a 100644
---- a/QtCollider/widgets/QcLevelIndicator.cpp
-+++ b/QtCollider/widgets/QcLevelIndicator.cpp
-@@ -23,6 +23,7 @@
- #include "../QcWidgetFactory.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator);
- 
-diff --git a/QtCollider/widgets/QcMultiSlider.cpp b/QtCollider/widgets/QcMultiSlider.cpp
-index 046b18739..381ddd404 100644
---- a/QtCollider/widgets/QcMultiSlider.cpp
-+++ b/QtCollider/widgets/QcMultiSlider.cpp
-@@ -26,6 +26,7 @@
- #include <QApplication>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include <cmath>
- 
-diff --git a/QtCollider/widgets/QcScopeShm.cpp b/QtCollider/widgets/QcScopeShm.cpp
-index bb44623f4..edd38ef57 100644
---- a/QtCollider/widgets/QcScopeShm.cpp
-+++ b/QtCollider/widgets/QcScopeShm.cpp
-@@ -25,6 +25,7 @@
- #include "../debug.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTimer>
- #include <QResizeEvent>
- #include <QWindow>
-diff --git a/QtCollider/widgets/soundfileview/view.cpp b/QtCollider/widgets/soundfileview/view.cpp
-index a3eca811f..baba0b245 100644
---- a/QtCollider/widgets/soundfileview/view.cpp
-+++ b/QtCollider/widgets/soundfileview/view.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QGridLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- #include <QPaintEvent>
- #include <QCursor>
--- 
-2.26.2
-
diff --git a/media-sound/supercollider/files/supercollider-3.11.2-boost-1.74.patch b/media-sound/supercollider/files/supercollider-3.11.2-boost-1.74.patch
new file mode 100644
index 000000000000..1e1ca8b7e195
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.2-boost-1.74.patch
@@ -0,0 +1,39 @@
+From cc873049ff9249a33567e4cbcdeffeb6806a30d6 Mon Sep 17 00:00:00 2001
+From: brianlheim <self@brianlheim.com>
+Date: Tue, 25 Aug 2020 17:14:29 -0500
+Subject: [PATCH] remove workarounds for old boost versions
+
+we don't need to support boost pre-1.70 anymore, and tcp::socket::executor_type was always the right typealias to use
+---
+ server/supernova/sc/sc_osc_handler.hpp | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp
+index f17e99a557..676c94dbf1 100644
+--- a/server/supernova/sc/sc_osc_handler.hpp
++++ b/server/supernova/sc/sc_osc_handler.hpp
+@@ -234,11 +234,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer
+     class tcp_connection : public nova_endpoint {
+     public:
+         using pointer = std::shared_ptr<tcp_connection>;
+-#if BOOST_VERSION >= 107000
+-        using executor = boost::asio::executor;
+-#else
+-        using executor = boost::asio::io_context::executor_type;
+-#endif
++        using executor = tcp::socket::executor_type;
+ 
+         static pointer create(const executor& executor) { return pointer(new tcp_connection(executor)); }
+ 
+@@ -249,11 +245,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer
+         bool operator==(tcp_connection const& rhs) const { return &rhs == this; }
+ 
+     private:
+-#if BOOST_VERSION >= 107000
+         tcp_connection(const executor& executor): socket_(executor) {}
+-#else
+-        tcp_connection(const executor& executor): socket_(executor.context()) {}
+-#endif
+ 
+         void send(const char* data, size_t length) override final;
+ 
diff --git a/media-sound/supercollider/supercollider-3.11.0-r1.ebuild b/media-sound/supercollider/supercollider-3.11.0-r1.ebuild
deleted file mode 100644
index 5132d3a2743b..000000000000
--- a/media-sound/supercollider/supercollider-3.11.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf"
-
-REQUIRED_USE="
-	qt5? ( X )
-	webengine? ( qt5 )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.70.0:=
-	media-libs/alsa-lib
-	sys-libs/readline:0=
-	virtual/libudev:=
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	!jack? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	server? ( !app-admin/supernova )
-	sndfile? ( media-libs/libsndfile )
-	webengine? (
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwebsockets:5
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
-	dev-libs/icu
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gedit? ( app-editors/gedit )
-	qt5? (
-		dev-qt/qtconcurrent:5
-	)
-	vim? ( app-editors/vim )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
-	"${FILESDIR}"/${P}-boost-1.72.patch # Upstream PR 4990
-	"${FILESDIR}"/${P}-qt-5.15.patch # Upstream PR 4986
-	"${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
-)
-
-S="${WORKDIR}/SuperCollider-${PV}-Source"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_HELP=ON
-		-DSYSTEM_BOOST=ON
-		-DSYSTEM_YAMLCPP=ON
-		-DSSE=$(usex cpu_flags_x86_sse)
-		-DSSE2=$(usex cpu_flags_x86_sse2)
-		-DSC_EL=$(usex emacs)
-		-DFFT_GREEN=$(usex !fftw)
-		-DSC_ED=$(usex gedit)
-		-DNO_GPL3=$(usex !gpl3)
-		-DAUDIOAPI=$(usex jack jack portaudio)
-		-DSC_IDE=$(usex qt5)
-		-DSC_QT=$(usex qt5)
-		-DSCLANG_SERVER=$(usex server)
-		-DSUPERNOVA=$(usex server)
-		-DNO_LIBSNDFILE=$(usex !sndfile)
-		-DLIBSCSYNTH=$(usex !static-libs)
-		-DSC_VIM=$(usex vim)
-		-DNO_X11=$(usex !X)
-		-DNO_AVAHI=$(usex !zeroconf)
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DSC_USE_QTWEBENGINE=$(usex webengine)
-	)
-
-	use debug && mycmakeargs+=(
-		-DSC_MEMORY_DEBUGGING=ON
-		-DSN_MEMORY_DEBUGGING=ON
-		-DGC_SANITYCHECK=ON
-	)
-
-	append-flags $(usex debug '' -DNDEBUG)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	use emacs && newdoc editors/scel/README.md README.emacs
-	use gedit && newdoc editors/sced/README.md README.gedit
-	use vim && newdoc editors/scvim/README.md README.vim
-}
-
-src_test() {
-	export QT_QPA_PLATFORM=offscreen
-	cmake_src_test
-}
-
-pkg_postinst() {
-	einfo "Notice: SuperCollider is not very intuitive to get up and running."
-	einfo "The best course of action to make sure that the installation was"
-	einfo "successful and get you started with using SuperCollider is to take"
-	einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/supercollider/supercollider-3.11.2.ebuild b/media-sound/supercollider/supercollider-3.11.2.ebuild
index 288d5aa5c6b9..22651297c886 100644
--- a/media-sound/supercollider/supercollider-3.11.2.ebuild
+++ b/media-sound/supercollider/supercollider-3.11.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake flag-o-matic readme.gentoo-r1 xdg-utils
 
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
+DESCRIPTION="Environment and programming language for real time audio synthesis"
 HOMEPAGE="https://supercollider.github.io/"
 SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"
 
@@ -57,9 +57,7 @@ DEPEND="${RDEPEND}
 	dev-libs/icu
 	emacs? ( >=app-editors/emacs-23.1:* )
 	gedit? ( app-editors/gedit )
-	qt5? (
-		dev-qt/qtconcurrent:5
-	)
+	qt5? ( dev-qt/qtconcurrent:5 )
 	vim? ( app-editors/vim )
 "
 
@@ -67,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
 	"${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
 	"${FILESDIR}"/${P}-fix-libscsynth-linker-issue.patch # Upstream issue 4992
+	"${FILESDIR}"/${P}-boost-1.74.patch # bug 760489
 )
 
 S="${WORKDIR}/SuperCollider-${PV}-Source"
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 89ae3c827fb4..c3898a38d750 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -2,15 +2,10 @@ AUX teamspeak.initd-r1 559 BLAKE2B fa37f29a3a03579d091da5cd01785dd93e15f38c070e0
 AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7d01c8931a18bf63615b0a125dec420f35e2517dacfd760750957997fcf58e69bcd2ca0721b4e2054ae SHA512 a31633591ae97224f3aefef25ed9d50e6cedf252c94559f7c424065ae815e0724c75e1c71337283933283cc77626d106ba5e15f3cce5c5dfddfc74a1f99160ba
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
 AUX ts3db_postgresql.ini.sample 99 BLAKE2B 06931c928de8f46373b6c7102358379260432d9f4b8d25d83455b62242abdb3a74b124fce5ba08b0a5f06a6dbe8252712d88b4106200976a032024ff14da37dc SHA512 803763b93d2cc7e7b111ca9649deb6e582e1f0228bd9acd677f8d3f914cbed745381663562ada655618bdb955c07f0cdf02bdd4d8ce02861f082ca9aef8e480f
-AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server.ini-r2 721 BLAKE2B 8427ffb88e2856b0807fe3c3ed2411039fe330f65322cca1e4b35d57e68e021b982a3e3c9044994bc21ed7010ebd746adf6fcfa93b3e2e9f5b5a16e3a3779bd5 SHA512 8d5ce0e3bf30bacd88784504dde88c1561d886f2402398d5f84d0acac56159fa21181adec25fec01f42582e0489a576606c9f12e426edcb1e9c2436ada196c4c
-AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
 AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
 AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
-DIST teamspeak3-server_linux_amd64-3.12.1.tar.bz2 9428301 BLAKE2B aeab07edc31d1ee57ffd34b218aeb3f7e23f31ffb5b8b940cbc46bca91b6ef9caffb67f1a52c059439a64d73ceb8fce124c0e8101d3e04d752782344ff6c1843 SHA512 58bfb582deddc4137245fe73d3aabfbcd84c3c346fe5fd3db8c7756014fcdd1f0bd7798ee029aa9beebe454fa8021dd180dd577f147cc5f02c833b68d9253fc7
 DIST teamspeak3-server_linux_amd64-3.13.3.tar.bz2 9945408 BLAKE2B d714a046279c8cac11ff373a66ba41010e5839704030ae29f8d7f429759126dff8675b8b0b37b584115ad44d9e216cb5449d4b159dae53ece72f9e5bbe119f84 SHA512 39ad3a00f5e38a0601ed9e9df4227a7f00b4cb9bdaed6562ccf05e0fce22ed040cfd5a2ea36e9e97a18a74c335e90c0c080106cdaf5c0b32859819286727cb58
-DIST teamspeak3-server_linux_x86-3.12.1.tar.bz2 9268349 BLAKE2B 61d0794944775e4e9bfb57bc2ac331c5cc9da04d6a3956d4c1ec6c6d36ef87cb04ea1f0004d75251adc4baa1b9be999373d08ea36ca9f86e10b00e03d0f20f38 SHA512 83222586ff6e157af7242afc151c900eb339f05813f8b5fef602f9989a109b80de46bc86c7381b6acce240c62e9859b86df655a0b0219225162315337ca609ef
 DIST teamspeak3-server_linux_x86-3.13.3.tar.bz2 9779788 BLAKE2B 1ddb466dfc6a7d19dacfa05a0608487a8b086963186eb48e2480b83fb9eaa408ca45bc80bfc6fbfd1623c21caeb27e516f6d893ab84e442ba75c9f59daf4fa79 SHA512 9b14e1fd8b969c32ca63e3b9665e0941c3d1e67b3e49d5f2d6cc701aa4ee10a80f1c10428ef2d59bb3767cd03ad5503a527c47b1db11ea525cca8c7e07787621
-EBUILD teamspeak-server-3.12.1.ebuild 3083 BLAKE2B 2790ceaad0373faf5fb5b6e7ebcb997590ac3916021efabedcd4573c5c785351a1c617e418b2075bc10545c79ca64106c4506bc3844d007dab4aa6add16deb86 SHA512 8c4f7e56d0b035946b02a236d1488be1f2052332012724ef0158f00e58c1c0a7a0b7037a59a838a283e905c72b9194de483c0633c5095097c5920c1307dbbab3
-EBUILD teamspeak-server-3.13.3.ebuild 3512 BLAKE2B b58690672fdab82da1f31cc1ca0707c7aec578719454bb80f141f9d996e512d20495bc5fe6a0c6a6b15176ab7c57af50c17deee6c85b905f2304aae44b05279f SHA512 a426856348012da8589a4d3c65c2fac8a87e1582a9aae66bf6176a67f3724e189e1f21187837cbc345ffbe4ed1e2d62058ffd6b39e109bce776d1cd32e4f226c
+EBUILD teamspeak-server-3.13.3.ebuild 3510 BLAKE2B 8b7c969ca30aa7683c506f730e135ba127ecb6b7d0eac50dcd7b6286e445c8bdeabacf96cd79cb1a591e00aa29193eb29d98e7816da386c426afe97309166a44 SHA512 a6d75c808865c5f8a48ce3a17671ff242b34e82bf83672be8dc779945db8f02816a0d55c28900b1a96e77e1e067db0c375bd9d6082d21b3ba8b1c927148fa551
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/files/ts3server.ini-r1 b/media-sound/teamspeak-server/files/ts3server.ini-r1
deleted file mode 100644
index 769e815a1997..000000000000
--- a/media-sound/teamspeak-server/files/ts3server.ini-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-machine_id=
-default_voice_port=9987
-voice_ip=
-licensepath=/opt/teamspeak3-server/
-filetransfer_port=30033
-filetransfer_ip=
-query_port=10011
-query_ip=0.0.0.0, ::
-query_ip_whitelist=query_ip_whitelist.txt
-query_ip_blacklist=query_ip_blacklist.txt
-dbplugin=ts3db_sqlite3
-dbpluginparameter=
-dbsqlpath=/opt/teamspeak3-server/sql/
-dbsqlcreatepath=create_sqlite/
-dbconnections=10
-logpath=/var/log/teamspeak3-server/
-logquerycommands=0
-dbclientkeepdays=30
-logappend=0
-query_skipbruteforcecheck=0
-query_buffer_mb=20
-http_proxy=
-license_accepted=1
-serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
-query_ssh_ip=0.0.0.0, ::
-query_ssh_port=10022
-query_protocols=raw
-query_ssh_rsa_host_key=ssh_host_rsa_key
-query_timeout=300
diff --git a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1 b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1
deleted file mode 100644
index 6b2a28d2976b..000000000000
--- a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-machine_id=
-default_voice_port=9987
-voice_ip=
-licensepath=/opt/teamspeak3-server/
-filetransfer_port=30033
-filetransfer_ip=
-query_port=10011
-query_ip=0.0.0.0, ::
-query_ip_whitelist=query_ip_whitelist.txt
-query_ip_blacklist=query_ip_blacklist.txt
-dbplugin=ts3db_mariadb
-dbpluginparameter=/etc/teamspeak3-server/ts3db_mariadb.ini
-dbsqlpath=/opt/teamspeak3-server/sql/
-dbsqlcreatepath=create_mariadb/
-dbconnections=10
-logpath=/var/log/teamspeak3-server/
-logquerycommands=0
-dbclientkeepdays=30
-logappend=0
-query_skipbruteforcecheck=0
-query_buffer_mb=20
-http_proxy=
-license_accepted=1
-serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
-query_ssh_ip=0.0.0.0, ::
-query_ssh_port=10022
-query_protocols=raw
-query_ssh_rsa_host_key=ssh_host_rsa_key
-query_timeout=300
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
deleted file mode 100644
index 8188b8163ba4..000000000000
--- a/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="A server software for hosting quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="doc mysql tsdns"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/teamspeak
-	acct-user/teamspeak
-"
-
-QA_PREBUILT="
-	opt/teamspeak3-server/libmariadb.so.2
-	opt/teamspeak3-server/libts3db_mariadb.so
-	opt/teamspeak3-server/libts3db_sqlite3.so
-	opt/teamspeak3-server/libts3_ssh.so
-	opt/teamspeak3-server/ts3server
-	opt/teamspeak3-server/tsdnsserver
-"
-
-src_unpack() {
-	default
-
-	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
-}
-
-src_install() {
-	diropts -o teamspeak -g teamspeak
-	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
-
-	diropts
-	keepdir /etc/teamspeak3-server
-
-	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
-
-	exeinto /opt/teamspeak3-server
-	doexe ts3server
-
-	dodir /opt/bin
-	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
-
-	exeinto /opt/teamspeak3-server
-	doexe libts3db_sqlite3.so libts3_ssh.so
-
-	insinto /opt/teamspeak3-server/serverquerydocs
-	doins -r serverquerydocs/.
-
-	insinto /opt/teamspeak3-server/sql
-	doins sql/*.sql
-	doins -r sql/create_sqlite
-
-	insinto /etc/teamspeak3-server
-	newins "${FILESDIR}"/ts3server.ini-r1 ts3server.ini
-
-	dodoc CHANGELOG
-	docinto ts3server
-	dodoc doc/*.txt
-
-	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
-	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
-
-	newenvd - 99teamspeak3-server <<- EOF
-		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
-	EOF
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/serverquery/.
-	fi
-
-	if use mysql; then
-		insinto /etc/teamspeak3-server
-		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r1 ts3server_mariadb.ini.sample
-		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
-
-		exeinto /opt/teamspeak3-server
-		doexe libts3db_mariadb.so
-		doexe redist/libmariadb.so.2
-
-		insinto /opt/teamspeak3-server/sql
-		doins -r sql/create_mariadb
-		doins -r sql/updates_and_fixes
-	fi
-
-	if use tsdns; then
-		exeinto /opt/teamspeak3-server
-		doexe tsdns/tsdnsserver
-		dodir /opt/bin
-		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
-
-		insinto /etc/teamspeak3-server
-		doins tsdns/tsdns_settings.ini.sample
-
-		docinto tsdns
-		dodoc tsdns/{README,USAGE}
-	fi
-}
-
-pkg_postinst() {
-	elog "If you have a license,"
-	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
-	elog "Please note, that the license must be writeable by the teamspeak user,"
-	elog "as it will be automatically updated every six months."
-}
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
index 75790c371a7d..04a06cc4ff6e 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 postgres tsdns"
 
 RESTRICT="bindist mirror"
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
deleted file mode 100644
index 5e025182e54a..000000000000
--- a/media-sound/tomahawk/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX tomahawk-0.9.0_pre20181030-cmakepolicy.patch 926 BLAKE2B 8af469b6186e57db674dc5acaec6032bf43c15d91b5db9a9bf30f617c47b74486149a50774c76eb69bf89157e1ee8eed0d449b9d107e4f8e7e376f9d9d4f9d29 SHA512 7d0c98a6f1708d156ab643439faf3f469fa21a106f618dc1b8b7c569a2f65a9c929670bc1aa679eebf1116e615fd832593116f84e3abe5fff3d91450e1455f21
-AUX tomahawk-0.9.0_pre20181030-findtaglib.patch 8972 BLAKE2B 939a01eadce7709ed499bee56c6d3b9b1327cedda4d803024ca52ac11eacf798c62ccdc01e1fc6f8477545207ca9e17e85f3d000ce6b7d09379aad33677edf03 SHA512 8225e6b03c4b747f9179bb434c7ab3e1eb3708a8c62e95db87e918cb254d8717a2bc7fcee587ada70a954e73da2d85cac708121fe1884536450a8e7c2cfe185b
-AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
-AUX tomahawk-0.9.0_pre20181030-qt-5.15.patch 4668 BLAKE2B 40c40daa9079f1695234dff83102087ab3eaa26ef6b084df36fc2040e9f23d69296a452e3d263a6e7fd902c78f62f2ae12a15ae181b8ff8848e4db0542df3462 SHA512 e5dbef2b9cf042576565ca16fd278778847af1657bf22d9c27cb177b5ba20fbc492f6769cc661657dbfc23bbfde66399f42a657c2fbea2c91d87216b921da8bd
-DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
-EBUILD tomahawk-0.9.0_pre20181030.ebuild 1885 BLAKE2B 6ba75ba004d9b7137fba269c6853567ed278c0a5daa025f69a77dc959a07f6e97890f2a000fd4f4f245d527127ad0a2e54f768c50556d250fbc1748528790039 SHA512 b83c1fd7ff15d1431a28f3716ea43b07e405015b350a8e1d31a0491315a300ef8c7c93755573b614e8c942c99cac4290f0fd9cee38e9eb03d15684881f018263
-MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
deleted file mode 100644
index 7ddf116eeccc..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 663981b4dd28fca6cac0b079bed26c411e7d1722 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 25 Jan 2019 21:13:05 +0100
-Subject: [PATCH] Fix build with <cmake-3.10
-
----
- CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b44d2ee43..9422a808e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,14 +2,18 @@ PROJECT( tomahawk )
- CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
- CMAKE_POLICY(SET CMP0017 NEW)
- CMAKE_POLICY(SET CMP0022 NEW)
--CMAKE_POLICY(SET CMP0075 NEW)
-+IF(POLICY CMP0075)
-+    CMAKE_POLICY(SET CMP0075 NEW)
-+ENDIF()
- 
- # TODO:
- # Update to NEW and fix things up
- CMAKE_POLICY(SET CMP0023 NEW)
- 
- # Let AUTOMOC and AUTOUIC process generated files
--CMAKE_POLICY(SET CMP0071 NEW)
-+IF(POLICY CMP0071)
-+    CMAKE_POLICY(SET CMP0071 NEW)
-+ENDIF()
- 
- # TODO:
- # Disable automatic qtmain linking
--- 
-2.20.1
-
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
deleted file mode 100644
index 9a53e0d69020..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 7c7b57e295aebcca9b09d8c5798e172cb8fd179c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 13 Jul 2020 02:11:06 +0200
-Subject: [PATCH] Import FindTaglib.cmake from ECM 5.72.0
-
-This version of ECM gained a module that is overriding Tomahawk's own, but
-variables are incompatible. Use the updated ECM module until we can depend
-on the necessary ECM version itself.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                         |   2 +-
- CMakeModules/CheckTagLibFileName.cmake |   5 +-
- CMakeModules/FindTaglib.cmake          | 173 +++++++++++++------------
- src/libtomahawk/CMakeLists.txt         |   4 +-
- 4 files changed, 93 insertions(+), 91 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9422a808e..2f1e72238 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,7 +213,7 @@ macro_optional_find_package(Lucene++ 3.0.0)
- macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
- 
- macro_optional_find_package(Taglib 1.8.0)
--macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
-+macro_log_feature(Taglib_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
- include( CheckTagLibFileName )
- check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
- 
-diff --git a/CMakeModules/CheckTagLibFileName.cmake b/CMakeModules/CheckTagLibFileName.cmake
-index e5b3706c9..7828dcf34 100644
---- a/CMakeModules/CheckTagLibFileName.cmake
-+++ b/CMakeModules/CheckTagLibFileName.cmake
-@@ -1,9 +1,8 @@
- # taglib changed filenames to be a char/wchar struct on some platforms, need to check for it
- macro (CHECK_TAGLIB_FILENAME TAGLIB_FILENAME_COMPLEX)
- 	include (CheckCXXSourceCompiles)
--	set (CMAKE_REQUIRED_FLAGS ${TAGLIB_CFLAGS})
--	set (CMAKE_REQUIRED_INCLUDES ${TAGLIB_INCLUDES})
--	set (CMAKE_REQUIRED_LIBRARIES ${TAGLIB_LIBRARIES})
-+	set (CMAKE_REQUIRED_INCLUDES ${Taglib_INCLUDE_DIRS})
-+	set (CMAKE_REQUIRED_LIBRARIES ${Taglib_LIBRARIES})
- 	check_cxx_source_compiles(
- 	"#include <tfile.h>
- 	int main()
-diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
-index d4ada2592..ad14c79cd 100644
---- a/CMakeModules/FindTaglib.cmake
-+++ b/CMakeModules/FindTaglib.cmake
-@@ -1,87 +1,90 @@
--# - Try to find the Taglib library
--# Once done this will define
-+#.rst:
-+# FindTaglib
-+# ----------
- #
--#  TAGLIB_FOUND - system has the taglib library
--#  TAGLIB_CFLAGS - the taglib cflags
--#  TAGLIB_LIBRARIES - The libraries needed to use taglib
--
--# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-+# Try to find the Taglib library.
- #
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--IF(TAGLIB_FOUND)
--	MESSAGE(STATUS "Using manually specified taglib locations")
--ELSE()
--
--	if(NOT TAGLIB_MIN_VERSION)
--	  set(TAGLIB_MIN_VERSION "1.6")
--	endif(NOT TAGLIB_MIN_VERSION)
--
--	if(NOT WIN32)
--		find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
--		   ${BIN_INSTALL_DIR}
--		)
--	endif(NOT WIN32)
--
--	#reset vars
--	set(TAGLIB_LIBRARIES)
--	set(TAGLIB_CFLAGS)
--
--#	MESSAGE( STATUS "PATHS: ${PATHS}")
--	# if taglib-config has been found
--	if(TAGLIBCONFIG_EXECUTABLE)
--
--	  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
--
--	  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--		 message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
--		 set(TAGLIB_FOUND FALSE)
--	  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--
--		 exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
--
--		 exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
--
--		 if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
--			set(TAGLIB_FOUND TRUE)
--#			message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
--		 endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
--		 string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--	  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--	  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
--
--	else(TAGLIBCONFIG_EXECUTABLE)
--
--	  include(FindLibraryWithDebug)
--	  include(FindPackageHandleStandardArgs)
--
--	  find_path(TAGLIB_INCLUDES
--		NAMES
--		tag.h
--		PATH_SUFFIXES taglib
--		PATHS
--		${INCLUDE_INSTALL_DIR}
--	  )
--
--	  find_library_with_debug(TAGLIB_LIBRARIES
--		WIN32_DEBUG_POSTFIX d
--		NAMES tag
--		PATHS
--		${LIB_INSTALL_DIR}
--	  )
--	  
--	  find_package_handle_standard_args(Taglib DEFAULT_MSG 
--										TAGLIB_INCLUDES TAGLIB_LIBRARIES)
--	endif(TAGLIBCONFIG_EXECUTABLE)
--ENDIF()
--
--if(TAGLIB_FOUND)
--  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
--    message(STATUS "Found TagLib: ${TAGLIB_LIBRARIES}")
--  endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
--else(TAGLIB_FOUND)
--  if(Taglib_FIND_REQUIRED)
--    message(FATAL_ERROR "Could not find Taglib")
--  endif(Taglib_FIND_REQUIRED)
--endif(TAGLIB_FOUND)
-+# This will define the following variables:
-+#
-+# ``Taglib_FOUND``
-+#       True if the system has the taglib library of at least the minimum
-+#       version specified by the version parameter to find_package()
-+# ``Taglib_INCLUDE_DIRS``
-+#       The taglib include dirs for use with target_include_directories
-+# ``Taglib_LIBRARIES``
-+#       The taglib libraries for use with target_link_libraries()
-+# ``Taglib_VERSION``
-+#       The version of taglib that was found
-+#
-+# If ``Taglib_FOUND`` is TRUE, it will also define the following imported
-+# target:
-+#
-+# ``Taglib::Taglib``
-+#       The Taglib library
-+#
-+# Since 5.72.0
-+#
-+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
-+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
-+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
-+# SPDX-License-Identifier: BSD-3-Clause
-+
-+find_package(PkgConfig QUIET)
-+
-+pkg_search_module(PC_TAGLIB QUIET taglib)
-+
-+find_path(Taglib_INCLUDE_DIRS
-+    NAMES tag.h
-+    PATH_SUFFIXES taglib
-+    HINTS ${PC_TAGLIB_INCLUDEDIR}
-+)
-+
-+find_library(Taglib_LIBRARIES
-+    NAMES tag
-+    HINTS ${PC_TAGLIB_LIBDIR}
-+)
-+
-+set(Taglib_VERSION ${PC_TAGLIB_VERSION})
-+
-+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
-+    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
-+        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
-+
-+        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
-+
-+        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
-+
-+        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
-+    endif()
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Taglib
-+    FOUND_VAR
-+        Taglib_FOUND
-+    REQUIRED_VARS
-+        Taglib_LIBRARIES
-+        Taglib_INCLUDE_DIRS
-+    VERSION_VAR
-+        Taglib_VERSION
-+)
-+
-+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
-+    add_library(Taglib::Taglib UNKNOWN IMPORTED)
-+    set_target_properties(Taglib::Taglib PROPERTIES
-+        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
-+    )
-+endif()
-+
-+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
-+
-+include(FeatureSummary)
-+set_package_properties(Taglib PROPERTIES
-+    URL "https://taglib.org/"
-+    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
-+)
-diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
-index 348d6b1dd..e0a342f0e 100644
---- a/src/libtomahawk/CMakeLists.txt
-+++ b/src/libtomahawk/CMakeLists.txt
-@@ -533,8 +533,8 @@ TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} PRIVATE
- )
- 
- # TagLib
--TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${TAGLIB_LIBRARIES})
--TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${TAGLIB_INCLUDES})
-+TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${Taglib_LIBRARIES})
-+TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${Taglib_INCLUDE_DIRS})
- 
- INSTALL( TARGETS ${TOMAHAWK_LIBRARY}
-     EXPORT TomahawkLibraryDepends
--- 
-2.27.0
-
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch
deleted file mode 100644
index 8e02e8e300c3..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cd5444573eec73a564263c20220ba0562cc655c5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 8 Nov 2018 15:10:56 +0100
-Subject: [PATCH] Fix "control reaches end of non-void function" in
- DelegateConfigWrapper
-
-Thanks-to: Fabian Vogt <fabian@ritter-vogt.de>
----
- src/libtomahawk/accounts/DelegateConfigWrapper.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
-index e78b64aec..875016ca1 100644
---- a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
-+++ b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
-@@ -247,6 +247,7 @@ DelegateConfigWrapper::getTestConfigMessage( int code )
- 	case Tomahawk::Accounts::ConfigTestResultAccountExpired:
- 	    return tr( "Your account has expired." );
-     }
-+    return QString();
- }
- 
- 
--- 
-2.19.1
-
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
deleted file mode 100644
index f07b746a03f7..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 4fb44c931be648d61ef3c8d10426b34de1b2a53b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 8 May 2020 23:55:43 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath)
-
----
- src/libtomahawk/utils/AnimatedSpinner.cpp               | 1 +
- src/libtomahawk/utils/TomahawkUtilsGui.cpp              | 1 +
- src/libtomahawk/widgets/DropDownButton.cpp              | 2 ++
- src/libtomahawk/widgets/HoverControls.cpp               | 1 +
- src/libtomahawk/widgets/SourceTreePopupDialog.cpp       | 1 +
- src/libtomahawk/widgets/searchlineedit/SearchButton.cpp | 9 +++++----
- src/tomahawk/widgets/AccountsPopupWidget.cpp            | 1 +
- src/tomahawk/widgets/SlideSwitchButton.cpp              | 1 +
- src/tomahawk/widgets/SocialWidget.cpp                   | 3 ++-
- 9 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/libtomahawk/utils/AnimatedSpinner.cpp b/src/libtomahawk/utils/AnimatedSpinner.cpp
-index b4778cbe9..a705cfaa2 100644
---- a/src/libtomahawk/utils/AnimatedSpinner.cpp
-+++ b/src/libtomahawk/utils/AnimatedSpinner.cpp
-@@ -28,6 +28,7 @@
- #include <QApplication>
- #include <QHideEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QShowEvent>
- 
-diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
-index b35799723..d2733d4a7 100644
---- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
-+++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
-@@ -32,6 +32,7 @@
- 
- #include <QLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QBitmap>
- #include <QPalette>
-diff --git a/src/libtomahawk/widgets/DropDownButton.cpp b/src/libtomahawk/widgets/DropDownButton.cpp
-index 74aa344d1..106e8b882 100644
---- a/src/libtomahawk/widgets/DropDownButton.cpp
-+++ b/src/libtomahawk/widgets/DropDownButton.cpp
-@@ -19,6 +19,8 @@
- #include "DropDownButton.h"
- 
- #include <QMouseEvent>
-+#include <QPaintEvent>
-+#include <QPainterPath>
- 
- #include "Artist.h"
- #include "Album.h"
-diff --git a/src/libtomahawk/widgets/HoverControls.cpp b/src/libtomahawk/widgets/HoverControls.cpp
-index 3e31bf236..0b6b20aa8 100644
---- a/src/libtomahawk/widgets/HoverControls.cpp
-+++ b/src/libtomahawk/widgets/HoverControls.cpp
-@@ -27,6 +27,7 @@
- #include <QPixmap>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- 
- using namespace Tomahawk;
- 
-diff --git a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
-index 807eb354a..1379c9c53 100644
---- a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
-+++ b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
-@@ -22,6 +22,7 @@
- #include <QApplication>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDialogButtonBox>
- #include <QVBoxLayout>
- #include <QHBoxLayout>
-diff --git a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
-index 1d9f1c4bd..97c5406f2 100644
---- a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
-+++ b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
-@@ -19,10 +19,11 @@
- 
- #include "SearchButton.h"
- 
--#include <qcompleter.h>
--#include <qevent.h>
--#include <qlineedit.h>
--#include <qpainter.h>
-+#include <QCompleter>
-+#include <QEvent>
-+#include <QLineEdit>
-+#include <QPainter>
-+#include <QPainterPath>
- 
- SearchButton::SearchButton(QWidget *parent)
-     : QAbstractButton(parent)
-diff --git a/src/tomahawk/widgets/AccountsPopupWidget.cpp b/src/tomahawk/widgets/AccountsPopupWidget.cpp
-index cb5739b97..ffd5dcaa1 100644
---- a/src/tomahawk/widgets/AccountsPopupWidget.cpp
-+++ b/src/tomahawk/widgets/AccountsPopupWidget.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QVBoxLayout>
- 
-diff --git a/src/tomahawk/widgets/SlideSwitchButton.cpp b/src/tomahawk/widgets/SlideSwitchButton.cpp
-index 3c61b4987..103562e00 100644
---- a/src/tomahawk/widgets/SlideSwitchButton.cpp
-+++ b/src/tomahawk/widgets/SlideSwitchButton.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPropertyAnimation>
- #include <QStyleOptionButton>
- #include <QPixmap>
-diff --git a/src/tomahawk/widgets/SocialWidget.cpp b/src/tomahawk/widgets/SocialWidget.cpp
-index f0901279d..b43f44c5d 100644
---- a/src/tomahawk/widgets/SocialWidget.cpp
-+++ b/src/tomahawk/widgets/SocialWidget.cpp
-@@ -29,8 +29,9 @@
- #include "Source.h"
- #include "Track.h"
- 
--#include <QPainter>
- #include <QDialog>
-+#include <QPainter>
-+#include <QPainterPath>
- #include <QPropertyAnimation>
- 
- #define ARROW_HEIGHT 6
--- 
-2.26.2
-
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
deleted file mode 100644
index 602a023a5bef..000000000000
--- a/media-sound/tomahawk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
deleted file mode 100644
index 442d0f525b7b..000000000000
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
-inherit cmake xdg-utils
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://github.com/tomahawk-player/tomahawk"
-SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="telepathy xmpp"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-cpp/lucene++
-	dev-cpp/sparsehash
-	dev-libs/boost:=
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/extra-cmake-modules:5
-	kde-frameworks/attica:5
-	>=media-libs/liblastfm-1.1.0_pre20150206
-	>=media-libs/taglib-1.8.0
-	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-	>=net-libs/gnutls-3.2:=
-	x11-libs/libX11
-	telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
-	xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/qca:2[ssl]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-warning.patch"
-	"${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
-	"${FILESDIR}/${P}-qt-5.15.patch" # git master
-	"${FILESDIR}/${P}-findtaglib.patch" # pending upstream
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CRASHREPORTER=OFF
-		-DBUILD_TESTS=OFF
-		-DBUILD_TOOLS=OFF
-		-DBUILD_HATCHET=OFF
-		-DWITH_TelepathyQt=$(usex telepathy)
-		-DWITH_Jreen=$(usex xmpp)
-	)
-
-	[[ ${PV} != *9999* ]] && mycmakeargs+=( -DBUILD_RELEASE=ON )
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index db2512b59506..e01327f00fe6 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -4,7 +4,9 @@ AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec72
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
 DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2 SHA512 bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656
+DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb SHA512 4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768
 EBUILD umurmur-0.2.17-r4.ebuild 2631 BLAKE2B d5ee8f085fcdc6721821fd8cdcc09170d4643779543e3b19645fe0b350ee351a2890bfc15e95518442d600ccf4c8426d5daa841ce55cf95993cab6f8d59759c7 SHA512 a4fd25d49c4d53d58d9ef17db266d428648d9cd77f9c5aeca1f4c857f90c5c975895401bf0b77eb6addc18cdb1073f994bce4ee816b5b2646c9279580d22c123
 EBUILD umurmur-0.2.18.ebuild 2634 BLAKE2B 439488afcd30893130a98e21e63ce862ce8c620cc284056fcbc8475657b4a104b6a3658d82b1f085557e568a3e40269779ff827905bcc866ca38b94245c45e18 SHA512 437aa84ae793e82073cb038a206ea19eaaef3749b8c4bf9c78b3db7bee8f9b55329224263f5456cf65c451c69bc23a69fb3cbf94c977f0587651f5350a5b7b27
-EBUILD umurmur-9999.ebuild 2634 BLAKE2B 439488afcd30893130a98e21e63ce862ce8c620cc284056fcbc8475657b4a104b6a3658d82b1f085557e568a3e40269779ff827905bcc866ca38b94245c45e18 SHA512 437aa84ae793e82073cb038a206ea19eaaef3749b8c4bf9c78b3db7bee8f9b55329224263f5456cf65c451c69bc23a69fb3cbf94c977f0587651f5350a5b7b27
+EBUILD umurmur-0.2.19.ebuild 2527 BLAKE2B f38babbe818b6b5d5a1c856d4ccf70b4f8d86f3abbd2c517351486c726456cebe197fda69a34f414eff407da4bf47e1ca524a3f0dae7328e9dedf83e5bc403c5 SHA512 2aa0eea1635dd225fe9b00cc263674c39ace325e05010f1dd6d8055600a482333ed379e5d524268043ec58606bbe974b3c682e36f41ef72e9370f8e6e098759c
+EBUILD umurmur-9999.ebuild 2527 BLAKE2B f38babbe818b6b5d5a1c856d4ccf70b4f8d86f3abbd2c517351486c726456cebe197fda69a34f414eff407da4bf47e1ca524a3f0dae7328e9dedf83e5bc403c5 SHA512 2aa0eea1635dd225fe9b00cc263674c39ace325e05010f1dd6d8055600a482333ed379e5d524268043ec58606bbe974b3c682e36f41ef72e9370f8e6e098759c
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.19.ebuild b/media-sound/umurmur/umurmur-0.2.19.ebuild
new file mode 100644
index 000000000000..5bc252e176bb
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.19.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://github.com/umurmur/umurmur"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+LICENSE="BSD"
+SLOT="0"
+IUSE="gnutls libressl mbedtls shm"
+
+# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
+	dev-libs/libconfig:=
+	gnutls? (
+		dev-libs/nettle:=
+		>=net-libs/gnutls-3.0.0:=
+	)
+	!gnutls? (
+		mbedtls? ( net-libs/mbedtls:= )
+		!mbedtls? (
+			libressl? ( dev-libs/libressl:0= )
+			!libressl? ( dev-libs/openssl:0= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}
+	acct-group/murmur
+	acct-user/murmur
+"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
+	may want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+S="${WORKDIR}/${P/_}"
+
+get_ssl_impl() {
+	local ssl_provider=()
+
+	use gnutls && ssl_provider+=( gnutls )
+	use mbedtls && ssl_provider+=( mbedtls )
+
+	if ! use gnutls && ! use mbedtls ; then
+		ssl_provider+=( openssl )
+	fi
+	echo ${ssl_provider[@]}
+}
+
+pkg_pretend() {
+	local ssl_provider=( $(get_ssl_impl) )
+
+	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
+		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
+		ewarn "defaulting to ${ssl_provider[0]}."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ssl_provider=( $(get_ssl_impl) )
+
+	local myeconfargs=(
+		--with-ssl="${ssl_provider[0]}"
+		$(use_enable shm shmapi)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local confdir
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
+	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
+	systemd_dounit "${FILESDIR}"/umurmurd.service
+
+	dodoc AUTHORS ChangeLog
+	newdoc README.md README
+
+	confdir="/etc/umurmur"
+	insinto "${confdir}"
+	doins "${FILESDIR}"/umurmur.conf
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the
+	# key used to sign it, which are read after priveleges are dropped.
+	fperms 0750 "${confdir}"
+	fowners -R root:murmur "${confdir}"
+	fperms 0640 "${confdir}"/umurmur.conf
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
index 2eaae13bc97a..5bc252e176bb 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -18,8 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="gnutls libressl mbedtls shm"
 
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
+# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 	dev-libs/libconfig:=
 	gnutls? (
@@ -52,9 +51,8 @@ get_ssl_impl() {
 
 	use gnutls && ssl_provider+=( gnutls )
 	use mbedtls && ssl_provider+=( mbedtls )
-	use libressl && ssl_provider+=( libressl )
 
-	if ! use gnutls && ! use mbedtls && ! use libressl ; then
+	if ! use gnutls && ! use mbedtls ; then
 		ssl_provider+=( openssl )
 	fi
 	echo ${ssl_provider[@]}
@@ -75,10 +73,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+	local ssl_provider=( $(get_ssl_impl) )
 
 	local myeconfargs=(
-		--with-ssl="${ssl_provider[@]}"
+		--with-ssl="${ssl_provider[0]}"
 		$(use_enable shm shmapi)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 75d2a5ccbc02..36279ac66dd5 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,9 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
-DIST upmpdcli-1.5.2.tar.gz 550460 BLAKE2B e9905fb2f6c07d7374651fd0a9d7ec821d6ea25d4debe1b6e69bbf7def8b75d0b35b245a5e4ca2477832f71a9fe950f7f7635d1b6fc29add0e59405c0c69b338 SHA512 4d6cd44b64637c5a07996a416f0cf15e27e24b84aa04ee3ee9f6f5eda3164a5b964915587a4342cc0a8f95fa175dd106b99242de5c50d3cb603e48450694009e
 DIST upmpdcli-1.5.5.tar.gz 550726 BLAKE2B 1a32f5a3126e037f6663ab60244d7af3fd7aeb79c5878ba1ca4d8029b97917a70f5b06a82e6006fcf14642b96cb5539488b3bba03860a2dd23e6bce0efe54bdc SHA512 90ce69b4ef004e1b5db3229b3bc99637ecba0f5f7e82d0e9f567da163295b4a572d059accbeb679194d1846eb822d48378acc743ee334ffd9859f3e025f6a0f3
 DIST upmpdcli-1.5.7.tar.gz 552203 BLAKE2B fe8e8aa3f4c777925dce2a143aec201462cb2da9e33f604d48848f27acc51fad42e1c626c17b5325918f0d1de1b37c1c456240f811af118b83bc7ce3260e0687 SHA512 ce86b8f9b4e7614433ab542facbf7452426b66bf026bb21ea0e868cde9b492b09a86ee8aa259a9353f2ede6a22d1055987986747aa8e284714c5e60f73a3a55a
-EBUILD upmpdcli-1.5.2.ebuild 1266 BLAKE2B 544ab7167dbec8e99e5256895c697a80fae5799f22dc410524cd20a9717397fbc296b87602279693276f298739a49de07543d331a86612e141fe09b1fa806a53 SHA512 6c7287599db7529da5840a90cfe0ce4cbd17c20588ddc0a4aba343fed2f65448c70e1d053a53cfeb9d134adad9b40bbf9693c8545bc2e0be1acb79f957b9e008
-EBUILD upmpdcli-1.5.5.ebuild 1268 BLAKE2B 6458a9fb1875e490e8ee5fb45a748c176c9fac2812b46b4239da1e50ccd7383471a19fe761c40a29b37289c293e9047d26ef46a2feb9fb8a8f16b4043e25e6b9 SHA512 86c8c689450786448bfe7576601e50765b73d7e8c109c7a6377e9978951a110616d7cc5d060c6e55a4b1f4622e9f0e1ae3f909c906f152ef050c98c1a2c0157e
+EBUILD upmpdcli-1.5.5.ebuild 1266 BLAKE2B 8e943647e08b7513f9f836a4d8b39a12719722b1480a4ee431c037b424e0b972c6163d99cd7ceafce40adc51d119a2a4988ae6375634766aafaffea5562a40fd SHA512 1357b27d8910b1875da2b1b5957d7b6a5dd1d01b0a8c7444ff12759d96735ebe10963213ce25451da82ccc6a854eec9397ccea70f230b037cf304eecc220a49b
 EBUILD upmpdcli-1.5.7.ebuild 1268 BLAKE2B 9caeb9ba3faef04081a3177d35c651c4e72d083761d001761bd9f9e14a884a42e0edc19cfb6feaa663c9252caa3bce3d57518576bcbddfe2492f67e8606e2643 SHA512 7ef64f8f02d8601877ec933808fca11ce0b12b77fd28c57eba98842d5b2fb35c43c3d885a095a652b6337671c64ec31b124dd7391efd98d2dabe5d8a9a435b45
 MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild
deleted file mode 100644
index a3c936e6337c..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.20.0-r1
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/upmpdcli
-	acct-user/upmpdcli
-	app-misc/recoll
-	thirdparty? ( dev-python/requests )
-"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild
index 0eb2b288b4ea..32fbe2a26ccc 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 57dacef12d4f..4b1760b885f3 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,5 +1,5 @@
 DIST vmpk-0.7.2.tar.bz2 438006 BLAKE2B 78b1f50ce4ec6a430e4b82b500687261c448043d07fcd8e5a8fabcf0554f0488b7a87abf4a208a1d102a86c7b399c0637210c23f7d5b45a5166d6909aeb26b1f SHA512 69e31d6fd91a6604b7482b18840ed0b274723f380d7fe59827391e9031c3c670cb4e331c8bff01aacf6271973689f0bdb8c1dad4b749524095b398063634a477
 DIST vmpk-0.8.0.tar.bz2 466517 BLAKE2B 9fee766b71ad7f9cd96f9dfd859dc31434f14c913c75f5a8e76c66150522dbf04c6e28582269d1603c6d53d6db436e9e7f73cab1172c0d6b004cc71edccb21c8 SHA512 b3e1e40792661c1e4ce3a5274513b4b75742ca861a6233c2653d6df90b7a89e086d15a4196d59c7021c48e9e2aae83116ba29c3395960179d602f0cb06c1f608
 EBUILD vmpk-0.7.2-r1.ebuild 842 BLAKE2B d1acc38d1f501379bca06506c856ad34ca5d6c270854b466b3f776b842858a52d22457c1d776fafdf740e14f59edcc93c32f1ca93877cb87101cfdcf8016c7e6 SHA512 ebef89994a001d8cf2ed360944232f99764b28797c983e5812d14df6af234ecb33439cfc650b54f7429104346a78840158e19fc291e5596a5f1bb82f69035566
-EBUILD vmpk-0.8.0.ebuild 910 BLAKE2B d23822aaca63fb33088a1471c73715b99c54b623f2b6a881aa4f511d223c634db341d67f1f25e87e425b2c82766a19872d0a814918f289634963fad3aab95b44 SHA512 510b2b261d73ca878701f5a63a55723aace770127acf46098df2d2de3e0322b78718087ce97294a66f8789a6659a2478b50fc6d9d8be8b8120df0991bd7f1fab
+EBUILD vmpk-0.8.0.ebuild 909 BLAKE2B 5290da9110b84d45ed0006c0acdfb56fd6a90124d3b521921d2c9701551b5c29db15447ca263f32aa7393ee1c670ae9854029fb31171cc0d117517affa8140e9 SHA512 a931b5aeaa918aadfb25c5c97b7a01c4b096935243df03bb7afdfa11e5ffb8df9d4bfb8fa085718e413c3a340edd57152e93e7ab70266aad5c8607614b3be4d4
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.8.0.ebuild b/media-sound/vmpk/vmpk-0.8.0.ebuild
index cd6827e95032..5563b3b440ca 100644
--- a/media-sound/vmpk/vmpk-0.8.0.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="dbus"
 
 BDEPEND="
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 487f78f9167a..d830af1528b7 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -3,6 +3,9 @@ AUX vorbis-tools-1.4.0-CVE-2014-9640.patch 691 BLAKE2B bdf2e1f18ddddf90afb26e681
 AUX vorbis-tools-1.4.0-docdir.patch 340 BLAKE2B 147fa0212acd6a7df359d3eeb120465ca962532263c8cfa8815a91c5f0a43c230d52b2693e9ff1167a17191edf4f70592778249857ff91641b99ca19f572ea87 SHA512 080e70054ef9583430c1675f5cba1cef1ad6cf76068fe1881b0771a08d9d3651cd2adfe92388ad8974fbbc64f2066b3aaeb8de790ba5bfaeae68b5618c733646
 AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743afe660ae1a741d8bb7b2790823936a089c4a8667a41160d6d1b79ec6027f4bf77dbbd8110bc65d2503bcd87c51f4f1e675566ff2dc6 SHA512 319451c4317e2224cb56c791528c8ba4722a142b5c85f63fd606e3a1acadc95904cfab3bee7ad4634fa982f59a92ebeb30d8698d8f697640d6579b6a80eadd93
 AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
+AUX vorbis-tools-1.4.2-docdir.patch 416 BLAKE2B 1ce521f429314e40b9fbde91103dc0fd4cb02a0801479da8c4d5cf17334e6586c23a892f12398b9cc62c86fd17394d5325bd580c5be1d03ffd11e5a21bf18443 SHA512 96f1ef85b92e25dd1d029cf19b4e81ca455cbf9da83b49bf50ce10bbbf02a0150975eaeb2ded262c8931d213d6d767013ced4d7334ab5a6fa1c06f55bf278c91
 DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
+DIST vorbis-tools-1.4.2.tar.gz 1389947 BLAKE2B 6cec240a2c069a74accfadd4d4a5a2a75bb4ad40c83aff86e190f7b19a87d4348d7a932e69a9ae9dd2efff636f47d3465b3d26d39393b4fec925cb7d1543f77e SHA512 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf
 EBUILD vorbis-tools-1.4.0-r5.ebuild 1187 BLAKE2B ff778c641c185df7262a9e7ff146d329c3a64eab774ad64f67b846e3e9c1ce35d618ce98d27b92e6ef390daa52168aacf63d0e3bd2eca1e0e5dde33fae4dc8d1 SHA512 8829796e494ab2e280b5d1cd028ce55b33c0f3c0bac84b5f4aecd005cd90bf036eaf1d4561ec9233f93be6dd0078936223dd46fc722b0e1314c26166decb03af
+EBUILD vorbis-tools-1.4.2.ebuild 951 BLAKE2B 3b819d545b3c9041522d51500168742ab3fe92b6ca2d3de7315bff32caa18b31941da68fdfc2531bd489a05e5242a7869c50e6c270ca30264793fc64894db362 SHA512 993af7575a3edb7f0f1f9af7bf8fcd9575d99f5a096a63477e5549b5adf863a17eaf0e2f77eecc2b602be0efdd80971b7564a47774ec9bb061a5669b9ce9ae2d
 MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-docdir.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-docdir.patch
new file mode 100644
index 000000000000..faec14fe65c6
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-docdir.patch
@@ -0,0 +1,14 @@
+Thanks-to: Chris Mayo
+https://bugs.gentoo.org/533774
+
+--- a/configure	2021-01-21 10:14:17.000000000 +0100
++++ b/configure	2021-01-23 14:24:06.178883282 +0100
+@@ -937,7 +937,7 @@
+ runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
++docdir='${docdir}'
+ infodir='${datarootdir}/info'
+ htmldir='${docdir}'
+ dvidir='${docdir}'
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
new file mode 100644
index 000000000000..eaae1ed08819
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="https://xiph.org/vorbis/"
+SRC_URI="https://ftp.osuosl.org/pub/xiph/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="flac kate nls +ogg123 speex"
+
+RDEPEND="
+	media-libs/libvorbis
+	media-libs/opusfile
+	flac? ( media-libs/flac )
+	kate? ( media-libs/libkate )
+	ogg123? (
+		media-libs/libao
+		net-misc/curl
+	)
+	speex? ( media-libs/speex )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-docdir.patch )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with flac)
+		$(use_with kate)
+		$(use_enable nls)
+		$(use_enable ogg123)
+		$(use_with speex)
+	)
+	econf "${myeconfargs[@]}"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
commit	d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree	1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /media-sound
parent	abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)