gentoo resync : 15.01.2020

4 files changed, 43 insertions, 38 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index cee3e85d4c09..bdfea2a13879 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
-DIST bluedevil-5.16.5.tar.xz 160136 BLAKE2B 19b39ce147a7678d8740a9c209e5af5c80d1affebb349f03b49e48f170fa1323410399c32b56b844b522e75056680e926bb1a432b69567cbede256dfc977b6f9 SHA512 de3c767413ede046ef39bc249c728c50f22db04ce1062956f9462214cf0d9dda0468ea3e463330663da720226a97b3bf935c5c138d282d066181faf0b6e55828
 DIST bluedevil-5.17.4.tar.xz 160528 BLAKE2B 88f5e5c28221fdd2e07c407daf857c4b02e45fe6f178042519a2acb9ffb2a1367ffdd89b58c00fafd81f649ac46e297876179daa610d716f986beeb3d10814a1 SHA512 d3f64f340c4cbe29791407ceca28cc70176d0d8d888296d557c01400065d8c05dfd647bb22c104bfc58dc4288bd9e2ef0da1433aece5c8d82c71910d4c9873c9
-EBUILD bluedevil-5.16.5.ebuild 854 BLAKE2B f8d5f9ab71706527cf2dd6291e53c2d6bee0e7ede681bba227191eb0822e8aecbdbb7c1b32ba02f639b1f54b8c0818d78158cd1c52aa425b35127195d7717c11 SHA512 08f883f38ccc2fbd166ede36864cfbfc8da52eed34b6eb253249bb91c7f1b8b76e01e1490c66e4682db4f94cad8050cf88210a71f72ac876566e5839fd2bb41b
-EBUILD bluedevil-5.17.4.ebuild 1058 BLAKE2B cfe5a8706656a9a43f420e44ea5814db72b749a568d75aeae3e1b53ca8ce918405c72859e18112d7cf97f88c7c1f40b64b7d00ea3fa9fa72185c0c7bc4fb79f4 SHA512 a46c7380c309361a5655aad336ce976acc598c9f5336c3702b0c71e5122a70f86ccea0a0ed7b6665bd68f74af4542596a8d43a7b8186b8183269ce255ce454c6
+DIST bluedevil-5.17.5.tar.xz 160996 BLAKE2B 57ad3e69ed6addeb96bc4969bb8d37f738c03960b43921421f35af5c4f6d230f92160875c1b0f2ca201d2d3ad5227df1e5d6626b251cbec4659845847c93ce7c SHA512 b20616e4e9fbbe144b7ce0b3c4e1a72d543deaa018ab3fc4ed93d04d613102a29743b33060140d648ca756f87094f682768142752ac9ffe9d2ec6ed08a7e9b1a
+EBUILD bluedevil-5.17.4.ebuild 1055 BLAKE2B 13753ea1de8cc3174bd15fcd035fcad28cbe8e7a85126be5a645f2fcd0f133794cb82cbd6619c77eeda1e173a19cf11010afc2705b3a3f81405636db682978d5 SHA512 d1a98c960db3043872b78e9f787c6122065b3626d25d641f8b955dc5a648d266ee7a00c3e462ffc48118e3abce56908877a667315cb77940a2186f9cddeb42e5
+EBUILD bluedevil-5.17.5.ebuild 1058 BLAKE2B 7c87302c040b085a37ff5939c0f7e86d1249df6f5e2d97bfaa298a96559cb6f0787782725cbc90ee751457b92f1c185b180da22bd7aa1f0b32dd34107a4a7d85 SHA512 4643cffe833e43bf66e13720dbd4cba1550b18eadb26fe49eae1a174935c86b8129a91734778edc3b723229efd192ef2396c0b0d7f8f31c8f2f3c5b436b54c9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.16.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.16.5.ebuild
deleted file mode 100644
index 0712de35aeb2..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.16.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
index 2514f78b89ea..58a8699bc828 100644
--- a/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Bluetooth stack for KDE Plasma"
 HOMEPAGE="https://cgit.kde.org/bluedevil.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/bluedevil/bluedevil-5.17.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.17.5.ebuild
new file mode 100644
index 000000000000..817372a780a0
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.17.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://cgit.kde.org/bluedevil.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/bluez-qt-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"