gentoo resync : 15.01.2020

4 files changed, 73 insertions, 68 deletions

diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 95ac48be5d6d..1f42cd41be7f 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
-DIST kde-cli-tools-5.16.5.tar.xz 587312 BLAKE2B 03b2188eb4ffefdc790c16fe791ec4e1748acae310655510490c8950ec03ef69f565d83d5d645a20f1d0cec2f52a27943dd0617036e99f3ca0e83d714bc085ef SHA512 11b5acd6bb0a6a7e566e8b6e6f24299bf23128ba1ed9cb0ae78c8e344da3c0769791b5543fac2152cae638b90615cf6b8c4b455a95f6d09afa515eb391370406
 DIST kde-cli-tools-5.17.4.tar.xz 592128 BLAKE2B c858c637572584e54d99eb2facd0b2bf16ee15a6d9c259032ad01185e5016732e47c5e127b1fad38080b89701aee7c5fbdf9499ae027b6d37a2141196458afab SHA512 bafd8386813dbdf4c5c8a34705938925c34ffd531befa1e5a92dc764a46c4de0a78344de6c76d6c64ee6f7bed0b6328cd1f2c1cc1afe6df490901755f1e0da48
-EBUILD kde-cli-tools-5.16.5.ebuild 1511 BLAKE2B 7eae9cd1c20276faaf671d9d0bd5d698d4386f5dc248278d9ff9cb568a693218a00b1cb1b4026a3906728d6f4c5c1faea954874b38f9b00f866d87d8a1a28d9b SHA512 f4f53b9d0bd28fb789ec7be1c12c00d8ee75aff4c148b654250d913a841be1856dde8d12149e0a3026c6101815e26ca726ef7ce74f7786d7d0f454eb9c28c381
-EBUILD kde-cli-tools-5.17.4.ebuild 1713 BLAKE2B dcc61d35040c785d7e50a4a15a822ccdc36feac3d01c6225938f0a17cf23b4647568a377772c01d8ebcb33f8577074eca9f55f4c8a1cb9ea8441315b724f9e44 SHA512 f72138d4d9d6d93fd494bcd23e778ce8ba9fdfa28bcfc65eba337f71432e8dac2b8c64a1b48622fd7023b5264c00924d891a9062bb2075595db9a619ec5f36a8
+DIST kde-cli-tools-5.17.5.tar.xz 590264 BLAKE2B 6758b9e153a5f87fe903fdae4587e16f5c61eaae043a7ff370bae5b1f596afbaa63bcddbd1439eac8776f20356b96589a86d87ffe7311cb54973035fda17e517 SHA512 65c1fb474abc193eb1ca3cf230865edc795e5df85d9daac7ca594a507e729db6dddb50dcfe4b7caad19f87b4a752d793c8ca590101b59a2a16ec7b079cf524e8
+EBUILD kde-cli-tools-5.17.4.ebuild 1710 BLAKE2B 204a6165b99995964239f882a1f50e0b8125b239c0f6140e1272f95bc25e9e7aef9e93e4c3d1d485a5d9e60f90f45d25259599727cb7cb846e240dc0f6f210a0 SHA512 673a719338281fda9c277a8e4586761ff6fd38a62453f03fc809fd1e8e3f29d62c84a12ca0b1c6449ce9d303d3de97d7ab5531e5e8d2c6a71d1883eb51d3e557
+EBUILD kde-cli-tools-5.17.5.ebuild 1713 BLAKE2B 2e203f09a07ef3eee69bcf03810f682e645c40d118d02eabcc6d24078008c38a1f4338ca3b1b30fafd0caab592eabe89b27f844175c1c20a84261ba559c1c1ab SHA512 6e708f2b1f0780786d8f12bea641d02d89b2d20fa4f889c0ee53b6691dff37e369b256e8ae6f16a1cda43c7769071630c3b3c6fe7309f027382a67fdc7a82ab6
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.5.ebuild
deleted file mode 100644
index b770a42ebb07..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	kdesu? ( $(add_frameworks_dep kdesu) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
index 65f153aa12be..0177a644d52f 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
 HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild
new file mode 100644
index 000000000000..2162b94c23b5
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	kdesu? ( sys-apps/dbus[X] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kdesu KF5Su)
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}