gentoo resync : 18.11.2019

2 files changed, 36 insertions, 31 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index fa417606bf59..621b2caae6f2 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.16.5.tar.xz 122872 BLAKE2B 0a25fcad963696394de880b2dcf8263cc8d8bfaf9ab7ff70aaae497cb46f47574dcc180568967ae05ee95b9a818f5e66e243f35cfcfe29756632bef12ad56d18 SHA512 ce7cef6ca4bcd94f716b70df26691dc70b7709421d56827ef2e355a3350af71779168cf17c0437e53ef0fc930f20590a7e7ffa5f11ea01d3a4f2f25e1fa00549
-DIST kscreenlocker-5.17.2.tar.xz 123688 BLAKE2B cecfbe899b919a15479a8365a7c4f7a802c8fddefbbcba592f1ef4431cec0801f7aec8124b528953bb5560f8a77cc57a5de3266f9486747862b6755668883931 SHA512 6f7ce4275e674835d03a695a690c8aa9fa0a9f2e99d71a7e48568eb38bc8501f82fb125885fa585f07b0410d9f74bbd89bae43413db694134814aa02c9c7c144
+DIST kscreenlocker-5.17.3.tar.xz 123624 BLAKE2B 416da5d3ec15ff797f2799abac721e28004e8c667d2372d253a2b7d4d9cd31967cf97101aef4e20d6ab3f70b11bf158fe5fa2054ad60fd6b41f6cca569267fc6 SHA512 82b1639c0d0b5e60ec0c7a970813dbe054130f86af48bbad590168e5a292e1d970be76d044a8b663f201c01becefe060c87ee1112390ae12f9ac88f1d81e7c57
 EBUILD kscreenlocker-5.16.5.ebuild 2136 BLAKE2B 10f918df9df18f8607cecebb88f5a4050c3698f8a5d04d482d6c80e7b85c3c54240e87b99aae27fd6c3cb4417611fd4d8fbe6a7044ec80e60c0f4cf1b9a5fc5b SHA512 b34745f4184cc3eb52d7266b5e6fd8d682ef366a43b8230a76fb20d9b5dc89ff6560fde431236a7af79f7af8a669adf49271d28071f27c0c3fe2be5961a7e829
-EBUILD kscreenlocker-5.17.2.ebuild 2139 BLAKE2B ffc243ee7b462661106705e89530c48cca83139bf71df483b6c06ef55ecf7962eff433d152f8664b142ae5201bae3a0e07704ec6b8dd113e1375ad3de4c12de0 SHA512 a165aab61021386c257e41949bd0dbf0198fd3eb84e24e9abdcbf4eddfd9a7ea70ec752c0656a9007f172c0d1ad3cb43632034873fbc69b9de58bb491eb4cafd
+EBUILD kscreenlocker-5.17.3.ebuild 2365 BLAKE2B 66ad257f5360db395b7c7a88d34a1e00ef4fc9b9b486a3ad95d79c856831878d65dfbccf9b04dde90f5b571690d6e6288c9b088e022f8b2ddc55d12baeeb25ed SHA512 93eb9bc2d9109fc6875f4ab77c9da18b5840046bea7965b78e7001ae282b8eb3dec124bbcde09abf6ac3bd530a73f4c7b41d8f0b15c3fc85c0c0c411aa14db7d
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.17.2.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.17.3.ebuild
index 568b2f8fb8ed..3ddffc5bbd02 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.17.2.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.17.3.ebuild
@@ -3,39 +3,44 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5 pam
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org pam
 
 DESCRIPTION="Library and components for secure lock screen architecture"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="consolekit +pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
 
 RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	dev-libs/wayland
 	x11-libs/libX11
 	x11-libs/libXi
@@ -49,13 +54,13 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 RESTRICT+=" test"
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if ! use test; then
 		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
@@ -68,7 +73,7 @@ src_test() {
 	local myctestargs=(
 		-E x11LockerTest
 	)
-	kde5_src_test
+	ecm_src_test
 }
 
 src_configure() {
@@ -78,11 +83,11 @@ src_configure() {
 		$(cmake-utils_use_find_package pam PAM)
 		$(cmake-utils_use_find_package seccomp Seccomp)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 
 	use pam && newpamd "${FILESDIR}/kde.pam" kde
 	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np