gentoo resync : 16.02.1018

4 files changed, 21 insertions, 130 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 65f10e553ca2..4f53b877c849 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,7 +1,6 @@
-AUX audacious-plugins-3.10-fix-slow-search.patch 3373 BLAKE2B 1b66928f0f92395179931ffe681d60db466bd9fa70cc6d1cdf6e4ebd9803737d7dd2d967d006ec6a90eca557f63610059407987dbe54e2c41f69d2443b257836 SHA512 8287ad3a85c526cef99f155752b6de53ab4100eec08a3b746536123973c59c7e7a4b917d7e143bb59d99b9aa7812dfd11000add11c2c293f4f7d08259a02f4a3
-DIST audacious-plugins-3.10.tar.bz2 1701877 BLAKE2B 4db7351af494ff5b7d2a7968524e2480f321505759f4a6532dd86f8fd87f43ab0a66e9f1fc75cfcbc8c59d35c1071048b61a8452fa6e041cd1667872f5b5699e SHA512 88dd93b5a7f6582ec42cf539d1000de0900cce683f4de85d8a17f57c7ba34545c6277882cad1505cb6682ee7b885ffcd1fe5675f7e24dc3e2a650615789d9d52
+DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
 DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 BLAKE2B 55f373be204a9b4c9cff41d41d43c4776f680ab203643e90e5d338bec2e7f8a4c60cda9caa08e461089a475f3ec1bc237538f781718eb0d26a4365743337e977 SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b
-EBUILD audacious-plugins-3.10-r1.ebuild 4331 BLAKE2B bf4ca1c68855e38fdbb281d7ee95b7857a5e7ac8a40727a2dbaaf5eb05deb68c23dc0cd615a8c71e348df65f06647c887c3115dada0ea02eee54d57cb8d1bc06 SHA512 93cd48c84ff38ddb994d74b9162f0c0bfb746d7b9d550a4765c42f2e4a03ecc84fbe8bd47184511fe54f9c566768ae69908e34aa8c35c04a6cce24fc261231b9
+EBUILD audacious-plugins-3.10.1.ebuild 4287 BLAKE2B 00cf13e43cf2cd33574631f102b8a7e1c441663aa5b2a142b4d1232e64aef3086e5b0077dcc61f85076525132eb245e2ae034912af62847b113504b1607aa1de SHA512 e03d3936a4ec505188d13c241a3e3cb298acbe7043a506a90efa3597bbe878b57aa5ef5b273ac16dfbfdb4cebbee9429582499372e0ba90884c5db8cdf25e844
 EBUILD audacious-plugins-3.9-r2.ebuild 3684 BLAKE2B 089fb220f9212d6bff4c10ea3b86719e918928d177a754d5d274f3e0d04257ce4cbbf4db0c3485cee2a8f31648ea96eaffafdb6908b5a71f51e2f0d7b46d8043 SHA512 2dc3cae3e3b663aa3dcaa2efc085d86ae292229e3984bc18a9b5876aef9d2923f04434774c5f39f47d33d178110b448a34d0a939c9a713495a180f0dfd8c6ee4
-EBUILD audacious-plugins-9999.ebuild 4277 BLAKE2B 1916a029169b9da4162cbf18ae3d52e64315943e91ee733eb6ebdbba017bf5f7b108e6fc7262f4575b88065a902cbdef2db794777cf22d2f0e164c1245b831d0 SHA512 0b9b68b4dd8db53198a8bf9787b91a09b359d5ec4279943f7db39e67c23fc8451e0b6ed9a0b9a98a3fa7e7308820f757f39f243723e80beabd67e32cbdf5ddb0
+EBUILD audacious-plugins-9999.ebuild 4287 BLAKE2B 00cf13e43cf2cd33574631f102b8a7e1c441663aa5b2a142b4d1232e64aef3086e5b0077dcc61f85076525132eb245e2ae034912af62847b113504b1607aa1de SHA512 e03d3936a4ec505188d13c241a3e3cb298acbe7043a506a90efa3597bbe878b57aa5ef5b273ac16dfbfdb4cebbee9429582499372e0ba90884c5db8cdf25e844
 MISC metadata.xml 1333 BLAKE2B f27c5c2d94c45688e56a6a48382c6b5fb3e05bfbbdff613af56ce386af8f607b6d24f5eedfebe221274fe5f56d0d13cc1cba21c11007ff9b5ceb5080f36dde64 SHA512 2c31199cc1f095d0108223e15584dd901fedc88aa02820bf4749cbb1014eeec5af04e1df9688efdd2c2b78a4f27658dec3a73a7c3e6e3968fc8ab659611e9c81
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild
index 2866dd8fcd2a..2b461d2a0570 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-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/_/-}"
 
@@ -40,7 +40,12 @@ REQUIRED_USE="
 #   hotkey
 #   notify
 #   statusicon
-RDEPEND="
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
 	app-arch/unzip
 	dev-libs/dbus-glib
 	dev-libs/glib
@@ -100,13 +105,7 @@ RDEPEND="
 	)
 	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 "
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-slow-search.patch" )
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index d3d11e6d7792..2b461d2a0570 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-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/_/-}"
 
@@ -40,7 +40,12 @@ REQUIRED_USE="
 #   hotkey
 #   notify
 #   statusicon
-RDEPEND="
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
 	app-arch/unzip
 	dev-libs/dbus-glib
 	dev-libs/glib
@@ -100,11 +105,7 @@ RDEPEND="
 	)
 	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 "
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch
deleted file mode 100644
index 3012d3138737..000000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 9d162207ef01c5972e4bb718d390c494f0ad0241 Mon Sep 17 00:00:00 2001
-From: John Lindgren <john@jlindgren.net>
-Date: Tue, 4 Sep 2018 23:39:00 -0400
-Subject: [PATCH] qtui: Fix slow searching on large playlists.  Closes: #819.
-
----
- src/qtui/playlist-qt.cc | 58 +++++++++++++++++++++++++++++------------
- src/qtui/playlist-qt.h  |  1 +
- 2 files changed, 42 insertions(+), 17 deletions(-)
-
-diff --git a/src/qtui/playlist-qt.cc b/src/qtui/playlist-qt.cc
-index 28c480ead..750d87c37 100644
---- a/src/qtui/playlist-qt.cc
-+++ b/src/qtui/playlist-qt.cc
-@@ -89,6 +89,31 @@ int PlaylistWidget::indexToRow (const QModelIndex & index)
-     return proxyModel->mapToSource (index).row ();
- }
- 
-+QModelIndex PlaylistWidget::visibleIndexNear (int row)
-+{
-+    QModelIndex index = rowToIndex (row);
-+    if (index.isValid ())
-+        return index;
-+
-+    int n_entries = m_playlist.n_entries ();
-+
-+    for (int r = row + 1; r < n_entries; r ++)
-+    {
-+        index = rowToIndex (r);
-+        if (index.isValid ())
-+            return index;
-+    }
-+
-+    for (int r = row - 1; r >= 0; r --)
-+    {
-+        index = rowToIndex (r);
-+        if (index.isValid ())
-+            return index;
-+    }
-+
-+    return index;
-+}
-+
- void PlaylistWidget::contextMenuEvent (QContextMenuEvent * event)
- {
-     if (contextMenu)
-@@ -379,33 +404,32 @@ void PlaylistWidget::playCurrentIndex ()
- 
- void PlaylistWidget::setFilter (const char * text)
- {
-+    // Save the current focus before filtering
-+    int focus = m_playlist.get_focus ();
-+
-+    // Empty the model before updating the filter.  This prevents Qt from
-+    // performing a series of "rows added" or "rows deleted" updates, which can
-+    // be very slow (worst case O(N^2) complexity) on a large playlist.
-+    model->entriesRemoved (0, model->rowCount ());
-+
-+    // Update the filter
-     proxyModel->setFilter (text);
- 
--    int focus = m_playlist.get_focus ();
--    QModelIndex index;
-+    // Repopulate the model
-+    model->entriesAdded (0, m_playlist.n_entries ());
- 
--    // If there was a valid focus before filtering, Qt updates it for us via
--    // currentChanged().  If not, we will set focus on the first visible row.
-+    // If the previously focused row is no longer visible with the new filter,
-+    // try to find a nearby one that is, and focus it.
-+    auto index = visibleIndexNear (focus);
- 
--    if (focus >= 0)
--        index = rowToIndex (focus);
--    else
-+    if (index.isValid ())
-     {
--        if (! proxyModel->rowCount ())
--            return;
--
--        index = proxyModel->index (0, 0);
-         focus = indexToRow (index);
-         m_playlist.set_focus (focus);
--    }
--
--    if (! m_playlist.entry_selected (focus))
--    {
-         m_playlist.select_all (false);
-         m_playlist.select_entry (focus, true);
-+        scrollTo (index);
-     }
--
--    scrollTo (index);
- }
- 
- void PlaylistWidget::setFirstVisibleColumn (int col)
-diff --git a/src/qtui/playlist-qt.h b/src/qtui/playlist-qt.h
-index a2894323c..df44205af 100644
---- a/src/qtui/playlist-qt.h
-+++ b/src/qtui/playlist-qt.h
-@@ -66,6 +66,7 @@ class PlaylistWidget : public QTreeView
- 
-     QModelIndex rowToIndex (int row);
-     int indexToRow (const QModelIndex & index);
-+    QModelIndex visibleIndexNear (int row);
- 
-     void getSelectedRanges (int rowsBefore, int rowsAfter,
-      QItemSelection & selected, QItemSelection & deselected);