gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 37 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 13894ce3145b..6d07e03b54e2 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,9 +1,8 @@
-AUX clementine-1.3.1_p20190609-fix-restore-from-systray.patch 1235 BLAKE2B 9904a6df024998d4268ca952fc2c17cebec01873b93aa141ac6db193e1a69481d4f7f5f02cf9fec6174eb390fce66b443ef86de8b2379c6c9192c6d5eed5edd8 SHA512 86be2b64b38347d5f0bd086dd35970d6f2c1fcffe315a116d68251193e91a05a0fe02f029d558290d4ebc09175067f0f2bb4e59bb58984150d52d219a8c9503e
 DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
 DIST clementine-1.3.1_p20191004.tar.gz 8528437 BLAKE2B 11c7bd7ac4ad4cdc75e2c5e54651832c1aa31448341230917df973227fcb1cd659309bb361f0b62a12dc38ce48e1f25697742df478650f4c10996938a7093acf SHA512 eb755d47f2e518c4e1bb28596e6554184d9fb6bab594e2f16b73c0bdecaa7c19692d368e9ec6a91e5012b786368eb7d3b2d051db11f3b5934233ba3e5b488679
 DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
 EBUILD clementine-1.3.1_p20190127.ebuild 5027 BLAKE2B 5b9fb6dbbf5b57be7c610e882afc7f5e0bbfebc164b66d471092475106ce9b11e2dafb12d3f383320fa41c0c411c8cceb9644a940e4947b024d48ffab6bf2705 SHA512 1c85a20de5367dae202e44ae93845b5333e89c72f135a180c3f25c8218eb122209a8076a6f72266b242f619ad1c45cd5ac06102f37d0b7b8be90641b85403299
 EBUILD clementine-1.3.1_p20191004.ebuild 4597 BLAKE2B 92e229aa5164fff33e1f099eca0d92dc235b72798a28b524e1588b66e0693fbc1f0050fdc59a454f90eeafcca5fcd0f2625f06c9b391c01cbae3b190b2875537 SHA512 8166d382f4be0047e6423f5f9105a40aed4d617565f3fd019356774ab320a9aa346fef67ec722d673719c238e68f2083f7d57cf271bb2a690b732fe4d89777b3
-EBUILD clementine-1.4.0_rc1.ebuild 4837 BLAKE2B 03f253d587282b49f18abb0cb13d4ef6a2e368e738e9a6bec180d1554d9b17cfbfcbd128c94fd82c1b3f7073dbcea9d5ca520971c513e3ee38b59e2c70bf6b71 SHA512 1250358eeeca2fafb93cc749f9616385daed37129f82a5ec41e21a8984358ba4eb4ea7e7f22a283507fa2707added4d307b006e9f77b1e7360bbe22ce474b88e
+EBUILD clementine-1.4.0_rc1.ebuild 4836 BLAKE2B 41a40559ed037a1f8988ebd9ddad0c566c9146c271b83a27b5eec18b697af8b49e19f278137b33a169ea5058ea4013ee1a6a489f80c59ac2a12156bd13a1411c SHA512 1efcd27eede95c2864d7ca41e2437b2c3c345c41468eb8b0be095f5b949714a2e5bad0b4d6d4664601e3da8d3d49dd1f234a9805143445643c67ffbaf7f3c82c
 EBUILD clementine-9999.ebuild 4820 BLAKE2B 2fe724b22cc8b7b60e6b71a82fc39c9975e722690905b223f19d910f35ddcd238987dfd5a6cebc63169ee952cd1214e68e1e11768ff281b0ae230a11d0eaf373 SHA512 969c6a71948ce2d59b3074fbe481853ef269168f59a1f9dc74cc1f4cf1508b6c6b726f0b64e4f8c55fdbab14f6c3201064be4033aa4641afd9b1fa53f621a495
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index 8d5ccbe101be..df13da4343c5 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -23,7 +23,7 @@ else
 	else
 		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 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"
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch b/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch
deleted file mode 100644
index 9f27e219e89d..000000000000
--- a/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1bf633e71b7b5d8e5965971036d66e1d18552b49 Mon Sep 17 00:00:00 2001
-From: Michael Niggli <m.niggli@gmail.com>
-Date: Fri, 31 May 2019 17:04:46 +0200
-Subject: [PATCH] Fix blank window when restoring from systray
-
-This applies the fix qBittorrent used for this same issue:
-https://github.com/qbittorrent/qBittorrent/issues/9240,
-so credit goes to those guys
----
- src/ui/mainwindow.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
-index 2944d46ec..ad603fd64 100644
---- a/src/ui/mainwindow.cpp
-+++ b/src/ui/mainwindow.cpp
-@@ -1441,7 +1441,7 @@ void MainWindow::closeEvent(QCloseEvent* event) {
-     keep_running = s.value("keeprunning", tray_icon_->IsVisible()).toBool();
- 
-   if (keep_running && event->spontaneous()) {
--    event->accept();
-+    event->ignore();
-     SetHiddenInTray(true);
-   } else {
-     Exit();
-@@ -1454,7 +1454,7 @@ void MainWindow::SetHiddenInTray(bool hidden) {
-   // Some window managers don't remember maximized state between calls to
-   // hide() and show(), so we have to remember it ourself.
-   if (hidden) {
--    hide();
-+    QTimer::singleShot(0, this, &QWidget::hide);
-   } else {
-     if (was_maximized_)
-       showMaximized();