gentoo resync : 15.01.2020

4 files changed, 49 insertions, 43 deletions

diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 5d6c5d9136b4..90eaeb55bd0c 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
-DIST kscreen-5.16.5.tar.xz 122200 BLAKE2B b404cd9c23004398f19513dbcb941958ef09a8cc28e149a370b297a4d49eccea484da89ed0fbda827c634ac00fa0651fcd9131c4949bb8de644945e0865acbc0 SHA512 4c3307894698ce8e781cf6ce27b0394725d1ada5e46c599ef6c4380a2213a0059004943b795edf9bab7b343576d4dc8e1d18add3b539f40381286d1b7e4ea726
 DIST kscreen-5.17.4.tar.xz 100032 BLAKE2B b87e97c9cc16eee6f9f0ec2522b3a96eadaa40e55b3ea7b3a5cd4b24fd32a79fafbb9b710d262e5399a2af9363c43f71dd1962269638a41b08314f57e4c80ce5 SHA512 f8927c0aca28107a8c19a230831ddf7a7e3b1bc87f7865bc74b76aabed9b8f512ed09fa24436691bca9bb833bf3515aaf734962845c1f085a32da21e00e7bad8
-EBUILD kscreen-5.16.5.ebuild 944 BLAKE2B e3efb10975048d182736edc78a5fb7ed55170a41fbaba70b8ab3e566df19c9e138f5ce60094ce5418e6270ab225eea0dfbd0374fa554038e005a3f0a70ebfb7e SHA512 f81c103d465ee6fb15d791b014b14c311bb63e594314648945f68bcfe691f6308cd78c6eb8bb550461e1bc915d6b14a54a88a2173cd375a495487da5b4e03fe6
-EBUILD kscreen-5.17.4.ebuild 1185 BLAKE2B 4885adefdd330a4767411b1fe5303a912c1123cc6d3ee58bac1ad038f1f78a909f45489523650dad1d956e6efeac6ff2e273f8719673a6474687d3b9b037d0de SHA512 d716879a479744830061b922e8e26aa8c1869c07079729414e9f2871233482f0d4fc167c770198732df03174f34fe1d2b7bb4903314fb4892aa4196f586bed82
+DIST kscreen-5.17.5.tar.xz 100672 BLAKE2B 02c3f52d6cd457ee7e9343790aaf6ba87227e4b8499b3c5fd1920c5140b59a60b81a9202ebbde05db4705d25b2ae949e44247b63e32a645616ad2bffe7b2c6c2 SHA512 3a0abdeb8aa4ffde8a3aefee71292916ea1331ff91292976cb94b6def068d012ead4fe1aae3c6ad9353423a701cfaaa051f0455897fd80693a3281a33fe3d332
+EBUILD kscreen-5.17.4.ebuild 1182 BLAKE2B dce52d6d61d27c64b27907d0c33ab49c956940ec1646c3a4d039a70e99ee2d55719186f6134cf2c9f383b7e95ba2f75ad7dd9c31a21b2fcd4389d1998d02cde1 SHA512 7dde8ea40b406d441c6c55c980c521ade5af7c9ae7cd25ff1732ecd098553dbadc3acf7e4c4a520dc03474e5d7ed58f0735e7f2b7d9c7a7efe5a5fc5a8db49ed
+EBUILD kscreen-5.17.5.ebuild 1185 BLAKE2B b16a9ebc87e6e36e0fa1d10b83bcd299975707dcabc3b4fc855e644e9b11eed6f44b625eb9d91f44f7105decc58583ac1049759bd72f496a29912ef32f6620ff SHA512 70ee19befb7dcefebefb420ae0d5e4a3c47a5799e2fa705ef43d88a8e61f4071d3a8f9d6af377a0e29268a992a96a23bd1ad57f1c7f5d2868324428300b72696
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.16.5.ebuild b/kde-plasma/kscreen/kscreen-5.16.5.ebuild
deleted file mode 100644
index ff19cf5b12ed..000000000000
--- a/kde-plasma/kscreen/kscreen-5.16.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://cgit.kde.org/kscreen.git"
-
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.17.4.ebuild b/kde-plasma/kscreen/kscreen-5.17.4.ebuild
index abed1c8573d8..cdfc562821ae 100644
--- a/kde-plasma/kscreen/kscreen-5.17.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/kscreen.git"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreen/kscreen-5.17.5.ebuild b/kde-plasma/kscreen/kscreen-5.17.5.ebuild
new file mode 100644
index 000000000000..277c8cf09347
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.17.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://cgit.kde.org/kscreen.git"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/libkscreen-${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-plasma/kde-cli-tools-${PVCUT}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"