gentoo resync : 22.05.2021

14 files changed, 464 insertions, 14 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 1b6b94e1bb3f..c1cc9f37777a 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index a2c72fdbe9f6..74914bb057d4 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,8 +1,9 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1
 AUX extra-cmake-modules-5.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
+AUX extra-cmake-modules-5.82.0-sphinx-4.patch 2959 BLAKE2B 1edd0052595551e33b231cc7cfac2a4bcd60787a1a126f5e5d2b5ab0ebe0c7f2850feb0e154ebbdc4104e917eecd342456d1f82a19c43e849757fa036e89e21c SHA512 af39e29c46ebdc22fe3c0d090b1fa5a4948909798521e773f5f35cfb793132d483f4d83126641f2fd53d193d672b2f05be90f3c503a10baf907871c9fbf8f684
 DIST extra-cmake-modules-5.80.0.tar.xz 357412 BLAKE2B 1a564eac42bce7001b2840a052596456970e81810d07c091e47161933f906a66d20560a7d031f08660acd48c5db2d32c5512579b243dc4c0c803142cac4bb0bc SHA512 d07dcb31f8142c99270c234679cc0ab4dd13acd61e505a3623b7e2c811250acfb9f260cf355d8264bb1924a2aa61ed12fd3b5b431a4f619e33e3c7d53f2f7f68
 DIST extra-cmake-modules-5.82.0.tar.xz 313052 BLAKE2B 40f4a64ce1b9175137f01db9f148b21bde931934d238b3080fa8a8e6830fa556d5c0506ddd52705d3d0b1d419508663a0f96d7e9dbe565061081c48c47eabc5f SHA512 a8c8d1d15718760de42238b121ed1294d12d36f1ef25acdd2542f12a56d5091a5cc0135884b6c97e62123d64fc80e2756dccd32c88b65caaf6e86418bae4217f
 EBUILD extra-cmake-modules-5.80.0.ebuild 1813 BLAKE2B 091838f815968e4b53533f519de46878fb25b8432edd1a0702c813be02bf08cf6daafce21434d4d8c8c04edbb24532fb1583cb08619f98c5833925b3f7a0498c SHA512 47b39b65949b2025d4992b46c1326e8305549a2768d6bbe709df0575982f3b1731df4c26a04cd9e0473465d6f15dffae98abc0510151ff7bab1c2362e2b7b58c
-EBUILD extra-cmake-modules-5.82.0.ebuild 1818 BLAKE2B fbb8413d79452649dffd890ccde1867bc844261b78170292bbefb9c38675a2f10be490c49b2a7d08ce71bb7e8e139324e0ce84c36e58dead3289904d6c93fc57 SHA512 284836a461162269a8aa06a29b09b4cc6f87d2c7f301814c232d9ad23c420948063d0ff7e3688bf913027e129191be1f13e3bacd0830d95334333ffcea4d6154
+EBUILD extra-cmake-modules-5.82.0.ebuild 2019 BLAKE2B 2e13af98aba11913f53b215eb6fcc9431b872ccdd30a1eed040d7d9af487cbf3d8602a48fec1500af1364c122b661ccb12995e07df252a7ac430276da9fcb26f SHA512 eb8aaa04e5bc9c685ea59a24811ccc1ab42ffd2bc292cb0f1904d7c56e24efa96a3bac42da96f5ffaf54068f99e0be36ea565419c7ccb7b7fe32507baa2647b0
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
index 6bd09789c613..41f98627db4f 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
@@ -16,10 +16,16 @@ IUSE="doc test"
 
 RESTRICT+=" !test? ( test )"
 
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
 BDEPEND="
 	doc? (
 		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+		')
 		>=dev-qt/qthelp-${QTMIN}:5
 	)
 	test? (
@@ -27,18 +33,17 @@ BDEPEND="
 		>=dev-qt/qtcore-${QTMIN}:5
 	)
 "
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
 	"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
 	"${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
+	"${FILESDIR}/${P}-sphinx-4.patch" # bug 789096, pending upstream MR 121
 )
 
 python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch
new file mode 100644
index 000000000000..7ccd024affc4
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch
@@ -0,0 +1,81 @@
+From 02abfc3695b71e05e3d5df83514f50ec0ab60bdf Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 14 May 2021 20:42:02 +0200
+Subject: [PATCH] Fix doc build with Sphinx 4
+
+Port away from removed functions. In particular, port to the new index structure which was introduced in 1.4 (released november 2016).
+Also account for the new default location of built man pages.
+
+BUG: 436818
+---
+ docs/CMakeLists.txt    |  3 ++-
+ docs/sphinx/ext/ecm.py | 13 ++++++++-----
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 84cca9ea..32687b64 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -110,7 +110,8 @@ if(BUILD_MAN_DOCS)
+             set(name "${CMAKE_MATCH_1}")
+             set(sec "${CMAKE_MATCH_2}")
+             install(
+-                FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec}
++                FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} ${CMAKE_CURRENT_BINARY_DIR}/man/${sec}/${name}.${sec}
++                OPTIONAL
+                 DESTINATION ${MAN_INSTALL_DIR}/man${sec}
+             )
+         endif()
+diff --git a/docs/sphinx/ext/ecm.py b/docs/sphinx/ext/ecm.py
+index 8667b367..a09e4890 100644
+--- a/docs/sphinx/ext/ecm.py
++++ b/docs/sphinx/ext/ecm.py
+@@ -5,6 +5,7 @@
+ #
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
++import html
+ import os
+ import re
+ 
+@@ -19,8 +20,11 @@ CMakeLexer.tokens["args"].append(('(\\$<)(.+?)(>)',
+ 
+ # Monkey patch for sphinx generating invalid content for qcollectiongenerator
+ # https://bitbucket.org/birkenfeld/sphinx/issue/1435/qthelp-builder-should-htmlescape-keywords
+-from sphinx.util.pycompat import htmlescape
+-from sphinx.builders.qthelp import QtHelpBuilder
++try:
++  from sphinxcontrib.qthelp import QtHelpBuilder
++except ImportError:
++  # sphinx < 4.0
++  from sphinx.builders.qthelp import QtHelpBuilder
+ old_build_keywords = QtHelpBuilder.build_keywords
+ def new_build_keywords(self, title, refs, subitems):
+   old_items = old_build_keywords(self, title, refs, subitems)
+@@ -29,13 +33,12 @@ def new_build_keywords(self, title, refs, subitems):
+     before, rest = item.split("ref=\"", 1)
+     ref, after = rest.split("\"")
+     if ("<" in ref and ">" in ref):
+-      new_items.append(before + "ref=\"" + htmlescape(ref) + "\"" + after)
++      new_items.append(before + "ref=\"" + html.escape(ref) + "\"" + after)
+     else:
+       new_items.append(item)
+   return new_items
+ QtHelpBuilder.build_keywords = new_build_keywords
+ 
+-
+ from docutils.parsers.rst import Directive, directives
+ from docutils.transforms import Transform
+ try:
+@@ -127,7 +130,7 @@ class _ecm_index_entry:
+         self.desc = desc
+ 
+     def __call__(self, title, targetid):
+-        return ('pair', u'%s ; %s' % (self.desc, title), targetid, 'main')
++        return ('pair', u'%s ; %s' % (self.desc, title), targetid, 'main', None)
+ 
+ _ecm_index_objs = {
+     'manual':      _ecm_index_entry('manual'),
+-- 
+GitLab
+
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 9a8413c1acef..a9ed5eb7b830 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -2,5 +2,5 @@ AUX kglobalaccel-5.80.0-dont-run-w-root-privs.patch 1383 BLAKE2B 77925b30b0360ce
 DIST kglobalaccel-5.80.0.tar.xz 87360 BLAKE2B f05027f4aeb71ba17b42bfe3214222737df4689e72e7eaa2e848d891e4934acead92051a21ce49313513050d4e3b01148576ca0ab58c609670fc88e7bedc15cb SHA512 6e12d3926f1b44425747bfca3eea21986cfe57ce032a2f691a2ab6b12556feec15cceea4b2b6c21bbdc9ecb6af11e9fb64489d60d9e95f4443b0a74ebab551af
 DIST kglobalaccel-5.82.0.tar.xz 87932 BLAKE2B feed60b09b01da373b3a6b989ca465b93a67d1ba84ce45c503805e6cb49af1b7ce99afa1921414e9a616d344f95366e0e4822b58f41ea73222dacfcc448a588c SHA512 c6f757628ca8123183b1ead08fbf326bf8b6d5b97e4dc65c33a2c158103aa7915617d423692ee417059bd08a299546b7cdd373b31dbfd80f2498193da7b5aaf7
 EBUILD kglobalaccel-5.80.0-r1.ebuild 855 BLAKE2B 8772c8ecb5ab37f6d51417f8722e6186e97a086cbb4ffb29db568d06516508acc16e62571a25f8d65bf0966ebe52d02c995539453e383a31c1b06cc0c064da8b SHA512 13c333282bb973e21a7cc381bf593c8beebd746870fc4c641b088bc2f4daa3e24a523999d4742ba66fa13c9919cc24e1103ffe1457745876a0a6f10ec279db68
-EBUILD kglobalaccel-5.82.0.ebuild 768 BLAKE2B 696eccce98b84e6f677eec4cbc6f582ac04c5e211bfefa16e49ed4d915a86699abdc1db8e4154139e763faad60544b4e0f54fe7ed2b4d7a4a36b8f7fa7db6d20 SHA512 71116289029140ea86e6537116a50a772ef82592d6dbf3a95c7fd7a06cf6375136132c295248938635b3e26f93094588775bb6fe43786b1fb53442e3e3a75caa
+EBUILD kglobalaccel-5.82.0.ebuild 835 BLAKE2B 5f93998aa4ed4dd1dc96b9ad0c8f115efa8891dd68624d412987111dbf1f362638c5d7fd6f1082c5278a723f5c858864478ccca60bffe64334da0013577b6800 SHA512 a3b4887bd7292d887809cf101002da27274388e068471eba66f8e464fad18fb2512cfd00f6be713fb57e86ca4a76fa3da0e81b95de8e3a66df6f5d61358b9a49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild
index 6473474b63b6..c07636e53c53 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild
@@ -9,13 +9,11 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
 LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
 
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -30,3 +28,8 @@ DEPEND="
 	x11-libs/xcb-util-keysyms
 "
 RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+
+src_test() {
+	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 55e1db58dff5..4eccbe863665 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -3,10 +3,15 @@ AUX kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch 4334 BLAKE2B d3895b59787a97f
 AUX kio-5.80.1-fix-create-files-on-ftp.patch 1096 BLAKE2B 9e577af9aeec00d3c95ea1e39df1d06b3e8d548f630a4597041776d6b2b01faf72b32e8492dfcd493ae75f2038aa107369dc1cfc734235d1efb5ac72bbb09f53 SHA512 5d0838e0afb506dda607ab70d245de67459027458cb493e4cb4a9f395df8fa56c489f4ffe1663b44b1deb1003fbfcdd9767d233700070cf3fe94f0773a9907c0
 AUX kio-5.80.1-gcc11-include-order.patch 944 BLAKE2B a95cd2765a528e5d3d11e84cf935271c61e837d22f8d1344a78f5f09889b9a6947c9180854bb1dbdcec857b7b1210a4f4ad46d1de79df0acf4a539fa09380c0d SHA512 73ee379c8acc25ab4a9dc2fbc09ba5a012bc76e67453ca96faa415b0e0688c76ea786785d0caeb75bb167ebd22e50ee778eb8cc024892bb9ac36270115ea5e3a
 AUX kio-5.81.0-fix-qtconcurrent-private-link.patch 1544 BLAKE2B f2e24a00addd20b60f93ee85ab8dab532b95c7dbfe85ba411ad83ff59ccb563e63560b557e33caafac3a385ac3d640bbabb801481ac709b06784c8d6d4a3326c SHA512 afc541a93607ad4e3544bb06631fbba4770d1e3a2d67ece951479dcf6e8bc8c8e12bb44ff79ddf491b526a98e74f350cfce6358da073310122ecd809e56d047c
+AUX kio-5.82.0-MimeTypeFinderJob-memleak-1.patch 2892 BLAKE2B b099cb4ce322c47d9e82c2e0ff9ca9b088a24caf919d22cafc1c1f766f5542fc71c313770e8342909136a9835e58126c8b8f1fca5cd2ffeb9e2deb0b93d5c04b SHA512 136085cf6abc6fb51b6ab3551dab339f97b18b77f51e8174e3a79358d3dd487b1f6306a774cfacafd84917f0ebfebc96d8d3eade2607d870d5791830f3b19a69
+AUX kio-5.82.0-MimeTypeFinderJob-memleak-2.patch 2478 BLAKE2B 51971136c6131a768f716f808278c2019237e42660f8d9c700a6a8cda45a6e9f9e95662317463ebb6026cf314b76658c230dd9b61240de8d6ad171bd3fd3a434 SHA512 fb40aa6a56ef7269645ac957aabb48ea277a5a4abcdf6905dd66cf1b9ecd0bcfcdfc91a0cfa9d1f4ebae563fb7df33c6085747b1f8a5dac66fb538fc2b39aef5
+AUX kio-5.82.0-MimeTypeFinderJob-memleak-3.patch 2179 BLAKE2B b32879d9ef0b88c3a2241eb1da21d7f390c3c2fb7c7fb8a5e6e812c60b50b5798f296e79c451f380c77b5d873909e3c8d5fb1661dae51fe753b5f7170e8a7236 SHA512 639635f6aa6acad149c90a3d277d142cf78fa28c59cd86ad56e11e825ee9938a05cfe151fff34164d81d15f3fcb41c2fb255cf706f9d0009c4b3afca4710d213
+AUX kio-5.82.0-MimeTypeFinderJob-memleak-4.patch 2467 BLAKE2B e32cf57531afd4532a7edccb48e185519ffba23e2e30877de2954730e8bc74b5569317d5d8eb7083b4f532aa2f7a49637c556f2ff136b41d03ef055cbbd0d6c6 SHA512 10559a3fb0b09901008d8eef7d494efc82e134701084bb30b62389e9255efc9821d9e30c408fa697995f04ad88caac0843803a33fbb2001d172e5f9b615e97c9
 AUX kio-5.82.0-no-cache-kcm.patch 2801 BLAKE2B 6779c2d1e77aff1e530beeb002b9aa7a993b365d8bdb22b7f77532038314cae62a237666b6d033a92f1219761f845c678b8367d86a757e5fc499165455f6345e SHA512 422ac748100d1e227ffc29da898437e4c4142b4c7f85ce46239ac6c76ae8feffe048fa1a44f3484b5859eb37baa3be96047652016c96c10b5fa2a262ce85b51a
 AUX kio-5.82.0-no-useragent-kcm.patch 3751 BLAKE2B 09ea333db392f0b35a531ff6921f4d9b0f8059ecc3bf48c8229c39815c49b4e6cbd6516fb2f99489ac468c33317260bb714915e971884d93dfa8b6284ba96039 SHA512 3641673476efab1c8e69408bc8472b1c6490209805d4039776ba397c39c98b59feed28cce9c03c55a8f87379d351cb87358773695dcdb5398aadb5cc1b89c4a4
 DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213
 DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
 EBUILD kio-5.80.1-r2.ebuild 2614 BLAKE2B 4ef207fb64570f85403458b350e7ceb31fefe8d0f22dc09ee567e97c2bc3a1c0ac0c13b1050b2ab949b1b2036bbacdce0ad1050477c202799043720dff8fea96 SHA512 533a59b34d618f3ebff2a12de264c1bf2734b5f3149cc787bc3fc950b2af659422153db77883c381a6aa782e0819399d88b8641769766c747d1c46c8dc91267e
+EBUILD kio-5.82.0-r1.ebuild 2866 BLAKE2B 710b1f44ce0a8b367648493e77a238e17408ed91fda22c4ab16ffe4a9f1dc25433f7a0a264b1a7f934c419bc09e524529ebb1cfe691c616c481ec91e41a09657 SHA512 6fbe5b5f3c11dc7ab95165fd6631c77c54193083ff75fe7404aebeff4b186d5a2bafdad3833a1664ed645487fc22b96dee421a0244f4e34e264a8160cd0e4e1e
 EBUILD kio-5.82.0.ebuild 2749 BLAKE2B dcb50ccc4b3d9ccdeaec792f4686e243b0f401953feac932260520a41451f3d2f9fb2055943f1b2703008951a737ed3249b64460747b2665b87148996e2cf2be SHA512 d409c142979d4ad96fa6e70219c65e4bbb1cf078fe15f0c6b0d996e0bf4225624bfab4f051ee7ea1fa771a2683957a5db34e8e1f72fe5e8793e04cba4e3bd5c6
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
new file mode 100644
index 000000000000..08d72d754d70
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
@@ -0,0 +1,69 @@
+From e79da836c34fce66231e396c7215314d0eba51b4 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten <jjm@keelhaul.me.uk>
+Date: Sat, 8 May 2021 15:20:39 +0000
+Subject: [PATCH] MimeTypeFinderJob: Resolve symlinks for a local file
+
+---
+ autotests/mimetypefinderjobtest.cpp | 18 +++++++++++++++++-
+ src/core/mimetypefinderjob.cpp      |  2 +-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/autotests/mimetypefinderjobtest.cpp b/autotests/mimetypefinderjobtest.cpp
+index 72296b9b8..f494ff3b6 100644
+--- a/autotests/mimetypefinderjobtest.cpp
++++ b/autotests/mimetypefinderjobtest.cpp
+@@ -48,6 +48,7 @@ void MimeTypeFinderJobTest::determineMimeType_data()
+     QTest::newRow("text_file_no_extension") << "text/plain" << "srcfile";
+     QTest::newRow("desktop_file") << "application/x-desktop" << "foo.desktop";
+     QTest::newRow("script") << "application/x-shellscript" << "srcfile.sh";
++    QTest::newRow("directory") << "inode/directory" << "srcdir";
+     /* clang-format on */
+ }
+ 
+@@ -60,7 +61,12 @@ void MimeTypeFinderJobTest::determineMimeType()
+     QTemporaryDir tempDir;
+     const QString srcDir = tempDir.path();
+     const QString srcFile = srcDir + QLatin1Char('/') + fileName;
+-    createSrcFile(srcFile);
++    if (mimeType == "inode/directory") {
++        QVERIFY(QDir(srcDir).mkdir(fileName));
++    } else {
++        createSrcFile(srcFile);
++    }
++
+     QVERIFY(QFile::exists(srcFile));
+     const QUrl url = QUrl::fromLocalFile(srcFile);
+ 
+@@ -68,6 +74,16 @@ void MimeTypeFinderJobTest::determineMimeType()
+     KIO::MimeTypeFinderJob *job = new KIO::MimeTypeFinderJob(url, this);
+     QVERIFY2(job->exec(), qPrintable(job->errorString()));
+     QCOMPARE(job->mimeType(), mimeType);
++
++    // Check that the result is the same when accessing the source
++    // file through a symbolic link (bug #436708)
++    const QString srcLink = srcDir + QLatin1String("/link_") + fileName;
++    QVERIFY(QFile::link(srcFile, srcLink));
++    const QUrl linkUrl = QUrl::fromLocalFile(srcLink);
++
++    job = new KIO::MimeTypeFinderJob(linkUrl, this);
++    QVERIFY2(job->exec(), qPrintable(job->errorString()));
++    QCOMPARE(job->mimeType(), mimeType);
+ }
+ 
+ void MimeTypeFinderJobTest::invalidUrl()
+diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
+index f5e50cdc4..48fc8c289 100644
+--- a/src/core/mimetypefinderjob.cpp
++++ b/src/core/mimetypefinderjob.cpp
+@@ -122,7 +122,7 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
+ {
+     Q_ASSERT(m_mimeTypeName.isEmpty());
+ 
+-    KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic, KIO::HideProgressInfo);
++    KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic | KIO::StatResolveSymlink, KIO::HideProgressInfo);
+     if (!m_authPrompts) {
+         job->addMetaData(QStringLiteral("no-auth-prompt"), QStringLiteral("true"));
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch
new file mode 100644
index 000000000000..bf3ff50802f6
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch
@@ -0,0 +1,61 @@
+From c748d6987252fafc296cde9351b289ef734cf861 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Thu, 13 May 2021 23:03:57 +0200
+Subject: [PATCH] kio_file: pass the absolute path to
+ QMimeDatabase::mimeTypeForFile()
+
+Otherwise detecting the mime type based on the file content may fail and
+return application/octet-stream.
+
+And pass the whole url to createUDSEntry(), less QFile::decodeName/encodeName()
+in the middle is better and less error prone.
+
+Note that without this change a MimeTypeFinderJob could end up failing to
+find the mime type of a local file based on the file contents.
+---
+ src/ioslaves/file/file_unix.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 99d46c8f1..940e3cbc4 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
+ }
+ #endif
+ 
+-static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details)
++static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
+ {
+     assert(entry.count() == 0); // by contract :-)
+     int entries = 0;
+@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
+ 
+     if (details & KIO::StatMimeType) {
+         QMimeDatabase db;
+-        entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(filename).name());
++        entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
+     }
+ 
+     return true;
+@@ -1186,7 +1186,7 @@ void FileProtocol::listDir(const QUrl &url)
+             listEntry(entry);
+ 
+         } else {
+-            if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details)) {
++            if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
+ #if HAVE_SYS_XATTR_H
+                 if (isNtfsHidden(filename)) {
+                     bool ntfsHidden = true;
+@@ -1476,7 +1476,7 @@ void FileProtocol::stat(const QUrl &url)
+     const KIO::StatDetails details = getStatDetails();
+ 
+     UDSEntry entry;
+-    if (!createUDSEntry(url.fileName(), _path, entry, details)) {
++    if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
+         error(KIO::ERR_DOES_NOT_EXIST, path);
+         return;
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch
new file mode 100644
index 000000000000..a9c55e1f7f24
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch
@@ -0,0 +1,52 @@
+From c19876052ecec18a87a82f5950e8909e22e895ba Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Thu, 13 May 2021 17:02:52 +0200
+Subject: [PATCH] MimeTypeFinderJob: the StatJob details should include the
+ mimetype
+
+Apparently we forgot to specify that we want the UDS_MIME_TYPE field in
+the statFile() method (both when it lived in OpenUrlJob and when it was moved
+to MimeTypeFinderJob). And now there is a dedicated StatJob flag, StatMimeType,
+that we can use.
+
+Not passing KIO::StatMimeType when creating the StatJob meant the code always
+used a get job to determine the mime type, which mean that e.g. opening an
+ISO file from Dolphin, which supposedly just needs to launch Ark, had the
+whole file read into memory, which means that opening a couple of ISO's and
+you're out of memory...
+
+Thanks to sitter for doing a big chunk of the investigative work in the bug
+report.
+
+CCBUG: 398908
+---
+ src/core/mimetypefinderjob.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
+index 48fc8c289..baca58695 100644
+--- a/src/core/mimetypefinderjob.cpp
++++ b/src/core/mimetypefinderjob.cpp
+@@ -122,7 +122,9 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
+ {
+     Q_ASSERT(m_mimeTypeName.isEmpty());
+ 
+-    KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic | KIO::StatResolveSymlink, KIO::HideProgressInfo);
++    static constexpr auto statFlags = KIO::StatBasic | KIO::StatResolveSymlink | KIO::StatMimeType;
++
++    KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, statFlags, KIO::HideProgressInfo);
+     if (!m_authPrompts) {
+         job->addMetaData(QStringLiteral("no-auth-prompt"), QStringLiteral("true"));
+     }
+@@ -147,6 +149,8 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
+ 
+         const KIO::UDSEntry entry = job->statResult();
+ 
++        qCDebug(KIO_CORE) << "UDSEntry from StatJob in MimeTypeFinderJob" << entry;
++
+         const QString localPath = entry.stringValue(KIO::UDSEntry::UDS_LOCAL_PATH);
+         if (!localPath.isEmpty()) {
+             m_url = QUrl::fromLocalFile(localPath);
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch
new file mode 100644
index 000000000000..9e59a0eb16eb
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch
@@ -0,0 +1,62 @@
+From 71484c97dee0c977a00f141123d8ccd9b93c2e96 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 14 May 2021 21:19:31 +0200
+Subject: [PATCH] kio_file: fix how createUDSEntry() is called
+
+When calling createUDSEntry() from listDir(), we need to concatenate the full
+path to the item.
+
+This is an addendum to commit c748d6987252f.
+---
+ src/ioslaves/file/file_unix.cpp | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 940e3cbc4..3573c200e 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
+ }
+ #endif
+ 
+-static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
++static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QString &fullPath)
+ {
+     assert(entry.count() == 0); // by contract :-)
+     int entries = 0;
+@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
+ 
+     if (details & KIO::StatMimeType) {
+         QMimeDatabase db;
+-        entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
++        entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(fullPath).name());
+     }
+ 
+     return true;
+@@ -1186,7 +1186,13 @@ void FileProtocol::listDir(const QUrl &url)
+             listEntry(entry);
+ 
+         } else {
+-            if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
++            QString fullPath(path);
++            if (!fullPath.endsWith(QLatin1Char('/'))) {
++                fullPath += QLatin1Char('/');
++            }
++            fullPath += filename;
++
++            if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, fullPath)) {
+ #if HAVE_SYS_XATTR_H
+                 if (isNtfsHidden(filename)) {
+                     bool ntfsHidden = true;
+@@ -1476,7 +1482,7 @@ void FileProtocol::stat(const QUrl &url)
+     const KIO::StatDetails details = getStatDetails();
+ 
+     UDSEntry entry;
+-    if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
++    if (!createUDSEntry(url.fileName(), _path, entry, details, path)) {
+         error(KIO::ERR_DOES_NOT_EXIST, path);
+         return;
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.82.0-r1.ebuild b/kde-frameworks/kio/kio-5.82.0-r1.ebuild
new file mode 100644
index 000000000000..297ae2bbe4af
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.82.0-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT+=" test"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND="
+	>=kde-frameworks/kded-${PVCUT}:5
+"
+
+PATCHES=(
+	# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
+	"${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+	# upstream backport request - see also KDE-bug 398908
+	"${FILESDIR}"/${P}-MimeTypeFinderJob-memleak-{1,2,3,4}.patch
+	# git master/KIO 5.83:
+	"${FILESDIR}"/${P}-no-useragent-kcm.patch
+	"${FILESDIR}"/${P}-no-cache-kcm.patch
+)
+
+src_prepare() {
+	ecm_src_prepare
+	rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index b0b63a65ee12..0d852891d36f 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.80.0.tar.xz 74620 BLAKE2B 9c82f676300fa6bcb85ae2b14055f82b1f06c1c80f11a78fb01085989263992e44fb8c743e14991d94653d0df956239ce77eeb51c81734d391de93bea8c165fb SHA512 71cc43ec6f52993c9a9d5fb6d736734af45b141fef50675a7825a1d03edadc4edfeecd52b5e229aa387a6bd28078cb887d63ecfc259f7b44c1aca1ecfd929d28
 DIST krunner-5.82.0.tar.xz 76916 BLAKE2B f846383458b46bf655a2a2b08fea099eff910aceac90306bea1f3af1b1370d2d59169ee4ff0e68c6ab0186c35b336b4a807f56cd8374f89b16c5319ddba459f9 SHA512 a4430196d32d850f9498027df251a65dcf3fcb161a7005926a9ec3de429bd03487e72fda342a6a588c4e5972ee55baf21e53433d68408ccab1b0b99b5c2980da
 EBUILD krunner-5.80.0.ebuild 1080 BLAKE2B cbeee82b27499bec448b904f5d65ff0729b7a7c632bff088931b76930a93d863a8c9c307faa9237f3f632df9c9422fa9ddee716a90525bbd59ba4ca042d8adab SHA512 f432bca30e658766fd4cac83fe984b9dcb2c25f3411b3d1eb7d0d7f6db9f1cd3073f75cbfcc7ad7c2b24393d71339b3bc0088b84133c9c1fedfb3637ef8c08cd
-EBUILD krunner-5.82.0.ebuild 1083 BLAKE2B ef7ad0855f11eaad21faa18e7c495a448cbabcb359ab3f1eb68872153a663af9662349f175be3fab84e0b361b4ada15f01bea173b520393de9be6b36d37a1eae SHA512 f1f00b3881d212dc8acaad8e5c503daddfd02e5c18943ea1175d917fc4a0c6b8275b207ed624798fa69c1bd40244405f1b23dc33951c651e142a64005734c2ee
+EBUILD krunner-5.82.0.ebuild 1150 BLAKE2B c5bcaa025c32f205054cb6d14da87c595ec1a26b0b381433102f65d6db9bffb5e1876727ee30b76ab2b15f00ffe55256ce1d7ba410c0287756df220d975aa0f0 SHA512 041d437a988026ea9219c8937f3b3ffb10ced7f224246fc25fc0cf0a721e90c11d12fbd97b0e24743a9d1cb24b5d3a235a8f32e699f8edaf6c29750a8d9eb8cb
 MISC metadata.xml 345 BLAKE2B 98483681a50512c1e37b502d7114c6f44e40d3c66ff33d858e4dd111cc0f6f4eef30fd51faae0b6fde2b3392ddab79a11d2eb20b904d0d309cb598c7bf6c874e SHA512 6fc972e21befa52a3fa494c63fd423def69d798b7d422bcfcbc142a1fb3f96b2e425700ada34f29cf78b69c81ebf27d51d180dad67c33aaf4942cd647d34008c
diff --git a/kde-frameworks/krunner/krunner-5.82.0.ebuild b/kde-frameworks/krunner/krunner-5.82.0.ebuild
index 414cdb8822d4..9b94a1daf9ae 100644
--- a/kde-frameworks/krunner/krunner-5.82.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.82.0.ebuild
@@ -9,6 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for providing different actions given a string query"
+
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="activities"
@@ -38,9 +39,9 @@ src_configure() {
 }
 
 src_test() {
-	# requires virtual dbus #630672
+	# requires virtual dbus, otherwise hangs; bugs #630672, #789351
 	local myctestargs=(
-		-E "(dbusrunnertest)"
+		-E "(dbusrunnertest|runnermanagersinglerunnermodetest)"
 	)
 	ecm_src_test
 }