gentoo resync : 13.10.2019

4 files changed, 5 insertions, 33 deletions

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 6c692bdeb578..4c5eb92b0cf0 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,7 +1,6 @@
-AUX qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch 1177 BLAKE2B e11b201b5852017e17343340ff79b106667117b1271dc1b53d99d4ca44df31f81cbfa5ef8403695a0902e8e2350d499f5e52e2e83e5331a3808d4fc23a7a870f SHA512 65637b31469f2fe5b9a97383adf63f3bdc65d90c759d5d71981ebc8e65ed653b761b3fa5d35dbf407cbff75a97e9442dc799624f957a0a74561098969ed779d8
-DIST qbittorrent-4.1.6.tar.gz 7780676 BLAKE2B fe2572bece5a014d821cf905a13a45f71c63eda661b338a90517a23d257d83f556c1ad1bd064cc2840e9731886d7afaafa36ea50f8c3fe8ff05fc3ec3a12c478 SHA512 14c337257a71a7a6f850bbbbe3effe6f34c299fe71486c1a71160f54ccc7377a5c8e742ca2fd85cf198b2a603fdfee50bdb19b33a10899f86f8499468ca8a735
 DIST qbittorrent-4.1.7.tar.gz 7803389 BLAKE2B 6a8cf01c2bd86b63b629877fd3446db4aedd1591058af24c14dd4b69f0abae7f3ca715190fa0496b1a3ec742d4ee12585dd27e27c1465a1d22a149c2d47608ca SHA512 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4
-EBUILD qbittorrent-4.1.6-r1.ebuild 1544 BLAKE2B 3f55264180555674103b3297165b760ddb1e818fbed002526cbc683dd2616bbc84c4e7bf81fb803d6680412f9c4b183638a2039a388664cb636cc2bd02f0463b SHA512 7fd200c4163f71b1a88fd818f9bdb52ecf771d713c6b589bd4958f425a045a50428f5f17212b2a23b7d02e3e1dedaecfbdf434710fbfee4040725bb9f31646c2
-EBUILD qbittorrent-4.1.7.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db
+DIST qbittorrent-4.1.8.tar.gz 7803739 BLAKE2B ee56e004945025f06b179b08e938c6a3182f252c3bed6990158634ea1fdfd525fd67d105fd7ecdf0217a4bd73d847c5007d1e95f492f4f4e41c32d22dd6b7523 SHA512 8920e98f8db5dd738caab8815cc4a10950c34ba2eaa19b50479bb2ab548f6f297534759d71791caa4c8bfbea92d4b71d223a27fae150e00cc0a262eb3370a1e3
+EBUILD qbittorrent-4.1.7.ebuild 1471 BLAKE2B 4425b0c76189dc80766092cfcea3939951918051fe73c14c9b7bc270ce4cdd4cea1bf9d879ca0aa1791d197bd331e4426fdb195eae78d59e0764cbff948d45d5 SHA512 e3660d0920d56b236f0309eeb9af01b4fe83d091687a814970ea33d7c5ed7be242bb1f7996b0cbbbacfd3b3e998250b175c412d0abca05a42b53bf80fc35bada
+EBUILD qbittorrent-4.1.8.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db
 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
deleted file mode 100644
index 361f7aa22553..000000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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.7.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild
index e4e1c16a3150..19a8c92ab041 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
 else
 	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S="${WORKDIR}/qBittorrent-release-${PV}"
 fi
 
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild
index 1031d3dfb61f..e4e1c16a3150 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
 else
 	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 	S="${WORKDIR}/qBittorrent-release-${PV}"
 fi
 
@@ -44,8 +44,6 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-no-screenblank-on-close-to-systray.patch" )
-
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
 src_configure() {