gentoo resync : 15.01.2020

4 files changed, 69 insertions, 62 deletions

diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 2afdf5e67adc..23fdd2941045 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
-DIST systemsettings-5.16.5.tar.xz 180252 BLAKE2B 75860a6aad43dc2804cdb4eaa649dedeaba9fbb3d5a78bb4c49309e2e452cbb08b29040426643d5a07ff904041787d72ec0e924b4e0b81b5ad17aa0599139e8e SHA512 b9899ff13a16fcc59d3daf47d327e2711ec544c672e61ac875a4cfb02716849d735b8aaed20e4e38ac5f8f9f926ee01065d2d2d6db76f74e72ad5333c96cfb0e
 DIST systemsettings-5.17.4.tar.xz 172764 BLAKE2B 99af8adb54a43d649ae44832ddff7e65acdc06416b20bb26513eda22dd49f73cf6d2b734ba12424d32f66e7074a515bb97d31d00562ddbd15624f7147df40704 SHA512 c06662eaf4f75a498a2e28168e88ac70b421ed634b8757aadfd27e31e1ad259b2e3199d56af154cacfe4096f5d54e2596f5c2eb914b6668ad040cad2d7549194
-EBUILD systemsettings-5.16.5.ebuild 1411 BLAKE2B f7bf5ba22264ec03c07bf296dc0ec0d75cc2261aabde796fbaaf400b24177194b56251c9124b6c560e2a3a5d20007a86f07a16d72c0d6853aababb084bc449b3 SHA512 3c161149e19a792559b360a7b5863df3b87c5c30795c035fe94e36fddb633ae11453ea3f93545440d7966654269fe3add7e38b51dd8411793630c2614e089d39
-EBUILD systemsettings-5.17.4.ebuild 1779 BLAKE2B 310e7d380a701dfc76cadd300a53f0ab725368a5aa36560d38bdab9ebada84cd79eb48fdcd9976630d043f40d421740230b6b897a8213296c2841b503010f261 SHA512 70eadb859f82d134504e848425a8f9cc8009f6811f89e6d115d7c397dfb5b792242a1f70b5668c50547aa079ebaa0e393c6984247df8ffd4da0f3d4ac0c02d36
+DIST systemsettings-5.17.5.tar.xz 172720 BLAKE2B f8cc7bd6e554e0a88c4241ab255b63fc259f09182c94e5ceba6a931a79927c52df926e8121180ea96075bf428dc28e3cedba9a4611491e06a151fe8d23a380b5 SHA512 75844d5bbfe518f857f24df46769ef38460518fa7eb548ba4903619dc6336d85f2d8d4ba7dc6b36bffd04dc1cf6f3e515e49a4bc537d2b1fffb374005c622b7f
+EBUILD systemsettings-5.17.4.ebuild 1776 BLAKE2B 5ad7d3b14162c9c403131cc86217dd65a3a6c88de58044d4b6476d9cd5f1b9203f70e886945716ee784a7239f256174e46ed20c0a9e18308c5a09be6512ed858 SHA512 eeac6fdaea801f3b50cc24a09a791c8356b54b06721031542a99d5f54e24b4f821cd4f42b75397cf379433f7754f023d701de55c579e124c143fe76ba61222eb
+EBUILD systemsettings-5.17.5.ebuild 1779 BLAKE2B 33787a9a9475f7570f110a41d94c5d3c9fa9cc104fcd5c859733dc9bd095a952f1270c79d13e7debb6a7a266bdc37ad0931b7afc9773f6e127120403406d0977 SHA512 b5b5dbe0c687e507dfcfeb0e76a83e5c982182fd91bdb7e0819af547fee10d9a9697abbbb564af83afddbadc802f504aa7ed038e72c3c6c7bce3105107dddfbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
deleted file mode 100644
index 12bfd748c79b..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: hangs in chroot; similar to bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
index 54ffd396b902..f33b1039c611 100644
--- a/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Control Center to configure KDE Plasma desktop"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild
new file mode 100644
index 000000000000..f8d92ce2a4be
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=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
+	>=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+."
+	fi
+}