gentoo resync : 16.02.1018

7 files changed, 21 insertions, 203 deletions

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);