gentoo resync : 18.11.2019

3 files changed, 71 insertions, 66 deletions

diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index abc5b0221157..5228fa187c3a 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.2.tar.xz 591820 BLAKE2B a14a264d9102185f55c02d3339fd372418696832bfdc0b048aeba434b64e2b1cb096f7837a08a745505f416d31ca286c6e049efad0bb52a56bdc186ada9d6d44 SHA512 51cbe94b98e151553fc6752dbc280d95f076cbcd9e26db02f193b8d6a27b5d14c20e3bc5051cbbf44b71b90181ad833da63063ed406c508a686900fbdc8de397
+DIST kde-cli-tools-5.17.3.tar.xz 590648 BLAKE2B 3c001e8ccc72414944c4ddb9ca05d3fcf9756db30d72323353b689eb2e77db337542d14eb08865466f003e75aea118aba0b635f534876a5284aad67e2cdc2e02 SHA512 d7fafdd008799d22631ef14fd040ef690b68d2faafb857313bac5b4d6f7e3a53ef5c242b6ffdb43a5bb2a3e1a9a7daa7647108e6ce9567e1e181c00b25a7e340
 EBUILD kde-cli-tools-5.16.5.ebuild 1511 BLAKE2B 7eae9cd1c20276faaf671d9d0bd5d698d4386f5dc248278d9ff9cb568a693218a00b1cb1b4026a3906728d6f4c5c1faea954874b38f9b00f866d87d8a1a28d9b SHA512 f4f53b9d0bd28fb789ec7be1c12c00d8ee75aff4c148b654250d913a841be1856dde8d12149e0a3026c6101815e26ca726ef7ce74f7786d7d0f454eb9c28c381
-EBUILD kde-cli-tools-5.17.2.ebuild 1514 BLAKE2B 09618b35b7c272a71a932abff94324ea963f23dbb92431e790aa33a154f42a4f616a54dd82bdd20da30b5e95bbe2dfd541bfc483cb038e3432ba3e003adfda0f SHA512 eabdfd68a32c9edf0b41ec6351afc93c9c7e571e25706022a43a3c9f1f3c9cd29787a705dbe86ce8fa5c0473557c97f0b7a501a7229dd590de903ecba41e79d6
+EBUILD kde-cli-tools-5.17.3.ebuild 1725 BLAKE2B e8626ae6f404d93f378dd75ab88faed5e9a94b8a7e1a48677406e0f42e71a8a28faa7f0bb07efeef789be988b6fc9ab8623f2dfcd5f241d436344d4e334fc627 SHA512 04dbab5a76d644558815c4bb43195dbcc9ca5ea12c4e89539618d251699ebc69b2b226221b9e608d35e0e8162f55b466e058bbcc1e3473033ee2fe0116862fe3
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.2.ebuild
deleted file mode 100644
index fe466b4b22c8..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.2.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.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.3.ebuild
new file mode 100644
index 000000000000..4c7dfc50eb8b
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 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-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}