gentoo resync : 18.11.2019

3 files changed, 67 insertions, 62 deletions

diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index b720a866ade8..11eb62396e69 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.2.tar.xz 172696 BLAKE2B 9b51ad230ba82a9191c96f1df91947b3928f0f7ef81c01609712dd6c62f4709a4e298c74593b6b5a60fb2a4a1f66add67476d3c9f7a9f08216ea6a18e5024d8e SHA512 5986be8af85472c1c197e09238d36d91b13e2e2c48330f6ebc951f718d51d524fee0c8c2bf1f73268fdba0e1819e4c8756a8b957e94b15be0211f40a8b4d34a0
+DIST systemsettings-5.17.3.tar.xz 172544 BLAKE2B e9789d4e53a949c34661b9ee8f5334061de7b8dca1c7919392679658ad3d4d92c169d01f058b8f0e9ceff27605cedbc0b4105657f024e394e425fb83c69cc458 SHA512 0f4b4c9f27d9df72c4c35dbe1e22ebcd495a7cac796e8a9f0892445df14b45cf819633bfcb448c409493629bda849b2203439b7639b76d9ae566fab158a1222b
 EBUILD systemsettings-5.16.5.ebuild 1411 BLAKE2B f7bf5ba22264ec03c07bf296dc0ec0d75cc2261aabde796fbaaf400b24177194b56251c9124b6c560e2a3a5d20007a86f07a16d72c0d6853aababb084bc449b3 SHA512 3c161149e19a792559b360a7b5863df3b87c5c30795c035fe94e36fddb633ae11453ea3f93545440d7966654269fe3add7e38b51dd8411793630c2614e089d39
-EBUILD systemsettings-5.17.2.ebuild 1533 BLAKE2B 7eea00cbcb2bfe2488a3c0df4442dc87a4bf6b3a8a8fbe35ca54b7e18b8ebf7a0adb810a546b0ef5b855d18ebdb84c9b102df0e511ad4dcc0045c9fec3ef7872 SHA512 80d4843e7c91b0413765dba45ea5ea49ca68117fa2ef9ad748087816c8b672f0b514d46920569e3100ea76b32be7d58264ff90e13cb6303742142a98b899486e
+EBUILD systemsettings-5.17.3.ebuild 1779 BLAKE2B 310e7d380a701dfc76cadd300a53f0ab725368a5aa36560d38bdab9ebada84cd79eb48fdcd9976630d043f40d421740230b6b897a8213296c2841b503010f261 SHA512 70eadb859f82d134504e848425a8f9cc8009f6811f89e6d115d7c397dfb5b792242a1f70b5668c50547aa079ebaa0e393c6984247df8ffd4da0f3d4ac0c02d36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.2.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.2.ebuild
deleted file mode 100644
index 322169a1d4f0..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.17.2.ebuild
+++ /dev/null
@@ -1,60 +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}
-	!kde-misc/systemd-kcm
-	$(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
-}
-
-pkg_postinst() {
-	kde5_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
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.3.ebuild
new file mode 100644
index 000000000000..54ffd396b902
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.17.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 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
+}