gentoo resync : 18.11.2018

58 files changed, 1407 insertions, 1184 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4c36efcf9835..21dbf4c21c42 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 15c315f41968..4be12758cabb 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -3,6 +3,6 @@ DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd2
 DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75cb6838c407586b52144963350d51271fb500e627e152d05d1c586c337c70fc839072094e0492a0a1b160d6876ccedeb SHA512 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
-EBUILD alsa-tools-1.1.6.ebuild 3548 BLAKE2B b6a7fd71fdf79123aed542424f475b42d4d279daa2f33d586c499518aaf20aea4311b9e0d960f0e8d2e67bd77ddb1f0d1039a6c7a5af5be91d51eb5c097c7b84 SHA512 2535753579ebff3dd7fe0f4cca577a4873e2b71c902eae675d7d9cef97aab708cb46a0d02342e9dcebb1ccf8f09ac4f6c80c3965183c1e4a4c637b00d0bba882
+EBUILD alsa-tools-1.1.6.ebuild 3546 BLAKE2B 94e7e245cea9bcf265eabfcc6cfb0c4cab0fad34b2b242539bbe71937b4c9dd4b7208ab65f2bd1c832a3b7ed457647529c49369478011970d793afc497d6177a SHA512 64db16171d4cb54f3d2977b7c53d5c9c07d9ad0016731fd582d5d3298c04b754f4031d92577abd2bc077e58721d5c32a16eb6974fe6d6074a68607ce1d7727c3
 EBUILD alsa-tools-1.1.7.ebuild 3544 BLAKE2B b833cc72f9bd1d45a75f992cd9d0667ba23e94bcda8a22b2d39c2d72fa475bc78fc5e746061dd961fa7a7b83d74af3e7f910ba46ffd5fa8c67f21c5b8d5900ad SHA512 f2f7ed51b00cdd3ae72eae5d22f0185001bb0c96bbba656882c8f562ef962aa8b484b87db45aa2730ad2659c740e9c62621d8c2e4c069610cdda4c5f44055c81
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
index b0f1e28d9fa4..18fcd567ec8c 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 2c2a52fbb278..40b3933c53e6 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 2252 BLAKE2B 5077094316298854a10ed48553a6d06d7a93524d11bb9ea2a3991f0390d9ab0b227b1fd06403beca4d34f1dcd342613c6f4fb0e0224fba36dbc9ec2dde46e4c8 SHA512 958d1a4682fb8220f2bf3c9f126e07e400e9aa6a066afc59db2ef005be2a16b8125f5b50aef601df90481fa9ce5691cb668b1739fcc0b25f9939e9569b661da7
+EBUILD alsa-utils-1.1.6.ebuild 2250 BLAKE2B 91f62ec519292ed9ca58c3be32114533da746c9d749db5f8d7c29aefb799342957a4078f9c207713e60582001578850fb1153f33d169cb36297ceb0f1112e5c8 SHA512 8a84e7ba4a4e861f9ad691e87e9e6d5ae42d38365252f3182374f83f37af5cacb9e365a4604e00e7c8dcaff1366ec825b97faefe8553468093d650087cae5c39
 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 128573ffd423..d52b19af0a34 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/audacious/Manifest b/media-sound/audacious/Manifest
index 15cfac2092f6..06d4afa53330 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,6 +1,12 @@
+AUX audacious-3.10-dbus-crash.patch 1820 BLAKE2B 90caf90a4fd6843b8aa7c4833c36ae962fe188ce07de962c8b7c20b0fe91c532ce83e7564fd4722a602d4b77dc14de557001f6aeb9b9b009b7a00590094f2455 SHA512 a57f834eeab3d5cc686723c9605d331378beae2b5cb2115750aaebe71fd4d85f5ece1a8c2a179ed50ceef4cc2d59e90ea0f37a976c9a1673d9150d3e5618c397
+AUX audacious-3.10-ui-freeze.patch 1243 BLAKE2B a26645d3a401c5d7338ab88aa2067deef73b8b0fbcfa8db62a09d71759701e4259d75b453301b2a7d3cc58c81e6fb3c0401897f29a6f6b7ef3a75308170a1254 SHA512 880b1194f28016f1213c452f3265fc06960c1307ae9f1a656ef7e719064331feb62d61ce1a4188645f8e7f6fe554b97dd35ef13bacb00d0a7516570a021c2f21
+AUX audacious-3.10-use-after-free.patch 1301 BLAKE2B 6b36392901f75cfbb118a8ec7dc348d44f61402f829a4fb03a9ce150fcb756d2795d8a9cb9b7b13e79cc87fd075ece8787abd482097c401983dc6f804ad7454e SHA512 cda15375ef0183061627bf33604bd46ef3be4ff34a289c45ce5093c80024e1922587b955c61a58ea8a438d90c42d869bfbec60c53878ea40c410d2d6b3a14f68
+AUX audacious-3.10-volume-slider-boundaries.patch 896 BLAKE2B 222a1b45f3dfdb4f97f232a290a804d3c78ceeb634fd4db7a0d64f4f86eaf2d14d2806c91695eb99f943ca743fb1521f402c58473b24eeb1d2832f6ec20d9348 SHA512 c565f3dc776e4093acb7d19a3e000b5575fb93b6f275d12f0d23e77802522fb7944a18056cadd0fff3b23262892a2b9feea93e6fcba5c9ae7ce969095730d4d3
+DIST audacious-3.10.tar.bz2 563531 BLAKE2B cde59bd5aff8e0530f76f3bdde20b48f829592a0a67cc03e8b7c08a8892259e99e9de2b1608698ff28819b7a6d0341d5237491f7591c4380566512076a0889b9 SHA512 513d5f9608c1ebeae9cf9bb95128244e990e66c74bf49aff6570ec557d537809f3ebf93c400f5df2708ff61cf04ecc95da183b111f5a757735cef5a68dd9907f
 DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
 DIST audacious-3.9.tar.bz2 599488 BLAKE2B 2288fe6919c1770cd283af809629fda72186cc0b87a42821f5fb9b7a20c8e7cd5bc00611d10677a82877c5ebc8a1b5ad728626027b95cc875b66dda732b8747f SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
+EBUILD audacious-3.10.ebuild 1850 BLAKE2B 8ec899c2b73a5c747f270ed9e51926817611c1c79b050a42f859bd3c4f6631895fc114aa0e1090f99b9d4b65e146fad244a8feeadb05bb30ef548cd1d91b575c SHA512 2c903bb9aacc3e68ca1278efa914aae7cf44cd02978f8928c50a23febd8f461019ce88acd2420444f6aff24d45d4a0c268c2f65460c80e93332df9d746bc3e8b
 EBUILD audacious-3.9.ebuild 2118 BLAKE2B a56f92b3c6b166cfbb8a32f8819ac54b055a9bdf193049e20b450f4ce7f7e149db255876b9ae826abf5083afaabdcec4c6c757117691f50dd587721c106cb226 SHA512 6f65840eb3b70d0f9cc0aae6617754c5563e014db904a572b159cd5746c21baae0ad71d575e5b8756d869edb743f8da25410522c0d4d3e1c7e9da798dec0fbdc
-EBUILD audacious-9999.ebuild 2118 BLAKE2B a56f92b3c6b166cfbb8a32f8819ac54b055a9bdf193049e20b450f4ce7f7e149db255876b9ae826abf5083afaabdcec4c6c757117691f50dd587721c106cb226 SHA512 6f65840eb3b70d0f9cc0aae6617754c5563e014db904a572b159cd5746c21baae0ad71d575e5b8756d869edb743f8da25410522c0d4d3e1c7e9da798dec0fbdc
+EBUILD audacious-9999.ebuild 2102 BLAKE2B ce1cfbe19b142f4e4273fc040e5e1ba60f65805fb6b29bb00c2a96236c7ad9b87283bf59c28684fa6605e920e4b7a1ad784913f7fbf38bca9d12574b65055dfb SHA512 408ebe7cfe721e90e6fc35d628fd61657049f8ab4920c3c7e94a35c97bac947ccd2963c84ccf451c9f4f83730bd6760a4b7bdf3caafe3f5a4742d037a90f6143
 MISC metadata.xml 486 BLAKE2B 982e0b5a578375d9d67369cf92edcef934c8227e6469aca89417634aca805dea8eba386033a575458d55cce34aceb6adf1de8fdcf3fb3a255c853d6c3be7629d SHA512 365b810cf7b096c86804a87d06a522b5a151559035a1ff5694153081426f5565d6465000bc9618acefc403bda9f675a048aea4dbd3af7dfc25200dd16a1c1dec
diff --git a/media-sound/audacious/audacious-3.10.ebuild b/media-sound/audacious/audacious-3.10.ebuild
new file mode 100644
index 000000000000..926f5853cae9
--- /dev/null
+++ b/media-sound/audacious/audacious-3.10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
+else
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ui-freeze.patch"
+	"${FILESDIR}/${P}-dbus-crash.patch"
+	"${FILESDIR}/${P}-use-after-free.patch"
+	"${FILESDIR}/${P}-volume-slider-boundaries.patch"
+)
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--disable-valgrind \
+		--enable-dbus \
+		--enable-qt \
+		--disable-gtk \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index dea37f7b001f..47a2fb255287 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -8,7 +8,7 @@ inherit gnome2-utils xdg-utils
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-sound/audacious/files/audacious-3.10-dbus-crash.patch b/media-sound/audacious/files/audacious-3.10-dbus-crash.patch
new file mode 100644
index 000000000000..83b9c74f98cc
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.10-dbus-crash.patch
@@ -0,0 +1,60 @@
+From 1528e780825b1fc49639ea16d332c5752051dab7 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+Date: Sun, 19 Aug 2018 14:12:30 -0400
+Subject: [PATCH] Fix crash when an invalid field name is sent via D-Bus. 
+ Closes: #817.
+
+Regression introduced by commit 203b41f8e249.
+---
+ src/audacious/dbus-server.cc | 31 +++++++++++++++++--------------
+ 1 file changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/src/audacious/dbus-server.cc b/src/audacious/dbus-server.cc
+index 7602ace22..20a6c5839 100644
+--- a/src/audacious/dbus-server.cc
++++ b/src/audacious/dbus-server.cc
+@@ -635,27 +635,30 @@ static gboolean do_song_title (Obj * obj, Invoc * invoc, unsigned pos)
+ static gboolean do_song_tuple (Obj * obj, Invoc * invoc, unsigned pos, const char * key)
+ {
+     Tuple::Field field = Tuple::field_by_name (key);
+-    Tuple tuple;
+-    GVariant * var;
++    GVariant * var = nullptr;
+ 
+     if (field >= 0)
+-        tuple = CURRENT.entry_tuple (pos);
+-
+-    switch (tuple.get_value_type (field))
+     {
+-    case Tuple::String:
+-        var = g_variant_new_string (tuple.get_str (field));
+-        break;
++        Tuple tuple = CURRENT.entry_tuple (pos);
+ 
+-    case Tuple::Int:
+-        var = g_variant_new_int32 (tuple.get_int (field));
+-        break;
++        switch (tuple.get_value_type (field))
++        {
++        case Tuple::String:
++            var = g_variant_new_string (tuple.get_str (field));
++            break;
+ 
+-    default:
+-        var = g_variant_new_string ("");
+-        break;
++        case Tuple::Int:
++            var = g_variant_new_int32 (tuple.get_int (field));
++            break;
++
++        default:
++            break;
++        }
+     }
+ 
++    if (! var)
++        var = g_variant_new_string ("");
++
+     FINISH2 (song_tuple, g_variant_new_variant (var));
+     return true;
+ }
diff --git a/media-sound/audacious/files/audacious-3.10-ui-freeze.patch b/media-sound/audacious/files/audacious-3.10-ui-freeze.patch
new file mode 100644
index 000000000000..da05bc5b0009
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.10-ui-freeze.patch
@@ -0,0 +1,30 @@
+From 8f9745a5a539e44244d5e8200c61ed443c638aad Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+Date: Sun, 19 Aug 2018 13:47:17 -0400
+Subject: [PATCH] Prevent UI freeze when displaying song info window.  Closes:
+ #822.
+
+---
+ src/libaudcore/probe.cc | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/libaudcore/probe.cc b/src/libaudcore/probe.cc
+index 5c57ef884..38cf73d96 100644
+--- a/src/libaudcore/probe.cc
++++ b/src/libaudcore/probe.cc
+@@ -242,6 +242,15 @@ EXPORT bool aud_custom_infowin (const char * filename, PluginHandle * decoder)
+     if (! strncmp (filename, "stdin://", 8))
+         return false;
+ 
++    // In hindsight, a flag should have been added indicating whether a
++    // plugin provides a custom info window or not.  Currently, only two
++    // plugins do so.  Since custom info windows are deprecated anyway,
++    // check for those two plugins explicitly and in all other cases,
++    // don't open the input file to prevent freezing the UI.
++    const char * base = aud_plugin_get_basename (decoder);
++    if (strcmp (base, "amidi-plug") && strcmp (base, "vtx"))
++        return false;
++
+     auto ip = (InputPlugin *) aud_plugin_get_header (decoder);
+     if (! ip)
+         return false;
diff --git a/media-sound/audacious/files/audacious-3.10-use-after-free.patch b/media-sound/audacious/files/audacious-3.10-use-after-free.patch
new file mode 100644
index 000000000000..8271a3d6d1b0
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.10-use-after-free.patch
@@ -0,0 +1,38 @@
+From 1d34f6799b8f5910fc6863ae96afd5ab035e830f Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+Date: Thu, 20 Sep 2018 13:46:52 -0400
+Subject: [PATCH] audqt: Use deleteLater() to prevent use-after-free in Qt
+ event handling.  Closes: #828.
+
+---
+ src/libaudqt/infopopup-qt.cc | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/libaudqt/infopopup-qt.cc b/src/libaudqt/infopopup-qt.cc
+index fdbba41d2..81dd87f5c 100644
+--- a/src/libaudqt/infopopup-qt.cc
++++ b/src/libaudqt/infopopup-qt.cc
+@@ -176,7 +176,9 @@ static InfoPopup * s_infopopup;
+ 
+ static void infopopup_show (const String & filename, const Tuple & tuple)
+ {
+-    delete s_infopopup;
++    if (s_infopopup)
++        s_infopopup->deleteLater ();
++
+     s_infopopup = new InfoPopup (filename, tuple);
+ 
+     QObject::connect (s_infopopup, & QObject::destroyed, [] () {
+@@ -206,7 +208,11 @@ EXPORT void infopopup_show_current ()
+ 
+ EXPORT void infopopup_hide ()
+ {
+-    delete s_infopopup;
++    /* This function can be called from an enter/leave event, and Qt does not
++     * like widgets being deleted from such events.  This is debatably a bug in
++     * Qt, but deleteLater() is an effective workaround. */
++    if (s_infopopup)
++        s_infopopup->deleteLater ();
+ }
+ 
+ } // namespace audqt
diff --git a/media-sound/audacious/files/audacious-3.10-volume-slider-boundaries.patch b/media-sound/audacious/files/audacious-3.10-volume-slider-boundaries.patch
new file mode 100644
index 000000000000..99155bf79e8c
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.10-volume-slider-boundaries.patch
@@ -0,0 +1,25 @@
+From 473ee3b3b0ce09feb23afcfc0ff276986db4f1af Mon Sep 17 00:00:00 2001
+From: Eugene Paskevich <eugene@raptor.kiev.ua>
+Date: Sun, 4 Nov 2018 21:45:07 +0200
+Subject: [PATCH] Qt: don't let the volume slider go beyong upper and/or left
+ screen boundaries.
+
+---
+ src/libaudqt/volumebutton.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/libaudqt/volumebutton.cc b/src/libaudqt/volumebutton.cc
+index e9144cb60..71edf16a1 100644
+--- a/src/libaudqt/volumebutton.cc
++++ b/src/libaudqt/volumebutton.cc
+@@ -134,7 +134,9 @@ void VolumeButton::showSlider ()
+     int dy = container_size.height () / 2 - button_size.height () / 2;
+ 
+     QPoint pos = mapToGlobal (QPoint (0, 0));
+-    pos += QPoint (-dx, -dy);
++    pos -= QPoint (dx, dy);
++    pos.setX(qMax(pos.x(), 0));
++    pos.setY(qMax(pos.y(), 0));
+ 
+     m_container->move (pos);
+     window_bring_to_front (m_container);
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 1f6baa0173b8..5941ff7dd012 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,10 +1,7 @@
 AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805
 AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca
 AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
-DIST audacity-help-2.1.3.zip 20682229 BLAKE2B f3a7c5870c2fd10e5d1420c03ea608d39e9768989ac106b6b1554994646200fb58550bb07ba889002dc652e9c2ea5a16f2ee87daa1e66433fc6f322d24fbc564 SHA512 4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B 4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119 SHA512 96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
-EBUILD audacity-2.1.3-r1.ebuild 2716 BLAKE2B e382834bf933f73269c4122b173361d071a976d4dfc746559ac99ca953395fd22b8d1bc5aaf70393426cf08a97cc8a6d18aabaa9f2fdb737f9560a47c1ff7a20 SHA512 1d92991b6295ac279c898c94fa30c9928b596918a0425ca30f7acbf77e417dbf0ab8e819df14e93c69293f6fd63b80845c2943c4cb2635204d5596a552ff86c5
-EBUILD audacity-2.2.2.ebuild 3308 BLAKE2B cea563a92f65b102b1fa2eab190b653ee12d7abb16c1a89400de47681778c21c814d640bd15ccdf30fa218c1beb85f14a95ea3e918c716a9f3202106fea704d6 SHA512 fc58fcebfffeec13309b6570dec88314eab5cbbc98f1484096cb83992d34e42f4f2d70391be5c8791655939d452e91d0fd47558721d87ece383a74e98578462e
+EBUILD audacity-2.2.2.ebuild 3304 BLAKE2B f58a95c6a33bdc10f9ef661203ea9b8bfecdb488b1c37e3d42e09b4f05e647950cf1b82552d0352d573765f04085c09c6efe7d495004d39057aa2ec53a4a17a5 SHA512 dd9e585bc9c24418e0879b38d70e9cb7b81f2ddaa20eeaccca84874f060378f6cb445e1218f2b3ef0239e6fd150213ef8bc5838737b9ebfa26938ae162980b57
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.1.3-r1.ebuild b/media-sound/audacity/audacity-2.1.3-r1.ebuild
deleted file mode 100644
index 7c2c2b2d5b66..000000000000
--- a/media-sound/audacity/audacity-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets
-
-MY_P="${PN}-minsrc-${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${PV}.zip )"
-	# wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
-	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-	dev-libs/expat
-	>=media-libs/libsndfile-1.0.0
-	=media-libs/portaudio-19*
-	media-libs/soxr
-	x11-libs/wxGTK:3.0[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= ) )
-	flac? ( >=media-libs/flac-1.3.1[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( >=media-sound/lame-3.70 )
-	lv2? ( media-libs/lv2 )
-	mad? ( >=media-libs/libmad-0.14.2b )
-	midi? ( media-libs/portmidi )
-	sbsms? ( media-libs/libsbsms )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	twolame? ( media-sound/twolame )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	WX_GTK_VER="3.0"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	local myeconfargs=(
-		--disable-dynamic-loading
-		--enable-nyquist
-		--enable-unicode
-		--with-expat=system
-		--with-libsndfile=system
-		--with-libsoxr=system
-		--with-portaudio
-		--with-widgetextra=local
-		--with-wx-version=${WX_GTK_VER}
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable ladspa)
-		$(use_enable nls)
-		$(use_enable vst)
-		#$(use_with alsa)
-		$(use_with ffmpeg)
-		$(use_with flac libflac)
-		$(use_with id3tag libid3tag)
-		#$(use_with jack)
-		$(use_with lame)
-		$(use_with lv2)
-		$(use_with mad libmad)
-		$(use_with midi)
-		$(use_with sbsms)
-		$(use_with soundtouch)
-		$(use_with twolame libtwolame)
-		$(use_with vamp libvamp)
-		$(use_with vorbis libvorbis)
-		$(use_with portmixer)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove bad doc install
-	rm -r "${D}"/usr/share/doc || die
-
-	# Install our docs
-	dodoc README.txt
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/{m,man,manual}
-		dodoc "${WORKDIR}"/{favicon.ico,index.html,quick_help.html}
-	fi
-}
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index 13e4b20853c5..13149d281ebd 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.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
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
 IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
 	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
 
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index e991ef27ab78..fd5867cded77 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,5 +1,5 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
 AUX chuck-1.4.0.0-makefile.patch 929 BLAKE2B 1bb70bc169faf5138b3e0d4b60c60366bc6e60a366f2eee3d18c3093b5f2d99e821e0fc948b6a79205500884b8babd12a6676d31c65435f37bf73dedbf5aec74 SHA512 4ceda974263f3a043f187f7d95aae7a16fc65936c7a687f6fa0003a51493caa6eebc8e932075a274373fd319a1c0fb329e1764fc756c4b1691c1dfd8443be836
 DIST chuck-1.4.0.0.tgz 14664130 BLAKE2B 2009cc3f6905c7e4361aefdbcc89cab08d21328c6fe8ea366aad32a862428a5ffb16d45b1717e849d174f52e104ff0394a0aa2f93cfceed066e7b393edaabb1e SHA512 198b3c08a79bbbd2c0cdd5d9a7a11b8b58f09e949a3f5dd3f330af7d80fdb2861ca53dce807df555aed6ba917e72001ef7147b62a3ada57c34154102388dece1
-EBUILD chuck-1.4.0.0.ebuild 1892 BLAKE2B cd70d52af6b1e789a4eff89f7d92d96263e6d472586bf796c285c69f5c70d121d9d6e0573375b186264f95bd02c1d7ad60dcc836349a1f2059a92cd14b78ffe9 SHA512 a5a5d49048ad3ea97f0e522712142272bc8c04e11f20b113bbf8524db7108e836f96533de0e9100a4ad024d8be5cb5987a0e45cfbef46ea59723e2dfd82d2278
+EBUILD chuck-1.4.0.0.ebuild 1865 BLAKE2B 4a083c5e4faf4b8130d33207188984123a72308367c55a08ff8dd3d922d3936b4357bb0198c58fe38189b54d5ecc0d8efc4c396c30f508b97cb82c7760001d95 SHA512 f7b47dad21f650d22db788e9016207ce77623b1a3a6dd1a11be8acf7b35d65fd54122bea2a08b8f6052a8d3fe1cc2160a9b2b96a7010f5687c5309ad72fcdb6b
 MISC metadata.xml 967 BLAKE2B 505781d22a20892538d6bcdda07f1a1ecaecb56c8574cc6745d4fddfa2b4d3ab643947c1403827bc306eb0082434327beccd0eb583287eea9a488bf6adc4ad21 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0
diff --git a/media-sound/chuck/chuck-1.4.0.0.ebuild b/media-sound/chuck/chuck-1.4.0.0.ebuild
index 874e0f13126c..dabca98d3a16 100644
--- a/media-sound/chuck/chuck-1.4.0.0.ebuild
+++ b/media-sound/chuck/chuck-1.4.0.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
 HOMEPAGE="http://chuck.cs.princeton.edu/"
@@ -17,7 +18,7 @@ REQUIRED_USE="|| ( alsa jack )"
 RDEPEND="app-eselect/eselect-chuck
 	media-libs/libsndfile
 	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
+	jack? ( virtual/jack )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 23cbe04e99fa..360d13cf6994 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,7 +1,8 @@
+AUX clementine-1.3.1_p20181112-no-dbus.patch 1356 BLAKE2B eda2e90798f5028cc5406df9b5ba5b2be01c16d6644d6f2a2416af46e8e8dbadf6a7fd7b5b6e6d32393589ef9d3e2b73ee5a37290f8265fbb7f3e03405825224 SHA512 a001f42b6c4352a0d01eea769959383b4674a1988ae07d6754bd85546b8343f793f8ab86a865c86a6bb7ce2a4c8f99f921e7e1cc61b624bdae4f5bf36865d6b2
 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
+DIST clementine-1.3.1_p20181112.tar.gz 8526632 BLAKE2B da3f155006ef5e94233104011aadad41e974ec339827b91bd3c5c0c2420b23199be852a9d0cb7c9b0112ba2d43ff3e3e87388db92679f8e64da5c3fa3e578c1d SHA512 eed16cec7323b142e4602a4bd81d7363e9cf4fc203c3b8b341aadbe883fdbd571dff0792260eec8af2f91e79fe905c3510d1e7ce1b06e9d4698016820cc771fa
 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
+EBUILD clementine-1.3.1_p20181112.ebuild 5219 BLAKE2B acda6fd2baaaa86a1366bbc8f3be825fffd0238e70a14529b991aae4637a63a6770726eeb7ec357cabc08e9d38bbc9d28231fee57351f31032ed826bf27fb1ce SHA512 083866c2400177d690263387dbe6384a33b24fda7822bc6f687b5214511ec4ac74cdd88aca6faa0c77af2dc5a0e603736a6d33fa7b9c00b9493179289cfb5f8a
+EBUILD clementine-9999.ebuild 5106 BLAKE2B 173f32354a9891b77909bee7e617b39b6b90005d7dc40a1da8e271dbc7aeb28421e7b9aeaaf1e075de0be9801df98a8233e89e4b669efb2891854ec3b5fae55b SHA512 6b2a173785f473e5290f673a42d55092bf1e184eff3eed0fabef238758395f7a21d9a090cd29efb36e3db3fd2b52dc55d53a271edf1c8d7038ff5a516cefe39a
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20180523.ebuild b/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
index 1af1af58a542..0840a685935d 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180523.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	GIT_ECLASS="git-r3"
 else
-	COMMIT=4619a4c1ab3b17b13d4b2327ad477912917eaf36
+	COMMIT=b8eea8ccc116388b67e4b042a5b81e87bf7a24e5
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	media-libs/taglib
+	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
@@ -104,7 +104,7 @@ S="${WORKDIR}/${PN^}-${COMMIT}"
 
 DOCS=( Changelog README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
+PATCHES=( "${FILESDIR}"/${P}-no-dbus.patch )
 
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
@@ -119,6 +119,8 @@ src_prepare() {
 		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
 		cmake_comment_add_subdirectory tests
 	fi
+
+	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
 }
 
 src_configure() {
@@ -134,7 +136,6 @@ src_configure() {
 		-DENABLE_DEVICEKIT=OFF
 		-DENABLE_GIO=ON
 		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_BUILTIN_TAGLIB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
 		-DUSE_SYSTEM_PROJECTM=ON
 		-DBUNDLE_PROJECTM_PRESETS=OFF
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index cfb50fb9b37b..78421f8b1167 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	media-libs/taglib
+	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
@@ -113,6 +113,8 @@ src_prepare() {
 		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
 		cmake_comment_add_subdirectory tests
 	fi
+
+	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
 }
 
 src_configure() {
@@ -128,7 +130,6 @@ src_configure() {
 		-DENABLE_DEVICEKIT=OFF
 		-DENABLE_GIO=ON
 		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_BUILTIN_TAGLIB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
 		-DUSE_SYSTEM_PROJECTM=ON
 		-DBUNDLE_PROJECTM_PRESETS=OFF
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch b/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch
new file mode 100644
index 000000000000..d03db2451ad3
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch
@@ -0,0 +1,41 @@
+From d940136d0ae2a98ea72d842df0099bebcd361426 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Fri, 2 Nov 2018 12:58:08 +0100
+Subject: [PATCH] Fix build without Qt5DBus
+
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1de26e3e..eaf794c27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -304,7 +304,7 @@ endif ()
+ if(WIN32)
+   set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent)
+ else(WIN32)
+-  set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras Qt5::DBus)
++  set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras)
+ endif(WIN32)
+ 
+ # Remove GLU and GL from the link line - they're not really required
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 120f09949..88f1ac6c3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1249,6 +1249,10 @@ target_link_libraries(clementine_lib
+   Qocoa
+ )
+ 
++if (HAVE_DBUS)
++  target_link_libraries(clementine_lib Qt5::DBus)
++endif ()
++
+ if(ENABLE_VISUALISATIONS)
+   target_link_libraries(clementine_lib ${LIBPROJECTM_LIBRARIES})
+ endif(ENABLE_VISUALISATIONS)
+-- 
+2.19.1
+
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 491a7404f096..069ee2c1449e 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,3 +1,5 @@
+DIST gpodder-3.10.5.tar.gz 1000492 BLAKE2B d3c1381fa613e018c79995a5b5d95958096dab49d4b4d9012e8741efe754f7f9db82e7fc46527e1fb837ce8fbfd3c14d58f8af64f96e51c5750b56402767ddca SHA512 056375d7a21f64e691bd62676d575dfaa8a32e715dc4f7ddf7b0c1cb9e99f07cef5972de812765874afd5a8e8adf220eb7b969afcc8dea1e2e3a76be8886c9cc
 DIST gpodder-3.9.1.tar.gz 996497 BLAKE2B ac50cba8d5bf459361c592e579cc9e5deafa3a1a7517f0f5e1f07faa1eaea6456b35451ba2c21def390f85c38f4a95c46cb17a7db4ae4e56c58f79fae6413b11 SHA512 d32405ac1d0aa7943b58d73f806a0d28e68bce541a1947c08d9cb69a763eda311816c059019e43eb3dea6ce08fc1cb4f0bd39cc44933114e51a036cb603d3be3
+EBUILD gpodder-3.10.5.ebuild 1563 BLAKE2B 807255f00028c8477e3d3edc4f1e7f5683aefda32fa3783221e9bc7e533529b2dff857a23b31bee6e4784d7bb7d0b4095e9c787e488ce8e1fb0d519fdc9a0042 SHA512 920f57be208759166362f18b309825521dda05678e9780a7866467be1d52b7142565384f384b4d6c62b4a4154dd07a00c68ddbd06510d07b5476dc39ab84e56b
 EBUILD gpodder-3.9.1.ebuild 1495 BLAKE2B 57d16103e9b037a3f846f98f5f756f0872972bf813d7fbb4195108bdffd73f68471e09f4420bc5256be7b8362af9e2f1cd202fd774ca5d0e8079e61719a9f355 SHA512 ef8fc4a57fdd5b266dbe99db91b35cb05b093b7e58083553b81150cffeda48750f5297cd2d3ca133358f2371393653e4cc0f08f406bf38d3cc9cd4268333eb72
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/gpodder/gpodder-3.10.5.ebuild b/media-sound/gpodder/gpodder-3.10.5.ebuild
new file mode 100644
index 000000000000..6cc2606c98ba
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.10.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth kernel_linux mtp test"
+
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
+# support python3
+COMMON_DEPEND="
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/isort[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		dev-python/minimock
+		dev-python/coverage
+	)
+"
+
+src_install() {
+	emake PYTHON=python3 DESTDIR="${D}" install
+	distutils-r1_src_install
+}
+
+src_test() {
+	emake releasetest
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index a6081666cbc1..f443b583cd37 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,5 +1,6 @@
 AUX hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42
+AUX hydrogen-9999-gnuinstalldirs.patch 5411 BLAKE2B 74cc202dbab0243e14ce489a5c2db4385bf6eaee363b38ed151684a2829d4794ccc70c18fe55cd2cdd7043c61025d62f39469023441071be8c64c6fc31e18742 SHA512 231c4af81c1ca5bb5ec0d3aadccee16b653e0ec79ac4129d9178da6c4e509f2e3655ab0c9f77c2835b599f15197626f77cb12edae3ef455e8233042381026425
 DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
 EBUILD hydrogen-1.0.0_pre20180301-r1.ebuild 1937 BLAKE2B 1338ca9bed21852edf5219f68a1584b4d2ac7ae46fc63f47ae209f261aeba6c69990a773974e5d7eceb7baf34461aa272bb11837b7b9d642b6972104b8f17bbf SHA512 4c5411a87f399211430ad30c94d933494b919bf0ac62e23bda32aadd7af7988c11f1bb924b5cd3ece46a61b743ff6aa65786eab91e319174560b1129a54312cc
-EBUILD hydrogen-9999.ebuild 1849 BLAKE2B 7c8e0555d88dcd682ef01503f0f80a04851f9515eb411949078cab0f3194ae032fade26cd1dfac870c06ea9fb2fc96c76f9a882cec9c5d51252a8f9f9c1f2ea2 SHA512 aacae6cc35be6f45302b40dde8d997424617ead7681956db9659408aa79d103a980bd376893f72b1305e66c88b2e5e8b3847733f3b31cb17ba58f84da04a6ca7
+EBUILD hydrogen-9999.ebuild 1927 BLAKE2B 8db5844843c51df98d882e0dc3c91aabcfdda4b8afd24a2249bf1145833135b4d4d5bff4eab32dcd25b92473bf01f4dde46f49b615c5b1f9cbe3ea6dfbcf72f1 SHA512 c2b6a5f120e5d1fcc9ec8e333718e333719ef88065403bab15cf72ba3540b1077004ea4766ae05cc1a545692f21bbcc92a7ba073fdff47975e32bc10ed14c4d2
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
new file mode 100644
index 000000000000..14babedefa5c
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
@@ -0,0 +1,120 @@
+From 64e251765e58b6948953f0bbc2aac05042daaa55 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 1 Jan 2018 11:52:18 +0100
+Subject: [PATCH] Use GNUInstallDirs
+
+Fixes multiarch and deprecated man dir location.
+---
+ CMakeLists.txt            | 19 ++++++++-----------
+ src/cli/CMakeLists.txt    |  2 +-
+ src/core/CMakeLists.txt   |  6 +++---
+ src/gui/CMakeLists.txt    |  2 +-
+ src/player/CMakeLists.txt |  2 +-
+ 5 files changed, 14 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b18508a8..76305ea7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,6 +30,8 @@ ELSE()
+ 	SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
+ ENDIF(VERSION_SUFFIX)
+ 
++include(GNUInstallDirs)
++
+ SET(LIBSNDFILE_VERSION_PREV "1.0.17")
+ 
+ #
+@@ -144,21 +146,16 @@ IF(APPLE)
+     #Without setting this, installation would go into /usr/local, which does not exist per default
+     SET(CMAKE_INSTALL_PREFIX "/usr" )
+ ELSE(APPLE)
+-    SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
++    SET(OSS_LIB_PATHS "${CMAKE_INSTALL_FULL_LIBDIR}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
+ ENDIF(APPLE)
+ 
+ 
+ #Installation paths
+ # TODO remove data from path
+-SET(H2_SYS_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen")
++SET(H2_SYS_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen")
+ # TODO remove data from path, could be .config/hydrogen
+ SET(H2_USR_PATH ".hydrogen")
+ 
+-#Changing this to user writable location will allow successful, non-root, deployment (e.g: make install).
+-IF(NOT MINGW AND NOT APPLE)
+-    SET(H2_UNIX_ICON_PATH "/usr/share/pixmaps" CACHE STRING "Freedesktop default icon path.")
+-ENDIF()
+-
+ SET(MAX_INSTRUMENTS 1000 CACHE STRING "Maximum number of instruments")
+ SET(MAX_COMPONENTS  32   CACHE STRING "Maximum number of components")
+ SET(MAX_NOTES       192  CACHE STRING "Maximum number of notes")
+@@ -366,10 +363,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${H2_UNIX_ICON_PATH}")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+index f6cd04eb..7725dc83 100644
+--- a/src/cli/CMakeLists.txt
++++ b/src/cli/CMakeLists.txt
+@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
+ 
+ ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index db1333da..0ab61d96 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
+ #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
+ 
+ INSTALL(TARGETS hydrogen-core-${VERSION}
+-    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+-    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     # do not copy directory hierarchy
+     #PUBLIC_HEADER DESTINATION include/hydrogen
+ )
+ 
+ IF(NOT APPLE AND NOT WIN32)
+     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
+ ENDIF()
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 4030dc9a..2aeb17c2 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -51,4 +51,4 @@ TARGET_LINK_LIBRARIES(hydrogen
+ )
+ ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
+index 72c270f3..836fc5b4 100644
+--- a/src/player/CMakeLists.txt
++++ b/src/player/CMakeLists.txt
+@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
+ 
+ ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+-- 
+2.19.1
+
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index c5712d4665c7..2d92d83a64cb 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-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
@@ -12,12 +12,11 @@ EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"
 
 RDEPEND="
-	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
@@ -37,11 +36,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
 "
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.0_pre20180301-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
 
 src_configure() {
 	local mycmakeargs=(
@@ -65,9 +65,14 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
 src_install() {
+	use doc && local HTML_DOCS=( ${BUILD_DIR}/docs/html/. )
 	cmake-utils_src_install
-	dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html
 }
 
 pkg_postinst() {
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 7c508622f7fd..389801b39452 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,5 +1,5 @@
-DIST mpc-0.28.tar.xz 109172 BLAKE2B de0155bd1d723c0affc02055fe8923a174d6a393e431bd71399e0c0833dda5488569fa90bbdb0c650a367bbc0c384d91215bc0997f013a372c0eae015d7acc27 SHA512 1d0c96c3c7cee2eac2d3cf25f09d74b5807b8ea56ff7dfc033b8fa690fd4d42de726a641e4f2552550d8a1c1b2840575aec5c595166ca5ae5776fcc93c8fb7cf
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
-EBUILD mpc-0.28.ebuild 769 BLAKE2B e402677f91a26693a9c3d7598ac518406e4a67811660498e4800ae0be4b0b58f5ffd6a0a444259269a90024383b665e59af52e805e03be166f724e373783b086 SHA512 b321017aa79736c7da21dc3dfb210f12c29c8fc7e39843e429eb8f62f9c0367cf376bead4c41a6d126332194c9be92a1319b8305c1254706614f76448d4872a6
+DIST mpc-0.31.tar.xz 43896 BLAKE2B 2b65307983dfd0bc2738b3e4b1379b43b6fec712352f25a6158adefd2065eb3ff8be194e482fc441c74b69feeb8fba277d7061fb80ee6d7d72432f3284f61fb2 SHA512 48df7d85df704ae901ee0a07193daf9738b682b71a24ebd5bf4458aa562acd11b582f83adcfca814faa9a014ef565cb6c23df837b83a569fd6050f9f3802e6fe
 EBUILD mpc-0.30.ebuild 821 BLAKE2B 11cb4a54988476db7b20eb7ea4c79cc0c974146bbb0dfa1a991cb2abbb26b68e19ad2256c44b87ad0baf061a66c97bb8ec249d4fcaf5a286ee2424ab8c2db4e6 SHA512 7cfb2d1d2c06181f5205b34f4c5f8a184c34995eca8107336e2268569a195e807f7910d1f5588523e5bbe6442724e430f7cdcc2f0fecee0fe6dab62104e607cf
+EBUILD mpc-0.31.ebuild 870 BLAKE2B df930ab67691618ed141d743fbafb702d324dd6652bceead49b69e7c6f3aa8e035b1d2cb336bca6685a5d28bfd135c24f75177983b6b44573ccba66c6d40298b SHA512 2adbd8c19282c054700e3634fedd29477da4d5345159ee6494189b3a5f52cef62e9b31bfc77b26b8d51d15a9ab68df70f54319ae9d4dd9e94f547b033de9a629
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.28.ebuild b/media-sound/mpc/mpc-0.28.ebuild
deleted file mode 100644
index 8903c35bc907..000000000000
--- a/media-sound/mpc/mpc-0.28.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1
-
-DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="iconv"
-
-RDEPEND=">=media-libs/libmpdclient-2.9
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/mpd-m3u-handler.sh doc/mppledit doc/mpd-pls-handler.sh )
-
-src_configure() {
-	econf \
-		$(use_enable iconv) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	newbashcomp doc/mpc-completion.bash ${PN}
-}
diff --git a/media-sound/mpc/mpc-0.31.ebuild b/media-sound/mpc/mpc-0.31.ebuild
new file mode 100644
index 000000000000..2429ef0a37b6
--- /dev/null
+++ b/media-sound/mpc/mpc-0.31.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="iconv test"
+
+RDEPEND="media-libs/libmpdclient"
+
+DEPEND="${RDEPEND}
+	dev-python/sphinx
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/check )"
+
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local emesonargs=(
+		-Dtest=$(usex test true false)
+		-Diconv=$(usex iconv enabled disabled)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newbashcomp contrib/mpc-completion.bash mpc
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 5bc2705a2b52..08a467233506 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,12 +1,11 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
-AUX mpd-0.20.10-libcdio-2.patch 843 BLAKE2B d0c7eeeedb6065b1e08b1a8b1e6f5237408cd1b747aba72651441f0c203a4d32a39bf4e3c2371ae16fbde2f991c2f60870b15e8340b81bbc793355131ea57f62 SHA512 c9b62e6e0e7408ff3ab1e73c08001e498150c6bda8a9796ef23c35ba4dd0313e243129f7fb1760997f4a226f1ea3de56657eeead41f07bcaafa9affde40cc851
 AUX mpd-0.20.21.logrotate 112 BLAKE2B 2fd60db81c39d3b7eb1cd375450b5902d6e31734e3801819dbc9475d84750491780aab6c4db0be00039c88dce2fb25b83abc9374a0c736697d8c1cc1bd4f5b24 SHA512 32da561c59f8641e549ccec6ecf8a678cd1b9c1d7fbbef5ca6a1b1eb0f07948c2ea23366d357a16a221e0a9b96fe079df3a046f18c4410b8ddc4adce63c6d467
 AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
-AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
-DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
+AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
-DIST mpd-0.20.23.tar.xz 806784 BLAKE2B 859edfe37b355ce8b64a9dc22dd0c13891d9154b5d07299ec1655757b02df3900af0d7fea7e7cbdcccc8d82d61a4c9c05a145fc2b23c471fefd1cb9d95043356 SHA512 9875f5b7d7eb7d51fa135249954fbaa2b300ecd539e15aee1a090f14c7a340f328c2f910aeb641ce32af2df21d0e56725ad1a3f957339b0a9c051a02ea0b8a05
-EBUILD mpd-0.20.10.ebuild 7285 BLAKE2B 08b8d0afe72f0ad186438441aa1229e71c1c2564250c9e624eac2f7c6ec7596bd9f0ad4b353b4ca37af9acac2bda7b2a59f134265cb9a41be0bdfef64cf384b8 SHA512 82c6c20fbe05137a61ed07daa9bdcd0e7639267d8301e14257978d13e67a6ec9e0581f873c22df14a90a1dffb71dfd47fc456aee49889dc5d67a566ea6326ba4
+DIST mpd-0.21.2.tar.xz 664408 BLAKE2B da1cde9b5f87c3e52c90d9a743ec8bf7acbcf52f3bf28969414bcc0f3f29151fd47157dc153a094844c94f6eb50e5a3564baf66a2e87d840b7b34efc8d0f760b SHA512 a98ff2636a22f7f0e377f814d0312b03344624317a68fcd89a7c5f33a40629908cd19f8bfff5dde1eef96cebd93e92cef63153bf60b02791803532357a38e020
+DIST mpd-0.21.3.tar.xz 664992 BLAKE2B 42e2bef46f4eb99e43c4078373dab4301cafa3062459abfed08e9f4b448a1fcfaa40da5a53941b49b426abecf2f31278fdb0857293b24156fa77845c56cbd095 SHA512 c6ce513ea641d026594cd7ae6e9051bd0060e45f5839d89b350ba144cc9094a8e1490052df4d024cbc92d88680ee8e8bae14fc8037431394771018a75c3ee3d7
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
-EBUILD mpd-0.20.23.ebuild 7311 BLAKE2B 25d0a67accc8cd81fd2a2d241f9a94b02d2a686af4fe7184f543fbd8f7a5f14793bf046a862222dea26b5e1533c0a132513a698b1199b46d33aa25b99a1f9392 SHA512 cd47cf1501ca33252c97e35c91708ca66c63e2030d1727d507b84575b5bc70e8867a4c8b3aca5ba4fdcba0847bb5bb36901d87989a002d0536016a53209f5b93
-MISC metadata.xml 2412 BLAKE2B b208c2d3481421794b7fd5328814e9dd340eb820df4972c0bd70626d9d63707dfceb8f7446239a3ca581f46004a1aa5e6438cbb6449700f472c1aa411d848649 SHA512 4cbaa880020239d2fcf6e2f057004569eb86288d3f25dce8e89eddc8d65cbbccf01dd0cfbfc376790297a1147d18aec3148515659fae5aec3bbe215bb94c2f8d
+EBUILD mpd-0.21.2.ebuild 8234 BLAKE2B a0f7578c2062368f60916d22c4b403fe192e1048bba733a9f17bed900bccc20f86dae23e1241d7ee84acc5a4cadd7ba7a40b397b536c6e85a6ffa242812c8464 SHA512 254d6ec58bca9086aed9c3bb0b858bcf4fabd74e4cd4a4a991e0a7a61a0839d31cf50cd997e4d5b7ce71817521b83c518cb6390a798552959577ff5c3a4c854f
+EBUILD mpd-0.21.3.ebuild 8234 BLAKE2B a0f7578c2062368f60916d22c4b403fe192e1048bba733a9f17bed900bccc20f86dae23e1241d7ee84acc5a4cadd7ba7a40b397b536c6e85a6ffa242812c8464 SHA512 254d6ec58bca9086aed9c3bb0b858bcf4fabd74e4cd4a4a991e0a7a61a0839d31cf50cd997e4d5b7ce71817521b83c518cb6390a798552959577ff5c3a4c854f
+MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch b/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
deleted file mode 100644
index 9153a87dcf9d..000000000000
--- a/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 12fd1cad0cc5472cbe931516970c1ac7aeb7ec00 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max@musicpd.org>
-Date: Sat, 3 Feb 2018 19:32:31 +0100
-Subject: [PATCH] archive/iso9660: libcdio 2.0 compatibility
-
-Closes #173
----
- src/archive/plugins/Iso9660ArchivePlugin.cxx | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx
-index 536745d85..363921527 100644
---- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
-+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
-@@ -115,7 +115,12 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
- 			visitor.VisitArchiveEntry(path + 1);
- 		}
- 	}
-+
-+#if LIBCDIO_VERSION_NUM >= 20000
-+	iso9660_filelist_free(entlist);
-+#else
- 	_cdio_list_free (entlist, true);
-+#endif
- }
- 
- static ArchiveFile *
diff --git a/media-sound/mpd/files/mpd-0.20.4.logrotate b/media-sound/mpd/files/mpd-0.20.4.logrotate
deleted file mode 100644
index ff47d1098cf1..000000000000
--- a/media-sound/mpd/files/mpd-0.20.4.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/lib/mpd/log {
-	missingok
-	postrotate
-	/etc/init.d/mpd reload
-	endscript
-}
diff --git a/media-sound/mpd/files/mpd-0.21.1.logrotate b/media-sound/mpd/files/mpd-0.21.1.logrotate
new file mode 100644
index 000000000000..597c4fb2306d
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.21.1.logrotate
@@ -0,0 +1,9 @@
+/var/lib/mpd/log {
+	missingok
+	weekly
+	delaycompress
+	compress
+	postrotate
+	/etc/init.d/mpd --quiet reload
+	endscript
+}
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index d6162fb2c8ad..a0ce86018108 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
   <maintainer type="person">
     <email>zlogene@gentoo.org</email>
     <name>Mikle Kolyada</name>
@@ -12,6 +8,8 @@
   <use>
     <flag name="adplug">Enable the AdPlug decoder plugin</flag>
     <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
+    <flag name="chromaprint">Enable ChromaPrint / AcoustID support</flag>
+    <flag name="cue">Enable CUE sheet support</flag>
     <flag name="curl">Support for web stream listening</flag>
     <flag name="eventfd">Use the eventfd function in MPD's event loop</flag>
     <flag name="faad">Use external faad library for AAC decoding</flag>
@@ -27,10 +25,12 @@
     <flag name="network">Enables network streaming support</flag>
     <flag name="nfs">Enable support for the Network File System</flag>
     <flag name="pipe">Support writing audio to a pipe</flag>
+    <flag name="qobuz">Build plugin to access qobuz</flag>
     <flag name="recorder">Enables output plugin for recording radio streams</flag>
     <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
     <flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
     <flag name="soundcloud">Build plugin to access soundcloud</flag>
+    <flag name="tidal">Build plugin to access tidal</flag>
     <flag name="systemd">Enable support for systemd socket activation</flag>
     <flag name="twolame">Support twolame MPEG-2 encoding</flag>
     <flag name="webdav">Enable using music from a WebDAV share</flag>
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
deleted file mode 100644
index e61366e3f1d1..000000000000
--- a/media-sound/mpd/mpd-0.20.10.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 )
-"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	adplug? ( media-libs/adplug )
-	alsa? (
-		media-sound/alsa-utils
-		media-libs/alsa-lib
-	)
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( 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:= )
-	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="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-	"${FILESDIR}"/${P}-libcdio-2.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-systemdsystemunitdir=$(systemd_get_systemunitdir)
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	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.4.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/mpd/mpd-0.20.23.ebuild b/media-sound/mpd/mpd-0.20.23.ebuild
deleted file mode 100644
index 0e22d8297530..000000000000
--- a/media-sound/mpd/mpd-0.20.23.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# 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/mpd/mpd-0.21.2.ebuild b/media-sound/mpd/mpd-0.21.2.ebuild
new file mode 100644
index 000000000000..1b27c1b94a14
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.2.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+MESON_AUTO_DEPEND="no"
+
+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 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 tcpd
+	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="
+	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 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	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.47.1
+	 virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	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
+}
+
+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)
+		-Dlibwrap=$(usex tcpd 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.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
+
+	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() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/mpd/mpd-0.21.3.ebuild b/media-sound/mpd/mpd-0.21.3.ebuild
new file mode 100644
index 000000000000..1b27c1b94a14
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.3.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+MESON_AUTO_DEPEND="no"
+
+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 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 tcpd
+	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="
+	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 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	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.47.1
+	 virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	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
+}
+
+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)
+		-Dlibwrap=$(usex tcpd 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.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
+
+	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() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 0654a6f2c2fb..e13f329e7e31 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -2,7 +2,9 @@ AUX playerctl-0.6.1-doc-typesfile-path-fix.patch 1127 BLAKE2B d41f347717cbd49fb9
 DIST playerctl-0.5.0.tar.gz 17015 BLAKE2B 5da1d0fd4e442ac5f124bd693ae14222624c5239c9fad72e57d43977467339522344bc8d8c37b0f2bfda51c61861dc33d7e35e4a730ce59a87b691b5657ec729 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c
 DIST playerctl-0.6.0.tar.gz 22124 BLAKE2B 6bb90586c56e21a00b5e6e1769248b9782a8211b01dacf590857fe4fe199d6d3fa7aa46a36cba9a8e198a1aad0bf17973fc15140db11c484edfb0275971d3d08 SHA512 8023b5704ca2a428510df6228850b616061289764cc3c4190c0c46f79d6a20e499495f2d773bd821357653ba63bca40eac70f7cc3a11251da3c6a4f7781db739
 DIST playerctl-0.6.1.tar.gz 22921 BLAKE2B d2f5874280e1a99b318bc83c40a38ee31d9c68426cb63e1e16e8ded26bac1a894d78a929f46d45d631af70e37476a4151c520eb69c94e80026689a12c682f0ad SHA512 07c302eb06a96bf3b8aa180e68e85ef6f9fdb5933b80fbce8ee5f9a36c1d961eaf5638e319ff0b26475984acc57a447a4aa8e705667f77e4bd393364cdbfb284
+DIST playerctl-2.0.0_rc1.tar.gz 42452 BLAKE2B e9a5d2b12b2687d0f06993860cd242551c15e66fb7a58e3b034350c8be9d29f5506a3c588cb2a7e7a7932011aeaa19b600060bc2ed78f994382a10f768fe5d43 SHA512 a38e5a0f729b305ac2d87ea34995dedf3c083599d8960fcc55a0273b0ced26ad72eface57a859a9e7b61ed3a2e4a0e8a419c5523087f2349ed4d32099e4512f1
 EBUILD playerctl-0.5.0.ebuild 909 BLAKE2B 4b4149e81209610d4de900f59860270d9bee8d97821350f5a9dd921869c6987b0952d93e958f662ded41a08ba58709dfb9af5b4c71e9b5ce209cbbde8c1135b7 SHA512 81bd0b13240357151302d2ba9bc28631e634b25437a19112b3b10e0d1939141c9acb0cf26f62d795bfff8f0d0d70c0a74149aeafa0185a2cae6a67ee8c8db666
 EBUILD playerctl-0.6.0.ebuild 919 BLAKE2B 9023af5a6c9fe937c5096e12720b676c434e45c21238326d957dd50f33d4a44ed20abd2f541386ae471ce6835efdfad1f406fcb220ae6833cc94544aeec2445f SHA512 898d55b119f86d63a9b46dab9b10f53017caa728ba484c7ab814b58f936ae4a25d168b407d86e560099b478b4dfa10fcef01ea5c9c4ecb1d8367cc833cc26e28
 EBUILD playerctl-0.6.1.ebuild 973 BLAKE2B a6f3a4432d1b42984a3426977b05f4e94b303afc755a061f121196e882704cf440c8606b9829099ff91d3e01653ecf75e2beee121b9d0683c6e3c4c0c1b8032c SHA512 0c57ffda7cedd332b10cc566967f35c9a89b0cf732025fe9b4febedb89801332b7a357fb281520dfeee668ae1cea95b1d9c26e9a5cde6fdf0536bdbe9f355d5e
+EBUILD playerctl-2.0.0_rc1.ebuild 1089 BLAKE2B 40c7f8aa4f46ff0ce97afc04ef49c54f1d81a6a6bc1ab507bf1ff9949288e58cf8636333da0446a2b44714b0b2281ca83f5faf0e5e57706141c4c1eb02e20a1a SHA512 a454a5cb4fe8bb366cba3af673698b108de63e7053185526b9ad8de2cae154af8f1eefff998552f67084855f22fcf66d2e2c5a7263bdbdc0a54349a56388ec60
 MISC metadata.xml 487 BLAKE2B 26a06ce93634d362dee7b3a595d5257ef946c27a17c181f758fa3c0acd33aeb45c825643311da3739791f80402e38b8fd618ea43655ec60689978cf2e0f2f30f SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f
diff --git a/media-sound/playerctl/playerctl-2.0.0_rc1.ebuild b/media-sound/playerctl/playerctl-2.0.0_rc1.ebuild
new file mode 100644
index 000000000000..990d1ddebffb
--- /dev/null
+++ b/media-sound/playerctl/playerctl-2.0.0_rc1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson xdg-utils
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+# Override the meson dependency in MESON_DEPEND of meson.eclass
+# The eclass depends on '>=dev-util/meson-0.40.0' as of writing this
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/meson-0.46.0
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc gtk-doc)
+		$(meson_use introspection)
+	)
+
+	xdg_environment_reset # 596166
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	docinto examples
+	dodoc -r "${S}"/examples/.
+	docompress -x "/usr/share/doc/${PF}/examples"
+}
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index 721fceda0576..ca6e460f35d3 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,13 +1,5 @@
 DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e23224ce18b3927933c0986fd8793dec9457eedcb005be498b37940cc3c7e36e68940ccaa675f4b350931315c3d997 SHA512 3dc87d4e75cd9f145c3921af4c09140a705611d72176fd80db2d89048bc22c8edda5f87bce75f26e0cce4f6934c927e814e5c54fec7820116485cf4e04e876a9
-DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5f2b59e877c2c998b2e4744f1298f28469bdb11f00598f31fc154c55427d000a995d952112b238cf84302993564 SHA512 877d27814927ab67a0b1defe70d753466e3ad14a0274a2168eb2521ded4eddeb04bce5177869b19ca57b38e7374047ee36982cce3f7e8a75b801cd060f8460d2
-DIST pragha-1.3.91.1.tar.bz2 755933 BLAKE2B db24a8752cfc52ded17a15555f3e39f2792c4f9717bca75a158d4672812fbee8d502149c08daa15113aa0de0fb1fe6f417d8a36c1b1b98c73f47d0319edca0a9 SHA512 ec0617ce0e1ead5ce2783c7bfb26cc4a2fc3f15a6f79ba887a02fc8a3dd01551ff91a41e90acc7fb23793a2261a340acdb80b9268fd08b5fa7dd26dd337fb07b
-DIST pragha-1.3.91.tar.bz2 740279 BLAKE2B c42f1b6d0c7071b56080d8feb8a11c9ba00b1339bc653a61cc80f09e1f076b2183091dbe2cbc42e7aa7347826492fa77cbbac980c25999ce3968a8e74dbc3623 SHA512 49b03ef69e7d12086e324a2088b4540eaebc01fd56247c43f069bd1b9fadbdd1b5f27af87b5086cc3e9a957281c3f7ff72c8ce3b0a6474514714a017ca5e0ab5
-DIST pragha-1.3.92.tar.bz2 764105 BLAKE2B f90dd45064d9ae7169bcb1f671e22da716560b3eb31caaff962a0eb5aa928f857200c61782bd90a54d660c21c4b3158cd6d224f4824939abdc572e7513c89b67 SHA512 8d166074dd3c1b2fa9a6f75e7bef222e09a2913a441c5ed90df6c431b7d3ab877e586b7df1adbba221656a52cd1630ad7bcfbb3f4fab762a8d8f9fa67b2842b9
 DIST pragha-1.3.99.tar.bz2 781892 BLAKE2B 9d73dd2859db0c7ab7ac66fdafe873bd78b019408682828ddd05aa18a1591576df667e326037a7ca28eaed227fcbce943209fad16c9f55bb38c0c2c808275104 SHA512 df032fe16932ad464417306d8d01373b8e415f5f810a06b1baff647a395b10bdee5c912f36a3f6e3ea6a0e04d399257e202112c1838444d23dfc17b5fd34e12b
 EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
-EBUILD pragha-1.3.90.ebuild 2502 BLAKE2B ad6086767bf4d14ba02311377ee5009ca66e8a87265119f1476191c81641867804eaa7484b7c04133ca82e4651b4e1cc45f1820227c7d6fa3be609fe2122197f SHA512 27c0cbe0ed8ad4bdb76a0d18dd0d60bdacac7506f36bc68165675c17845b514cdd5a913be34702809b6186a0d26e40fb412e36d1faed1bdd1f86335fcb737d8d
-EBUILD pragha-1.3.91.1.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
-EBUILD pragha-1.3.91.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
-EBUILD pragha-1.3.92.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
 EBUILD pragha-1.3.99.ebuild 2591 BLAKE2B 3ea0da51e0ffe4fee16e69d92e39143666817c9031c037be0fca13de5d457819fa348b0d7258651f67e888d265d9396f4db8ead768bfcd8c4c04f58a06ed50e2 SHA512 d83414ca8e3d34357d9b123dbb4ab19d663ea529f6898437404108d9394b061dde8d1bb0a3219f9a8e3bebe0ff8cfd7973fb80ced341d7955363f8f3d63ff06d
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.90.ebuild b/media-sound/pragha/pragha-1.3.90.ebuild
deleted file mode 100644
index 32a9c17084b4..000000000000
--- a/media-sound/pragha/pragha-1.3.90.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight music player (for Xfce)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/V${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.36:=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	>=media-libs/taglib-1.8:=
-	>=x11-libs/gtk+-3.8:3=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	cdda? ( >=dev-libs/libcdio-0.90:=
-		>=dev-libs/libcdio-paranoia-0.90:=
-		>=media-libs/libcddb-1.3.0:= )
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( media-libs/grilo:0.3=[network] )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.26:= )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig
-	xfce-base/exo"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable cdda libcdio)
-		$(use_enable cdda libcdio_paranoia)
-		$(use_enable cdda libcddb)
-		$(use_enable playlist totem-plparser)
-
-		$(use_enable libnotify)
-		$(use_enable keybinder)
-		$(use_enable udev gudev-1.0)
-		$(use_enable mtp libmtp)
-		$(use_enable soup libsoup-2.4)
-		$(use_enable rygel rygel-server-2.6)
-		$(use_enable grilo grilo-0.3)
-		$(use_enable grilo grilo-net-0.3)
-		# avoid trying to use 0.2 & 0.3 simultaneously
-		# https://github.com/pragha-music-player/pragha/issues/124
-		--disable-grilo-0.2
-		--disable-grilo-net-0.2
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/pragha/pragha-1.3.91.1.ebuild b/media-sound/pragha/pragha-1.3.91.1.ebuild
deleted file mode 100644
index eddc94284005..000000000000
--- a/media-sound/pragha/pragha-1.3.91.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight music player (for Xfce)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.42:=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	>=media-libs/taglib-1.8:=
-	>=x11-libs/gtk+-3.14:3=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	cdda? ( >=dev-libs/libcdio-0.90:=
-		>=dev-libs/libcdio-paranoia-0.90:=
-		>=media-libs/libcddb-1.3.0:= )
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( media-libs/grilo:0.3=[network] )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
-	koel? ( dev-libs/json-glib:= )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.26:= )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig
-	xfce-base/exo"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	koel? ( soup )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable cdda libcdio)
-		$(use_enable cdda libcdio_paranoia)
-		$(use_enable cdda libcddb)
-		$(use_enable playlist totem-plparser)
-
-		$(use_enable libnotify)
-		$(use_enable keybinder)
-		$(use_enable udev gudev-1.0)
-		$(use_enable mtp libmtp)
-		$(use_enable koel json-glib-1.0)
-		$(use_enable soup libsoup-2.4)
-		$(use_enable rygel rygel-server-2.6)
-		$(use_enable grilo grilo-0.3)
-		$(use_enable grilo grilo-net-0.3)
-		# avoid trying to use 0.2 & 0.3 simultaneously
-		# https://github.com/pragha-music-player/pragha/issues/124
-		--disable-grilo-0.2
-		--disable-grilo-net-0.2
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/pragha/pragha-1.3.91.ebuild b/media-sound/pragha/pragha-1.3.91.ebuild
deleted file mode 100644
index eddc94284005..000000000000
--- a/media-sound/pragha/pragha-1.3.91.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight music player (for Xfce)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.42:=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	>=media-libs/taglib-1.8:=
-	>=x11-libs/gtk+-3.14:3=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	cdda? ( >=dev-libs/libcdio-0.90:=
-		>=dev-libs/libcdio-paranoia-0.90:=
-		>=media-libs/libcddb-1.3.0:= )
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( media-libs/grilo:0.3=[network] )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
-	koel? ( dev-libs/json-glib:= )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.26:= )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig
-	xfce-base/exo"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	koel? ( soup )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable cdda libcdio)
-		$(use_enable cdda libcdio_paranoia)
-		$(use_enable cdda libcddb)
-		$(use_enable playlist totem-plparser)
-
-		$(use_enable libnotify)
-		$(use_enable keybinder)
-		$(use_enable udev gudev-1.0)
-		$(use_enable mtp libmtp)
-		$(use_enable koel json-glib-1.0)
-		$(use_enable soup libsoup-2.4)
-		$(use_enable rygel rygel-server-2.6)
-		$(use_enable grilo grilo-0.3)
-		$(use_enable grilo grilo-net-0.3)
-		# avoid trying to use 0.2 & 0.3 simultaneously
-		# https://github.com/pragha-music-player/pragha/issues/124
-		--disable-grilo-0.2
-		--disable-grilo-net-0.2
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/pragha/pragha-1.3.92.ebuild b/media-sound/pragha/pragha-1.3.92.ebuild
deleted file mode 100644
index eddc94284005..000000000000
--- a/media-sound/pragha/pragha-1.3.92.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight music player (for Xfce)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.42:=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	>=media-libs/taglib-1.8:=
-	>=x11-libs/gtk+-3.14:3=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	cdda? ( >=dev-libs/libcdio-0.90:=
-		>=dev-libs/libcdio-paranoia-0.90:=
-		>=media-libs/libcddb-1.3.0:= )
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( media-libs/grilo:0.3=[network] )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
-	koel? ( dev-libs/json-glib:= )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.26:= )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig
-	xfce-base/exo"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	koel? ( soup )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable cdda libcdio)
-		$(use_enable cdda libcdio_paranoia)
-		$(use_enable cdda libcddb)
-		$(use_enable playlist totem-plparser)
-
-		$(use_enable libnotify)
-		$(use_enable keybinder)
-		$(use_enable udev gudev-1.0)
-		$(use_enable mtp libmtp)
-		$(use_enable koel json-glib-1.0)
-		$(use_enable soup libsoup-2.4)
-		$(use_enable rygel rygel-server-2.6)
-		$(use_enable grilo grilo-0.3)
-		$(use_enable grilo grilo-net-0.3)
-		# avoid trying to use 0.2 & 0.3 simultaneously
-		# https://github.com/pragha-music-player/pragha/issues/124
-		--disable-grilo-0.2
-		--disable-grilo-net-0.2
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 2bb5cbfb29a1..c7ac54eedfd7 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -3,4 +3,4 @@ DIST qmmp-1.2.4.tar.bz2 1189587 BLAKE2B eff6d52456a79373434b793fc2303eea2ba42675
 EBUILD qmmp-1.2.3.ebuild 4172 BLAKE2B 9db4f2b3d25b782c9e27eae6ae8d2f64b247634863ee3b58362401746c0004a66d9444f8a21efb86d79841136f5a22a10d40838e98ab83b4bce04ccce5d4dae4 SHA512 911c14441c370ae4494da1e9b0dacc28ad9b469eaab72fb99a5210af73760f2597c63a1ff844c10b0a2d8a17f270f6ec3b9196b0d08ed738ce9c640e061be6e8
 EBUILD qmmp-1.2.4.ebuild 4171 BLAKE2B 83e5f7bf60a315e55491b571bdd7440edd0023b3e3bf61aa2484c6ddb06873606ecbefea24499eaef252ce4fda770b368b2c0804d88801cc43853f36fc8794fb SHA512 fb1c6f1c21b84a6ef507a8dd218ff469172861cff6b6970652bf78538859e1ebf217c21f9e60167296c8bd87dbe40bba36ffbd423708f9cafa0fd6c2d13855b5
 EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
-MISC metadata.xml 1726 BLAKE2B cb094a332efab67fd0171b3f2f2c15928e35f2dc3dbb348eaaee54716e61390549e8506caaa42430df2f03f436b8a28502a7870de2335caf792c3af6ecc2cdc9 SHA512 4c63d06e5c2e08725a1bd3a9172c41ddbba831b88b1ff23749c9702560355b963413540b7261609f1c063d8f4b311b5402dee63e9918628d4c3a90585cece510
+MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index fa31e6172dd3..eb5b4f1891fd 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -26,6 +26,7 @@
 		<flag name="shout">Enable shoutcast plug-in via <pkg>media-libs/libshout</pkg>.</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Use the SoX resampling library</flag>
+		<flag name="sndfile">Enable wav playback support via <pkg>media-libs/libsndfile</pkg></flag>
 		<flag name="stereo">Enable stereo effect</flag>
 		<flag name="tray">Build tray icon</flag>
 	</use>
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index bc031611289c..437bd5b6137c 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,4 +1,6 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
 DIST qsynth-0.5.0.tar.gz 260537 BLAKE2B def589a1cfb76517fa34811fe75a8379043d7e0f9fc661dd456b49414042662c3a3b8f57e2d0de5fae99cbdb60062b12d9b73b93032115648b9a21921766fbeb SHA512 3c7026edfef3115fae8e2167bb961f5e32d886c8d75b3534a3f110d921264cd270953145a4737f9d6660c55fccce81d7306ec0ce4064df6e7226598b52399298
+DIST qsynth-0.5.3.tar.gz 269252 BLAKE2B c496063ba33bc78a65d63151871e841f9d3938fe03049655da3c124fd495c592f9c726c479062c3fb2d1561e4dee3284d12b04e04a51ba06e20d297b6e84ac0f SHA512 15632274e5822f5e1a49bd332c5d8b7e59a54800ad32510f425f06b4557e474d5479bd531b45fc43af20535017a656fbd9469d318940931912a56ea1856dc117
 EBUILD qsynth-0.5.0.ebuild 1271 BLAKE2B b8bbfd868583056ced958ac07010ac886d17e2a502230fa56a8eb832e5b355e80a59745cacbead86144b5607046e1154cf7e03e494038528dd074bcaa7b5b3dd SHA512 6d3c40d98862d8031fd97953e5fcf84dcedebb8f3dae93f344939c7028bc39448270ec3ab5f54cdfc5176de74ec855897b3a4e31e5dc931734c2e05b1b205382
+EBUILD qsynth-0.5.3.ebuild 1329 BLAKE2B 63293f666041dce667e089b0fb022271e70155df62992c93075e54442fd30fad590b0d43267efb08b01d4416d6832e3dbc36d9a3e1bd2b0057220051fb7e4709 SHA512 7625201ee66d74d6213a9ec91df084f083f4f5219bd03a5cdf3a0efcab3c33f02d67c8bbd6784e5535f648f7a4cc091511bf055b3315c65f059c1358b702d8e3
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.3.ebuild b/media-sound/qsynth/qsynth-0.5.3.ebuild
new file mode 100644
index 000000000000..1abb5201564b
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.5.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
+	econf \
+		$(use_enable debug) \
+		--with-qt5=$(qt5_get_bindir)/..
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}/usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 518e47661fce..5995e11aeb22 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -4,7 +4,7 @@ AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b
 AUX ts3server-bin 323 BLAKE2B ab3fb5522ffef33d4517d76f01c91091cb1322e1433ac158c2aaaf18c56f44a74875e3ae82e7c39209207291a668104bc4d08d54dbff7042e4faebc0e54104cf SHA512 578bee3c35fc6bc5a06ceebbab1aaeab6201fdb32a13e9c2473dffd78282690f57b1bc277a973006fb573cf9f1a11c0643c0479ff1a9e1318c015437086c6c42
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
-DIST teamspeak3-server_linux_amd64-3.4.0.tar.bz2 8426025 BLAKE2B 767df96757581dd1c5139e6831c89dbb1f0a76232c5b286b88406fb2a19614c9ae29251030c00f534742c8aba0510a45f2b44e453a05a6558e82a1ac8dcd718b SHA512 568646ae4a2a3b3c8cfdc91580a073ed62985f1b6510533b0e8c8627ea4dc8cf3ff8717a1cc8323fc60dd5c399c972da505c3c84300262538a5f3e945087d832
-DIST teamspeak3-server_linux_x86-3.4.0.tar.bz2 8299226 BLAKE2B fc9149171d3463cf443f35e5fff672c4c6a3260378efb497e2fa424dcc685bd1f33907f63f0d08b755cff8151ac672b58db33fb7a0bfa74ba723615d969aeb0d SHA512 76420b495b61287e9174fa1edc8d85043ac7d79665ca457b4b377fdcb2b9231fac1f10d7cdde39df252b0e3dddba998b6191c999b402cb37192fd6307d494ed1
-EBUILD teamspeak-server-3.4.0.ebuild 3064 BLAKE2B 2dca7f778d55d2b29086f0defebbc23384e268e00ff4533ce63251d796013caa89b7d1308d84ba161757e53e13bd0781466c6c60fef2d90c5d94a727bad40630 SHA512 14b1c9e78433aa77f61f2f67e54ba3dcdcc001d1cd9ee7cd1f8b717cf9678cd9d4b777baf16b1bc34f1bae8fde60db049200de7d130505a0563252f362c26edd
+DIST teamspeak3-server_linux_amd64-3.5.0.tar.bz2 8455959 BLAKE2B 1569716e80187a5de0316b8305d55c0a3b094553145a494ed7e1d0599fb1ebb0c3585b9e59a11340e6f1e4537a0502ca11124203e814a39e9650a6a0ae5122c6 SHA512 692b88d1a2a43232fe52927b6c2a70039d814ff02bfc2f1bf69138d256a2242100145fe6d7133d5745d7f945f79e24a1f3f40caf1da3697ae766cab493af9b8d
+DIST teamspeak3-server_linux_x86-3.5.0.tar.bz2 8326197 BLAKE2B 792e9429f1eb6ab9cb49f304fd8159927ca8b3d6a9fa4ceffc830d76712202b8a79fb8c5ded6cd4219a779bab7662c47fe43e2d589edf69334ee631c32f17213 SHA512 efae8d3315ccd7b36b7a031e65496bde37596e3bdd4f84a5836971d246996f92071b8dd48aab1053acc00f98a38a3a0a6bea399de0c4536194a6d1988b96cfd7
+EBUILD teamspeak-server-3.5.0.ebuild 3103 BLAKE2B 60ca145f36cd21e0f132e6b46dac673311c96d07d4e1ceaa653dd4df81bc167649b71a0a0f8b38c48f3086ff60d78073c6c91617fee21a82ee2fce0f0c88b899 SHA512 c6ec9da9ef15d7469ce4eab3a47e9932aebf4b6ecd9239e8de1869db3c1fc62bf0db3740eb20c90ced1862cc0e852f9adb5686cee8123ce1a318bea42ca190c3
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.4.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.5.0.ebuild
index e8110a9eba1a..dda16c3b435a 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.4.0.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.5.0.ebuild
@@ -1,28 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit systemd user
 
 DESCRIPTION="A server software for hosting quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
+"
 
-LICENSE="LGPL-2.1 teamspeak3"
+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="mirror strip"
+RESTRICT="mirror"
 
-QA_PREBUILT="opt/teamspeak3-server/libmariadb.so.2
+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"
+	opt/teamspeak3-server/tsdnsserver
+"
 
 pkg_setup() {
 	enewgroup teamspeak
@@ -32,7 +36,7 @@ pkg_setup() {
 src_unpack() {
 	default
 
-	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) ${P} || die
+	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
 }
 
 src_install() {
@@ -42,7 +46,7 @@ src_install() {
 	diropts
 	keepdir /etc/teamspeak3-server
 
-	touch ${D%/}/opt/teamspeak3-server/.ts3server_license_accepted || die
+	touch "${D%/}"/opt/teamspeak3-server/.ts3server_license_accepted || die
 
 	exeinto /opt/teamspeak3-server
 	doexe ts3server
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index a2ce05e9cb71..397cb13f36af 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,3 +1,6 @@
+AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
 DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f SHA512 51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7
+DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
 EBUILD tomahawk-0.9.0_pre20180501.ebuild 1585 BLAKE2B 35d70ed1b3c8fbe9e96aaa1d3c901a8c41993145142d870577e858970894fce7f9b9cbae5837eff97be334b72975365b02b0c5214e188a7bd96f226e9bfdb086 SHA512 ddbc08c214ab3f17c8dbeea1da2d026f9825257c0020b29089aa0814e2a95f105dac8c29c4aa7d6a8feda5f681f708f4a7f4c93e80534b9f327a9c0469aabed3
+EBUILD tomahawk-0.9.0_pre20181030.ebuild 1719 BLAKE2B fb60cb5b1d1242063fd1061f602402b680de409245f988f07e136ab80f80dd4fd6e4d3c614a8686931ab5a59a2c8a5020eda9ee0074e719a85cbd39e740e7bdc SHA512 5131942184c391b6d9865e0f0e7bdb0bc068a97214b8c88a446cebcfd05ae548b1156ec4be01bb0aeabc81eab8ee8612bd90cf5c8e4429a5a60e4bb94d42ba25
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
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
new file mode 100644
index 000000000000..8e02e8e300c3
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch
@@ -0,0 +1,26 @@
+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/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
new file mode 100644
index 000000000000..b9e80fa1ed9e
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="https://www.tomahawk-player.org/"
+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"
+
+COMMON_DEPEND="
+	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
+	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(+)]
+	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/linguist-tools:5
+	dev-qt/qtconcurrent:5
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/qca:2[ssl]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-warning.patch" )
+
+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-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 545852782cfb..1abd1f0fefe5 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,6 +1,5 @@
 AUX vorbis-tools-1.4.0-CVE-2014-9638.patch 2579 BLAKE2B e568ba19d7905546672e31d3bf3e119df2cf7ba521e500bbd348e1c19e7498ddaaf8bb39b188b87d11adf2aee0c7a9f9bdeed671a4e1737550b7f8634a117655 SHA512 f7e05deb226e6f32088f55519cfc17849e0bf6ddfc27aa582f77b4e7fb9ba3962f509d86af895e1b867f29a50ec5550aeb8fda780f5875fd2e2564aa4b723f1e
 AUX vorbis-tools-1.4.0-CVE-2014-9640.patch 691 BLAKE2B bdf2e1f18ddddf90afb26e6814afbf67032509570d9671a7f90b6188897e7494f0832d888f4fe4c854de75151d6e4c4811ad6d0dee3da3d65446402b7aa9fa71 SHA512 f9dd54fa2d09f2ad1a45bbf576884aa00148334452c478914566713bd149572f9c4e05b301aa8bd2aeb299a095cbae5cde09dcb762eaa6c2e8bbd33c91fec2f0
-AUX vorbis-tools-1.4.0-aiff-buffer-overflow.patch 1039 BLAKE2B 60cdd1c197072eb6ed7f2efadb0eb7e37dbbed93d7c841f5c469a25db85608851e32bac3a4c3db2f8114ada899295519666b80b0e03e8d8be0dc036670e0a96e SHA512 6a411e0857a6b4a56ef82db6e0a22ebf5dd5ff4695e7a4f6bb652f5bdda62e9f18ca60c68d97724932d692bd6ec23c3017edf7e52cb72d0a965e1c45b59e3506
 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
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch
deleted file mode 100644
index f8b66a90e7cd..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Patch taken from: 
-https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
-To fix bug report:
-http://www.openwall.com/lists/oss-security/2015/08/29/1
-    https://bugs.gentoo.org/show_bug.cgi?id=559170
---- oggenc/audio.c
-+++ oggenc/audio.c
-@@ -245,8 +245,8 @@
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- {
-     int aifc; /* AIFC or AIFF? */
--    unsigned int len;
--    unsigned char *buffer;
-+    unsigned int len,readlen;
-+    unsigned char buffer[22];
-     unsigned char buf2[8];
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@
-         return 0; /* Weird common chunk */
-     }
- 
--    buffer = alloca(len);
--
--    if(fread(buffer,1,len,in) < len)
-+    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
-+    if(fread(buffer,1,readlen,in) < readlen ||
-+        (len > readlen && !seek_forward(in, len-readlen)))
-     {
-         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
-         return 0;
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index d40413ca2657..458c2ad7520c 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,5 +1,5 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 AUX whipper-0.7.0-src-Makefile-respect-CFLAGS.patch 1755 BLAKE2B 5b750690e20230528830a468b34d0a481dbf08af36b1b687121a57518613fabb5b298145b8f2693b21653749b3ed1e185864c6348b0adfb33810c1723fe640d3 SHA512 ccda4c1e97a841d8afec9ed68ccf87371e0883afa7b179010973925185fa58e6a21f4b488dba1891a416c22a8e0ee911318117a059c20989d673c5e5e214c25a
 DIST whipper-0.7.0.tar.gz 160649 BLAKE2B 8e14b6dda00b3c8be7ba0fabb25d1cbca536edc785373986f857bafbc2e54d358f18b27140ffda74384c4e815e68ee466c8fc5e4e5d17aa80c8237fda389ba2b SHA512 b4bf4ca64521d8600288addecec6cbd8e43d1ff9a6b9a60872eff1bd5a2b6966af036d6467ba09273ac78aa01d8cac3be29a0e2c4e6600829b9988a74ef8cd88
-EBUILD whipper-0.7.0.ebuild 1573 BLAKE2B ec636c39a9cb7abcbd4e4be2ba8c23dd3c5751080e670e8a5b20167edc133c54da87a29b26bc71e10565839e1c487d5627c0abb152267b5be32301310cb9010b SHA512 f4595bf32d8fa4830903bdb13beb33beae2fb725239f430001c1001556ea9166f3be152c52e322b50a42afb1574780dfae17eee601adb7bcf103ac5175f51085
+EBUILD whipper-0.7.0.ebuild 1577 BLAKE2B 668694c4bb2d36d96f86a29198139312a4ad21ba1615912dcd33a62b12465478f859584afe8647f8f241076e973e9cbf07fd5c630f7d73650d14831ac9f259b8 SHA512 6187ea4ac13ae93b5e4e780e1c36d808038f08cd02395a67ca7065f480d652049ef55e4cc62e60ae508a40488d19716fb24c661f210b493ebb2a1858c48fa476
 MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/whipper-0.7.0.ebuild b/media-sound/whipper/whipper-0.7.0.ebuild
index cf58c45c2d39..0806473cc347 100644
--- a/media-sound/whipper/whipper-0.7.0.ebuild
+++ b/media-sound/whipper/whipper-0.7.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
-HOMEPAGE="https://github.com/JoeLametta/whipper"
-SRC_URI="https://github.com/JoeLametta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/whipper-team/whipper"
+SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"