gentoo resync : 27.10.2018

27 files changed, 306 insertions, 39 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 612be3d5ca7f..5827e4a9d49d 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 8cac599a2fe8..2441afaac84c 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -6,6 +6,6 @@ DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2
 DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
 DIST alsa-utils-1.1.7.tar.bz2 1205754 BLAKE2B 419fa61fe85750ed26ab2b1dfe87adc7898f8c95dfe082993c0d5ee7755c4cb6563000555f44267608a2138d033e7011e7c67d98b714fdf1884cc03a8fd50ed3 SHA512 5da9b03e219d67634307bd5bb06b76734db5286221bec11658ce9c4dfca8ed639a4155ed90450f1d6c8db322960bb023ced0873e276500ce24f14fab17ceeb65
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
-EBUILD alsa-utils-1.1.6.ebuild 2254 BLAKE2B 2977985938945fbf24e34735f5bb07cb44e644c9feeb7c6efab3a02cdb6864ee2a38ca49bf759f9642af7decc763d8b73dedf7cbe8da7799a061c3eb6b6b3bb2 SHA512 6f300503628a3fe5ea5dc570ac04d7c5bdbf52169570c9333f32f5f696527ca685e9b709c4e94dae3e9ee465e58d0edd8eeea705f5d42f8d4229bd27f5bb476a
+EBUILD alsa-utils-1.1.6.ebuild 2253 BLAKE2B b759a06442dd0b371aaf1be2fdf37f0fc2aceecd5177869e4587c068acb72e7ff239b046a342152be8f0646c40931f6488c0234f243f3ab0e999f905c4903e35 SHA512 23c6479c1820838db84f3302a7ca720603ed554611e56170a6be6d98c9bd7b7d0dd2c2fe19d0783a2b35d7d85094894f33ed1d66ac6b48c3e9862cd20b364eb9
 EBUILD alsa-utils-1.1.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
index a4bef363fabb..d2442cb22f50 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/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/clementine/Manifest b/media-sound/clementine/Manifest
index 9ee797e50195..23cbe04e99fa 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,7 +1,7 @@
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
 DIST clementine-1.3.1_p20180523.tar.gz 8490122 BLAKE2B 783cd420c8e3cd7423ecb6caa3466efd2c09e9033c2a198f52dc113603233f1bf3e3dc5208491338c0fdc9ab26e5b661e7fced0dd835b4c19a867fa3cacc9ccd SHA512 a47de226108240313fef2ce965726b3afea988030adffe38fdabf5d0dc46b2eda42cfebc32d77e939eb6dd687a99556c9bd8848c6a5e78c434950d00a8833200
-EBUILD clementine-1.3.1_p20180416.ebuild 5173 BLAKE2B 911367e87faa64ca4664a2765ee05d8df3809f86f0dffc560681fc5702b5e562e8ac6db8b8efc85cd9fcf3c574b0be05974353bdf45a9f8636a0d0c3508a6a58 SHA512 ac365714bc8e1477d2d7484816ac834334d9bb861a6fec763ef86ea79f88ab154c70d4bc027264f434bd97e46497d54ee9c68d84e0fd05894e3f33b0f16d0b2e
-EBUILD clementine-1.3.1_p20180523.ebuild 5175 BLAKE2B abd9e0acf98581c7bd9cb1cd4256c1e89401e0f6ae18d63582b0171663865abb26e5680520ed335a455dadae919460eb4bda420f26ae80013b97a951b19e4ede SHA512 6276db36f7e99efb51fe01ff708a46039d33364f6817883d1c9e7b4f47924fbcc8919dd817407be5ef27f1985213e528b940373ec8505d36ebcc628646e5162c
-EBUILD clementine-9999.ebuild 5054 BLAKE2B 3c0eb34b89cdc488a0e5553d43d9a80ab394e336fbee8e79bb322c3e86f0704c59ce30ff8eea96696d211d5f1218cd52aba929218f9f84c5dd8d940e2ba4767a SHA512 99250978824c2b96dc52f9298519be138ded54b60afb2ea17cc6c3133a49676d16f666947e001e31bb18894c78bdc9a4ec080f4eeb877fc7c7af55bffd5174be
+EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7
+EBUILD clementine-1.3.1_p20180523.ebuild 5177 BLAKE2B 0bce51b4bcdba84963d6872017d5c944d9092eb0732d5c4bf99f581814e652c9aeda7f3429961de0b75fe1869a3cbc7897a8895eddb39e7b3ee7d73778c52888 SHA512 078cc9a488ac8e47aa29e2d53c4f56f39fea5e73699f9a23ecbfa4555cbcc50572cdbf7c9f7f022481be07da984777c5876119c221470e1734868df01b9130f0
+EBUILD clementine-9999.ebuild 5056 BLAKE2B 46397ac46af25668683a505acd33478a36e32832edd8a89fcad664906b10404825c2bb4454b6cb9d99b4aad935aaba9a51c9ca23a1a5df14b0e70128ca968bd1 SHA512 f18af7523ab3143578ea99db58ac6d926a4e6f7c567dec5b7fcc40a961549e21af51a8110ee07a419f31e1a59d76d855b90a38b188f9d8f208fbf512563c16cd
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
index a55f952ee724..2af2d69f7b7e 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ REQUIRED_USE="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++
+	dev-libs/crypto++[asm]
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
diff --git a/media-sound/clementine/clementine-1.3.1_p20180523.ebuild b/media-sound/clementine/clementine-1.3.1_p20180523.ebuild
index 429b9aa05e05..1af1af58a542 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180523.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180523.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ REQUIRED_USE="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++
+	dev-libs/crypto++[asm]
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 2d1b92dddf91..cfb50fb9b37b 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ REQUIRED_USE="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++
+	dev-libs/crypto++[asm]
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
index b74afc953125..b9c907f29b5f 100644
--- a/media-sound/forked-daapd/Manifest
+++ b/media-sound/forked-daapd/Manifest
@@ -3,5 +3,5 @@ AUX daapd.confd 344 BLAKE2B 62176766f5350bc0335b233431adffae42915abb5fd540e121db
 AUX daapd.initd 583 BLAKE2B 0d84bdf5eb458568e07b2e3866dc36e95f1a2e169055345383b5607a38c347b3457b108385f16df8cce0ca280845a3ff122246af3c06747b91e9f2f7ac39857c SHA512 a584cd71c5673732ac0c31fb92d156f5c480ced066d0686f957d6adf9c769ec234fe46a468077ea6b28efca132336e186fa0adc2200150e9fca11f2800aeb67a
 AUX forked-daapd-23.2-fix-arg-enable.patch 2272 BLAKE2B a32aafa2779f3c276def8c522215f46dc6289230d3b055d5ae0389590b9d71eadb7e96a919266089eead0b567ad880b4c836bb596f569d64cda1365f3c87285b SHA512 48768ab213334c2324435a82cb58982100e8467001284bf589816e983982d4916198e659afad1fd7ca8e437c48971fb5ed7eeafcfa0118965d91fac839bfafe4
 DIST forked-daapd-23.2.tar.gz 325895 BLAKE2B 31fd3362ed3a46721aec7b48efafb2fd77a4bb549362ee1717e2166409ce0f24a65c5ea95d4278860cb0e3ad717bcdaf7c3a744678dc591263f5cd4c4a965991 SHA512 11b5c6c16c0c9e20f1c196941cd09602d90b5e2ed0765e4fac25c6aeba388706bd7ede9f6c467227c245f2597466e8658f9db75073ee8b47b16f947514eb1511
-EBUILD forked-daapd-23.2-r1.ebuild 1710 BLAKE2B afba25b6d1c922ae65b5c019323c680d972a9ab2ee1913c0a33520e70132c4799f7cfa830c4a6ee74e47a56012fa1e7af053c6602d1e95ee7fc3aec9943a2b70 SHA512 dadfdbf217507b5ddff5681d13d6d3f657f3229fbb85599da0ad347a0633b1e09a214241103aa00dc881303d0e6537a5515fcb93dcd0df827e599dd1cd3dc288
+EBUILD forked-daapd-23.2-r1.ebuild 1706 BLAKE2B 3f8e975f12e33b4bb199bced28400914ebde21282e7738ef007f77ff1ea7ebb84c7f6eef584b08dca54d8077af8e6560618e82cbf09576c05986b77a138a0226 SHA512 84eedde4fb1a319bf4a9eec0b7c49ba0e46ca35c9c59742086e7866b7b3b8e71ae36987c71d7a31ff6bde49d6480736ef528e879886fed4da7d58e5c4835158e
 MISC metadata.xml 793 BLAKE2B aa9497c2700a6b0fa38496b637d9a65124bccc571ad2afc76ceca831b2fcacca09a31f318ad7eba39d0848476e14057a1e61d3cb1c7880a425c936f979909dbd SHA512 43ef73e58b7e999ee49ac1af5fcf1861e19debcad5cb783f3cec5e977badef997be362520932b97e404b39c5578df91b26821289733458cf1125d41572bf4d34
diff --git a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
index 291b1f091c68..e38ffacba8d5 100644
--- a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
+++ b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/libevent
 	dev-libs/libgcrypt:0
 	dev-libs/libunistring
-	dev-libs/mini-xml[threads]
+	dev-libs/mxml[threads]
 	media-libs/alsa-lib
 	net-dns/avahi[dbus]
 	virtual/ffmpeg
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index d57def02c9a2..9485fbff9109 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,6 +5,8 @@ AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75c
 AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
+DIST mpd-0.20.22.tar.xz 807084 BLAKE2B 156b5cac8ea571df37cd4460fb6c511c4101bed16dd9196d4287ed7dd83069d7cbe1c6ab64b2d955c36c22499653c929da2516a1ceafb498ba4b5645390ea568 SHA512 7fe2b7f31cdda874ec686fd3d2047a6630c9370d7475004c09fdb3c35e85ef1e1ee5d63e039ed1fed52929498a3d261b297e68ed802ae7487810d5779b02ad10
 EBUILD mpd-0.20.10.ebuild 7285 BLAKE2B 08b8d0afe72f0ad186438441aa1229e71c1c2564250c9e624eac2f7c6ec7596bd9f0ad4b353b4ca37af9acac2bda7b2a59f134265cb9a41be0bdfef64cf384b8 SHA512 82c6c20fbe05137a61ed07daa9bdcd0e7639267d8301e14257978d13e67a6ec9e0581f873c22df14a90a1dffb71dfd47fc456aee49889dc5d67a566ea6326ba4
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
+EBUILD mpd-0.20.22.ebuild 7311 BLAKE2B 25d0a67accc8cd81fd2a2d241f9a94b02d2a686af4fe7184f543fbd8f7a5f14793bf046a862222dea26b5e1533c0a132513a698b1199b46d33aa25b99a1f9392 SHA512 cd47cf1501ca33252c97e35c91708ca66c63e2030d1727d507b84575b5bc70e8867a4c8b3aca5ba4fdcba0847bb5bb36901d87989a002d0536016a53209f5b93
 MISC metadata.xml 2412 BLAKE2B b208c2d3481421794b7fd5328814e9dd340eb820df4972c0bd70626d9d63707dfceb8f7446239a3ca581f46004a1aa5e6438cbb6449700f472c1aa411d848649 SHA512 4cbaa880020239d2fcf6e2f057004569eb86288d3f25dce8e89eddc8d65cbbccf01dd0cfbfc376790297a1147d18aec3148515659fae5aec3bbe215bb94c2f8d
diff --git a/media-sound/mpd/mpd-0.20.22.ebuild b/media-sound/mpd/mpd-0.20.22.ebuild
new file mode 100644
index 000000000000..0e22d8297530
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.22.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info systemd user
+
+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 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
+
+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 ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	opus? ( ogg )
+	upnp? ( expat )
+	webdav? ( curl expat )
+"
+
+COMMON_DEPEND="
+	adplug? ( media-libs/adplug )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	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:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? (
+		>=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) )
+	)
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-4.0.25 )
+	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 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	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="${COMMON_DEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-cluster/mpich2-1.4_rc2
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	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
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	if use network; then
+		myeconfargs+=(
+			--enable-shout
+			$(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output
+			$(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)
+		)
+	else
+		myeconfargs+=(
+			--disable-shout
+			--disable-vorbis-encoder
+			--disable-httpd-output
+			--disable-lame-encoder
+			--disable-twolame-encoder
+			--disable-wave-encoder
+		)
+	fi
+
+	if use samba || use upnp; then
+		myeconfargs+=( --enable-neighbor-plugins )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	myeconfargs+=(
+		$(use_enable eventfd)
+		$(use_enable signalfd)
+		$(use_enable libmpdclient)
+		$(use_enable expat)
+		$(use_enable upnp)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ao)
+		$(use_enable audiofile)
+		$(use_enable zlib)
+		$(use_enable bzip2)
+		$(use_enable cdio cdio-paranoia)
+		$(use_enable curl)
+		$(use_enable samba smbclient)
+		$(use_enable nfs)
+		$(use_enable debug)
+		$(use_enable ffmpeg)
+		$(use_enable fifo)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable gme)
+		$(use_enable id3tag id3)
+		$(use_enable inotify)
+		$(use_enable ipv6)
+		$(use_enable cdio iso9660)
+		$(use_enable jack)
+		$(use_enable soundcloud)
+		$(use_enable tcpd libwrap)
+		$(use_enable libsamplerate lsr)
+		$(use_enable libsoxr soxr)
+		$(use_enable mad)
+		$(use_enable mikmod)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable musepack mpc)
+		$(use_enable mpg123)
+		$(use_enable openal)
+		$(use_enable opus)
+		$(use_enable oss)
+		$(use_enable pipe pipe-output)
+		$(use_enable pulseaudio pulse)
+		$(use_enable recorder recorder-output)
+		$(use_enable sid sidplay)
+		$(use_enable sndfile sndfile)
+		$(use_enable sqlite)
+		$(use_enable systemd systemd_daemon)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_enable wildmidi)
+		$(use_enable zip zzip)
+		$(use_enable icu)
+		$(use_enable webdav)
+		$(use_enable faad aac)
+		$(use_with zeroconf zeroconf avahi)
+		--with-boost="${EPREFIX}"/usr
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}-0.20.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
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.20.21.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index adb233e454a0..70722995f5c0 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,7 +1,7 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.3.8.tar.gz 1020024 BLAKE2B 07cc1341a9c829c6e9e4f820337ee993b16e4d014636ad89793952059af5814754682035841b4307a700d2681e49aec5cd4138cdf13fafc79e60557d8087a362 SHA512 3c6537daf2fd3205ecb42ee91cc01ce2a4b28ec2ecfe32c978f70e8334fef667369c684b1ea2dfdd0537fe70d10084a1c758da7757f5473d1dafba6110dc03c7
+DIST pulseeffects-4.3.9.tar.gz 1019494 BLAKE2B ddc2cb818a520b9a5fe9d88078a058e1a6e1c27225f6ffd41979bd5ebd5349f6fcdbb64766ee6b45759c059ad31859ad88de8f28fc4c7242275147b6eca18d81 SHA512 90d18ca3154baa685d9b421371c6a5098a11feb4f154d9b19865bb7b54d074aca703f803fbb40f29dd758b1090d3c12656268b59410d3249d4f34a8a1707953f
 EBUILD pulseeffects-3.2.3-r1.ebuild 1568 BLAKE2B b50ff96cee7ea244dc499c46bfd9dc382e3fa22d03b1d74c25614a5fcd9b540521bc4b7c50a42cd11e19286f5f86c82b7ab5cb93c44da0e29a9d87c2bb4157ba SHA512 704a2e5d1bc7abc1ab31d48092cd825a140a571e5ee0034bf4a9041615183c91383fb5b4051275a4b598be35e638b375e63de3d117d0fdbc63fdfb341c57e05e
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-4.3.8.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
+EBUILD pulseeffects-4.3.9.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 EBUILD pulseeffects-9999.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.3.8.ebuild b/media-sound/pulseeffects/pulseeffects-4.3.9.ebuild
index edcf67ece621..edcf67ece621 100644
--- a/media-sound/pulseeffects/pulseeffects-4.3.8.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.3.9.ebuild
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index b9a9bfe5e25b..ed8885aa3b01 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -1,9 +1,9 @@
 AUX snapcast-options-for-use-flags.patch 2583 BLAKE2B 4ad94f7c2d796017047645dcc74bd04209817dcf6c96c05cf92a130af2c5239761325f25a0bf8ebd65c6d1221f3ba248b93eb98c22ad278c06bca46c8e27d056 SHA512 84be456467309c2c040526dfa1847e65fdec2c59d7ba917416d10ece0d7173d53ce11c2fed2a566fb3157e58757ea21500464c46abff18e57dfb092c18450932
-AUX snapclient.confd 643 BLAKE2B f15281f607b230b165e61dae2d71e58a9b899329da435caca46aa866a14528246bbfd9abfa1002815270d98fb926e322025095b9955fe84e0381c17149ca0b9c SHA512 34961a219a608aa5447fc4b47d08785923a4a8a5d70f87f03c62dab2f590180d72992f40594772ac9d2c8cfc89281789418eee46c860b1b7c1b826e6660cfc72
-AUX snapclient.initd 378 BLAKE2B a1f2dda0843c541edfefce80e0ad9587af8ef50844fe742d932a1a1d3ea06e8587574ec4c08d403858bb42b4bf3ebcfa67fce59182b2f779e09e2ad53790d0ca SHA512 5d58c9746ba793c59ae1690a97aa5f0c74ffd3fe86a1f9ed5851e3f181e050188f70a96fbc7b8cfe0afe5de784bc332e25b4a4e68873503106b2231c59e8af69
-AUX snapserver.confd 1013 BLAKE2B 205c58e3d42dc12d759c7dd5acbb1a1229ae052a48392731a7cc10cf9ab36250938995a75c4968c33521cf1480396856b5cd8653e90b5b8a3188e1660b1c1257 SHA512 5adcf37ed69ccb09541f7bf7563ddf5a8aaf1bfcabc02f430976ae5b8e418ea68cf0b22216f3f7387a04f7516a8f30cc5b2923f811c1833c7a4208e951fd266e
-AUX snapserver.initd 383 BLAKE2B bd920738ecb98eda76f0045b50b3b0763cd123ab5eb08bbbe2964d7a0556b6df2ecb879dd0b0ff9614b10520008e9934cb278a0f3705539076eb812404f0ba58 SHA512 565084bea18bfefe60c0e33e0fd33929a0b170df9d0cbbfbf794a9ee9055a9bf605a716ff18bf72d2813e890b64815eebc2bc24963f300b4061cf017440a62d6
+AUX snapclient.confd 641 BLAKE2B 74bae4c2c11fb7c1a7d4f2bd0f199c92a5ee11f68efb71da00026816f9dd7ba3555cc96c1e68be04dce26ea190a8e353c71817b5655ad2d9b43e3e510345c97b SHA512 f0adfca9354a4f5acb2def99585409e39229053e2b9be36309a67ac0b6935b1aeb061380a9e8a61d70bd902930536ec3afa98a6a708b08008eea1eb080fd1a5c
+AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd987fa51e9885f4968b0144106883a1a48e502c3e3558ca408babd38c46663b13ee56215caa108c3be SHA512 f429dfef7abd5705a8afc38f68125a7a6e5a812cd68733c8f47a65c7fb6aa22fc665c91e557726b8f35edbaced7b2e72ffad0ba123a6ed33bf8a6d333e8c1bae
+AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
+AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
 DIST snapcast-0.15.0.tar.gz 667452 BLAKE2B 0bf7e28ba52356c8fff8066ded3d741243c2ba88cdc6cefda113c0d6866fe14b2fea6198d7809e564cd61d32a336a2c30ee22f6f5d6ae77368a6f3e254cc5065 SHA512 3751eeaa9be4ffd5c7633b8770f36e87360ab83004f090a8350e377f60a79d9502b92b92c5c9c35f513705e6484d113de9942f0a896824d7c5f806ba0010e84e
-EBUILD snapcast-0.15.0.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
-EBUILD snapcast-9999.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
-MISC metadata.xml 1335 BLAKE2B 6b0e6cfeb32d2fd6c9dfd5404df5795a1c82f1fffb2e12c31ee5c6656e0b7470d41416775c816211847bb37288f620b7f5ffe85641b88d3b5493f21436a43ae6 SHA512 78bc34f1071f7efaf923dded86d6af3761f34612832b29e6ddacf63c7bcbb5c9662e3857a818dfd0328423a7ba3aaa6d383cf425551227b6228d6d58cad4943b
+EBUILD snapcast-0.15.0-r1.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
+EBUILD snapcast-9999.ebuild 1966 BLAKE2B 9a5cd3681ad18305dd558d99baabe9a1630f817d1569fe9a30b77a160603fe52d941eb8398c99ce8f943995dedab370ccf141e8d7bc94c11df1883b697a854f8 SHA512 d824679b93e13117a206d69a2cb5c7978619ef25308bbe75d28685630435238fa4496d473bf54477ddb7b53b48c327aebb19de6a4ce393909249eb335392a599
+MISC metadata.xml 1161 BLAKE2B 6274c692ae99e43490e09e0c900a95a90ac423b4cd13a5399ab629023a594ba0d4c313df31d040760e46daee4cca8df23d497dd47052dbab86071156fc183624 SHA512 fce326e7afc1989206d24a970d38ddf1860368e8a69fceab5336b87558274eaace21214885f942ca40aca7031eef0abb0f0dc3b8f1d4ebde93ebe1bd8848a766
diff --git a/media-sound/snapcast/files/snapclient.confd b/media-sound/snapcast/files/snapclient.confd
index 311cce1c4fa6..e636d74da2bc 100644
--- a/media-sound/snapcast/files/snapclient.confd
+++ b/media-sound/snapcast/files/snapclient.confd
@@ -30,4 +30,4 @@
 
 SNAPCLIENT_USER="--user snapclient:audio"
 
-SNAPCLIENT_OPTS="-d"
+SNAPCLIENT_OPTS=""
diff --git a/media-sound/snapcast/files/snapclient.initd b/media-sound/snapcast/files/snapclient.initd
index df69eb2621a0..45c0c74316d6 100644
--- a/media-sound/snapcast/files/snapclient.initd
+++ b/media-sound/snapcast/files/snapclient.initd
@@ -4,7 +4,7 @@
 
 name=snapclient
 command="/usr/bin/snapclient"
-command_args="$SNAPCLIENT_USER $SNAPCLIENT_OPTS"
+command_args="-d $SNAPCLIENT_USER $SNAPCLIENT_OPTS"
 pidfile="/run/snapclient/pid"
 
 depend() {
diff --git a/media-sound/snapcast/files/snapserver.confd b/media-sound/snapcast/files/snapserver.confd
index 9b12f81ff2ab..8a4327a79b9a 100644
--- a/media-sound/snapcast/files/snapserver.confd
+++ b/media-sound/snapcast/files/snapserver.confd
@@ -42,4 +42,4 @@
 
 SNAPSERVER_USER="--user snapserver:snapserver"
 
-SNAPSERVER_OPTS="-d -s pipe:///tmp/snapfifo?name=default"
+SNAPSERVER_OPTS="-s pipe:///tmp/snapfifo?name=default"
diff --git a/media-sound/snapcast/files/snapserver.initd b/media-sound/snapcast/files/snapserver.initd
index 02762c861b03..220e7228eebd 100644
--- a/media-sound/snapcast/files/snapserver.initd
+++ b/media-sound/snapcast/files/snapserver.initd
@@ -4,7 +4,7 @@
 
 name=snapserver
 command="/usr/bin/snapserver"
-command_args="$SNAPSERVER_USER $SNAPSERVER_OPTS"
+command_args="-d $SNAPSERVER_USER $SNAPSERVER_OPTS"
 pidfile="/run/snapserver/pid"
 
 depend() {
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml
index 3a92671f3335..cf204c8ac111 100644
--- a/media-sound/snapcast/metadata.xml
+++ b/media-sound/snapcast/metadata.xml
@@ -10,12 +10,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="avahi">Build with avahi support</flag>
 		<flag name="client">Build and install Snapcast client component</flag>
-		<flag name="flac">Build with FLAC compression support</flag>
 		<flag name="server">Build and install Snapcast server component</flag>
 		<flag name="tremor">Build with TREMOR version of vorbis</flag>
-		<flag name="vorbis">Build with libvorbis support</flag>
 	</use>
 	<upstream>
 		<maintainer status="active">
diff --git a/media-sound/snapcast/snapcast-0.15.0.ebuild b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
index a664ea01e296..a664ea01e296 100644
--- a/media-sound/snapcast/snapcast-0.15.0.ebuild
+++ b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
index a664ea01e296..6bfe033cdb5e 100644
--- a/media-sound/snapcast/snapcast-9999.ebuild
+++ b/media-sound/snapcast/snapcast-9999.ebuild
@@ -35,8 +35,6 @@ DEPEND="${RDEPEND}
 	>=dev-cpp/asio-1.12.1
 	>=dev-cpp/popl-1.2.0"
 
-PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" )
-
 pkg_setup() {
 	if use server ; then
 		enewgroup "snapserver"
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 2a80897c6796..906161fd30da 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,7 +1,7 @@
 DIST yoshimi-1.4.1.tar.bz2 3674539 BLAKE2B a3561f4129b1da137caec4a4bb8a59222ca43c875a6533ce0c74ccff8d499a40cf98a1258f44e1a2f290fdc6f28786ce26772d19489c03590a360825488e5b3c SHA512 2ae98e4cfb0a24f7777a76c971fae9b12244624d18d1dd1cb3142af421be9f55874aac658b666fe29367aa75902895b9ec5a608939ab44b2158bdc5ef7a59499
 DIST yoshimi-1.5.1.1.tar.bz2 4035895 BLAKE2B 4579555c96f68ede8f6b604039f23512a041f879b23155334c6aab891fdb11d4e77b8d7d38ebad98b114d49da5fa815114872ca5cddd7f30fd5d56b5d4178be9 SHA512 f7f47835aceb30ca889ec536f922a30ef3d1e4d306c666c91b984a314781e5245045aab216be3dbdca95250f8e941229db799afd6b5fa079b61e75fd92ee1c28
 DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84
-EBUILD yoshimi-1.4.1.ebuild 1019 BLAKE2B 4bab0378aed6263d83e65bc1b74db47f199203bee7766cd5f09713d471ddbf094bff33adf25778b52aad43018cd67df540e4eec6b01170e0f7eb50626e56874a SHA512 363c24a42f57dbe9d49eb4b3110ba7a639ec4792ca03da54a42e33d94dbc169ac32af97d6dfb777adaf91595e25f463f5563beea0d79eeafa57fa770716efb73
-EBUILD yoshimi-1.5.1.1.ebuild 1036 BLAKE2B ada05bef04f792fce3b77498437cfcbcee7d187a506cd4c484cbadf42c7b8a2cc6deb9e1632a11c65c002d828b0207d9fff7c114f86d009bc380058580536379 SHA512 35f91f6cade5de16411b2e5639ade8ef325bd195cce129456aa91391d184c002a4c1dbf665eca7b561681effb153c1d66a80369eda8cdd253be174bbb6241e70
-EBUILD yoshimi-1.5.8.2.ebuild 1036 BLAKE2B a96b3cb54457a977cd653423e2281b78274f77644dbed838dd08b784f2cbfc1fd8d110ceda954044abca07f8a99d2ced2353b6aa8eb7b6ddad2f24d774ec364a SHA512 954ae0f3362e941b726d7ae18484537fa233ae92c9e5b016d2fd9e3bcb3304139a7cf98b66da15f41e56a62a6b7b55434b72f3f296aabd0d9e85bc101223a575
+EBUILD yoshimi-1.4.1.ebuild 1015 BLAKE2B 80c0ec583a13eb7aae5ea376c447c02ae31009cf73d4be324e8364203ab2b13f81294d77089d814e926eee592183eb0ee9ba5269113394eb3e1c042c6584561d SHA512 4dd13708b3d1829755bde9e37d982a7c61e822ef61fae1303fdb87318b6847ec96e002b7b16a94103f7e924fd869e65aa4a80acf28b091a28476b4fed76e3e15
+EBUILD yoshimi-1.5.1.1.ebuild 1032 BLAKE2B dcbedf93b5ca4c39206ac0809c6147b8b9133eeefb2692346ca3575ed40441c3bb0d32d855a8bfcb36686e434916775d9501537a81d313ec3fece389dde84788 SHA512 5764063f8511b3ad75e1ea4fdaedd377cc0622ef2bd0a576701d4bb047a144e60b9e458bf90b626ca9d6b555b66fe726c207c2a59cebe5507e982c767ca0e496
+EBUILD yoshimi-1.5.8.2.ebuild 1032 BLAKE2B 3d2293725a28d677eee7846e86370f7b4b48f2a45bb5c7f37be2df15eeca6fdd76b8b99a1d1e4c7444967346b3aa9d02b6189f29150a81512545057374246496 SHA512 68c13d8841deb26933ae05c9dcf6cd7212d0a8768989062209361539f123dd268b68035b4954848652cafeaa223569fc137ba989217ab3ba546f0e56d173c7c6
 MISC metadata.xml 397 BLAKE2B 2c4e07b154aa3dc9c5cfac332fe039e9dc6251673aaf29e256aae8ddb146851174bde3d16e892ecfcda54d53d544514cc36f8f46373764c907e98d2f0cf5ed5a SHA512 1fbabe7286878f7ae5877cf95384b7574a8cd7656c6dc8296608af2bb2bd0004379b6f7fe920005baa00d00687b56511f90b79709ff71145384cb748bd45f231
diff --git a/media-sound/yoshimi/yoshimi-1.4.1.ebuild b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
index 7c8f3e4ee739..d7d64c58b5a2 100644
--- a/media-sound/yoshimi/yoshimi-1.4.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+lv2"
 
 RDEPEND="
-	>=dev-libs/mini-xml-2.5
+	>=dev-libs/mxml-2.5
 	>=media-libs/alsa-lib-1.0.17
 	media-libs/fontconfig
 	media-libs/libsndfile
diff --git a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
index b33e6064a78d..b8e82d9c8ffe 100644
--- a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+lv2"
 
 RDEPEND="
-	>=dev-libs/mini-xml-2.5
+	>=dev-libs/mxml-2.5
 	>=media-libs/alsa-lib-1.0.17
 	media-libs/fontconfig
 	media-libs/libsndfile
diff --git a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
index a926a1d6d595..c5fd3cc38be7 100644
--- a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+lv2"
 
 RDEPEND="
-	>=dev-libs/mini-xml-2.5
+	>=dev-libs/mxml-2.5
 	>=media-libs/alsa-lib-1.0.17
 	media-libs/fontconfig
 	media-libs/libsndfile
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 3424b57de5ab..a209b4fb0381 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,4 +1,4 @@
 AUX zynaddsubfx-3.0.3-docs.patch 559 BLAKE2B cde5e6e4a3bfe0c03e013549a723f2415d0b3a5809ca3fac268e537af5cfdac71e1d9cc108ce708b2e509bc1705bb8dfd2aed31a15e5bb58356979f38fcfdbc5 SHA512 3771f0ea2d3fb3c3df4749e95312f026765af20b8531e93d37033d50ede8c4ecb90ab0879ce474db7ec9c9d6a606c8e64a22e82116ff85b8775a8ad804f5d448
 DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
-EBUILD zynaddsubfx-3.0.3.ebuild 1571 BLAKE2B f0a66394c74568fd2ec8ff6321e3da4e55027adf229d906d4352eb32411bf3cdf041e0baf189f7e604e3ccebfad646c11bfff7538f7ff34e620c7b0f8cc4edb3 SHA512 47fd2b5be892cf03baf8192627a82a9f2e1ae9462dc3802fd835d2d09f5536da383f65b91700e67f5d2e5244ea812e1dd4d38276247de7e1ba880991e4c6ed6a
+EBUILD zynaddsubfx-3.0.3.ebuild 1567 BLAKE2B c4e2e6b115c326e769ed98d95262d8545b576f3b809c403fcbae03717dfc40e8ccebced31acd82281a3712452e4b1206bba427239492a045d856920df3409fbf SHA512 e18092a175c36dc1958ee03bc388c330685a806aaa227e45a6ead4cde139e656dd9d7b82eac851875821fb6c465e176e438894c78f6bfa5c1f09bdf95fa0cd35
 MISC metadata.xml 340 BLAKE2B 1e630f1735f05b15bcc045f0146e81e932bfe6f08262a40518d15ababe8fe73e04f597b0aa7dd026e316a501276885fe5b842ccf7177c0880f754d1481c46c82 SHA512 c59fcb3065e3b34c3e3e23a8db07dbe245a8addcf7a6958834b5715bc0a8319c8d0cfa3b40925e7e9838df031843a5218bbcf91721ce57bee2632111dc27d4a3
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
index 988efc1b9940..b929690c9c52 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa +fltk jack lash"
 
-RDEPEND=">=dev-libs/mini-xml-2.2.1
+RDEPEND=">=dev-libs/mxml-2.2.1
 	sci-libs/fftw:3.0
 	media-libs/liblo
 	alsa? ( media-libs/alsa-lib )