gentoo resync : 25.11.2020

5 files changed, 13 insertions, 162 deletions

diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 3ead3c9f4eca..836fe43cc57e 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,8 +1,6 @@
-AUX powerdevil-5.18.5-fix-powermgmt-inhibition.patch 3326 BLAKE2B 56eed72622b6432f3e823ef0cfe9f99d963ab7563fdcf95655072551d45d32a0dec83c5d125ea804a0749225c62f1f02e9d4df546acd3df225a7439d75b0cbaf SHA512 8713a906e70f5c11e8da95258c7db130ec8f81031813203472fb7696076296e59085fcb7b704152937efd7829a9bea7d4c9e1b3d60e3ac976d810d06f0a35941
 AUX powerdevil-5.19.4-ddcutil-0.9.9.patch 975 BLAKE2B b151f0109b4ee804359c63171df3020334f8410baaa4f24155d9f478540254645866eabb594040f334ae811d2bb6c4016cb5c175a64626aafd229babe312e391 SHA512 d1bfb6d7b16b80077989af9bf7600d063c5811d1fa115ce8985099022b468bacd54a4cd41283766780eb5734dc3d8d26798c9d74f5aa7f2bc003aa76b7c131ad
-DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
 DIST powerdevil-5.19.5.tar.xz 600388 BLAKE2B 0b99c229b576d8a033187dd81a0f6f199ff991f9c1eb4c6856a77a7ddd269ddf1ce50a76ea71821487be11593f5740a7d66a2af3e6b6c1f983a5e87bfc008b9b SHA512 5f1b1e8fdcd996769024a4f008527960fc91af32862047fdd13674ddb6925fd7b1a024a5c45182d14be32aa0bb8ba1bc694476061e480bcdfb3bdcb65d60cb16
-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.5.ebuild 1948 BLAKE2B bb192efbe6dee836219db8377f1db9cf5d2953b158964e766accab5b690c17e773c484fd50917db07a52086bc16cd7522693162061839475f71f4181be9251ee SHA512 f86ad662ab07ea2a023fe0382b481119a3315e3e22ce96f1c081199a13790b8d5a9012923ce209dc84184fa63f48ff67cc51b9340cce717b91554d4164c1c5fe
+DIST powerdevil-5.20.3.tar.xz 609300 BLAKE2B df64f234c68abb5145263e6f2d7089d9780a62aa1aafb4cac6e74f0d65f5ee6dfcac7f2c442d34e4e468380098ab67cdd806550be7dd6e6154d091d1669d8ff8 SHA512 5fce022b73e38bbf6098de86b8ede2bffd571cce9985f18f57c2ddc1e2a2e3bd8d1fe4ced9461f17f68b4b68a39e0b6210a75d86f7f41abc916362ebd25279c4
+EBUILD powerdevil-5.19.5.ebuild 1945 BLAKE2B 764373c637212f2bbe811f850f6963980c0f4675b5ee34ed93defe6d63cc2eb19c83286c311c77b55701b6df34ff34953bd2f479a19572dbf395bf4077c76b81 SHA512 cfb3119edd15b9d212b1296d761bf4cf6e07cc59b21ea5406674e877177d21e7a644ccd62d211a8384954a678d2f7c4c91d8e4715c44a40545243537515b4f1e
+EBUILD powerdevil-5.20.3.ebuild 1947 BLAKE2B d67cbe9ffadd9ff582870e0c7908811107f1d3184647d0d6719679c88bb4f02dba0466a23dbcf442b627234576519a679021f37527412329731d63f87a26b0e2 SHA512 95167af47d29051ab417f8b4589580479a1d33a01eebb714068071dae67d4c9ae6dfbe2a5161856036b3ec6f229300fd775ec46726178f8234d98b2475c03aeb
 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
deleted file mode 100644
index cb6e27b7a977..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
deleted file mode 100644
index da5ea9b9b346..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-"
-
-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.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
index 11f984743646..e2c03a38d2cc 100644
--- a/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="brightness-control +wireless"
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.20.3.ebuild
index 79f0394f5fe1..4bd73a392c96 100644
--- a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Power management for KDE Plasma Shell"
@@ -15,9 +15,13 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="brightness-control +wireless"
+IUSE="brightness-control caps +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,13 +43,10 @@ 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 )
+	caps? ( sys-libs/libcap )
 	wireless? (
 		>=kde-frameworks/bluez-qt-${KFMIN}:5
 		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
@@ -56,11 +57,10 @@ RDEPEND="${DEPEND}
 	>=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 caps Libcap)
 		$(cmake_use_find_package wireless KF5BluezQt)
 		$(cmake_use_find_package wireless KF5NetworkManagerQt)
 	)