gentoo resync : 05.12.2021

4 files changed, 7 insertions, 82 deletions

diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 75daca4ef327..1a0b72882666 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,5 @@
-AUX kate-21.04.0-implicit-dep.patch 2160 BLAKE2B e184cbf456f45e15904e17213813c935b548d1fba6cff98b162dcc4619d0ba166ae1db0c726a637c2b41bd95ebfe75d114259b5d7bcceccdf09141532e893d78 SHA512 23d56228dfdbcb419ec6ecc3353659efdc604f0786ce0ddff6dddb63a990a7086a7d6d777e038567fdbf049c14013d77fdd99f1b01022627a235ce597ca05140
-DIST kate-21.04.3.tar.xz 7283360 BLAKE2B 9520b6cffb284581aaa9bf70daad08fe5ab4570d433ea785a24d0c9122470c9d9d362026c3ea430924c453828001455a377e05537a83a2a81814df4de5e3cf72 SHA512 51c4023f3915edd348c1aa7ce448475f39c3401649510f89c7e17f9943739b67b09330e52b912794b31d4bbab1f94ed322f96bb45d450f016f84efa010d694bf
 DIST kate-21.08.3.tar.xz 7291244 BLAKE2B 190f166be207b513f3e2d723b08886fd70711ef1e409f6d52b7fb4ae8a748ce7fb279c081e1a758884622b05243e4bc0044c757a2bb5e17a141823009b8fa9fe SHA512 2977db9224fb5b49b3a210d8789fa5d644614f2a6ff72fa504337718f017f30ee209dcffb990d3aee8e1f322184e62195ca98668700a2d9becf4de9d9dda65b3
-EBUILD kate-21.04.3.ebuild 3166 BLAKE2B e3c3f161e2749c5b0b8e9b869aebd598f58961dd8c90601cffd9a03ce0e592eda40e8bc4cbcff9bd79d3ce126a3af9213261dafb9c0ef92baf724c514feea4b5 SHA512 baad229af96f7dfb9b27010036bab6d957b8671e7ae08dea451c1d88157ca7f52793d74474b8706cb72f2cda979b16ef44afca884fa377418c46152b55502562
-EBUILD kate-21.08.3.ebuild 3087 BLAKE2B 957746670c3462d9eaeb294716486d6802d8b4abd2f52e7dd2a4cc56150400d74f5a4d376abb6accefd9f5152386c1bd95a92438e59580897e415b64fad213e8 SHA512 b63cfe8193ae5a4449368bbde9ae4fe5a25ae727f364042c2ca7ed76b6ddf89674c6e526a33fe592730e362dfb52c3d80e8e196c5bebddd6d61a9ff5aa0c88da
+DIST kate-21.11.90.tar.xz 7377248 BLAKE2B bc8df04f926662a08fb5613a231686aeab6ac6f1b28a3677dc7c7af1dbf5aa53191019039927ebc64ede5ddd97a7d00814075d373b52d2031f9a08daebed1662 SHA512 b173d6327e4efbfe0c259596188e960edb4589a86cd34db0b53040533f5a5ce8ee4232834ea8e2a347ddc0a80aed96267b46974e249b4012e22553924bd9cdfc
+EBUILD kate-21.08.3.ebuild 3084 BLAKE2B b42508ab801a85caeb0fd71ea72a192ebb9269c42ca97fcca5feabe869187f1ed6b94932e8347d1841326594a048345abe8559a74dfe8307d22bd3dbacd41260 SHA512 d8e0b070edbc6d0b461080d8fc1daa1b9f7417ceae36b5cf23b9605ca3bb0828ae2bd7d07ad6bdeaf0ee1de03db6ac1d758d024dded467768ee1999a5fee6f8c
+EBUILD kate-21.11.90.ebuild 3087 BLAKE2B 91d8fb51c23e56f75baae7012286f08467e21ffe8d153b7c689b073748e331a55892cf630e4b500f0fd77f510bf5cb2b77cf67c0206658f04d1ce1e4be1cb0df SHA512 ae5219368072c28a34f5b04314e0de39a0f06cf6ae1fded1d33b42c4e372c18c0cbb45851c4ce5caee24fcc794429677f03cff57c821d53eed8c9932f35129b1
 MISC metadata.xml 931 BLAKE2B c19c14170c006897490abd974bdb13e6b3deaea6194aab5c5e370ef06aa05eda6848549618854a89d2711676191d9192eb35fb87fbfd5e367b06cc92f8ccc035 SHA512 7a7af87fb546dabcbd9fa834fc1521db489b45ca3a293a2439912af1921092956ce397dfdaa4c398eaf3f7cbeacd70743f7f083ec3306f79d48bb987b677584b
diff --git a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
deleted file mode 100644
index 482d9a872cd1..000000000000
--- a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 93d8c2a1887ab70455f471d8e05f346921497a36 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 24 Apr 2021 18:08:33 +0200
-Subject: [PATCH] addons: Add missing Qt5Concurrent to project and search
-
-Implicit use via KIO.
-
-See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- addons/project/CMakeLists.txt | 4 +++-
- addons/search/CMakeLists.txt  | 6 ++++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
-index 16487f6cc..b1f66ada3 100644
---- a/addons/project/CMakeLists.txt
-+++ b/addons/project/CMakeLists.txt
-@@ -1,3 +1,4 @@
-+find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET)
- find_package(
-   KF5 ${KF5_DEP_VERSION}
-   QUIET
-@@ -9,7 +10,7 @@ find_package(
- set_package_properties(KFGuiAddons PROPERTIES PURPOSE "Required to build the project addon")
- set_package_properties(KF5NewStuff PROPERTIES PURPOSE "Required to build the project addon")
- 
--if(NOT KF5_FOUND)
-+if(NOT KF5_FOUND OR NOT Qt5Concurrent_FOUND)
-   return()
- endif()
- 
-@@ -19,6 +20,7 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro
- target_link_libraries(
-   kateprojectplugin
-   PRIVATE
-+    Qt5::Concurrent
-     KF5::GuiAddons
-     KF5::NewStuff
-     KF5::TextEditor
-diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
-index 9bbe2c1c9..a541f78b8 100644
---- a/addons/search/CMakeLists.txt
-+++ b/addons/search/CMakeLists.txt
-@@ -1,7 +1,8 @@
-+find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET)
- find_package(KF5ItemViews ${KF5_DEP_VERSION} QUIET)
- set_package_properties(KF5ItemViews PROPERTIES PURPOSE "Required to build the search addon")
- 
--if(NOT KF5ItemViews_FOUND)
-+if(NOT KF5ItemViews_FOUND OR NOT Qt5Concurrent_FOUND)
-   return()
- endif()
- 
-@@ -9,8 +10,9 @@ add_library(katesearchplugin MODULE "")
- target_compile_definitions(katesearchplugin PRIVATE TRANSLATION_DOMAIN="katesearch")
- 
- target_link_libraries(
--  katesearchplugin 
-+  katesearchplugin
-   PRIVATE
-+    Qt5::Concurrent
-     KF5::ItemViews
-     KF5::TextEditor
- )
--- 
-2.31.1
-
diff --git a/kde-apps/kate/kate-21.08.3.ebuild b/kde-apps/kate/kate-21.08.3.ebuild
index b0fe1f5e3c3a..72d30bea2b89 100644
--- a/kde-apps/kate/kate-21.08.3.ebuild
+++ b/kde-apps/kate/kate-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
diff --git a/kde-apps/kate/kate-21.04.3.ebuild b/kde-apps/kate/kate-21.11.90.ebuild
index 6fadb90d1b8e..319af807f297 100644
--- a/kde-apps/kate/kate-21.04.3.ebuild
+++ b/kde-apps/kate/kate-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
@@ -62,11 +62,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	# bug 785412, master/21.08
-	"${FILESDIR}/${PN}-21.04.0-implicit-dep.patch"
-)
-
 src_prepare() {
 	ecm_src_prepare