gentoo resync : 15.01.2020

4 files changed, 51 insertions, 47 deletions

diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index f77063678f5b..3f599e7124e3 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-vault-5.16.5.tar.xz 127376 BLAKE2B 94f6360ab8bbff5210a516d020250f4fffe1c61bcaa579d4f9d4fad1caa15a2dcaf749e04919a0e36fa08acb28fcb614820408008bee8249397410e81cae847e SHA512 bb5d06af090b9659cf9d253b8469e3b7264d7a820c6bbdce7db414d3a8e5aef5dc1122d11285194afa0b2d1aff2a0a2dd8a74036674541abd7938d38521afbd5
 DIST plasma-vault-5.17.4.tar.xz 129308 BLAKE2B 665994f13af2c621537a05e2495fdaa277cf80b1e7a764fa26fd953c14c1c34437a7939dd61d1abae781a49778916490405672225bd34ba4ae9dfdba0be26868 SHA512 f266027758128cff45dd2ed8c06a9c4c56dfbd734b00a55abeca2219752a53831c20fbaef68942ddcaddc6de15fdfba9ac3305ed3dc4ce71ac4dff6f6f57a9f1
-EBUILD plasma-vault-5.16.5.ebuild 1077 BLAKE2B b1438da912bef60253a671afd9121d7b78f7541645600730477bf1df40cf3b91923b7e873b6afb1590c363cadd06c6328e7e8f9d222743b92deb25bc13ec28d7 SHA512 192b5ef7ed418b69c4f687d3489a4cd51c5de7432211aceabe122992afe445f606b5eb7b3131d2900590c842fed7041b3da11ae6d8050e9e7ea20f6b44dd2e94
-EBUILD plasma-vault-5.17.4.ebuild 1232 BLAKE2B f3cdd2b04db1594b25cfbc2cd5fe8263010d9ec6f2628c06f056df19ccb4070129f1e6c16181b450f8450dd1a5fe8896e83387b730e007a6c4e77fbd6c517459 SHA512 e8c04a36f249dcdba62c675c83030fb1121e5b5d1b55a072793427fec6a909212d2a8ae571924d5b9684d963aceea7041e9a7aadbcf537b93d45c5ea15a5da24
+DIST plasma-vault-5.17.5.tar.xz 129144 BLAKE2B 87cf670facbbea5808be8fe220a9218e02ddf3355459782977b098551ebfe18dd34c029243d666f9bb9c2262094808bdc71e77891c6b9f2907fb830e67603f2f SHA512 fe130942a31f815400f7bf61c5d822f272e32f0291bd94dfcb6b3c8317a33dd8cbf4e23724a6d670d1975511b5b9a22a75c08e918849c4910bac3a5197964383
+EBUILD plasma-vault-5.17.4.ebuild 1229 BLAKE2B 323f580765eb483e2cc29648a01f6af3300920f13a2b897009f27fd2770c68bde02eccc14b0e4cdba174927ede98892f994d0ce1186e9c58083350a23ad76d7d SHA512 497d2d322a5a98271a344f73957f4684e36908840e31c308dc3d8da4d46f97da7d6937efce203298fe3a3be928ab5cb6a2a52ece419c45702fb93c89c33c6c51
+EBUILD plasma-vault-5.17.5.ebuild 1232 BLAKE2B 7ecb811756485026343dc3fe48ca58c3dec0e050b7ba5a7aacf482181cee10400c4177474b9225747a95d11480ff653c8754c9954c00d979eb27e4a1502570b4 SHA512 bf5977c4d3359a53a5538d0fe54b40c4187e0ad307f608edb9c3f7061bcd6d41e8fa2256429202d700ec4b1cc6a0d2f2d85e3369512119255451ce7324cf92d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.16.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.16.5.ebuild
deleted file mode 100644
index f70c37f54ade..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.16.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="networkmanager"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
index 179fc24cbc8c..7c086a8ba5c6 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild
new file mode 100644
index 000000000000..5042b0659f52
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild
@@ -0,0 +1,47 @@
+# 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="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}