gentoo resync : 29.06.2020

4 files changed, 158 insertions, 7 deletions

diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 61b0cc1c23b3..a12c4e99fddf 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,7 @@
+AUX powerdevil-5.18.5-fix-powermgmt-inhibition.patch 3326 BLAKE2B 56eed72622b6432f3e823ef0cfe9f99d963ab7563fdcf95655072551d45d32a0dec83c5d125ea804a0749225c62f1f02e9d4df546acd3df225a7439d75b0cbaf SHA512 8713a906e70f5c11e8da95258c7db130ec8f81031813203472fb7696076296e59085fcb7b704152937efd7829a9bea7d4c9e1b3d60e3ac976d810d06f0a35941
 DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
-DIST powerdevil-5.19.1.tar.xz 600072 BLAKE2B 17eb818523d06a78ae8fed9487acd52f388b63f8cddf2ab4eaf027f8ddcccfa5460993f3acdb6c8ec002acd168763c5cbad88fbd5ad83df5e43ab256e4847a7a SHA512 31cf3f0ffd6c4a7161c7facafa712aa8c55fbfb154b13cfb794f60c9097fa5d9bb02b98b9fdd5979e111e652d13cc8de18ba373120b8cc4e61aeab98dba87e3e
+DIST powerdevil-5.19.2.1.tar.xz 600120 BLAKE2B aaa6e4cac173ab6b16f05fdbc1ba436b5b15d8bebf8ab7f87745734c49b7433dd0dd08c54446bef01c8bc840e1bca12035dfbab50f829ee43dfffff68d338ff8 SHA512 937569c8b677a08e92f4daeb67d6e8c29de0debd64591f339ca5445d9248431d593852ea85ad62ebe27a6c5fa90c989826d1d8a6678bec14783687f3fd938c1f
+EBUILD powerdevil-5.18.5-r1.ebuild 1955 BLAKE2B dd399d4215373ca4e4ddcd8746d0d2f809bec25f3ab771723eded65fa3a9513780d50e33b8f808651e9059ff11ad595a15a19bb6f9f7f42f26bdd7d8d3071e4f SHA512 a6b9381c04af9a398640dfcb3c2752f94d1c7b35c6d04b232ff66b0ff8c58172d85376d71d35d151526298bac19dae53b55e53f6f8e815eb5f28292dacd91432
 EBUILD powerdevil-5.18.5.ebuild 1872 BLAKE2B 46ab9c544e709262b937789c9e04a04aeeb6ab849d79590f9e75a6cb558f9cdcac31e9961e17da24ef19ec3fa67e92cacd1438ec0943603de314d9832c3771b8 SHA512 612c2b81b1b6ee6b76c6d9d82ef0046f6ee007702c6870540dcd3b560e1f72dc42e4ba2df3d70396ba1f279b92beec234ed6e82fdf304ce6a40e47400ef91871
-EBUILD powerdevil-5.19.1.ebuild 1870 BLAKE2B 09be30cfc6f716ce31f7a11fb33688bf53c74ba18297c4b6aa7b179187f85b75c430d99af471812fbd89568c7716f58733e0dcd0e7e98434500a4f5904f85d0e SHA512 ed4a90ed86ca236aeb3e658ba8f4ce14308276406e58b229e846654167177a110a6fec0a40e8f8c3c47468296110da83f928f4851003bd4befbbe5fb8a57fe74
+EBUILD powerdevil-5.19.2.1.ebuild 1870 BLAKE2B 9fd4330cb18328f800f2c161a792df25a417ecc88ad855f53966a1001aa20ebab5273f28b1e816d5514ecf4380de9c42aa571d8912fbeb4343196383584e574f SHA512 d958b7ad5683f71b1e3eadd90f3d2d44bf5e97f14471960da2e3fe5241dd79075c35300c27c92d7a5ac7fb4e5ecf609194ff31ec1da0c1700ed73530d1b33f86
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
new file mode 100644
index 000000000000..cb6e27b7a977
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
@@ -0,0 +1,80 @@
+From d21102cc6c7a4db204a29f376ce5eb316ef57a6e Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Fri, 19 Jun 2020 19:51:06 +0200
+Subject: [PATCH] Watch DBus service right away to discard pending inhibitions
+ reliably
+
+PowerDevil delays applying a power management inhibition by 5 seconds to avoid brief inhibitions
+to e.g. wake up the screen and similar.
+However, when an inhibition was posted and the process then quit, we would then still
+enforce the inhibition as it wasn't explicitly revoked.
+Fix this by always watching the inhibition sender and remove it from pending when the
+service goes away.
+
+BUG: 423131
+FIXED-IN: 5.18.6
+---
+ daemon/powerdevilpolicyagent.cpp | 26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
+
+diff --git a/daemon/powerdevilpolicyagent.cpp b/daemon/powerdevilpolicyagent.cpp
+index a7d92dfd..2c2b1152 100644
+--- a/daemon/powerdevilpolicyagent.cpp
++++ b/daemon/powerdevilpolicyagent.cpp
+@@ -513,6 +513,11 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
+ 
+     const int cookie = m_lastCookie; // when the Timer below fires, m_lastCookie might be different already
+ 
++    if (!m_busWatcher.isNull() && !service.isEmpty()) {
++        m_cookieToBusService.insert(cookie, service);
++        m_busWatcher.data()->addWatchedService(service);
++    }
++
+     m_pendingInhibitions.append(cookie);
+ 
+     qCDebug(POWERDEVIL) << "Scheduling inhibition from" << service << appName << "with cookie"
+@@ -532,11 +537,6 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
+ 
+         m_cookieToAppName.insert(cookie, qMakePair<QString, QString>(appName, reason));
+ 
+-        if (!m_busWatcher.isNull() && !service.isEmpty()) {
+-            m_cookieToBusService.insert(cookie, service);
+-            m_busWatcher.data()->addWatchedService(service);
+-        }
+-
+         addInhibitionTypeHelper(cookie, static_cast< PolicyAgent::RequiredPolicies >(types));
+ 
+         Q_EMIT InhibitionsChanged({ {qMakePair(appName, reason)} }, {});
+@@ -596,22 +596,20 @@ void PolicyAgent::ReleaseInhibition(uint cookie)
+ {
+     qCDebug(POWERDEVIL) << "Releasing inhibition with cookie " << cookie;
+ 
+-    if (m_pendingInhibitions.contains(cookie)) {
++    QString service = m_cookieToBusService.take(cookie);
++    if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
++        // no cookies from service left
++        m_busWatcher.data()->removeWatchedService(service);
++    }
++
++    if (m_pendingInhibitions.removeOne(cookie)) {
+         qCDebug(POWERDEVIL) << "It was only scheduled for inhibition but not enforced yet, just discarding it";
+-        m_pendingInhibitions.removeOne(cookie);
+         return;
+     }
+ 
+     Q_EMIT InhibitionsChanged(QList<InhibitionInfo>(), { {m_cookieToAppName.value(cookie).first} });
+     m_cookieToAppName.remove(cookie);
+ 
+-
+-    QString service = m_cookieToBusService.take(cookie);
+-    if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
+-        // no cookies from service left
+-        m_busWatcher.data()->removeWatchedService(service);
+-    }
+-
+     // Look through all of the inhibition types
+     bool notify = false;
+     if (m_typesToCookie[ChangeProfile].contains(cookie)) {
+-- 
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
new file mode 100644
index 000000000000..79f0394f5fe1
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="brightness-control +wireless"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	wireless? (
+		>=kde-frameworks/bluez-qt-${KFMIN}:5
+		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=sys-power/upower-0.9.23
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-powermgmt-inhibition.patch" ) # KDE-Bug 423131
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DDCUTIL=$(usex brightness-control)
+		$(cmake_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.2.1.ebuild
index 74006f4b7781..53be36d6572c 100644
--- a/kde-plasma/powerdevil/powerdevil-5.19.1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.19.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
+KFMIN=5.71.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.14.2
 inherit ecm kde.org
@@ -18,6 +18,10 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="brightness-control +wireless"
 
 DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kactivities-${KFMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -39,10 +43,6 @@ DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-plasma/libkscreen-${PVCUT}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
 	virtual/libudev:=
 	x11-libs/libxcb
 	brightness-control? ( app-misc/ddcutil )