gentoo resync : 12.05.2022

5 files changed, 6 insertions, 151 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 153eff2922c1..f970083ab337 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,7 +1,5 @@
-AUX dolphin-21.08.1-port-to-KTerminalLauncherJob.patch 3579 BLAKE2B efcff49c7089d419f8c62b93fe0a5ef6459055a1a761b34c0bb40c20bf3c5a17daa1c1e77974158733573f479125f0c53985ba38547d07090f15f65907fa41c2 SHA512 35b21983204583aef7dd980faecb8c33eb88f50841f8b9996c3f2784393cc1d9cff85e57581cd3c380bd62dc51802979be9882c4d4d1102799a0038f734176f9
-AUX dolphin-21.08.3-fix-ProvidersUrl.patch 940 BLAKE2B 276ed217e986cfc3df675bcbedfd7bb1458d91588b8ec5759f6a036bb5dfd519cd8a570a97eb219aad56edcf828c8eaa412a9ade86b26a876fed965a8184f6d4 SHA512 a56b1d8917d8839b75a1357cf7e77e2e0039bf733f1ec802967df7a07957c4b632f3df736569093eb733eac2f3942da13b33bc409d789f7c759a63b4777f0a12
-DIST dolphin-21.08.3.tar.xz 5327496 BLAKE2B 864016bdb3b30c181eeb158ad0b418c27556f8e0d1bcd2da495cc387667a99e655abcd320a352157156443ab91bd2b1820dce7cb10a4b8d226b5b07dcb46b167 SHA512 918be8ff9ac01ce9e9f0f575a31e70687b24edc08f022cc991922a136bda5900f5cc431b056d2aac8349858e3b9592c365b1cfa8e4bbf01f86eb7be8cbca751e
 DIST dolphin-21.12.3.tar.xz 5346076 BLAKE2B 847a4abc0359cf4a45655746e3020b880550aaaadcbae190bac89bf77328f684932500b8ddf89a7c99b7680c2d3ddec9a8d288db03b4873146a7f89b29a64855 SHA512 bfd52cd88b205f375858c26062d278e8e619026a34d93d370d0913feaac3eb65bae2456c118d9f8f35f52c5982b7daaef8ba4012e4b8fdf27c8c435866ad1e0b
-EBUILD dolphin-21.08.3-r1.ebuild 3322 BLAKE2B 313ed40bf9696b806f17a65778979ffa7a77fbe852aeff727919f768423849d3d2d762316752e83699f61497c4e183812ba0f77f46301aafebba585bd75eeeb9 SHA512 860b6fb994af8d5bb4d868ca2214bc846572604b4b291ac5ef0d12e4cf704944c9a6a9b13a087e5e2f4c09a7e5a8557f356e4680e5419758b3fc2d2774848a25
-EBUILD dolphin-21.12.3.ebuild 3103 BLAKE2B 0bdbfb1111da174dc3f495a64c2033a7d02c8b6e7dbf9c895c9a410139a30c50fe16d6f3bcccf0887d3b6a0b4d7adf7999cc03147d2c279ebe434272077ee50e SHA512 08d234167c797482295099058a9f858cda672e44004ac0fa7f2222498b835a94ee7af0d64d5ffdda64b01f22918f80fe81c9ba72062bc39b0267e0a2cfdffb3a
+DIST dolphin-22.04.0.tar.xz 5329504 BLAKE2B ea1b9cccbb2d063d45731a6a0c48f8602f50762fdf5766819b8206f71c64923907e82d83f36900e95e7f2caf1f52b2d9f006a0c304b3d391b5d5d7403997b2b0 SHA512 30164646c93015eb2a840b3e48d841bb1f5c0acc2173c28bb4c20e29fb90d720258cb3e813b5b2b661a81ad1df4114f233ee722a3e196cb4374b348f9ee6251b
+EBUILD dolphin-21.12.3.ebuild 3102 BLAKE2B 29b5e44dd6564ea1a98447657715ee884089e50659480d5ae2316a6fb72bca7ff4875537995ed35827c6de7b3c704648681b6fe296b49a6b2c7da8cdee31060c SHA512 302c02f70d7a60615e43a9bcffe5fca0155db4472594a9dd73b51e57ac7a5a690fca25af83f82e73915d92297b92894fe352fc27da8c46c7062c0ad1f9fb4b6f
+EBUILD dolphin-22.04.0.ebuild 3105 BLAKE2B 6788339fa994e3b89952d132c627ca07543b9fcd3a1783e25c7ee0f49e3d8d3a7de28df693f451b189b72f859ba61fbe121f6ac42c51599062feb009f0fa7bea SHA512 923c8e867932e5be5e0555ef8bf13ff764c217c08afc82680bc030640d19032b48962fb8c6f3b6a997ba728991937816541af4585370789a0ec4bc33e7c7f1ca
 MISC metadata.xml 430 BLAKE2B 4e7f2312a9ff5828bb5090867a1cb3f8e80365cf7fe92e45973ee6d1fbf1bafaa9427227b6cc424214b4892c92188918c36e25ca346a89e44e2b2ea25d2871b8 SHA512 cd3e017e0c9259940450a1b7a6fa5b8c81e82963b3c4d63b0921474f42651076a0fd7c3dd90d8a23b57646ed6eb2ccba8fbd41944d4e874a4e2ac58c981a68c0
diff --git a/kde-apps/dolphin/dolphin-21.12.3.ebuild b/kde-apps/dolphin/dolphin-21.12.3.ebuild
index 74be3ce5b887..62fa56fd98e7 100644
--- a/kde-apps/dolphin/dolphin-21.12.3.ebuild
+++ b/kde-apps/dolphin/dolphin-21.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="activities semantic-desktop telemetry"
 
 DEPEND="
diff --git a/kde-apps/dolphin/dolphin-21.08.3-r1.ebuild b/kde-apps/dolphin/dolphin-22.04.0.ebuild
index d4a96ad6d8a2..14bcc7ada2cc 100644
--- a/kde-apps/dolphin/dolphin-21.08.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-22.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities semantic-desktop telemetry"
 
 DEPEND="
@@ -61,12 +61,6 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-21.08.1-port-to-KTerminalLauncherJob.patch" # KDE-bug 441072
-	# https://mail.kde.org/pipermail/distributions/2022-February/001128.html
-	"${FILESDIR}/${PN}-21.08.3-fix-ProvidersUrl.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/files/dolphin-21.08.1-port-to-KTerminalLauncherJob.patch b/kde-apps/dolphin/files/dolphin-21.08.1-port-to-KTerminalLauncherJob.patch
deleted file mode 100644
index 2189355de6a5..000000000000
--- a/kde-apps/dolphin/files/dolphin-21.08.1-port-to-KTerminalLauncherJob.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 27bfcde4efaf936243fc41e4a61d0cac32105ef6 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 31 Aug 2021 09:09:14 -0600
-Subject: [PATCH] Port to KTerminalLauncherJob
-
-Dolphin still uses KToolInvocation::invokeTerminal() which is
-deprecated and requires KInit. However Dolphin was ported away from
-requiring it in other ways, so it is now possible to have Dolphin
-running but not KInit, which breaks the "Open in Terminal"
-functionality.
-
-Using KTerminalLauncherJob fixes this. It was introduced in Frameworks
-5.83, so the CMake dependency version is accordingly increased.
-
-BUG: 441072
-FIXED-IN: 21.12
----
- CMakeLists.txt            |  2 +-
- src/dolphinmainwindow.cpp | 14 ++++++++++----
- src/dolphinpart.cpp       |  6 ++++--
- 3 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7d50205bc..ec87cdecc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
- project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
- 
- set(QT_MIN_VERSION "5.15.0")
--set(KF5_MIN_VERSION "5.81.0")
-+set(KF5_MIN_VERSION "5.83.0")
- 
- set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
-index 62e347032..f3a5e3b4e 100644
---- a/src/dolphinmainwindow.cpp
-+++ b/src/dolphinmainwindow.cpp
-@@ -56,10 +56,10 @@
- #include <KStandardAction>
- #include <KStartupInfo>
- #include <KSycoca>
-+#include <KTerminalLauncherJob>
- #include <KToggleAction>
- #include <KToolBar>
- #include <KToolBarPopupAction>
--#include <KToolInvocation>
- #include <KUrlComboBox>
- #include <KUrlNavigator>
- #include <KWindowSystem>
-@@ -1033,7 +1033,9 @@ void DolphinMainWindow::openTerminal()
-     const QUrl url = m_activeViewContainer->url();
- 
-     if (url.isLocalFile()) {
--        KToolInvocation::invokeTerminal(QString(), {}, url.toLocalFile());
-+        auto job = new KTerminalLauncherJob(QString());
-+        job->setWorkingDirectory(url.toLocalFile());
-+        job->start();
-         return;
-     }
- 
-@@ -1047,14 +1049,18 @@ void DolphinMainWindow::openTerminal()
-                 statUrl = job->mostLocalUrl();
-             }
- 
--            KToolInvocation::invokeTerminal(QString(), {}, statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath());
-+            auto job = new KTerminalLauncherJob(QString());
-+            job->setWorkingDirectory(statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath());
-+            job->start();
-         });
- 
-         return;
-     }
- 
-     // Nothing worked, just use $HOME
--    KToolInvocation::invokeTerminal(QString(), {}, QDir::homePath());
-+    auto job = new KTerminalLauncherJob(QString());
-+    job->setWorkingDirectory(QDir::homePath());
-+    job->start();
- }
- 
- void DolphinMainWindow::editSettings()
-diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
-index 9c551d67a..8d528f418 100644
---- a/src/dolphinpart.cpp
-+++ b/src/dolphinpart.cpp
-@@ -32,7 +32,7 @@
- #include <KPluginFactory>
- #include <KIO/CommandLauncherJob>
- #include <KSharedConfig>
--#include <KToolInvocation>
-+#include <KTerminalLauncherJob>
- 
- #include <QActionGroup>
- #include <QApplication>
-@@ -567,7 +567,9 @@ QString DolphinPart::localFilePathOrHome() const
- 
- void DolphinPart::slotOpenTerminal()
- {
--    KToolInvocation::invokeTerminal(QString(), {}, localFilePathOrHome());
-+    auto job = new KTerminalLauncherJob(QString());
-+    job->setWorkingDirectory(localFilePathOrHome());
-+    job->start();
- }
- 
- void DolphinPart::slotFindFile()
--- 
-GitLab
-
diff --git a/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch b/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch
deleted file mode 100644
index 74472fd0943d..000000000000
--- a/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d0898592a17d14fc8d48fc5cba71f3d57f0a1856 Mon Sep 17 00:00:00 2001
-From: Ben Cooksley <bcooksley@kde.org>
-Date: Thu, 30 Dec 2021 07:31:41 +1300
-Subject: [PATCH] Use the CDN based endpoint rather than the legacy endpoint
- which hits our download redirector.
-
-CCMAIL: distributions@kde.org
-
-(cherry picked from commit 694e4e24526c5f55e162ad9288782e7c82cac38f)
----
- src/settings/contextmenu/servicemenu.knsrc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/settings/contextmenu/servicemenu.knsrc b/src/settings/contextmenu/servicemenu.knsrc
-index 59d459895..4374082c7 100644
---- a/src/settings/contextmenu/servicemenu.knsrc
-+++ b/src/settings/contextmenu/servicemenu.knsrc
-@@ -1,5 +1,5 @@
- [KNewStuff3]
--ProvidersUrl=https://download.kde.org/ocs/providers.xml
-+ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
- Categories=Dolphin Service Menus
- TargetDir=servicemenu-download
- Uncompress=never
--- 
-GitLab
-