gentoo resync : 25.11.2020

3 files changed, 17 insertions, 25 deletions

diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 0337a4b19588..6490394892b0 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
-DIST systemsettings-5.18.5.tar.xz 178252 BLAKE2B ac8ec0ddb6eb54cf6133f1616284d41afbb630fd97ac55cc6eb68846c3a7e9028ecc2caed41c35f624235a74e28d810a81196ed3d6891cb0ff1387ff4bf45f32 SHA512 b6b9184570f188878daca140bd81ee13d47ba867eac5289b67295de9918205e5ebc7f7d644968fbbd9d9dfe1395cae6bd29f7ba4c4aa9a82f85b912693ae4e6a
 DIST systemsettings-5.19.5.tar.xz 183360 BLAKE2B dc8eb9b466f2f86405175e29e7abf54a243e64022222f5e8a370d17bedcf44a5b35e760b0f2f9a7da67a5845d68a77049d7d2ba405f2574b4676a42fea0b0676 SHA512 381aa73e5bc195f2c05cf4df904a031f8415fffb99eaf33414604bdb623e8618c66ffa2e5b108b7838f5d9cb83cec578cefa4e414d9d7fa3fe258c864e1568fb
-EBUILD systemsettings-5.18.5.ebuild 1825 BLAKE2B 59492e2f140213e274061c6a5decb4c0e0e5cd4858e3d43a39588aa214f7012039c21e738989efef2165055008d37f90e2f2cf3fe20615e424c94ef06f12971f SHA512 b3edc87210717f0e4354d2d0ac359aac653913f52bbf7d32a9cb884399ea4b931b1936c26589b3262ca54e52305837d55fcbe7b1b0614de56bcf9a119cdfe08c
-EBUILD systemsettings-5.19.5.ebuild 1701 BLAKE2B a101f0a3f1f645ac90f1bfcc6cc9d59a645a0786cf713a4b496b31bda531efe8eb7da8286f16da9de70b14fcd30afd1cb8beaadbacc55428d6e5567aa88c4268 SHA512 b0ff6fd9b9a7192dec31f71cb09ded35badfe876a52973c2bb696d576ccff3ee8571c41f273294beff1102623baee1d6a4bb391033b9bee84c0cd4eaa0403434
+DIST systemsettings-5.20.3.tar.xz 193692 BLAKE2B 98d1b40fe455d667159c4b9711d6e2610b3ea9fb6de3ce70dffdd26748b940e48313a0f902cb7a71c2311553f890f759d538f5f0edb2820563025031e3149e63 SHA512 5041f55a9715c86061c68ac689a63d426b4c543b38127291bb7f9b46b062514a93d0962821d5e8e3eb8895a8be1d7404e3cb8bdbb10ff0dcb3f71e4fa1d16eac
+EBUILD systemsettings-5.19.5.ebuild 1698 BLAKE2B 4963706de0bb6d75e70bfba760302c92b1929c1bb1a4b7321de2adbf98e751b3f5e4e4cd8a2b1132ca0feb584a2011fdc18a3faa4467624dc64caf23da0ccc60 SHA512 68ce3c2eca46848c3301ae2881f8c7a75a1290aec1c9ff3be43c1461a577013d3c7dd707f5c8429c64d6783c41ba0e8848a3f401947b24c8d6a20cf013a2d7db
+EBUILD systemsettings-5.20.3.ebuild 1706 BLAKE2B f35e33dd6a42d64e57b45944eac960f41a14ed6ca6ac6e9fe800041c1b6e88847345a231e3245edae49f182a01b0f6c09e171fa9d519c9f4da5da8e927c251e2 SHA512 341c37061857e2d7aa95e1f4f95c2f72b7e8ab2b68947949b3f0d6a1f088df0a2aa9c24a8cc5a77309be3df90748e505f35420ecbecfab3f8c73748967714387
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
index 30491d104eb9..f14cde3ad190 100644
--- a/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.20.3.ebuild
index 0f5b48d3d7d3..3bcf15f96ed2 100644
--- a/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.20.3.ebuild
@@ -4,19 +4,23 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
+QTMIN=5.15.1
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kactivities-${KFMIN}:5
 	>=kde-frameworks/kactivities-stats-${KFMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5
@@ -28,6 +32,7 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -39,29 +44,16 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
-	!kde-misc/systemd-kcm
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
-src_prepare() {
-	ecm_src_prepare
-
-	# FIXME: hangs in chroot; similar to bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
-		-i CMakeLists.txt || die
-}
-
 pkg_postinst() {
-	ecm_pkg_postinst
-
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version kde-plasma/kde-gtk-config || \
-			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
+		elog "Optional dependencies:"
+		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
 	fi
+	ecm_pkg_postinst
 }