gentoo resync : 11.05.2021

4 files changed, 198 insertions, 3 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 922e1130d2ac..55e1db58dff5 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -3,8 +3,10 @@ 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-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.81.0.tar.xz 3319696 BLAKE2B 9ce742ecc5f00223b6dd2b4adc2a8591796c0553f027414112c5bf2bc67c4a93708d2710c822697fbe38eb17b2a154a026bcb05a8914fb7bdd33f7479268544b SHA512 e2466412eb6360dc93eace9f44c161c7ac44ce1339688e4b64cba8f716733552610374627dd3e99205aeea735f0144beb0468f429f238a6be05f91827ff9ee3b
+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.81.0-r1.ebuild 2487 BLAKE2B 38900adf588eb210067bebeadd6d9026fa9ca49c06dcfd6879c5157d0576d250017c9b55341f25d2a7e96ccfa75bafb6abb2b9f3c9684bdd29cbaa287cf27b42 SHA512 7055bdd3e560252162417320f95b2d31e1f35c15919d3339673f8582ed1270a429e1190a94cafa73a32f92b0f42d44fd92f00f8a6c6c6849a6fe34e37220c109
+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-no-cache-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
new file mode 100644
index 000000000000..9cc0379b6998
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
@@ -0,0 +1,79 @@
+From 581fab08ff4d5539e4684adcffc74ec3517ce29d Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 6 May 2021 21:26:31 +0200
+Subject: [PATCH] Remove the cache KCM
+
+Same reasoning as for
+https://invent.kde.org/frameworks/kio/-/merge_requests/438.
+
+It is very targeted towards KIO-based browsers which don't really exist
+any more.
+
+The setting is also global to everything that uses KIO and it's a bit
+questionable whether for example webdav browsing in Dolphin should
+automatically have the same cache settings as network access in Choqok.
+
+It being part of system settings is also confusing for users since it
+gives the false impression of true globality. They might expect it to
+affect Firefox or Webengine-based Konqueror which it does not.
+---
+ docs/kcontrol5/CMakeLists.txt       |   1 -
+ src/kcms/kio/CMakeLists.txt         |   4 +-
+ src/kcms/kio/main.cpp               |   4 +-
+ 3 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
+index 2dd1ae16a..6c2f21b07 100644
+--- a/docs/kcontrol5/CMakeLists.txt
++++ b/docs/kcontrol5/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(cache)
+ add_subdirectory(cookies)
+ add_subdirectory(netpref)
+ add_subdirectory(proxy)
+diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
+index 11cd239f2..5281fc7dc 100644
+--- a/src/kcms/kio/CMakeLists.txt
++++ b/src/kcms/kio/CMakeLists.txt
+@@ -12,11 +12,9 @@ set(kcm_kio_PART_SRCS
+     smbrodlg.cpp
+     kproxydlg.cpp
+     netpref.cpp
+-    cache.cpp
+     ksaveioconfig.cpp)
+ 
+ ki18n_wrap_ui(kcm_kio_PART_SRCS
+-    cache.ui
+     kproxydlg.ui
+     kcookiespolicies.ui
+     kcookiesmanagement.ui
+@@ -41,5 +39,5 @@ install(TARGETS kcm_kio  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+ 
+ ########### install files ###############
+ 
+-install( FILES smb.desktop cookies.desktop cache.desktop
++install( FILES smb.desktop cookies.desktop
+     netpref.desktop proxy.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
+index 8bacb10ca..2c0ebc29b 100644
+--- a/src/kcms/kio/main.cpp
++++ b/src/kcms/kio/main.cpp
+@@ -13,7 +13,6 @@
+ #include <KPluginFactory>
+ 
+ // Local
+-#include "cache.h"
+ #include "kcookiesmain.h"
+ #include "kproxydlg.h"
+ #include "netpref.h"
+@@ -21,7 +20,6 @@
+ 
+ K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
+                  registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
+-                 registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
+-                 registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
++                 registerPlugin<KCookiesMain>(QStringLiteral("cookie"));)
+ 
+ #include "main.moc"
+-- 
+GitLab
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
new file mode 100644
index 000000000000..ce0e891e9164
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
@@ -0,0 +1,105 @@
+From 1aa42558a0f539abfe4bc92cf2c8078ac4adb9a0 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Wed, 5 May 2021 22:27:25 +0200
+Subject: [PATCH] Remove the Browser Identification KCM
+
+It's purpose is to control the user agent used by kio-http.
+
+Very few things use kio-http these days, not even Konqueror with the
+webengine part.
+
+For the remaining use cases (kioclient, webdav kio worker, etc.) this
+kind of configurability is overkill.
+
+Moreover being part of systemsettings this gives a false impression of
+globality. A user might change something in there and wonder why it does
+not apply to Firefox or Falkon.
+
+Given the questionable usefulness and the potential for confusion I
+propose to remove it entirely.
+---
+ docs/kcontrol5/CMakeLists.txt                 |   1 -
+ src/kcms/kio/CMakeLists.txt                   |  18 +-
+ src/kcms/kio/main.cpp                         |   4 +-
+ 3 files changed, 2 insertions(+), 21 deletions(-)
+
+diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
+index 1b19e5e7b..2dd1ae16a 100644
+--- a/docs/kcontrol5/CMakeLists.txt
++++ b/docs/kcontrol5/CMakeLists.txt
+@@ -4,5 +4,4 @@ add_subdirectory(netpref)
+ add_subdirectory(proxy)
+ add_subdirectory(smb)
+ add_subdirectory(trash)
+-add_subdirectory(useragent)
+ add_subdirectory(webshortcuts)
+diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
+index a354651b0..11cd239f2 100644
+--- a/src/kcms/kio/CMakeLists.txt
++++ b/src/kcms/kio/CMakeLists.txt
+@@ -1,6 +1,4 @@
+ 
+-add_subdirectory( uasproviders )
+-
+ find_package(KF5TextWidgets ${KF_DEP_VERSION} REQUIRED)
+ 
+ ########### next target ###############
+@@ -12,31 +10,18 @@ set(kcm_kio_PART_SRCS
+     kcookiesmanagement.cpp
+     kcookiespolicyselectiondlg.cpp
+     smbrodlg.cpp
+-    useragentdlg.cpp
+     kproxydlg.cpp
+-    useragentinfo.cpp
+-    useragentselectordlg.cpp
+     netpref.cpp
+     cache.cpp
+     ksaveioconfig.cpp)
+ 
+ ki18n_wrap_ui(kcm_kio_PART_SRCS
+     cache.ui
+-    useragentselectordlg.ui
+-    useragentdlg.ui
+     kproxydlg.ui
+     kcookiespolicies.ui
+     kcookiesmanagement.ui
+     kcookiespolicyselectiondlg.ui)
+ 
+-ecm_qt_export_logging_category(
+-    IDENTIFIER KIO_USERAGENTDLG
+-    CATEGORY_NAME kf.configwidgets.cms.kf.kio.useragentdlg
+-    OLD_CATEGORY_NAMES kf5.kio.useragentdlg
+-    DESCRIPTION "kio useragentdialog (KIO)"
+-    EXPORT KIO
+-)
+-
+ add_library(kcm_kio MODULE ${kcm_kio_PART_SRCS})
+ 
+ target_link_libraries(kcm_kio
+@@ -56,6 +41,5 @@ install(TARGETS kcm_kio  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+ 
+ ########### install files ###############
+ 
+-install( FILES smb.desktop cookies.desktop useragent.desktop cache.desktop
++install( FILES smb.desktop cookies.desktop cache.desktop
+     netpref.desktop proxy.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+-install( FILES uasprovider.desktop  DESTINATION  ${KDE_INSTALL_KSERVICETYPES5DIR} )
+diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
+index f1b065f46..8bacb10ca 100644
+--- a/src/kcms/kio/main.cpp
++++ b/src/kcms/kio/main.cpp
+@@ -18,10 +18,8 @@
+ #include "kproxydlg.h"
+ #include "netpref.h"
+ #include "smbrodlg.h"
+-#include "useragentdlg.h"
+ 
+-K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<UserAgentDlg>(QStringLiteral("useragent")); registerPlugin<SMBRoOptions>(QStringLiteral("smb"));
+-                 registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
++K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
+                  registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
+                  registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
+                  registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.81.0-r1.ebuild b/kde-frameworks/kio/kio-5.82.0.ebuild
index 8a640363ec96..4f99cc9cee3d 100644
--- a/kde-frameworks/kio/kio-5.81.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.82.0.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	=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
@@ -73,9 +74,17 @@ PDEPEND="
 
 PATCHES=(
 	# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
-	"${FILESDIR}"/${P}-fix-qtconcurrent-private-link.patch # bug 784971
+	"${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+	# 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)