gentoo resync : 16.02.1018

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
commit: 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree: ade7cb031f363fad64c77139dea7aa3d81908537 /media-sound
parent: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)
47 files changed, 572 insertions, 315 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6cdf1be2f38b..36f291267835 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 9a356c94d318..b48648b51a98 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,11 +1,7 @@
-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.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
 DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-3.10-r1.ebuild 2132 BLAKE2B cf5784125886dd7ccc73b7f60e9d158caeaeda4e10b8381dc458a274ef4bde8129889f28454bdd23c00a10432afabd1ded250263571ed81f9894098369543171 SHA512 6c6ab6ebccfb2942e29ea1dbc6151fab0a9531f05779c1444156f73238d563b29b5e0793d16ae100412434a26da735d55cf1b3337b1eb31220473fa9e3dcdd10
+EBUILD audacious-3.10.1.ebuild 1797 BLAKE2B 2731c0990b1ea3e822b9e4a9823182f176c856a8f10618c75a9bab1737e71ce9ab66ca555b695d5e9e1aae31461afb77310a0e822c7ce6794bce7516b8971f3b SHA512 be0ce92c1d90f81cd7f9e35e30d133978c4eac8edbb67d932d5dc9020d78e6561730a1dcd862839de668ddb1d48c158a1f55600098e1c038e753d438c5df469c
 EBUILD audacious-3.9-r1.ebuild 1585 BLAKE2B 5b3acabf06f46c95cb4fcce6ecc58768ca55fe7b71195efda2e96d8563218f3b40e3e940a53e9b32bea873bc349769d971e40415d2b58882654df8e0a620c90f SHA512 ae3133d291ce0b855f7308b9c050a6bc4c6c189afd5f4d975d1c531d0217ccb6ddb82693b433556401eea30540f791986a8b5340edd8d239987747e80f4d90fa
-EBUILD audacious-9999.ebuild 1954 BLAKE2B 169cf845913b32a57bcb0fd720a096ad873056926c56aa24142568afb3c89ae5afd97f34db43da3962feed1be421b4aaed238a490f7622156336de509bd43f87 SHA512 2214d35e85b1c43e8ae2fe063e79d4d98735885aaf1081c6f489601cafe340350d02ec9e3e2540cdd3a1d321e5bb85d757f7b2f63043aedf63d5dcee43551e9c
+EBUILD audacious-9999.ebuild 1797 BLAKE2B 2731c0990b1ea3e822b9e4a9823182f176c856a8f10618c75a9bab1737e71ce9ab66ca555b695d5e9e1aae31461afb77310a0e822c7ce6794bce7516b8971f3b SHA512 be0ce92c1d90f81cd7f9e35e30d133978c4eac8edbb67d932d5dc9020d78e6561730a1dcd862839de668ddb1d48c158a1f55600098e1c038e753d438c5df469c
 MISC metadata.xml 443 BLAKE2B aa56800edc8a8f1724c41e949081a2198776ac0e8d946e5a8190ec8934f4714fc98c1895d96be35343ed9ce668792c16eb8e329946d323eb3c50129a7ddf7ba0 SHA512 67fc7af1979f3e6377bf96ab610f14dd69d27ec416f98987ead762fa811edbbc977fc9b92fcf6ab722402326956807b51723bd0ebe21531fb1776dfddb486f68
diff --git a/media-sound/audacious/audacious-3.10-r1.ebuild b/media-sound/audacious/audacious-3.10.1.ebuild
index 624ecd083faa..12769bfaa102 100644
--- a/media-sound/audacious/audacious-3.10-r1.ebuild
+++ b/media-sound/audacious/audacious-3.10.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P="${P/_/-}"
 
@@ -12,7 +12,7 @@ else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
-inherit gnome2-utils xdg-utils
+inherit xdg
 
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
@@ -22,7 +22,11 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="nls qt5"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
 	>=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.28
 	>=x11-libs/cairo-1.2.6
@@ -35,19 +39,9 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
+RDEPEND="${DEPEND}"
 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"
-)
-
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
@@ -86,13 +80,3 @@ src_install() {
 	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 282261cbea55..12769bfaa102 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P="${P/_/-}"
 
@@ -12,7 +12,7 @@ else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
-inherit gnome2-utils xdg-utils
+inherit xdg
 
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
@@ -22,7 +22,11 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="nls qt5"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
 	>=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.28
 	>=x11-libs/cairo-1.2.6
@@ -35,10 +39,7 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
+RDEPEND="${DEPEND}"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
 S="${WORKDIR}/${MY_P}"
@@ -79,13 +80,3 @@ src_install() {
 	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/files/audacious-3.10-dbus-crash.patch b/media-sound/audacious/files/audacious-3.10-dbus-crash.patch
deleted file mode 100644
index 83b9c74f98cc..000000000000
--- a/media-sound/audacious/files/audacious-3.10-dbus-crash.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index da05bc5b0009..000000000000
--- a/media-sound/audacious/files/audacious-3.10-ui-freeze.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 8271a3d6d1b0..000000000000
--- a/media-sound/audacious/files/audacious-3.10-use-after-free.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
deleted file mode 100644
index 99155bf79e8c..000000000000
--- a/media-sound/audacious/files/audacious-3.10-volume-slider-boundaries.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/cantata/Manifest b/media-sound/cantata/Manifest
index a325b0c7e1f3..93be5f7bd9e9 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -3,5 +3,5 @@ AUX cantata-2.3.2-opusfile.patch 1529 BLAKE2B fdfd27280f757ba4fa017fde4d52514dbb
 DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
 EBUILD cantata-2.3.2.ebuild 3231 BLAKE2B eb0e61fe493625c48e813a5bfef9f783ee18228f4d0834e773d090f9e222039827cfad373cec47ac73cf6c588446d5f6097c3388c4e2fd7168519a52d8a10880 SHA512 5a5a92ca899306963e8740a6000b5333ac71bfb10086a1b6e35c7ce598275fc9a21b16b4881b80353a786e13f70b388785119f18bc05c9c2b35cf42b2144a5d0
-EBUILD cantata-2.3.3.ebuild 3195 BLAKE2B d9dd77ad8ebd2721221e64d867eb0236c16618808348a556c02e03adfe22cec33fd142240c4df673ca420652b54f0d7a6b2ad40b8897aafddb745a44b2b48608 SHA512 d51b4c23ce8ff69b1d815edea7f09e26003db1d009a85a8a6fde855e4bb39a30456204740eaad2c9b7fe8c37643f5fa3bb0953e6f26c034d4419bf74c513466e
+EBUILD cantata-2.3.3.ebuild 3077 BLAKE2B 93a2129cad70551854e3886c18801d9dfd7226a48f90fb6b59d39e7a694c798eb21aed6be001a7a55dae60c1644d265862fc483035bc3c1dc8933edcd9ce1ae2 SHA512 c969cfab10ce72f4b75b531c81544bd6f511d07fc22339db43d27f92e5fa3ec69d112aa852bec99a5e58d063317820aa898167d324d34570d70bbe3a5a758797
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.3.ebuild b/media-sound/cantata/cantata-2.3.3.ebuild
index 0db70f0c745a..db0b51d4e8d8 100644
--- a/media-sound/cantata/cantata-2.3.3.ebuild
+++ b/media-sound/cantata/cantata-2.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils
+inherit cmake-utils l10n qmake-utils xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
 HOMEPAGE="https://github.com/CDrummond/cantata"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )
@@ -24,6 +24,9 @@ REQUIRED_USE="
 	replaygain? ( taglib )
 "
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -59,7 +62,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qtconcurrent:5
-	dev-qt/linguist-tools:5
 "
 
 # cantata has no tests
@@ -105,8 +107,7 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 
 	has_version media-sound/mpd || \
 		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
@@ -116,8 +117,3 @@ pkg_postinst() {
 		elog "and querying of portable media players"
 	fi
 }
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 2d95452652e8..91d113d0f0da 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -5,6 +5,6 @@ DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4f
 DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
 EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7
 EBUILD clementine-1.3.1_p20181201.ebuild 5254 BLAKE2B 71f4a4ac2cdbcd23cf1a5e4f9e098e0841872306db1fef39189ee53ff2e18aa086095cbdcaf1977932e61be509213edbcd0783054b683ec9d7dcdc78ba8f2178 SHA512 40a9aa0d2bf16e68cd4b749adfeb0ebf46987a84554371f3c85d959f3c46eaf8c48067a9643cfb827850d0a2a3b51e82fb2eb5d90598386bf4394b6bdf2358e7
-EBUILD clementine-1.3.1_p20190127.ebuild 5196 BLAKE2B 1d7d01762691fe1d59e969fb8f7eb0a8ca6b7ad0ef865fe491d6346107db844a7ce808c05c6fbaf675a6908b0c76dad18022d8789bb94d0bd29d38d38f84df16 SHA512 c6fde549b1f6a21b76c5d5faa70df34e7a661fa1c9e4d9e4fa9a2aa1eb02319931929ce5bee19eca9e966be121bb64f70e45f905b690ce74ba044133f9feb9af
-EBUILD clementine-9999.ebuild 5153 BLAKE2B 1f43fd1abb60716a257dea4892036352fa419fa38ec606c9cfe7a12ebf10e31d817f44f8e7744eb043cf71e8a08057bccd58c5bc8416185d22dc4f8bd23cf8bc SHA512 ca24106145c5fe3a1ecf1a80fd6667ef02330a3da854b33e35cc0e303023e60bc177fc51cf89c9a050ddc99eb7c00a4bf017359b2824be6bdf94d08edd451cbe
+EBUILD clementine-1.3.1_p20190127.ebuild 5042 BLAKE2B a242ee5bb03e8a8f235670feb79ec8cd8be284b0d9b1507acb4053f9184af0bf81fff26632f959ae2d39324999a12469ebbd33608c69fee8552093606c16029c SHA512 537e2b3a78d54ef939183955c003cea18b32515f41727faa8c790f139989af076e293df21df97483f7e6490dbcf2c37bf76b24e07d2e313331b90aac6b563804
+EBUILD clementine-9999.ebuild 4977 BLAKE2B c542c8d91b7d2305b6a58b7f863159c175919a7960a59be872079ea6393e57d227046dec4c7ecb4a9c7efe9410d5fd1da37ea207d812da84950fd52830a06c5f SHA512 cbba3f82e7dcc42bb76b2d7b92d5de68110041dd8ceb06683757ee7da5efa1b23be0d5106dd14380dbc7798428e79020e4ae5a153673dd8ed92003bfd7876913
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
index 6e7d542ac49e..e79a3fa6aaf5 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
@@ -9,14 +9,13 @@ MY_P="${P/_}"
 if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="qt5"
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	GIT_ECLASS="git-r3"
+	inherit git-r3
 else
 	COMMIT=610566d25271c67d1625fd62041f6a27435b0a9d
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
-unset GIT_ECLASS
+inherit cmake-utils flag-o-matic l10n virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -30,6 +29,16 @@ REQUIRED_USE="
 	wiimote? ( dbus )
 "
 
+BDEPEND="
+	>=dev-cpp/gtest-1.8.0
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
@@ -78,24 +87,16 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
-	dev-qt/linguist-tools:5
 	dev-qt/qtopengl:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
-	sys-devel/gettext
-	virtual/pkgconfig
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
 	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
 "
 
 RESTRICT="test"
@@ -166,15 +167,9 @@ src_test() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 
 	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
 	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
 	elog "depending on your preferences"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 8fcba65622c4..d3752f437463 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
@@ -9,15 +9,13 @@ MY_P="${P/_}"
 if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="qt5"
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	GIT_ECLASS="git-r3"
+	inherit git-r3
 else
-	COMMIT=
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
-unset GIT_ECLASS
+inherit cmake-utils flag-o-matic l10n virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -31,6 +29,16 @@ REQUIRED_USE="
 	wiimote? ( dbus )
 "
 
+BDEPEND="
+	>=dev-cpp/gtest-1.8.0
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
@@ -79,24 +87,16 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
-	dev-qt/linguist-tools:5
+	dev-qt/qtopengl:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
-	sys-devel/gettext
-	virtual/pkgconfig
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
-	projectm? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
 "
 
 DOCS=( Changelog README.md )
@@ -163,15 +163,9 @@ src_test() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 
 	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
 	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
 	elog "depending on your preferences"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index e56530d49983..e71ae05f9450 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,3 @@
 DIST frescobaldi-3.0.0.tar.gz 4895317 BLAKE2B 6a9a2b92d075742f54b3148761f1946c4dd73616482aec9278c0326d5597773ce6eb714f8d31d49f79051294d23d4e43552ce29bde0f464d1a677900b8a276f6 SHA512 e33cbcb70bec74239cd84691725e9978b6c6fee391848c7de8ea32dd5459d953ddda120eeea25a602154d94a84947b6c151237b859450162db0822ef58fd7787
-EBUILD frescobaldi-3.0.0.ebuild 1041 BLAKE2B 471703d50885795af637c2594e28a3043b5d051cfe96a16b95c3c2ec403c6dfd66deb3f22a878935c8ba43f9c7b9fc958a3469115cc209f0260e24737a94e560 SHA512 42a5b5b0c30d4f6ea804af438f76446b0b1bfe0a785e893a27174b8517c0e6b252446465781c27e3d6bd009033c07ac2521d9909c483438295884ab8b5b7cd8a
+EBUILD frescobaldi-3.0.0.ebuild 1036 BLAKE2B 51ed67d2c04e1b8b3168bbb393282812982994cda27297dcd932222ddf65f67b359f573a7ad54359b2e17da187f2d776e174b4ece49f3fe3eef0d100537398f5 SHA512 eee6df5313ffb76b81bd053a345c61ef4fcb53784f80a80e3270c4fa2ef17ab12883b67324d04f43c79196df81ea1e27d304f1c66554a30e969ace3abf7f9585
 MISC metadata.xml 437 BLAKE2B 5df0dcf6f211964427c34070f126b8a7b65f4341d5ca0edc899e413d112eb3920197086981537847506148b11b58cfcba80213839e5171baf8c16f05781765f6 SHA512 fee7fc00ca40615d9470bcf15ac3df4541864f825f55021c4b8d59891ea1fbec88f4e5133cceef05791cee1d95be320c7405cdfa67446863bdd2b23e86ca2940
diff --git a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
index 6d845d5ce2c0..7f9ebe02b837 100644
--- a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # 	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] ) # bug 550820
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 05c7d8b1a6d4..27167bb0b730 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-music-3.24.2.tar.xz 1557848 BLAKE2B 329d60da4c2c601524e01bddf086ea699bc10ea311d440ae24af0a83829d7ad4c351963e1b08bd30a8538c9b9987d9f2a41f95690ae31e75c06aac0cc9db2dcf SHA512 a922c80f922b9231e9bbe0cbd1fd33c059c719350c250dbb24316224e3306de7576303119fc9ec303f569559c36d6b076b5ec1076b4f9221a8fb133dcd9f040e
+DIST gnome-music-3.26.2.tar.xz 1563244 BLAKE2B 5a5d27b34470a49a752cb67a1040e227595fd15c6ca4f7656818636d614dfef8ec082dc014ea05c271f512f7c362dc2f81a38359ef04e0663467f62ff3ac2423 SHA512 e8efe31003a54b6cfea151c5402c4d06e48928be7b79332f7f9fb8a567ff7d0d42a43e943398ad6cb7e391d0162322c7fde74922a4b16e52ec24691cc1bfc5b0
 EBUILD gnome-music-3.24.2.ebuild 1600 BLAKE2B b557c83509fa13fe33fea28b1938fe55b898ab056cf18a06ed01cab765474b28d2e2264be63b90056516e5e9cda41e2976116ca14ecf8ae2168288edf38d46b5 SHA512 36233e11a15d7c4a26a077f146d805f9ff971851816e1bb2be624aa3ab73d3f6c02f9029da5020163b7c00e67bc509d39cc45d887dc10bd47c0c7229e18b97cd
+EBUILD gnome-music-3.26.2.ebuild 1630 BLAKE2B 061c29740c59a142be455acb0643284a533fc557b0953e2a40c61c021d1e5e7b27b0fbe12084fbc3ba0f0dd828db8246d48e572cdd6650cf2d7c48d725a9110d SHA512 bc39dc181c9d9e853c79432c11c444a73099207721e013ba52b20e752ab0b72b0ea7f746ce40a3f28da2f0bf27f48eb778e22a1ab1557163f6ffd2a3f6cee8c9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.26.2.ebuild b/media-sound/gnome-music/gnome-music-3.26.2.ebuild
new file mode 100644
index 000000000000..c88b4dca273b
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.26.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/tracker-1.99.1:=[introspection(+)]
+	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=media-libs/grilo-0.3.4:0.3[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	>=x11-libs/gtk+-3.19.3:3[introspection]
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-misc/tracker-miners-1.99.1[gstreamer]
+		>=app-misc/tracker-miners-1.99.1[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf needs app-text/yelp-tools
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${D}"usr/bin/gnome-music
+}
diff --git a/media-sound/id3ed/Manifest b/media-sound/id3ed/Manifest
index 4b3466ed0139..7ffd1bf0ab59 100644
--- a/media-sound/id3ed/Manifest
+++ b/media-sound/id3ed/Manifest
@@ -1,3 +1,4 @@
 DIST id3ed-1.10.4.tar.gz 31610 BLAKE2B 4bb013fe8205a91fe9b25012390707c25b1879ef34322ce85430dcd4fcfc4545e2d2637c113d4779a054815d90951052db4ec4c4b16f0ab7658ad5bbc70a6d4c SHA512 c96716dd24e8fc0aafbb5f0befe1a401ff7ed13821c71470945a5251a553316d17d5eeca3df5d3bd9775d12386078ab2b88d47a7ab9e9f32cd3d209934e31d56
-EBUILD id3ed-1.10.4.ebuild 757 BLAKE2B 8ec8e6dfced323c4c5256d7a699a2958fd371d06e87c362d789ff7992f9d9906367093ffaf41f78d11c07f85997eb19ddde3b353bd749905aaab76b4e5516c95 SHA512 dd8cdb3ab88f0306ab1ac6bf64e5322f7998ca56162da3b163b57519932317b33695a1898ce18fff4ff81f2a6aa44ce68fa141492f4d066745989b4b9151b41f
+EBUILD id3ed-1.10.4-r1.ebuild 732 BLAKE2B b2f4fc8998ca661cf15accde3c5fcdba206b4eb716d8282ba797c659481d441835f6561d76217f46da05d207bf3051e0122108720e0971513f2506490a1c4836 SHA512 e96ef683a3d41066fd4d2b1450edca49eb99bd7e7bbf80b34a777b0d45730d87dcfd317e79869a97803cc71900ba58ec71950e3c0e18beab62c47d0c059cff7a
+EBUILD id3ed-1.10.4.ebuild 741 BLAKE2B d828a7818eea749d5129d2508f49c2f5302335de215ad833edc46ff3ff72dcb9a3adfc24b9b80d9bf44044192d7059911e5ea09f895ff2dc1dce6a302f0b13fb SHA512 b7631fb269284409b77d9c315893bc66795ee99264f0d0ae44d2d452c548b2d461712d46e803cf14d8521ca2e11c8bcfeddcea1b6b4175bca2ed9e1f9057b844
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
new file mode 100644
index 000000000000..f1c44b651575
--- /dev/null
+++ b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="ID3 tag editor for mp3 files"
+HOMEPAGE="http://code.fluffytapeworm.com/projects/id3ed"
+SRC_URI="http://code.fluffytapeworm.com/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/install/s:-s::' \
+		-e 's:$(CXX) $(CXXFLAGS):$(CXX) $(LDFLAGS) $(CXXFLAGS):' \
+		Makefile.in || die
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" CFLAGS="${CFLAGS} -I./" || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	default
+}
diff --git a/media-sound/id3ed/id3ed-1.10.4.ebuild b/media-sound/id3ed/id3ed-1.10.4.ebuild
index 7e8a20345820..dc9d2c770c56 100644
--- a/media-sound/id3ed/id3ed-1.10.4.ebuild
+++ b/media-sound/id3ed/id3ed-1.10.4.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
+
 inherit toolchain-funcs
 
 DESCRIPTION="ID3 tag editor for mp3 files"
-HOMEPAGE="http://www.dakotacom.net/~donut/programs/id3ed.html"
-SRC_URI="http://www.dakotacom.net/~donut/programs/${PN}/${P}.tar.gz"
+HOMEPAGE="http://code.fluffytapeworm.com/projects/id3ed"
+SRC_URI="http://code.fluffytapeworm.com/projects/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
 
 DEPEND="sys-libs/ncurses
 	sys-libs/readline"
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 2e128bffd864..1267e57b264a 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -5,5 +5,5 @@ DIST kid3-3.6.2.tar.gz 1430880 BLAKE2B f27d8e332639b72ccc0ace8afe05391c3edc0b470
 DIST kid3-3.7.0.tar.gz 1466849 BLAKE2B 39bdab9afb187754914ef77326d9c323e5dd4ab13a6f603deca3dfe97acb0d7a81d58a8eb569397c1a094ebaa7449997b729ce008614c8fc9f04d2b9e7995e03 SHA512 3112addba1e0697ae8874bf12336e54c744165a692dc81a99d97194df8511aa540a53085e2be84b3557cd9a2c9d3d887046c06550cef11406b28e6f6e6b507a6
 EBUILD kid3-3.6.1.ebuild 2039 BLAKE2B 916f9cc8c38797be544521a1547f32bfdfb92b657eb82ee7cbf04caaab44aedc2aa210c343dc07e061d832ca86ff9540d9926f79cd9977b05c805f4162a55ca3 SHA512 3c9579683274c70f5ab977887eab2973da50fce3aad59ecbc58cdeb653689422cbc3d87fe31aae262fde7241f5f41dedfd79bf52cfb99b5b4a269dd1a07661cb
 EBUILD kid3-3.6.2.ebuild 2003 BLAKE2B 20a0e16d6f891f9324d48a8473aee6261008dcab59611cd2fa62d113dc0c655a00f5a84b7f2bb313c13c74fbcbc13a132ae958ad12c80d04c6035754b16fc060 SHA512 8925b27536284c425677e45bf9f87881f663ff366939aed729d21443e95f55ab40d98d10922b893d1d07d6e13f8ed816b488a6d322998c87975094e545f7b37b
-EBUILD kid3-3.7.0.ebuild 1947 BLAKE2B 14cca442c7213ec59d0366d494cee9cfb7fb97caa30fc3c5ca2d6595ee4fcfbad39e88039d22aa1add8ec29c17b39eb7b99bc2230688c3c7735cafa9d44c26b5 SHA512 6e9667f8a5d7fb034c9a2806135d2acbf10e25198376758759a1d4453b48a193ffecfc3cad61c33056c9653db74ef3513818ddf4904e4ffd652321ba2ae035ed
+EBUILD kid3-3.7.0.ebuild 1946 BLAKE2B a2b76c978e455be4fe489aebc58f1db11371997363aa4094fd5a8655e6d340ff57674e1b32df24bf26f39771067760dd64dc1a92c715e286962ed68cb42c4cfb SHA512 0e566018c75e517c3a46999e28a8be0854a5ed866009db133d1076222cf1d62ece1c97553cd0995e50747a7d5ad9ab3a958fbe688e930ccb13ac73a68b7b2dd1
 MISC metadata.xml 661 BLAKE2B 5a16df625ed1a34a04f7cd00cae636ec4dc2867cf1bab477c4a2fd99e21777ac949391c0c940da1235ee976a00b3812a84db1fb58c8c089aed983668f9ff49fb SHA512 d27b8c077e8363864d6d4baa217bd7813a01c520cba943bf25996823b944ed07c7b78205d5c77c1610566e2aa55cf03624633e4abef86e4378f6386b7bfb89c9
diff --git a/media-sound/kid3/kid3-3.7.0.ebuild b/media-sound/kid3/kid3-3.7.0.ebuild
index 14d87122dd10..d02b65d040e7 100644
--- a/media-sound/kid3/kid3-3.7.0.ebuild
+++ b/media-sound/kid3/kid3-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index ead1bf125764..726d724d413e 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -2,5 +2,5 @@ AUX mpc-0.31-nodoc.patch 403 BLAKE2B d829c6f40005531ec7657054549b5fa9acd32d15d41
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
 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-r1.ebuild 1235 BLAKE2B e2009c9410ecd84a8aaf3ef2c873a48e3998606678d48ff7e5932cdaafba4bcf6004ee3fab0446a31546296e74cd4d12bbdbc40968680a073a8f29558b72222c SHA512 86417d83305e4cb2434f2e5c9c412907d524cdbb6ddd71b895d30eba9bacd7bf94538033965c7708d392b3048dd1fc1b09ba87fb60ab7baa75b58424ecf74861
+EBUILD mpc-0.31-r1.ebuild 1234 BLAKE2B bbc576bc0f0ffd160dd535b354561dd1054bdc0ee0d52f556dc6a5efb3d09ad138508f9c357a00bd914534c6a61f098e68003ec6d0d4f5c98b9b7be28077c69e SHA512 ed9431c208d5d0a57b13afe591c05507350a6c52ef4d1476e1a04fd13d51aa6c1844abf39b2a87875ab2c6ceeccc9d80e5c4e74540aa23008e46224d4f7d2143
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.31-r1.ebuild b/media-sound/mpc/mpc-0.31-r1.ebuild
index 63e630daea44..40d6be4e2325 100644
--- a/media-sound/mpc/mpc-0.31-r1.ebuild
+++ b/media-sound/mpc/mpc-0.31-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="doc iconv test"
 
 BDEPEND="
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 4c9a17ed31ab..5714fb8446da 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,5 +6,5 @@ AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
-EBUILD mpd-0.21.4-r1.ebuild 8177 BLAKE2B 88d64da9c7cf7db53408fab1160e457220b53d3b22f568ff5271c952c313a06bc535990efe4de1eaee31fd87269834dc236220b557a41a71e4d517319224da68 SHA512 44df6319722f18c8096c083e0c214e8e9a64a924178805d9359edc0a9576eafe00756d8537ca6425761b3835dbef055bd70e5c9fe9fd98f6cb8b3a6252ecbb8a
+EBUILD mpd-0.21.4-r1.ebuild 8174 BLAKE2B 35bc9bb4ccf75ab510065b1eee80ad626d1359654a3faadfd0ba8e3d09eb3ab3bca37836f2d540704f1914b2a25fe90dbcc80ad1333e6b57970e0f6b2c227f09 SHA512 b347f5939053b35bc95c1600706a364a762e4e81a3a238d31e38a884970df9d1db8892c6b943d8895cd7a115e21310fab646bb0c13a2731f7037e93ac21dddd2
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.4-r1.ebuild b/media-sound/mpd/mpd-0.21.4-r1.ebuild
index 51216f324c5a..bcf1b26d296f 100644
--- a/media-sound/mpd/mpd-0.21.4-r1.ebuild
+++ b/media-sound/mpd/mpd-0.21.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+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
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index e347ba8802a0..ef79e6d64f25 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,4 @@
 DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32
 EBUILD picard-2.0.4.ebuild 1754 BLAKE2B bdccd3bc45d0f800379a38872bbd5667b20f0a32605816e3879efea7619891cb99f72f773c72d9ff1da08bfd9a9209a4fef3a95d2eaa5c7538be57fa26c7f2e1 SHA512 194a79fd4f7f467802e14f2919b647ef98bc34b5b9445a68359db86d9a8db264516411c75ddbe4389a8ea528410da588886c32b750a59016d7db0612cb17afde
-EBUILD picard-9999.ebuild 1696 BLAKE2B 0923250ae18bc8d129649750325e0d8cbe0a9de61caa574f3f73a6023d5b915de3d4615447961ae5c9be24162ed4f6e2cdf69d263b3f80347f92337d0380faa7 SHA512 f85dfa4b86c95e3dcc3cecc4ab04efc14d0cda35e402850b3f2bae56fd278ac9bc9cbb9091367a6c6b1393b16ce055f0618f2e44aa16daa83d2e589ff5ac05e7
+EBUILD picard-9999.ebuild 1704 BLAKE2B 74df8c8bbde14f9399da4a4bf837d47982244f5f4294c2478fcd2fc2ddee9b2fd905533e74a5930833056f7cf5d3c82f17d2f99d719632b0def87211c0c5dfdc SHA512 8a743c0a66a747387d52b7eed15e5f0e90f2007f5926a87a69162cf0b60fe8a73efbbf9c6be554cb74641162f6959a8e1e3ab41deb971f53b8956707ce5da1ae
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index e29c2cbc2b5c..17fd6142062b 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -1,29 +1,34 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
-EGIT_REPO_URI="https://github.com/metabrainz/picard"
-inherit distutils-r1 git-r3 gnome2-utils readme.gentoo-r1 xdg-utils
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit distutils-r1 readme.gentoo-r1 xdg
 
 DESCRIPTION="A cross-platform music tagger"
 HOMEPAGE="https://picard.musicbrainz.org"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
 IUSE="nls"
 
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
 RDEPEND="
 	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
 	dev-qt/qtgui:5[accessibility]
 	>=media-libs/mutagen-1.38"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
 
 RESTRICT="test" # doesn't work with ebuilds
 
@@ -65,11 +70,5 @@ Picard's settings:
 
 pkg_postinst() {
 	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index ab5376ff2c94..a68997a043da 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,9 @@
+AUX qmmp-1.3.0-projectm-3.1.patch 3549 BLAKE2B ad650249ef621a84fe1fe359ae03c62df67deceee0c78c0a64ef00895ab3853bb072b0877ee5cae7aaf62eae617b439c97e1628c2060def5900c0904a6791620 SHA512 c21b3f3ce63479fa3f53b7a3079b5e3e4b998899f45c11ad1d7da6724ad48c80a7227958f73a2b4f141c9c814765b97b86e1ca29af8818f331f7291f28f8c3bf
 DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B f57eae68d25d709413a9cd33c48d82488be4e357eb472b19169f821ab96eba6babd75cf6d4492bade95ee590c17cb3dc789018782b136ee0829d337fb391008c SHA512 8daeae416b7c985450c7876145a896b88163608afd971f05eca9e4cbdea65039f21833836fe88cf1ceff253434370e3880c3ee7f30fe3ee7207fa8656a473d1e
-DIST qmmp-1.2.5.tar.bz2 1181154 BLAKE2B 12a0b3d47a2c844dfecf4c4236147bb3b53b18a37442b61502bc7c8388e7ca180fe744211100314fb9f2abda30174b4cf47810a3e9435262fa977faa3b246ddc SHA512 85000561ed8055e78342eeeea47064fdbac3a97d62fea26d10d7c8a19d762c73c2bdce0eea89ce2886d027cb64c127792c0848cf73ea427957cc4fd07d0f3842
 DIST qmmp-1.2.6.tar.bz2 1181291 BLAKE2B fb039d8abcc0e2c6e2e1aa64c603f1f8b81858c48332eaa480d9d71e77958af52352772394fe5c22be653fcb01bc2acc44011e5cf30ab38863f2a2deca6c0ef2 SHA512 c816f530a7b4dabfbe327f4c726c3412c8c22bc9713a288df0f0b405d9831f4958be01b3f9abd35818e54f03e5568eb79cec85bf154ac9ed8075c0bf3fd5a442
+DIST qmmp-1.3.0.tar.bz2 1220426 BLAKE2B 0a64b36876ed672c380c097897aa69f6d44f9d5fc7fdc2006ece63c91438fc72f3df67cf4c63d17dab526d8e67c45593b035df0e1ccfc1c179824807637aa812 SHA512 e91dc40ca8e96c1a5527ca73443e192bb8f2198a449f46911894b0e2779011766b2c6fd3b1786d2fbe3d87ccc7ee6b987ece0a3260144981bb74b96b3b7c3bb3
 EBUILD qmmp-1.2.3.ebuild 4172 BLAKE2B 9db4f2b3d25b782c9e27eae6ae8d2f64b247634863ee3b58362401746c0004a66d9444f8a21efb86d79841136f5a22a10d40838e98ab83b4bce04ccce5d4dae4 SHA512 911c14441c370ae4494da1e9b0dacc28ad9b469eaab72fb99a5210af73760f2597c63a1ff844c10b0a2d8a17f270f6ec3b9196b0d08ed738ce9c640e061be6e8
-EBUILD qmmp-1.2.5.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
-EBUILD qmmp-1.2.6.ebuild 4223 BLAKE2B e9020d44d635020ce71fbba6fc140a83859b28b6d7ea8120688a65fb86e41d237a04409acbf15c1c432445fa27c57bf7a4c83ba30ce977c7c835298aa17884fa SHA512 e165012fac685af0edda9e5d7bbee1ef3cd9e335d661ef981c9ea710a04e69ba21896b962dd7d9b985268b85645af686720fdc4dd488f8d340781c587f2b43d3
+EBUILD qmmp-1.2.6.ebuild 4221 BLAKE2B 7c67cfa55ac6cf2fdeabfee469ea7e492b81e8acb560a70a2890dae2704daf6963de5ee00d9a25de04c6b84433c91e3462a23786dbb2d26ece85b4d23d316d12 SHA512 d54e4e481244f1abc5817d45f7487e19e4d88ef6d17a42f72e55df62817d2994c499167004f05d8eb6e1e607573d1145454403251ef31c488f219b868a4f9ffc
+EBUILD qmmp-1.3.0.ebuild 4322 BLAKE2B 45ab0e243e10901cd0456c8459b4f751484da95b797c68b2e648ce4a7963ce77613f352dfe23fb4fe98b22f83338c177035a2a16326d8469e6843840d659e693 SHA512 e54d1867d000359ee22b41761e5b4ae7708639aab24b3a05faf3adfd1e8e095e67ed2c3c74a878a131d11b73a6a97e90c8aafed94db3432970e7da99fb4c61ea
 EBUILD qmmp-9999.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch b/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
new file mode 100644
index 000000000000..0db7359bff47
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
@@ -0,0 +1,91 @@
+Index: qmmp/src/plugins/Visual/projectm/CMakeLists.txt
+===================================================================
+--- qmmp/src/plugins/Visual/projectm/CMakeLists.txt	(revision 8708)
++++ qmmp/src/plugins/Visual/projectm/CMakeLists.txt	(revision 8709)
+@@ -15,6 +15,12 @@
+   MESSAGE(WARNING "Unsuppoted OpenGL implementation, projectM disabled")
+ ENDIF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
+ 
++pkg_search_module(PROJECTM_31 libprojectM>=3.1.0)
++
++IF(PROJECTM_31_FOUND)
++ADD_DEFINITIONS(-DPROJECTM_31)
++ENDIF(PROJECTM_31_FOUND)
++
+ find_file(PROJECTM_CONFIG config.inp
+           PATHS "/usr/share/projectM/" "/usr/local/share/projectM/")
+ 
+Index: qmmp/src/plugins/Visual/projectm/projectm.pro
+===================================================================
+--- qmmp/src/plugins/Visual/projectm/projectm.pro	(revision 8708)
++++ qmmp/src/plugins/Visual/projectm/projectm.pro	(revision 8709)
+@@ -13,6 +13,8 @@
+ 
+ RESOURCES = translations/translations.qrc
+ 
++#DEFINES += PROJECTM_31
++
+ unix {
+     PKGCONFIG += libprojectM
+     target.path = $$PLUGIN_DIR/Visual
+Index: qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp
+===================================================================
+--- qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp	(revision 8708)
++++ qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp	(revision 8709)
+@@ -1,5 +1,5 @@
+ /***************************************************************************
+- *   Copyright (C) 2013 by Ilya Kotov                                      *
++ *   Copyright (C) 2013-2019 by Ilya Kotov                                 *
+  *   forkotov02@ya.ru                                                      *
+  *                                                                         *
+  *   This program is free software; you can redistribute it and/or modify  *
+@@ -40,8 +40,16 @@
+         projectM::selectPreset(index);
+ }
+ 
++#ifdef PROJECTM_31
++void ProjectMWrapper::presetSwitchedEvent(bool isHardCut, size_t index) const
++{
++    Q_UNUSED(isHardCut);
++    emit currentPresetChanged(index);
++}
++#else
+ void ProjectMWrapper::presetSwitchedEvent(bool isHardCut, unsigned int index) const
+ {
+     Q_UNUSED(isHardCut);
+     emit currentPresetChanged(index);
+ }
++#endif
+Index: qmmp/src/plugins/Visual/projectm/projectmwrapper.h
+===================================================================
+--- qmmp/src/plugins/Visual/projectm/projectmwrapper.h	(revision 8708)
++++ qmmp/src/plugins/Visual/projectm/projectmwrapper.h	(revision 8709)
+@@ -1,5 +1,5 @@
+ /***************************************************************************
+- *   Copyright (C) 2013 by Ilya Kotov                                      *
++ *   Copyright (C) 2013-2019 by Ilya Kotov                                 *
+  *   forkotov02@ya.ru                                                      *
+  *                                                                         *
+  *   This program is free software; you can redistribute it and/or modify  *
+@@ -40,7 +40,11 @@
+     void selectPreset(int index);
+ 
+ private:
++#ifdef PROJECTM_31
++    void presetSwitchedEvent(bool isHardCut, size_t index) const override;
++#else
+     void presetSwitchedEvent(bool isHardCut, unsigned int index) const override;
++#endif
+ 
+ 
+ };
+Index: qmmp
+===================================================================
+--- qmmp	(revision 8708)
++++ qmmp	(revision 8709)
+
+Property changes on: qmmp
+___________________________________________________________________
+Modified: svn:mergeinfo
+## -0,0 +0,1 ##
+   Merged /trunk/qmmp:r8708
diff --git a/media-sound/qmmp/qmmp-1.2.6.ebuild b/media-sound/qmmp/qmmp-1.2.6.ebuild
index f7e9f2152bdc..81b05993cbeb 100644
--- a/media-sound/qmmp/qmmp-1.2.6.ebuild
+++ b/media-sound/qmmp/qmmp-1.2.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/qmmp/qmmp-1.2.5.ebuild b/media-sound/qmmp/qmmp-1.3.0.ebuild
index 70985023af4a..a895b3e7408a 100644
--- a/media-sound/qmmp/qmmp-1.2.5.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
@@ -34,6 +34,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/taglib
@@ -61,7 +62,10 @@ RDEPEND="
 		media-sound/jack-audio-connection-kit
 	)
 	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( media-libs/libmad )
+	mad? ( || (
+		media-libs/libmad
+		media-sound/mpg123
+	) )
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
 	modplug? ( >=media-libs/libmodplug-0.8.4 )
@@ -93,6 +97,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog README )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-projectm-3.1.patch
+)
+
 src_prepare() {
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i \
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 76f9a9b7c255..8581950d1bfa 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,4 @@
-DIST qtractor-0.9.2.tar.gz 1789514 BLAKE2B 0e314fd04c908d0916d9979de6df940225a5a9f522289e80c1956902c05478c7655a8bc2ef1827bc36472d2b4dd3885de67cda801596057dec58a10ac3235ac2 SHA512 7dbc23afb05465251daea3e56a72ed6e7814a74e6a0a844b251d8bb4f864f606bfcae5aeb3847e5227589b313777268034590a566dd74eff5cc221f081653c33
-EBUILD qtractor-0.9.2.ebuild 1458 BLAKE2B 758f3136c14495070fe2280496ff059c300592ca3ea70a5d4c1a221a0af15c9c702b6d1ff6231fa45fdd7a4d609f75550a05971a678af49dd4e25a6cad289f54 SHA512 44da8f2563db8d62c40db833ecbf41f79d581dcbf5593bb2b67277b8d166dfc5d3fdb1502e0406daa2d5aae393e80a55fe3387c4e749cccdf071bf417930920a
+AUX qtractor-0.9.4-dont-compress-manpages.patch 801 BLAKE2B 27ee7fd8711b87e8e8b32e3f40ed37c890c072e9d071d2011041af7b4d9bd1c1763f6b0f8326ee3a9e6a780f6abf418d52f8bcc894490adddcac05ef973eb86b SHA512 bd78649eb6f0616a4129d5851c997cc3fa233a86d9b7f98f5685b0999bfd25d536b38b539a9a7b2589d709004bd63042c41eae35fcdaa78167f071b0b8a2e5b9
+DIST qtractor-0.9.4.tar.gz 1812512 BLAKE2B 2851d2a8b939a151b7274524f15d5194941dfba99e5d5ffaf1f3147af0cb09c8ed7b075e38eec648f60bbef6e05289d8aee9e9d1007f5bee719a118a78efc96d SHA512 697e8f0b02658823bad2f75557340250349779c3eb1ce0efd1c30895524f9807b030d44149d9d25fd92a92f0822441d3c3236953d909b6ecfc9a18fa3ec1fbab
+EBUILD qtractor-0.9.4.ebuild 1475 BLAKE2B 70109e87bf3869c721f3639a38b0fb2865e49224aea547ddf2381f4c37dc53b0b64952fc729f669157c4892129c63b62d6753b9f52e258dd23399ed722178e8f SHA512 65c8b864ff73a3b317c57768775e963d6f395bde48ff173bed00dd68c97e43aa935df28aedfd5e80a5dc71a942454937c063a9640fd599c2bc4cad3402a9ee89
 MISC metadata.xml 542 BLAKE2B bc7330f8b5f775ebbab52dcf034130ee6016eada843baca1529e58d3c72ac19ce7fcd13b3483e4bf15b3620e8ee4c379520730146a39ec72d6ea1aaba094d93b SHA512 002d353914af0071fae342598619aef3b0dfe099d500da0bc98f40c209689f123dbbd93ca80a89a53c6257a54ee808798a858987d80a0443e2cc723dbfdedb7b
diff --git a/media-sound/qtractor/files/qtractor-0.9.4-dont-compress-manpages.patch b/media-sound/qtractor/files/qtractor-0.9.4-dont-compress-manpages.patch
new file mode 100644
index 000000000000..aecc2af3f0d7
--- /dev/null
+++ b/media-sound/qtractor/files/qtractor-0.9.4-dont-compress-manpages.patch
@@ -0,0 +1,24 @@
+From cca686b7c058d8ddda94bfa96043d39cce92fe42 Mon Sep 17 00:00:00 2001
+From: Simon van der Veldt <simon.vanderveldt@gmail.com>
+Date: Sun, 10 Feb 2019 16:04:40 +0100
+Subject: [PATCH] Makefile: Don't compress man pages
+
+---
+ Makefile.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1364d1ef..a0908aab 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -346,7 +346,6 @@ install:	$(target) translations_lrelease $(name).1
+ 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
+ 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
+ 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
+-	@gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
+ 
+ uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
+ 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
+-- 
+2.19.2
+
diff --git a/media-sound/qtractor/qtractor-0.9.2.ebuild b/media-sound/qtractor/qtractor-0.9.4.ebuild
index 4b56566c5bd6..800041fd3184 100644
--- a/media-sound/qtractor/qtractor-0.9.2.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,11 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
@@ -36,18 +40,17 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis )
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dont-compress-manpages.patch"
+)
 
 src_configure() {
 	append-cxxflags -std=c++11
 	econf \
 		--enable-ladspa \
 		--enable-lilv \
-		--disable-qt4 \
-		--with-qt5=$(qt5_get_libdir)/qt5 \
 		$(use_enable debug) \
 		$(use_enable dssi) \
 		$(use_enable libsamplerate) \
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index a747a37a71b7..3183087aa480 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -3,5 +3,5 @@ DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72
 DIST quodlibet-4.1.0.tar.gz 4882607 BLAKE2B 1e0c519eb3f1d377dc7fc0ee2a08faa51632eabd1f21638e38aaf5edc4faa6707274edfe314910b32895e59a5cdd27434914afb1c33aa2914788e644db2d2aaf SHA512 987001b6335e18ce18d25b71be327261c3fe5e0a142395ce061d7460e9ade2543a3372a64560b804be3e4d70889017612e9bc1a72215d45b215caf4da545e9ae
 EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
 EBUILD quodlibet-3.9.1.ebuild 1760 BLAKE2B 441b5af4ce9f397b30bc58bed0416c85417b28c55123d1d93c9ecd502e4ebdb0782d5a3eb8eb62c3861d768481e8103fdf0395cf310d0e801044321a20d7746b SHA512 76648bb9945ec27282302ed8e35cb9dcfde7fa0e98860f88ef66b112f6537499296f835c11e9890de642f00de884263af15edad2396feba5d02602cbdd7ace8c
-EBUILD quodlibet-4.1.0.ebuild 1556 BLAKE2B 10f9328beea91a03bfd464c86816b56937e7a1aff12b1179e07c044586d91a4a0583c0f3ba5f7133d93213bfaa284aba4776dd5826a8e9ed1809f6b659d73c3f SHA512 b2f33bd35016f011674db3f6e7f101140644dc6b8a64df1866867bc84c0bea833d53750255d3cb6f27970e490bca8aed5df7feec75ae0b5e3d892c6f2cd51222
+EBUILD quodlibet-4.1.0.ebuild 1553 BLAKE2B 0b9c20f531972ee135f0feaee0e0b304d234abb1c8f76ce3161b8d43cf5a615bf838c20a4e1dda76c382213653bb6b516b91dafa6772b0372aa78bd859abdfb4 SHA512 7d57337e952ffb70c89465aee5340c6141746c3cdb9c3337abd6740eb43b53a4420ca17bcd2c9283035f15353269afa471e73732a4c47dfe1ac7fad151571035
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.1.0.ebuild b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
index 3ba60258fb4b..502f91ae83ef 100644
--- a/media-sound/quodlibet/quodlibet-4.1.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE="+dbus gstreamer +udev"
 
 RDEPEND="dev-libs/keybinder:3[introspection]
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 88b9fe6c23c5..ecfc5d9d5049 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -2,5 +2,5 @@ AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d2
 AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
 AUX sonic-visualiser-3.1.1-qt-5.11.patch 262 BLAKE2B 627bedb71bab01fefa7edaee88f1245f19f312eea257904b2d03202b52c975a546fae73985b5cb9be4b42e97da2f41f28a26c13246f34a8c303b30ada0b276d0 SHA512 60ac4c02507c23fd7ebec556770175ddef3132ae54b0ef3136767c476f86e0c01e518ef2939b2ed6ddc044127f4a7393a800cfe70bfa21c2c103e378c8ea5983
 DIST sonic-visualiser-3.1.1.tar.gz 5304359 BLAKE2B 79c9d1d55ea2ec939fdb7abe656ab81aae72862d139eda4e62037e0231c596cf725b4fd5741216e6413bc25e659798dee3b0e06f55063a9ad73f0d9204f76d84 SHA512 e83efffb62179e67a0e5fd7352f63f5a0210102a7fb38c5ad486479a3749f68a44fec2d1843d1c1ca826ba0004bf421811a270a0a50e3f89f71d956dc7a76ae7
-EBUILD sonic-visualiser-3.1.1.ebuild 2710 BLAKE2B 66b1f3e8674cba67e4da8da29f5b48d5e18c064baa942f2cedfc640c6871aa2a1b0d1bdb6c5b5a8ca5b943de37ef53614a8b9dc4375a16b39fe96b3494adfb08 SHA512 882b2d59ddbe590fa7e0040d5c7e823b4aab082fcfffdabf9e2246005f77b13f3f0c56005361112f041c5f741e4abc5388dee2048715b5ac3f398db7cdbb179b
+EBUILD sonic-visualiser-3.1.1.ebuild 2985 BLAKE2B 1f8cbc2238e384063ddd0ee507d16481075e2a8f6532a8520f0da6795eac57fbdd4dbfffb4e6d82140397bdfc15d74a264f0b2c22e05d3c8958699ded1cde878 SHA512 bfec9ac5e08c0b05a2b0c5937f3f1ee72be454744ffc5d4623c7f275ae395368af1916a23638a76c3c5566672ae1f853c96ed857ef362a3f37ade4fb45bd848e
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
index 264d383f4b8b..788100ee4154 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,6 +49,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5
 	virtual/pkgconfig
+	sys-devel/autoconf-archive
 "
 
 REQUIRED_USE="|| ( jack pulseaudio portaudio )"
@@ -77,6 +78,12 @@ src_prepare() {
 	use portaudio || sv_disable_opt portaudio
 	use pulseaudio || sv_disable_opt libpulse
 
+	# capnproto 0.7 requires c++14 now
+	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
+		-i configure.ac \
+		-i */configure.ac \
+		|| die
+
 	eautoreconf
 
 	# Those need to be regenerated as they must match current capnproto version
@@ -92,6 +99,10 @@ src_configure() {
 	export QMAKE="$(qt5_get_bindir)"/qmake
 	econf
 	eqmake5 -r sonic-visualiser.pro
+	sed -e 's/std=gnu++11/std=gnu++14/g' \
+		-i Makefile.* \
+		-i checker/Makefile.* \
+		|| die
 }
 
 src_test() {
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index aed9ea5c707f..8e35b9d911f6 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.98.78.gb45d2a6b-10_amd64.deb 105135826 BLAKE2B e1641a738f8e03c86d9b28ac902ed9857e1bb406b03e7a1c59c522e86a211b13cfd442bf84f79af4302d32a4b1c041e8ef7297990e70912d8c0a5108838e0500 SHA512 f20f2c998a205f189a19f332b2e738a0ec98a34520765c0e1d27d95d92f7c9c2f78da32f9edcc61146be87e8d8df7d3521d2e84b427cd25586b9fe6bec8d1602
+DIST spotify-client_1.1.0.237.g378f6f25-11_amd64.deb 104760412 BLAKE2B d6cd695a41d80a47362b694e74b7d9d34a5c6480dbce189fa22d514126ab3022387871021a3d2a1301d9eb88c3b8f70755c1a5f880f9cc34c67c5faead7d84b8 SHA512 a1fcbf3463eea13a4ff38f4b40ae999c8e138abc8adf6988b4d764e597f166ef894baf449a6506a6b9b69ba3ed92c83dcb1a1eda23ab843c0441d2b71bbb0d51
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
 EBUILD spotify-1.0.98.ebuild 3429 BLAKE2B 436b23f7857907ba883d7ade7eedfe1ecbfe15f2b2f787c1a832bc4d888c13aa5098b9a495f38c200795775476501465d6fb63e39e1b0cbf5e6da9093ee76c48 SHA512 9f431988b6adf74319efce9aee404684bf495604db5d5b1a0cfa241c43cd026e4646bfc19ad1d66572bf451423be832761750ebfda1a43b10d50f283b37d70f2
+EBUILD spotify-1.1.0.ebuild 3430 BLAKE2B c953ba10780cc5af2142d3f32a2d2a9f6dc2045896a3ef9c0a333430fc95ddf0ae39358e75b8972eb175dd47456e0f7d706f89d94b81acbcafb2a1f0fe0505cb SHA512 caa258ec7469691b5d2241c32495cf8c8f702a745948986be8102249430955afc9bc61edc100f61fe114abcbd35c72bc48025e1db1aa0b232da1f76f1490e6e0
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.1.0.ebuild b/media-sound/spotify/spotify-1.1.0.ebuild
new file mode 100644
index 000000000000..c00dd57ac9fe
--- /dev/null
+++ b/media-sound/spotify/spotify-1.1.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="237.g378f6f25-11"
+#BUILD_ID_X86=""
+#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=">=dev-util/patchelf-0.9_p20180129"
+# zenity needed for filepicker
+RDEPEND="
+	dev-libs/openssl:0
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	pulseaudio? ( media-sound/pulseaudio )
+	systray? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/vimpc/Manifest b/media-sound/vimpc/Manifest
index 344e5653885b..5bdff4748140 100644
--- a/media-sound/vimpc/Manifest
+++ b/media-sound/vimpc/Manifest
@@ -1,4 +1,7 @@
 AUX vimpc-0.09.1-tinfo.patch 186 BLAKE2B 83d6bf9df4b6eee4dcc0d114813d49250fe062ae65931092086e1aa4c40f88dc1598f1f761ef34f078ea5ea7216ee8de9b25dc93b00c517b82a8af60f3c9dcf0 SHA512 05581e2cec907ec8b194d7d097498ebdc6d84774e74ebc5dc521d99b55e880f1b130ab919ac7fc6257537e37599f0797fe2fedded35f94517ddf4e58e8ce9556
 DIST vimpc-0.09.1.tar.gz 583073 BLAKE2B e2ab728a202cc7e5b9a1ffbca979274ae3f6b0f43acdacad51fdbbcd2c45f28dd9cf2f4372d085abc28633aec318f92a7632e54732516c51f20392c2d059e04f SHA512 cf40ae43ac21af80e1b5897f1fa83b4d730fb7dfa4c21b80c296a8e6f2c40e643325fd2aa96bd4dda1abca0ccd2d12545cf91ffcdb8017e5b9cd88917ca96222
+DIST vimpc-0.09.2.tar.gz 452593 BLAKE2B b6cbeab32318e723d7be114255fba7360fa2608d03bde6b2186d47b1cb8e74b4369d0d2b1d683cf5668232bf4581e9acb79d726308b18ff0d82122aa979f81a1 SHA512 456e2d2c0510273c071b24c2dd8f90b73d40a0b02565c00ea986a78f1231cb26fb053ce5b0d1476647c813b84684e400c21948086299e445ffd651c2af46d4c9
 EBUILD vimpc-0.09.1.ebuild 908 BLAKE2B 7b6b6cb81ab882feeab72dfa94a4e498a5d7d3ee135e3fded6fa7c767b1c8ffa48ef80b2a7672f91011609a66202d28cd88c7c83eff5c1c6a31d5431557521d9 SHA512 fc13626f2ea70f2f2c7bc82d239e4646bd2b076569bc5481e41e3187100454cde82815bd97e9ae2d3ba3baa09d211214125394d78a3ea676abba720b1df556ea
-MISC metadata.xml 408 BLAKE2B aa78919fd7d52755fee6b8aed4722e607032931f63866dba0badbe702bf8493d1af8e39a171ed47c4f1ea59d5010c25b97c345271aba2d72e617312d8f847aa4 SHA512 b728c8239a4c105fb9077d96def0fbf08ac34a565cfcad92621577c917b21c1656c65a690f35d209c0f249e63a7a56885990173791631e1e1109357214de8969
+EBUILD vimpc-0.09.2.ebuild 880 BLAKE2B c04e1efadce7e75448fabba104a6259926da6cce30a086878ba7a53d4658c7f972783198baef1543a7353336162e5850e5e5c412fb3e9d0d305f50a6a6d74208 SHA512 97c0844731c79e6e636285ac7369b11de6511e4d55e860d04cf6b0246196187d58400fffe9705c9dc825fa8d398a5370a6d78a84ff333a2563eae187aa3adabe
+EBUILD vimpc-9999.ebuild 837 BLAKE2B ce8588b8b69918c68d359d5fbc87fca0aee34652c92637dd01e7c753660e718126a10c228886c02f36863aff4a7bcb675107201bb3ff72972261041706f4cf42 SHA512 b3fe1c3768151d09a0a42257c507662da01387dfdb7fcb0d251fc845e0cfc3a085edeaf592c323825cfa0637d4f2e1a40c8ee03b7fe90ca50c9a7657d9165766
+MISC metadata.xml 647 BLAKE2B 51080503b1f1b25bd6e00945c6fd606f4cc4585d9309d09b83d8dfa1470c9ffe3a25710066eb0f9bfdbcfcab701591b6db5f54c982e8594e07be3b42b4a76909 SHA512 fcf2e6083cd328b278cd9d32da1a4267b6bbb9bf6831aa7ff895aeed00b464390fa4697d101c9cda0f78302640e4c866af927b870b902177788ccd8241d42db4
diff --git a/media-sound/vimpc/metadata.xml b/media-sound/vimpc/metadata.xml
index 936e40a0e753..60bf59635741 100644
--- a/media-sound/vimpc/metadata.xml
+++ b/media-sound/vimpc/metadata.xml
@@ -5,10 +5,18 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>stefan.strogin@gmail.com</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="boost">Use boost instead of C++11 libraries</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">vimpc</remote-id>
+		<remote-id type="github">boysetsfrog/vimpc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/vimpc/vimpc-0.09.2.ebuild b/media-sound/vimpc/vimpc-0.09.2.ebuild
new file mode 100644
index 000000000000..04c0f9dd2743
--- /dev/null
+++ b/media-sound/vimpc/vimpc-0.09.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="An ncurses based mpd client with vi-like key bindings"
+HOMEPAGE="https://github.com/boysetsfrog/vimpc"
+SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost taglib"
+
+RDEPEND="dev-libs/libpcre
+	media-libs/libmpdclient
+	boost? ( dev-libs/boost:= )
+	taglib? ( media-libs/taglib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS README.md doc/vimpcrc.example )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable taglib) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	# vimpc will look for help.txt
+	docompress -x /usr/share/doc/${PF}/help.txt
+}
diff --git a/media-sound/vimpc/vimpc-9999.ebuild b/media-sound/vimpc/vimpc-9999.ebuild
new file mode 100644
index 000000000000..c019bc106184
--- /dev/null
+++ b/media-sound/vimpc/vimpc-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools git-r3
+
+DESCRIPTION="An ncurses based mpd client with vi like key bindings"
+HOMEPAGE="https://github.com/boysetsfrog/vimpc"
+EGIT_REPO_URI="https://github.com/boysetsfrog/${PN}.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="boost taglib"
+
+RDEPEND="dev-libs/libpcre
+	media-libs/libmpdclient
+	boost? ( dev-libs/boost:= )
+	taglib? ( media-libs/taglib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS README.md doc/vimpcrc.example )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable taglib) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	# vimpc will look for help.txt
+	docompress -x /usr/share/doc/${PF}/help.txt
+}
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index ff1909223a28..400dbd2e44f5 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,5 +1,5 @@
 AUX zynaddsubfx-3.0.3-docs.patch 414 BLAKE2B 7988269f161ae948e63a05f9d84b986cf2a5c8644c594d14b431bb3366ac3e468d1668d1b03d1ad3e899e93a992c2b9722338f1a6ea1052994613ff7acce8eff SHA512 867cb63e0b057bf0930f8a2d7dfe50a547df740cb135dc21824b986f194c2384dd57e882f0ed2617c1e1306a88804849878eee4d825bf02908378acf0e00fb75
 DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
-EBUILD zynaddsubfx-3.0.3-r1.ebuild 1920 BLAKE2B 1efefa9809a8712e8d5e6873390ee84e2454fb445f03504cd1e06b4fb67100dca63f771ee959fb2294c54cee4418a0d50acc72d9fcfbd449f0aa3547a65fd56e SHA512 db94f5e26b35651c9791ab93b81fa87abb807ee96c7c4b3d3554e909af458cf352fad5d19f42c4e67d28f7daca88f9611e84bba3e3f44d4888e74e6380b869e8
+EBUILD zynaddsubfx-3.0.3-r1.ebuild 1919 BLAKE2B 4f3ef4df64fe5fe024458497023710d876aab85fda37c4fbdfa8a790ef21903e0f03804d7fa645207dab5423b92e1c835556f5c1350dbcb7f8a27079b51cdf5f SHA512 0ec1d782e3f9c3a09824fb5ccd13e189d903225481e081688c4a27746dddf41fa5b236f8008d044d575257a027b56a04a699294134bcc6551cd02d301b1062a6
 EBUILD zynaddsubfx-3.0.3.ebuild 1567 BLAKE2B c4e2e6b115c326e769ed98d95262d8545b576f3b809c403fcbae03717dfc40e8ccebced31acd82281a3712452e4b1206bba427239492a045d856920df3409fbf SHA512 e18092a175c36dc1958ee03bc388c330685a806aaa227e45a6ead4cde139e656dd9d7b82eac851875821fb6c465e176e438894c78f6bfa5c1f09bdf95fa0cd35
 MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
index 42707c6895ba..3e5d0e71fa8c 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="alsa doc dssi +fltk jack lash portaudio"
 
 REQUIRED_USE="|| ( alsa jack portaudio )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
commit	79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree	ade7cb031f363fad64c77139dea7aa3d81908537 /media-sound
parent	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)