gentoo resync : 19.07.2019

3 files changed, 42 insertions, 12 deletions

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 0946b433bde8..a2ff4dc19269 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,8 +1,9 @@
+AUX qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch 1177 BLAKE2B e11b201b5852017e17343340ff79b106667117b1271dc1b53d99d4ca44df31f81cbfa5ef8403695a0902e8e2350d499f5e52e2e83e5331a3808d4fc23a7a870f SHA512 65637b31469f2fe5b9a97383adf63f3bdc65d90c759d5d71981ebc8e65ed653b761b3fa5d35dbf407cbff75a97e9442dc799624f957a0a74561098969ed779d8
 DIST qbittorrent-4.1.4.tar.gz 7718217 BLAKE2B 46fc3ad230a74cc2f05bdfe5f53b6b39e0dcd99afff941614345ef1d85492f647080a6111c403f30746b24d1b03e1a6fd196015c7646dc5ab5c73027a8c8c5b8 SHA512 2621a9b6a19609bafd2d99336e5dc4c5f4aef9e5ab6ecebd9c622c759cdcea2a18999c08a70ac32d88fbd65c310749ea2254562152c1d3886285aa7c5c86bf68
 DIST qbittorrent-4.1.5.tar.gz 7719557 BLAKE2B d849227443843684d16ba93e65a64b2d637f1ce41c2f5c3a1ee46db74c7497d0d3cb6b627bfee79ce2e4f2b99ee252287b584542cd47003a1055a43bf0f63cfc SHA512 e090ecc9343ff94874a6d54d487a672dcd44a943da4e2d625b5f7db849c861173c12c870f4d7f0843a60fdffd1fbbd74d05d48223bd3ebf32b7a1ef478c95dec
 DIST qbittorrent-4.1.6.tar.gz 7780676 BLAKE2B fe2572bece5a014d821cf905a13a45f71c63eda661b338a90517a23d257d83f556c1ad1bd064cc2840e9731886d7afaafa36ea50f8c3fe8ff05fc3ec3a12c478 SHA512 14c337257a71a7a6f850bbbbe3effe6f34c299fe71486c1a71160f54ccc7377a5c8e742ca2fd85cf198b2a603fdfee50bdb19b33a10899f86f8499468ca8a735
 EBUILD qbittorrent-4.1.4-r1.ebuild 1520 BLAKE2B 82ff5d353ba5d1d7ee43276bc012051f12b29b6cf60b5c90b248e1e1d3c6d7c56eb30cff6e540e8cc5a953fb4dd74fb8bfa529272cf374b076ce154bc4664a1b SHA512 97ac862854c1cb5a89d311a2b3e1cb4b38544bfe9b4cc1da6f41c3b5ec0a09b50fa07ad359e2b371a6af14fc2b9e0462e621af2b88d61dd77886e6cbf81e2838
 EBUILD qbittorrent-4.1.5-r1.ebuild 1520 BLAKE2B 82ff5d353ba5d1d7ee43276bc012051f12b29b6cf60b5c90b248e1e1d3c6d7c56eb30cff6e540e8cc5a953fb4dd74fb8bfa529272cf374b076ce154bc4664a1b SHA512 97ac862854c1cb5a89d311a2b3e1cb4b38544bfe9b4cc1da6f41c3b5ec0a09b50fa07ad359e2b371a6af14fc2b9e0462e621af2b88d61dd77886e6cbf81e2838
-EBUILD qbittorrent-4.1.6.ebuild 1476 BLAKE2B 17de90559b1830bd74b745589e7fdd9f3b6eb9de191ab0e6083bbafe66143549117ab94bc5dd0fd587c17a3e34f7b7775121c622ec4333e9ec648a41d6cd37fd SHA512 bffb41425575c458fd7db4eba7ec071dbad620cb65c84aab7a18b4b9670587eee33139b12e9a370875857b6f806531ad24ee32b740538e6e94b055ccfc185acd
+EBUILD qbittorrent-4.1.6-r1.ebuild 1546 BLAKE2B d3f73d273caf5adf17ed6e5714532ef547cd0a6323c2a2f0c2344a1a9f1e7be030ac3e2dd10a340f8b6bdb66d435c0305e5204f5a5ba065b2a2dbd9772b63b14 SHA512 f2f7f6cb5f08fc4d6f76594d20b1d7e7490916af2a59ccc425e48ad7b24710f0a09883ea2396ea54426dd65f1f78d0aecf2b0779c5d0f32131a7157a1ae11531
 EBUILD qbittorrent-9999.ebuild 1476 BLAKE2B 17de90559b1830bd74b745589e7fdd9f3b6eb9de191ab0e6083bbafe66143549117ab94bc5dd0fd587c17a3e34f7b7775121c622ec4333e9ec648a41d6cd37fd SHA512 bffb41425575c458fd7db4eba7ec071dbad620cb65c84aab7a18b4b9670587eee33139b12e9a370875857b6f806531ad24ee32b740538e6e94b055ccfc185acd
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch b/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
new file mode 100644
index 000000000000..361f7aa22553
--- /dev/null
+++ b/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
@@ -0,0 +1,25 @@
+From 9a4dd3ea9d1fc2af0cc5724ebb19fc99297c2960 Mon Sep 17 00:00:00 2001
+From: Ekin Dursun <ekindursun@gmail.com>
+Date: Tue, 7 May 2019 02:08:46 +0300
+Subject: [PATCH] Don't turn screen blank when closed to system tray
+
+Closes #9240 and possibly #9121, as @zeule suggested here: https://github.com/qbittorrent/qBittorrent/issues/9240#issuecomment-408025722.
+---
+ src/gui/mainwindow.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
+index 4c62ba5d90..0b8b41ebab 100644
+--- a/src/gui/mainwindow.cpp
++++ b/src/gui/mainwindow.cpp
+@@ -1158,8 +1158,8 @@ void MainWindow::closeEvent(QCloseEvent *e)
+ #else
+     const bool goToSystrayOnExit = pref->closeToTray();
+     if (!m_forceExit && m_systrayIcon && goToSystrayOnExit && !this->isHidden()) {
+-        hide();
+-        e->accept();
++        e->ignore();
++        QTimer::singleShot(0, this, &QWidget::hide);
+         if (!pref->closeToTrayNotified()) {
+             showNotificationBaloon(tr("qBittorrent is closed to tray"), tr("This behavior can be changed in the settings. You won't be reminded again."));
+             pref->setCloseToTrayNotified(true);
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.6.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild
index 30188ae78c36..ae75d7415fa6 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.6.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils xdg-utils
+inherit xdg-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="https://www.qbittorrent.org
@@ -23,6 +23,10 @@ SLOT="0"
 IUSE="+dbus debug webui +X"
 REQUIRED_USE="dbus? ( X )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-libs/boost-1.62.0-r1:=
 	dev-qt/qtcore:5
@@ -38,18 +42,18 @@ RDEPEND="
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-no-screenblank-on-close-to-systray.patch" )
 
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
 src_configure() {
 	econf --with-qtsingleapplication=system \
-	$(use_enable dbus qt-dbus) \
-	$(use_enable debug) \
-	$(use_enable webui) \
-	$(use_enable X gui)
+		$(use_enable dbus qt-dbus) \
+		$(use_enable debug) \
+		$(use_enable webui) \
+		$(use_enable X gui)
 }
 
 src_install() {
@@ -58,11 +62,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }