gentoo resync : 20.01.2020

16 files changed, 31 insertions, 327 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index da4764decdf2..894b26f3fa78 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index f4e2b4180c3a..c09976f0bc89 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -14,5 +14,5 @@ EBUILD alsa-utils-1.1.2.ebuild 2217 BLAKE2B 2b0293d7f3acf6bae13cd1aaa341509b9fc4
 EBUILD alsa-utils-1.1.6.ebuild 2267 BLAKE2B 62b70e332647004bb076720a4fbe6ffcb62cf5cf681d928bfd774bcccdf27aeb9360ec57f1bf40e2054b8214e45fcc865a9c954ef819e8754052b03cb8858e17 SHA512 d2df64e3857c67b5a144af362aa3986346c379b0e2b8530688f10fafc8ffe2e8d81c33cd416bdfe36c2102e3651d09c77b61d1ca12b07a465e38275215654a39
 EBUILD alsa-utils-1.1.8.ebuild 2338 BLAKE2B 3618d6e3a8983cdac336f7c68e2c20e7ac0aaddc535ca83f7f8a0f4e2eb4acb6cc0931184fc8d23756b509f819581555c361ec2b3d6a41b6023f359ae66476f0 SHA512 89fc70da32aa126e27a76468adaf91dd05509a0347abc934d87945a618a1e1749f032e7b63d82cc1dbc2c9b5755b98abe1d7ad17fb0e14aedfc937021abed028
 EBUILD alsa-utils-1.1.9.ebuild 2423 BLAKE2B 27a87cd73011e680060fa04173aaff943b6b7674a0b937588c6421ae2f25bdd5ac1b37a15ec5a80a5d1ece1548275c6892e12a79564a8e3953aaa8ab596ee676 SHA512 38c1fd5cd8463d2cf4dabd3b509ff2270ad33f0c6fc3afba73560563767c8432baaf03bb315876f54ea0c2ebc6dbff23b8ae90599ac2f4cb1d8088f2d72711e2
-EBUILD alsa-utils-1.2.1.ebuild 2345 BLAKE2B 5b3405496a4998ba5b38d166d578ebe49230ce7a7aa9a85b2f78da35216df5fdfa1a369c3a1386ced0b64ed544cf528c16d1a46615baf011145e2a39f246188f SHA512 c1a049f4ce15e57d3f1f85c422fcd7ab4d9ac32d7bd3bbb008d351cf9a4b102baa0b9761738e6ae226fc699dcef998428b4dedb3037cbfc46a088a4108ac7c7c
+EBUILD alsa-utils-1.2.1.ebuild 2344 BLAKE2B 372a5b26b359f0e970244dd91096cc5cec99325ff7cd39cb3800261adca129b7c697a1442b78c107c079442d11a48e74a96056de18151ffc954cd6c460ff4369 SHA512 32a0fb18cbbbf2de1167cb593a1048e5e22578c86c17b283e4efe9da5fe9779fdd3fff258669b86d5af71d3df29b4845dd34d86ad69d5cccf8c3020feae0dc8b
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
index cdc8f1f1a025..23125478be31 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index a8ff8e6f5bd6..27d883f0d9a3 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -3,5 +3,5 @@ DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e670
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
 EBUILD fluidsynth-2.0.4.ebuild 1960 BLAKE2B 3c837ac65f448c3706e9e12e34c39c6bace524b33e521e36a2d8c86c34a57e6d6361ec4fec27c585418b91e399ba502cf076e6f45442673db9b793f11b47bc6f SHA512 6d092fedb5994a354d0002412775d3ef5729394692ee944248d2e89e0bc15d76dd17259b7391bece108a11cd956808573c3d68a44dd0529b555cca6ff4269a44
 EBUILD fluidsynth-2.0.7.ebuild 2538 BLAKE2B ce7275797d9a3fb38ff3b95e753d4ba81d5c11f3cb84c9213cf96847d2c6dd408f3039eb928218e999b9e358f2e92c2b79f3f12dd85174eb53ae6eaf5ed9822b SHA512 9529008829a8d0829404d1ef85aa622cd833d034bafba538d527a9c0a380513ef8483eb8c8d4e40b096ecc16841ec70381546e0f0f06e165240ba8f5d93e15a1
-EBUILD fluidsynth-2.1.0.ebuild 3304 BLAKE2B 379b54d6ab6066f0440c94de9f583ef8463e996ace6467ed42451db333ad4ea98a2ad84def772107887a944c1b1362a8290fcbc7bdbcf5a5228ce157521cdf38 SHA512 4f5ba4a3305dd07278c4fd6d0fa40724c1a50e49520043b39084cd30faef2689f143a375bbdd631ffbe8b2f5a522dd0c56cc1f4545673cad17199e4f2091e4b2
+EBUILD fluidsynth-2.1.0.ebuild 3323 BLAKE2B 4a9572ecf61630814035fbb6106becf333dfb58b76078acb8a3c2dfb4c8135f62360b5045e6fdf886b398da34af02ca7065caa9c7802a4e4ad48ee2d55fef941 SHA512 2da4bad58fe2d78fda897b009b7dc93756ff5bb61219c9aac9122a7e68020dc042574f4a95dd88c91b838685d9e3f42045060d7a4a4233d9287eafd90483e7be
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
index b6712b9612e5..292ecd242d22 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib systemd
 
 DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
diff --git a/media-sound/loudness-scanner/Manifest b/media-sound/loudness-scanner/Manifest
index 57bc2acea339..2c8b1084a3cd 100644
--- a/media-sound/loudness-scanner/Manifest
+++ b/media-sound/loudness-scanner/Manifest
@@ -1,4 +1,4 @@
 DIST loudness-scanner-0.5.1_p20190709.tar.xz 65360 BLAKE2B 122a14b1700e0b971d423bb3c6395eddd49663d8980ecc57dec85cbf45b67ef72b68203b15ac21b040af824b71641635bd72c67b40b0ba757ed536e121c7e3ae SHA512 2160a1dcba92efeb308f65e2dbd32405ad6c9b72355a4161f12579d767757e709c0ffe17df988105210cbb8f05f727f6b143cbe0540edeb8c7c6585b14998fe1
-EBUILD loudness-scanner-0.5.1_p20190709.ebuild 1845 BLAKE2B 2ed162b886b8062458d601ddf00c3ba6dc3f10725e952ff3e26ad4d588ada98b364540c61f62be39632ca691e856a895a28b09acbf3caaac421d193bead05485 SHA512 2367520efe3d9b4a2a300b4b29f64b7a36cfa08ce3a7736b7d72bc47072bedd94b411d0819cc422a92d3aaa34fc7c562c6d260ecf6b8a91373927d25036e1b66
-EBUILD loudness-scanner-9999.ebuild 1819 BLAKE2B 2f35861d3a762858cd11c604d86f0c82f603c4ce862e1e72b5caaa7ea29cbf5f727df3fd35709e5e0b96469b92a5b9c8c2d174ccc19aaf6327fab7cdc8642615 SHA512 1f8feb007fedb8ac5b88bd52864c8b1062002965b8c5636d8cad476dfda4465955fa8bc7e67a6863f26eb1a680128a007250f87aacf38896f02e6541beb6b8ec
+EBUILD loudness-scanner-0.5.1_p20190709.ebuild 1827 BLAKE2B eee75e107246a1b99a3d5769f121ee85084f3191bbea565e4e8875f501bad38edd917187f1e05ec40fb76fa3f41492976de8c069d0a5fb7f5003f2eb1a04a8d6 SHA512 bb04ba00c77cc8027993720c9e989b3b7a00cbc02ca3845dc19df580d4c57dedbd10f294754b298fe75cfb7858e6f19e18f70499f9a3460caee7f96fc9f69493
+EBUILD loudness-scanner-9999.ebuild 1801 BLAKE2B 6c5cfe6936e013bb24ea0752db548abb2ca62346afb13de886338198b9e9e66f22d65c4ce6b8ea2998a115951fb864de8b1afd0f42f3f1be842e683268ce2a67 SHA512 40c996572f23e422e6461abb296122c39510bd5c35ef889d7222a0099ad74a8baa417844890d53c8ead8ea256fb3b4568e57047cf97dd154bd68dd8e14d718a6
 MISC metadata.xml 977 BLAKE2B b68f84774b5494c9735661e858630eefd51bf8fc48fadee3b75237e688c96454355a0e9d728d4c0d919ed1c92871b21f7b9c4e694e9972b4f833f259bf5e8a1b SHA512 d1cfbef820d90d8b38b2baf038b06bd2bcd31c307c42f3edbf79c2d0dea98ee04b5fb30bcfc61b2336767b1a6e1afb6c2dd37cf7202f56a3673767ca471f7c74
diff --git a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
index 725c5aaa0a45..ee2ac482713c 100644
--- a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
+++ b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Scans your music files and tags them with loudness information"
 HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
 		"${S}"/scanner/inputaudio/input.c
 }
@@ -59,7 +59,7 @@ src_configure() {
 		-DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
 		-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
index 4c6bb45b8be9..0608e103196a 100644
--- a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
+++ b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="Scans your music files and tags them with loudness information"
 HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
@@ -38,7 +38,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
 		"${S}"/scanner/inputaudio/input.c
 }
@@ -57,7 +57,7 @@ src_configure() {
 		-DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
 		-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index a2e8c6d9d7fb..eaef22b427b6 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,10 +1,8 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
-DIST mpd-0.21.16.tar.xz 673732 BLAKE2B ed43ae9d5d40fcac0d035c24161c4db3a1b6df2b05f6a006a47beb7f7ba8ec198cbd20e34c9fcaf4e9832dbf13c57a77a9e5864d7f16de2bdd1c414d41ce391c SHA512 bb7587acd03d675ae3127ab4e196d549170551ac643e5134baa2bccaf8d7c9bba6c9a9edec9bcb61a2ec3a6ce26f4d77190323ef0329033d0cd8c1f8964be05c
-DIST mpd-0.21.17.tar.xz 675000 BLAKE2B 708ad03104529294b92e88aa0c29560b64301417a478b93dfaa922bc257920dad7cc687e3cc06c72c7c07a91237571c55fc0e3b05746e38a804df64cc69e3e5d SHA512 71a53ec7262d7292a7227878f3d6187563727a0fabb8716bd6df70d4b96990e2d0da0ea5e59a84530cdb1b5e3046f08118c6409cc67c731c191095bd66f256ec
 DIST mpd-0.21.18.tar.xz 676084 BLAKE2B f55ea278da4b50bf24da476ed9e3ff50a8130215702fb5c4a0accdbfeb00ed734983034ce6ee0542623e42d488555b1c709acefbba026f0e01f17f25f749b833 SHA512 68b4d9dc4be8454d7ef92df2a7b42513dc2d97bfd6b11ba99bce6709fc58ccbeab05419863bacb7a3427f1325bc88da74f9f4b48206222349085f02d0135e1a8
-EBUILD mpd-0.21.16-r1.ebuild 8088 BLAKE2B d720d1fe08a6e71366459e04a16a085bd3ea81e4d0ca621e17d59a0e582f6f74eb4909de6180dc54a353aef6c8b8dfdaf33622d86813202d9a4619a0eac96d16 SHA512 c1fe6b917446381be31131b8773950bb10b4379d77072e6fee5d982e95091cefb9841504e8971bc493a1d751fcdcdfe2e6de33da573ddbbcb7c92be9eed79db5
-EBUILD mpd-0.21.17.ebuild 8091 BLAKE2B 1b2ce0dd6f6b23a8eb1e233138deaba58d94203d13a65186bdaa2999d6e2ad18edd1cde2494a4f5f4633109ac80a5c40e69d15936ece4c901f8218778cbe004f SHA512 c57c53083e3071a1984dd91d2bfc9c7f98d6c843aba0178b41cb0d1ca228de0a23bc581c9810e8e532433a363dc744ef710e09417d6449d26721481c7163213b
-EBUILD mpd-0.21.18.ebuild 8091 BLAKE2B 1b2ce0dd6f6b23a8eb1e233138deaba58d94203d13a65186bdaa2999d6e2ad18edd1cde2494a4f5f4633109ac80a5c40e69d15936ece4c901f8218778cbe004f SHA512 c57c53083e3071a1984dd91d2bfc9c7f98d6c843aba0178b41cb0d1ca228de0a23bc581c9810e8e532433a363dc744ef710e09417d6449d26721481c7163213b
+DIST mpd-0.21.19.tar.xz 676020 BLAKE2B 295dd9067b8517739334fa09d4afc95f1167f291441bc34c4e5c4177bda66ef60eb3f4184f9192242faf64997b05d1c0a13736d1d6a3f343317271acc24a0e70 SHA512 50609b104b84b37dbb297fb40e8f4b352f13de7be5791b8d48c3af3459bfa0f0f88d1d37dcbb0d2409aaee881bca7a7bf6f871b82418ddade19829b02a2bde6a
+EBUILD mpd-0.21.18.ebuild 8088 BLAKE2B 76779df1a6f51cb008d111e1d230677f76e17ce61f925896adf0dae5af20cb60227fa925b5071c3edc46cebcc9b658e5483d7b63fe7d7a8a91b2b51ade346b4a SHA512 3d594032c1f2528cec910228c05981fad36b687590f6d5b28ae3c02fc5e19defcfd5a041e276b445199f910b69c9a44ed38cae863d586941a89bfb7596059aec
+EBUILD mpd-0.21.19.ebuild 8091 BLAKE2B 1151108b573e5e86959425cbba158b070c99519ffff96070e4391542cf54dc3f9fbe22cef40f5cd3b98625b8f82184830afb082e0fed5fa029bef66c3838f204 SHA512 9514b4368f5f5d018b20c657fc1d11b420e673af89d0e7243e6c1eef026f92915888711ec44a2df73216941ceb5cf5e32a783e73f03be5231168eba941994670
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.16-r1.ebuild b/media-sound/mpd/mpd-0.21.16-r1.ebuild
deleted file mode 100644
index 9911b4df7e6c..000000000000
--- a/media-sound/mpd/mpd-0.21.16-r1.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	adplug? ( media-libs/adplug:= )
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Ddebug=$(usex debug true false)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=false
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.21.18.ebuild b/media-sound/mpd/mpd-0.21.18.ebuild
index e3d021775ebd..db09890f55c3 100644
--- a/media-sound/mpd/mpd-0.21.18.ebuild
+++ b/media-sound/mpd/mpd-0.21.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.21.17.ebuild b/media-sound/mpd/mpd-0.21.19.ebuild
index e3d021775ebd..3395216d6d39 100644
--- a/media-sound/mpd/mpd-0.21.17.ebuild
+++ b/media-sound/mpd/mpd-0.21.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest
index 5396f855064b..29073a75fb54 100644
--- a/media-sound/snd/Manifest
+++ b/media-sound/snd/Manifest
@@ -1,5 +1,5 @@
 AUX snd-17.4-portaudio.patch 2154 BLAKE2B 3d6d6edd400aef4bd809e49021f0d42523db263dc9bb0626074ae32c4c3172c66181caaab141c754b8d04436d920dc7e104300a11bccf29f251052571c52e462 SHA512 01f7d7f3bd315a8b372d81e2f5a96b9f1cd100eb4afe62a57c5b0422740892b80d504ab2774190814fde04849bc097817262f7bc96bda1f90a08f544caa439ce
 AUX snd-17.4-undefined-oss_sample_types.patch 372 BLAKE2B 5bd87e2e8c953ab4dd3799295b6a425d1775572605b66eb4fb7e2927e45e8b1b6780a08c370fab7c197e3354eea33d87b4503aca5dbfb92a1150f786fb0cd810 SHA512 3b6a64eea622d77389edf754450a6ef1a5036b1ef0c5e02f7c84c4aa150fd0c30dd3e7855126dbbce1582a9ff1e02ddc2abfb5e7636feb71713e08c7b1bc0478
 DIST snd-17.4.tar.gz 15096338 BLAKE2B ca054977caacd2ea4c1b14f50c31d3b4cc6b206a58529ee5537ec80e51acb72c1b8baad6db9729270fe07067c097f16e630e1f7a81521ac0532f5b5689fb963c SHA512 cbbc546fe4a3ef758c5372edbdae4db29457c559eafa08854819917e153ce850f5ab302da68dee826f99c26f10769aae8c6df6ea8434614f084f21d0dbbc5c88
-EBUILD snd-17.4.ebuild 2634 BLAKE2B fe855cdc8f00a27dff9cbab98cc349088dd97a7f09aa574591ada63af7af2d2e124c698288d043165d7943fc261ec71cbdebe947a54b6b4e67b0be2d90180284 SHA512 d81487316e4b30e1f6a1efcfa71123baa165fdae69258b8d5951d8f45ba83a6c947071c3cf6c4c5972925bdf76eea62dc510b18aed66ecbecd360895e6d4790b
+EBUILD snd-17.4-r1.ebuild 2576 BLAKE2B 9882830b74e0b5d29bd38da4446168114164c1c5eadb4172b745eb53259d8f11f4b5be09d38639760335054620ebe27053abb1cd1ccc39ff85bb1fec346deaa8 SHA512 086f2929ea23a8fdaf7c282718d88de13d22fd34987d18c7c964458717526f282420d250925e5328c5c8d3b4785288b893dad31996fb615c54f3dcc61944b5b9
 MISC metadata.xml 344 BLAKE2B 213ec3b7c1d98fa3cd1c9942f2f97b1dade37731a00b74257ae0ed6cd8f3fcef7b136a48fef0c195903fa240d46b811d238728d947f4daec29df1b8089ec0969 SHA512 42144ef636272ad14dee0131dd1181ddb6635aaecec547b1d4eb3e66ef00eebfbbd8a551ce33f041fe44fb2e1758fd46c24b5961f5a148e90d94c6825fd37c87
diff --git a/media-sound/snd/snd-17.4.ebuild b/media-sound/snd/snd-17.4-r1.ebuild
index 2c8a042ea377..294872469b89 100644
--- a/media-sound/snd/snd-17.4.ebuild
+++ b/media-sound/snd/snd-17.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa doc fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7"
 
-RDEPEND="media-libs/audiofile
+RDEPEND="
+	media-libs/audiofile
 	alsa? ( media-libs/alsa-lib )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? (
@@ -24,12 +25,11 @@ RDEPEND="media-libs/audiofile
 	)
 	gsl? ( sci-libs/gsl:= )
 	gtk? (
+		x11-libs/cairo
 		x11-libs/gtk+:3
 		x11-libs/pango
-		x11-libs/cairo
-		opengl? ( x11-libs/gtkglext )
 	)
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	ladspa? ( media-libs/ladspa-sdk )
 	motif? ( >=x11-libs/motif-2.3:0 )
 	opengl? ( virtual/opengl )
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 21ef48dc8a9a..a8dbc8b04d80 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,5 +1,5 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.3.2.run 95632176 BLAKE2B b1a418e6af6c364050a532063b3129e27d03ac36ec325ab5f2044896f5eae02fb4a251e71b23bc125d41f169aa35d8dde340b333a67b845ebaca7faefa49fe70 SHA512 1dd8912120ba0e9e84849fd793d54aee56e98396f6228a4bcec5c79485b9902398eeefb8f276abd46bbe627e7bd3c8fc5d740d05807342f837ac226f475510d7
 DIST TeamSpeak3-Client-linux_x86-3.3.2.run 94323084 BLAKE2B f3b0317e8cbc7143d9814a52c8a8c9cd04aa012a40172aca59e6d4db956a19ae5752bffa102f06e34ad0dd5b211082e00ca06056c05a4a2dbbd8adfd76a0c0e7 SHA512 56b7b231ffa5195418823da435fd4daef2cbdbc653d3cfd328f60881a1370b9dd6f99479e9093216d0768ddb04bdd6c6cf1a7019d836abd89806518eeee23496
-EBUILD teamspeak-client-3.3.2.ebuild 2480 BLAKE2B a04519b5165c32748c2d16c5903312d3298dd430117dd74e3c4ff3d1dab93c6ebdd23d7cb8b87f7a1c3457dc94ec4469e9679562d774fb7b22c4b5bf8c25f195 SHA512 c73638cecb40848eddf35fe3cf1d3c6d2a8378240df132027a488193a77d1ccd22291139b141517424b2eb867fe966c39159e902990df4968e8ec423fdec8ff1
+EBUILD teamspeak-client-3.3.2-r1.ebuild 2535 BLAKE2B 41d4f8d3565b4d6801b1619adc2c32b120f33ba8d7b3b0ce1206371c93797d29da7849d0c100c4d8d85d144e759e88db0488def3a65668a7a5d8c5b235f19414 SHA512 ef5f3594fc6c8ebf6febb80b3fc3bfda2b45a4d6b318e4640f5c0ffe4450412a3081c9fa2836547da1fab4d51f2ea000472038a6ed6048529d6410bb737ba963
 MISC metadata.xml 637 BLAKE2B 996d3156ecf21c789e3a7017d7922f7fae257722021bc4ff968ec3c9863df61f9631fe83e3482781f78ede7b91f2138b4510473d8654063347037031812758fe SHA512 934068091ef8dce4652021965a99d50c4df0a426a7a1d1f26adeca776a73e7f1150d976bf44b704905aa0877d8844dd5d53bfa71279f5126e00dec924f3afc5f
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.3.2.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.3.2-r1.ebuild
index e98bb9cc9e7e..e80daf5efa28 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.3.2.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,10 @@ RDEPEND="
 	dev-libs/openssl:0
 	dev-libs/quazip
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[accessibility,dbus,xcb]
+	|| (
+		dev-qt/qtgui:5[accessibility,dbus,X(-)]
+		dev-qt/qtgui:5[accessibility,dbus,xcb(-)]
+	)
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5