gentoo resync : 28.04.2021

4 files changed, 79 insertions, 12 deletions

diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index f6612b63b32f..b4e2b630399a 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,7 @@
 AUX kate-20.08.3-fix-filetree_model_test.patch 909 BLAKE2B ffa7ea62388751d4d173aaab2b27372fd0e7ded38a7612ff8644906e12c4ae52bf27df22188bf0229b06ee7de08e3ead278e17631a79623350621ca61b4e2a06 SHA512 4d4388bf0cab7db1979f174ba79d5736843a5584e6e6d85cc0751fa8a6e43d8a1baeebe3c3ed463c3ec376a7df7fef79d4e28a1835604cd4120ae576d8f8fd39
-DIST kate-20.08.3.tar.xz 5853216 BLAKE2B 8ad6f14e98e44355731497dd3363dab51e3f1658feadc398ba03629c13acb648f1a84e573bb200040008c0f3226f0ec1b6414a0975cf1ccc2cd1bfcebce1e125 SHA512 bb514f92a65ce7ff4e3552f16a400d10b30703340f779a1318403035900f32b2fd5c1da2ca0714632d49ad35da15e0f7e05a17bc008cd039388e89ab4fac3bd2
+AUX kate-21.04.0-implicit-dep.patch 2160 BLAKE2B e184cbf456f45e15904e17213813c935b548d1fba6cff98b162dcc4619d0ba166ae1db0c726a637c2b41bd95ebfe75d114259b5d7bcceccdf09141532e893d78 SHA512 23d56228dfdbcb419ec6ecc3353659efdc604f0786ce0ddff6dddb63a990a7086a7d6d777e038567fdbf049c14013d77fdd99f1b01022627a235ce597ca05140
 DIST kate-20.12.3.tar.xz 5949012 BLAKE2B e35c4da5426772286abe54156babc0de09fbdf8fb5c7505714637ad427e3a694fd541ca7b17e99ebab22f9a19f2a8893d34098cb625fd0e1c0f0b6b920acd62f SHA512 545ec2a48ea6ec737011602b20ac2f60a0f9db0a5e55e0b232f9fd7c10b7e3f54d2a346be7e6341537758a3f8f94868c4083a6d2d10b572568f5c56c9d3aee9c
-EBUILD kate-20.08.3.ebuild 3153 BLAKE2B 0924bace56f9005e4410e3f480c9e03bc86361c5f749b57c4033e5ab60e0468486b5182f9825ad74317e0dff8d08689966e238876917c1c404b94ecd11dafa06 SHA512 649e1e5f2fed4601abedf7f69849854ab5962ff4b7660ffd71210e68a4736ffe1052f8433e5ac95d8a25781ef33ef21e087d2db68eb0be5a338e62ee5ebbbeb8
-EBUILD kate-20.12.3.ebuild 3165 BLAKE2B 88fc4e8a6800420ba386f64f123e4476f40973ea8c8d234df2c9ee4030143dab553fa0611c4c091ee8bed30368a152121baf88f3c0467f044948a4b76b5bdce8 SHA512 80e43883386acf2726d74ce2277bbd56ccc93e418fec3034918df3314c70a61612051da19e180079d69d2e104a4e5e7c8dd8e724fac8796b6e0f34f293562c01
+DIST kate-21.04.0.tar.xz 6940360 BLAKE2B ab4fdcb46cb9729e70537522387e3ab8fbf9808fd25453e6fd1aea5fa8a9aa67e5fbd44f4b68341b65da998e2412e24500cd009df10df5462ec2be55f137b988 SHA512 bc610758597bb2e800e8797c9c25eb0d227040dc2cf5b6e522dd019839f205b4ef05dcf2801265a4ce2743221054061b3002e31bc5e65470ef056afb96b834d9
+EBUILD kate-20.12.3.ebuild 3130 BLAKE2B 1f7b47493e7b3ca6031b3836ae805e05aac2a699e769a25f183d77254221b65b6f6ee6a88d29b89b713a120a2e1360eb418bb23c4dac6362db8d5de92ba58a16 SHA512 924d02160b20ae71d27824a420ff072e8601e2ff66face985498e75d0a712dfa44a041883907e6f3bb7d76bb55320238389f04a16298c7895927f9f1aeac714d
+EBUILD kate-21.04.0-r1.ebuild 3160 BLAKE2B a175317afd9b6e987d63ba0e7402171126487d9e9e529db0ab18eee56d2e23b48f518ab3136f5f8862f7cca13970a3220a94130996b080f047368d09fee3640e SHA512 dd03011e8693f8ebd26948e74bfb884ff09f0927aee2d2aec7fd45f28e5e4b91354b0decaa18cfcaed27007701672437644ae5d8535d10dbd20c9a425f788195
 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7
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
new file mode 100644
index 000000000000..482d9a872cd1
--- /dev/null
+++ b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
@@ -0,0 +1,69 @@
+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-20.12.3.ebuild b/kde-apps/kate/kate-20.12.3.ebuild
index 47bc8aebbfa4..e0bb021ef417 100644
--- a/kde-apps/kate/kate-20.12.3.ebuild
+++ b/kde-apps/kate/kate-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
@@ -102,7 +102,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
 		optfeature "DOT graph file previews" media-gfx/kgraphviewer
 	fi
diff --git a/kde-apps/kate/kate-20.08.3.ebuild b/kde-apps/kate/kate-21.04.0-r1.ebuild
index d6299f186d5f..c453398ad304 100644
--- a/kde-apps/kate/kate-20.08.3.ebuild
+++ b/kde-apps/kate/kate-21.04.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
@@ -15,11 +15,12 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
 DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -61,9 +62,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-filetree_model_test.patch" # bug 769548
-)
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785412, master/21.08
 
 src_prepare() {
 	ecm_src_prepare
@@ -102,7 +101,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
 		optfeature "DOT graph file previews" media-gfx/kgraphviewer
 	fi