gentoo resync : 22.10.2018

3 files changed, 18 insertions, 9 deletions

diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 87a2c32448fa..4d5b04f450e5 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-vault-5.13.2-nm-qt-optional.patch 1679 BLAKE2B f49742dda0b7de7bc76ec11002043093d2d955d3f53501096b7f66e3d031727a28e6f97dd85ab27d2b4d7c4413ff2831c79595e73ea76daaf0b4704c993c5e89 SHA512 faed86fca848ea89d3d00f5f72bae9c18aad2e5f091eb78a89c91b9f2e9c979e61d9f720ea9cbbb312fdd54b9b0da26559c6263b90c037934bb296c4ef5caa1d
-DIST plasma-vault-5.12.5.tar.xz 105108 BLAKE2B 4a4d574a08e52e3bad11ccc58cb509bc2a837767b10ea2cdf78320ab725d797a7a769c13209f06dfdc827ce1095a7ae3c73fe0bd3110430070e9b1957392f1ca SHA512 bb28a762b318707d61d7ae8621e0da31db9efb9171503c6f2ed9d53f29e78caf5716a86f7c9a6ae00cba2f6a1135456e5664e2f284d5a25214788b1099fa8345
 DIST plasma-vault-5.12.7.tar.xz 106780 BLAKE2B 75f6ebd3b4f6eaa565e6abc318632577a74488dc0a6e21dfe20df74c2562bb34ef85050ca5b0a18d02f7781c7b10c1588030bfec01b99712212c6ae6c850fdba SHA512 fc628ebaeb7b8ff24ca91290c3a0c27ef47b4245d1ca4766eabbdc5a59010b99375bb6128f36719be97261b7b11283a46759b37bc11211ac60e9dfc0d5c56e47
 DIST plasma-vault-5.13.5.tar.xz 114908 BLAKE2B 8043b46b5f8c0d2b6f22e6afedabc3b8116aadf47a5cdd1ca690ba2a232e5b6b7deb8de3bfd58a3566880f0b6c445e5d8ddec3165a6b74ecbf5d51ee3c981422 SHA512 f6579fd9134039c105f3399818520077e080a603459ad20d08825f00f341930dd84c0e6cb1ced8d722efd941a40751e7025a74098c4c1d4daca3b8f284fe38bd
-EBUILD plasma-vault-5.12.5.ebuild 856 BLAKE2B f7672f6b4868877e27e27c0028176f8f7ba0642c1071f23eda887f3fa174b8373dded2eccc36623e2623ac6de82396d8d9490aa38b72a94fc177c50aafccebeb SHA512 6e64d0bd6b08f47f5f73924cb4dc240a01405148286de6e8e3d01604ca27ff9fd1a24ff772c0dfc5ca5e218ada804e48a6cd9a4400f2f5284fbaa6e2ca52b329
+DIST plasma-vault-5.14.1.tar.xz 120500 BLAKE2B 88e5e171905f2c8bce29e38a62d9f876dc4ee4552001ea697755eddb5b6ac002a752afdd54d7523ce8ab02dd099f17c7406c21dc9d2139ee8499d8c832b87cd7 SHA512 83f01e2542aaec759dacb7500d07a61d72890107849a1468021df5412ba90eb03193550fa8972a666f50493ecccd9198d1a9df3808a14e1191a930cb100a06a7
 EBUILD plasma-vault-5.12.7.ebuild 855 BLAKE2B d2a15f5bc9f325556f42f897e0b781a26a71f1c6a7a74a0005580106042bfafadc0b1984907c874bac63eaa033323ea5217d03697ce6a4caddf4a76820652b3d SHA512 ee1dd5a2817c74c02e8807de26a6a8c8aff796601c1f594721284980b71f73ec564e18257ffb2f95ce1076d1af221c2b70dcdc4231929b70aa90e0193320216a
-EBUILD plasma-vault-5.13.5.ebuild 1137 BLAKE2B 8ad0836a50c02b632047fa67be439aa70aa1b5308624e1e6be93e1d60fe0ed07b599d2f304d66c78be326203434f48014396119185eb5bde7e005353d30fba65 SHA512 ed2ace4ad487ab4a4f53be35c8cfeb68c90ddd87ad09623a253fcd313c3b915a157846724b8bebd0bc96f7713cbcc13a583c38bf7dc393d6aaf7587b0f1047d0
+EBUILD plasma-vault-5.13.5.ebuild 1132 BLAKE2B 312a8ee062aaf47aea7d6e9b1a98ec2aa60316ee8e6c434291d1dbc53ef40e8004b570d1b2801476317338d1652e5ec5cc4820c518a4bb8b80d66bf9dbdb6654 SHA512 5b601579eea03c6e06ed11e29c137bc4e8ed893c74f731b87614149c396c279b519119e8275ac47ad91266c11a7db02674da3482f79ec6c38e7139aca55fc4c0
+EBUILD plasma-vault-5.14.1.ebuild 1073 BLAKE2B 214470e62ad0800c231c907dc29aefee6b3fc34637680e8c57949a0e89810b7076e95eb75e3e98f5c666faef690336485194290bee367c10daff9c8b1e181594 SHA512 023b791cc132616ca2db3cac07d70d7d87c196cf423495a36a6d650bb84792ba4f1393bf3c973a6d13e251828661fb674989311363d860c0ec2754f2ae9f4951
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild
index 2e3dc39df9bb..f536e2a31b4c 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.12.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.1.ebuild
index 85aaaf650693..29978f62b899 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.12.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ 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 x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="networkmanager"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -28,7 +28,16 @@ DEPEND="
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
 "
 RDEPEND="${DEPEND}
-	|| ( >=sys-fs/encfs-1.9.2 sys-fs/cryfs )
+	|| ( >=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
+}