gentoo resync : 12.05.2022

6 files changed, 27 insertions, 90 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index ef3f08709389..730b72807a51 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -2,10 +2,8 @@ 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.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
-EBUILD plasma-workspace-5.23.5-r2.ebuild 6648 BLAKE2B 87e6a386cc7a5a2d4dda80dd2a7ce712f2f124353835e6bb22055ee829a92125a9a1ac8b9fbe726cfc40580a31a1964941516eecf4a60f5f330e36d37fd6fd1d SHA512 d046ca0dce95f79632c345c457a6e37552684ead25517b799ce22e2a156a1954038efb3868384c7d0a4e98c7d19c8d5c61c8087895e15f897663fcc111431f5d
-EBUILD plasma-workspace-5.24.4.ebuild 6532 BLAKE2B 02ed5dbb1f14feba06d3168b3dc4a9194505cf6079bdb2b73a71139731d04472cad6a12eed49f04ca43d03b3abf456d094db7f4e1170ada9db5515684c3fe9d1 SHA512 ddc409f96b0e37c94f5617400efde7a8de96b7bcbe6e77b11999193570d7a75eb160da34bfc4e09fc77a8ce2cd8f5caee0a72c63c41a49403913495d88fd0b1a
-MISC metadata.xml 919 BLAKE2B f8ac08e31ccc060e3cc16370cc23258f49957e2a026905baa85669a46e673c83370486e2e06b0796c7385d92904cf078be73cffa934dd7188c9b231338f64093 SHA512 16c0b3e0ea50e6c145da3993cce54f99c4cea79846d3c7da5326f1d754aac27c62db8e670d449e8bcdd9057a03a846fbf40f811ae96a11c1feff484af990dba4
+DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+EBUILD plasma-workspace-5.24.4.ebuild 6490 BLAKE2B 5445697f4d3ecbc61f7714f4d7a03d7a410a1d36a2c34d0c4f9fbdfdcb861d039294557ecd7c8a91aeb6dce9ffdb931315beb4db52968af3f9868415c76e7632 SHA512 c22495611f87e8bae924b96f28df05c282352e8c303b46def1a7514b106da5b09f617ba6c8a3c4b985ad51083952d912f438bca1003a1b4f96e775e927cc4265
+EBUILD plasma-workspace-5.24.5.ebuild 6493 BLAKE2B 8bcb71ec895c5736aa743a13e17765632ec30f2a47e461ffb5d9bb83d2ff7c319962e97110299613c2ab8b7525ddbee172d316b7fad5e6e75aa45e4d8b0ef896 SHA512 a8eb9bff20073f628f7fbacc2db84181921d60ff13bfe7ec2c1c6fa7d36a14005f8801a9fc82cbf131a30c5ccbed0231d4ef9639ae18a8ba3ea79c7e67df448d
+MISC metadata.xml 822 BLAKE2B 653f8e3e3987d950746b0a5f423664302f1a59feefcf3704a6d89000748134ee26cb88262ef2fb1e6d79213b1d82c16ac4d8bcaa09a40bef987d7dc7d8a5c82c SHA512 638282cdb40c2386d56f8b20434ffd78a610e8bd4ce5212118d398ba482799de27b7eae3e7874099362e8b841da96c6c819d6e5e52f6ba97679f153425cbe55b
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
deleted file mode 100644
index e546f46d6b7f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 3bf9315facfc..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 0af150c3e6df..79fb12a10ab1 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="appstream">Enable AppStream software metadata support</flag>
-		<flag name="calculator">Enable calculator runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
 		<flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
 		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
index a783b627b934..8c06edc3b7e3 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="appstream +calendar +fontconfig geolocation gps +policykit
 screencast +semantic-desktop telemetry"
 
@@ -146,10 +146,7 @@ RDEPEND="${COMMON_DEPEND}
 	policykit? ( sys-apps/accountsservice )
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	virtual/pkgconfig
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5.ebuild
index d3c17ff48ed8..4a64d1146f77 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -15,9 +15,9 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
 RESTRICT="test"
@@ -84,6 +84,7 @@ COMMON_DEPEND="
 	>=kde-plasma/libksysguard-${PVCUT}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5
 	>=media-libs/phonon-4.11.0
+	sci-libs/libqalculate:=
 	sys-libs/zlib
 	x11-libs/libICE
 	x11-libs/libSM
@@ -97,7 +98,6 @@ COMMON_DEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	appstream? ( dev-libs/appstream[qt5] )
-	calculator? ( sci-libs/libqalculate:= )
 	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	fontconfig? (
 		>=dev-qt/qtprintsupport-${QTMIN}:5
@@ -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
@@ -117,7 +118,7 @@ COMMON_DEPEND="
 	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-libs/plasma-wayland-protocols-1.6.0
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-util/wayland-scanner-1.19.0
 	x11-base/xorg-proto
@@ -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
@@ -142,13 +142,11 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	x11-apps/xsetroot
 	!<kde-plasma/breeze-5.22.90:5
-	!<kde-plasma/plasma-desktop-5.21.90:5
+	!<kde-plasma/plasma-desktop-5.23.90:5
+	policykit? ( sys-apps/accountsservice )
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	virtual/pkgconfig
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
@@ -156,10 +154,6 @@ 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() {
@@ -176,9 +170,17 @@ src_prepare() {
 		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
 	fi
 
-	# KDE-bug: 433730
-	use calculator ||
-		cmake_run_in runners cmake_comment_add_subdirectory calculator
+	# 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() {
@@ -193,8 +195,6 @@ src_configure() {
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
-	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
 	ecm_src_configure
 }