gentoo resync : 15.01.2020

4 files changed, 53 insertions, 48 deletions

diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 02372c05d155..d798ee291dc6 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
-DIST khotkeys-5.16.5.tar.xz 1846184 BLAKE2B 3eb83840c540e64d9c30616bb366580f4e9c606a9f8ec3fb613019fac3112460a95059526a067af92fa005a175fa5bb72906e087451484a55fcae25b86feedd2 SHA512 f389396c058dc261a16f6a73f88babc24dc1d7226e35d798c77629bd3e15f1dc9bc2923f2eedb601df6517b168c251c8c6341f364ee14facf4d267e9e5358f34
 DIST khotkeys-5.17.4.tar.xz 1854756 BLAKE2B 7c8bb163d1ca8703ac7c78d38744889792205cd8286b3d2e88f841df42b68a4cd0d86e5c7cb1af5797857e329c3b6974b883772ec730f1c0325dae2981faecde SHA512 81cde2c4d9e06954d7203fedf47a0b08599795d94446eeb954de6b62b17882313bec5f325374acd662e7e77fbe2817151bc7944b6b7c1040b78ff8e0cc69ee7b
-EBUILD khotkeys-5.16.5.ebuild 1118 BLAKE2B 85f6887495e61d2b0fd9febe31963455c8144d9f22b8baa69a7e5e7a7daba6333fb940d8219a94166241949b778f684ab9ce2b0c2ef5cdd5be4f031bf0a379e2 SHA512 aee5200908e2dbdbfecefeb6d4dcb8638d176fbf31771bb8221d409e91065ed117ff91e9e731c4cec3a0cf034330452d8ee5b7ee2d9435a01b98daae84812353
-EBUILD khotkeys-5.17.4.ebuild 1341 BLAKE2B 5b928f07b29cab349b3e6ed4b21f098718724d483209ecefa10b2066ba3e8e0c3ffe8375a77df16adbd51d85dacd5ded54067933765f1dccdb258251b6d72f35 SHA512 b4404534f1911c932afa8ab82212ba0ca38dbbad7f10342b5da88f28eb6b76a9a046e9bdda62e582187a83da30cdfb7d44003c26c3a66b8488d3b304e2ad6a56
+DIST khotkeys-5.17.5.tar.xz 1853632 BLAKE2B dea94dd9c53a0c6d9f6b08a258a69b8e7dc3e64207ecc32429bcaab494dc99ac6d11428ab3886bc47f54444a54731cf784765be6dbaa19220fa6b1da31348697 SHA512 772e743860db25fcd9953de987d86f2eb1d463fa8f517add7f67426ff868c6b943dc515c23936bd803a680884e73a081e3226037b5f02080244b401b1c1211c1
+EBUILD khotkeys-5.17.4.ebuild 1338 BLAKE2B f688317d66319d8989e33d2013f280be0998e4308587f80302087575506fa4c0af4c19220f9e6127508e1813d672e10b3ee1bdffce46d2b2948bf0cda35f1afa SHA512 6fa6cecd0c2a352098cd0df680bfd64a3152b8139695973b023fa6ca3a655de1ba9fec1ad05912389fb7ab6bbbceec6d38d8ce43fee5a3af339aa58ebecc7192
+EBUILD khotkeys-5.17.5.ebuild 1341 BLAKE2B d005c7e2c99b99d414e121f05fb689b6743c461fea3b251520e9c2e49d4e0fcd9390f238f1b23f84a7154c1c16e125247def4739f9987203f20fe32e050a85ea SHA512 e2d628d322caf1990458599836b383558b3c188af4179864352d935f407c2e2899a71bb9653d6fad7fa0699def42ad3d507f62a127fc8c2ecb9dc6182d902e81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.16.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.16.5.ebuild
deleted file mode 100644
index bfede84a5c01..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.16.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-inherit kde5
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
index 8a49dd5ad90d..6d02928bacf4 100644
--- a/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE Plasma workspace hotkey module"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild
new file mode 100644
index 000000000000..e805f20f9987
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${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/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"