gentoo resync : 20.03.2022

5 files changed, 75 insertions, 6 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index d907cfae7f9c..7f9778bcc97e 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -2,8 +2,10 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099c
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95c3fd99c551ec7512054460d8ba04c265e56c2ee53d968c7885929724c81df2895eeae8609a5a0a4c28839461429579f56bcbde4dcaa5646e15b SHA512 c41d2c56170914a309c9765a58a6cccaf4a9afae937ce762387590f3b2ccf59969b5873f702986369c4c3118c74d314f8b68916bfabce5e7379b3cb27daebb50
 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
+AUX plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch 994 BLAKE2B b1d4768beddde8f3842a6fe872ba662dd04e35b6f5295c45cd633a3f6addf393b7ce8a998c2789773377143dd3ad8d4df03cde1cf1f1ad3383926bfd101b49e5 SHA512 1e047d121f1ecce86dbeba9136cdbad863a84185b85c0ffca297e8ce3beeb2e75d3c1bef582b366ab074bbd11eb94c127cbb05963ed8ab21c1f8704f721b59f3
+AUX plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch 1071 BLAKE2B 27619af4b1ca08b1c4dfc08f01e19b64c6dd82050071363ba38b4ca1d5265f331d641b11237f642aab0b04faa7f02a84abec426d71dc6c35bb343981f5a87270 SHA512 d2a194df812f3d3b602f4fdea6a1996221072a283edc619cb8c9d3c65d37c503a309846817616584b7dff3d78861d8a5779dadc8eccc43649c43627145e7b066
 DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
-DIST plasma-workspace-5.23.90.tar.xz 18479952 BLAKE2B cb7a6115230c27504a8c9b6439362baaacd70706bc76533c32d9c793bdae3d504b645ba2b6172254d81224d02c29468278cf1d9939a636cf3990633b118f45f1 SHA512 521f6a33649549af9a15c55c1143b364fa0d094ee1265f8a9d113e8f1730fb766a31aa60a10aab35bd07b2e669b8390e426ab0aeb7ba2313c05bb2c983b21cf5
-EBUILD plasma-workspace-5.23.5.ebuild 6306 BLAKE2B ea02a5714aee6588112e5d6857068b99d27b17cddef7d8bc039629c22c3adef3f410cca0603930a2bbec0e3cc8f5da0f34f5ddc27a70d561610ff35e7a73f4cf SHA512 b0ea8deac9d2ef8cb7c27fb689d9abe81c88053c2554626137f5325c87596d2434c419b7399230e92ee85091c3661980251fa1ac1f050e1869df5344f75203b0
-EBUILD plasma-workspace-5.23.90.ebuild 6317 BLAKE2B e84950332e0e415ccca4d3e1343075f8de49374a3154993e3a22830e7a01f69813bf44395ff5e41fc21df64cd0601af13f2bfb5347631cf702feeef1e4366b9e SHA512 1e6018e7727d090e1235345e38f715c37252a01645291cf3e0e2c94cc4532864c598641842c6639045378da82b0f40f70819c63c3a36ecf7f8730a869660e6b1
+DIST plasma-workspace-5.24.3.tar.xz 18481188 BLAKE2B e4dd150f42d6e192a05341141e0ba0d80dfb758b48226724e3be83da523b82f72f630ad1463ef0cf07e24c3a1c738a178aed149ec2acb62854d6488e74f33036 SHA512 cc442e4ca064ef99555c00ebfded348d2358b73dbe9d6f34a63267f9e066b63acad8b18576532bc4fa413c239580e823bde1271551f445190f566b87f66646a7
+EBUILD plasma-workspace-5.23.5-r1.ebuild 6568 BLAKE2B dc11c3051493b02fa1a2e824544509258d155e0d4db222e69cba14545c0370a5954d6568c378ebb6de458bd0d4dff7117d92dd63c916b2a536b7b3486543678f SHA512 f54bc3abe040ee3a621a877523700fbfb818821e5710dd9321db1e51c65aa62e4630d0f9df10153b04168cfaac6816a9542d5c89bf27d8aa7953608c44d79d60
+EBUILD plasma-workspace-5.24.3.ebuild 6452 BLAKE2B 8132d415d37e1659d7e049629e581c232f11c73f650dbd01f997fa62a9152b9b675a48621953d87aa95db59e41fc0b60600acdfe80a40fbc2c04c498f64746c6 SHA512 89d0c1dda02666124e6da125afd552fc97e0ad555e157389c91226aa951208117c290c6fec3ace50ae32dd3b20e6d02856b0e6e338ab4371cb2f3eeeb7b3f1aa
 MISC metadata.xml 919 BLAKE2B f8ac08e31ccc060e3cc16370cc23258f49957e2a026905baa85669a46e673c83370486e2e06b0796c7385d92904cf078be73cffa934dd7188c9b231338f64093 SHA512 16c0b3e0ea50e6c145da3993cce54f99c4cea79846d3c7da5326f1d754aac27c62db8e670d449e8bcdd9057a03a846fbf40f811ae96a11c1feff484af990dba4
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch
new file mode 100644
index 000000000000..e546f46d6b7f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch
@@ -0,0 +1,28 @@
+From 8c11f207e2bbf0f98488de7066bd3698705f20e1 Mon Sep 17 00:00:00 2001
+From: Ben Cooksley <bcooksley@kde.org>
+Date: Mon, 7 Feb 2022 06:44:47 +1300
+Subject: [PATCH] Use the correct endpoint for this - hosted by a CDN and
+ therefore capable of handling much greater volumes of traffic.
+
+CCMAIL: plasma-devel@kde.org
+CCMAIL: distributions@kde.org
+---
+ kcms/kfontinst/kcmfontinst/kfontinst.knsrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
+index deaf1e08f..932bc8802 100644
+--- a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
++++ b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
+@@ -41,7 +41,7 @@ Name[vi]=Phông chữ
+ Name[x-test]=xxFontsxx
+ Name[zh_CN]=字体
+ 
+-ProvidersUrl=https://distribute.kde.org/khotnewstuff/fonts-providers.xml
++ProvidersUrl=https://cdn.kde.org/khotnewstuff/v1/fonts-providers.xml
+ Categories=KDE-Look.org Fonts
+ TargetDir=kfontinst
+ Uncompress=archive
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch
new file mode 100644
index 000000000000..3bf9315facfc
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch
@@ -0,0 +1,29 @@
+From b49a102074087e6680f330fcf61cebdeeac306b7 Mon Sep 17 00:00:00 2001
+From: Ben Cooksley <bcooksley@kde.org>
+Date: Mon, 7 Feb 2022 06:25:33 +1300
+Subject: [PATCH] Purge all references to download.kde.org, replacing them with
+ the correct endpoint of autoconfig.kde.org.
+
+CCMAIL: plasma-devel@kde.org
+CCMAIL: distributions@kde.org
+(cherry picked from commit 1ab87dbf43bb51f21e2cd9e0188cb482a541734b)
+---
+ components/shellprivate/wallpaperplugin.knsrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/shellprivate/wallpaperplugin.knsrc b/components/shellprivate/wallpaperplugin.knsrc
+index 1495b6e27..3ed59f75d 100644
+--- a/components/shellprivate/wallpaperplugin.knsrc
++++ b/components/shellprivate/wallpaperplugin.knsrc
+@@ -42,7 +42,7 @@ Name[x-test]=xxWallpaper Pluginsxx
+ Name[zh_CN]=壁纸插件
+ Name[zh_TW]=桌布外掛程式
+ 
+-ProvidersUrl=https://download.kde.org/ocs/providers.xml
++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
+ Categories=Plasma Wallpaper Plugin
+ StandardResource=tmp
+ Uncompress=kpackage
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
index 204a23153bd8..ad412dd4223b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
@@ -150,6 +150,10 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	# https://mail.kde.org/pipermail/distributions/2022-February/001129.html
+	"${FILESDIR}/${P}-fix-wallpaperplugin-ProvidersUrl.patch"
+	# https://mail.kde.org/pipermail/distributions/2022-February/001133.html
+	"${FILESDIR}/${P}-fix-kcmfontinst-ProvidersUrl.patch"
 )
 
 src_prepare() {
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.3.ebuild
index dbfb0482e579..54329d72bade 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.3.ebuild
@@ -107,6 +107,7 @@ COMMON_DEPEND="
 	)
 	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 	gps? ( sci-geosciences/gpsd )
+	policykit? ( virtual/libcrypt:= )
 	screencast? (
 		>=dev-qt/qtgui-${QTMIN}:5=[egl]
 		media-libs/libglvnd
@@ -131,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	kde-apps/kio-extras:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/kquickcharts-${KFMIN}:5
 	>=kde-plasma/milou-${PVCUT}:5
@@ -167,9 +167,17 @@ src_prepare() {
 		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
 	fi
 
+	# TODO: try to get a build switch upstreamed
+	if use geolocation; then
+		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+			-i dataengines/geolocation/CMakeLists.txt || die
+	fi
+
 	if ! use policykit; then
 		cmake_run_in kcms cmake_comment_add_subdirectory users
 	fi
+
+	ecm_punt_kf_module Su
 }
 
 src_configure() {
@@ -184,8 +192,6 @@ src_configure() {
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
-	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
 	ecm_src_configure
 }