gentoo resync : 07.07.2018

3 files changed, 122 insertions, 0 deletions

diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index f0cf3920326b..77bc7fe02a13 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +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.6.tar.xz 104956 BLAKE2B 812d9e3dbc28ef9bfa636b739fecae4f60fa67d3e153554e70886bd865a27a50daffbc29fe9fd53fb5132ceb9a8d5b85be02264b7099baa2fac91c5c78852ec9 SHA512 5241d6a13099fe69fa279de6a6058ff4479b6f59d5348854de5a113304c5be333191d820802466ec75ccb43833e6abdb543b9b9089b12dd8bd78a69a8cce34bb
+DIST plasma-vault-5.13.2.tar.xz 113800 BLAKE2B b8f99c162486ed159b49387f9381498f8e8ed2bcb624bd28b1633d295e6f0dd6a69b06e4a0dd8842d4ce6143e7dd6c91b9746c557c42d62fee011f726b7136fa SHA512 2e7f4e223f626e58543d603b504998041a696c77831e01c681721fbd87c6ae692b0476136e59f44677b66e9162d3e0444d30df49f8388512664b95bc0c090ce4
 EBUILD plasma-vault-5.12.5.ebuild 856 BLAKE2B f7672f6b4868877e27e27c0028176f8f7ba0642c1071f23eda887f3fa174b8373dded2eccc36623e2623ac6de82396d8d9490aa38b72a94fc177c50aafccebeb SHA512 6e64d0bd6b08f47f5f73924cb4dc240a01405148286de6e8e3d01604ca27ff9fd1a24ff772c0dfc5ca5e218ada804e48a6cd9a4400f2f5284fbaa6e2ca52b329
 EBUILD plasma-vault-5.12.6.ebuild 858 BLAKE2B ac47bfa4f2c6dbf18a37da67e2ba603de151b533a8923ca0659e1e519dd56166c347ee23d89dd4ee26666293b670fc585c859392aa564a15089f8b771f9b36b8 SHA512 025bf8d31ea304fb5d3f18841519bdfb2ffb913b78cf2dc20ed743d9daefff56234b31a2472fa8f3f465eae91c05891b9b4c4cabdc0c5fba8017a26973b00b87
+EBUILD plasma-vault-5.13.2.ebuild 1129 BLAKE2B f9dc7e83586dee15037256e1f1fe406429810e04232311541ea84102301073984ae9c4602f74cd54f9dd6f2dbc70b781eda4afe5ca6aaeb08344da3d6a40c749 SHA512 b0ffc3d460389f116db3d14593718f63ae153a2bc3216a83d2a7a4fde2c7e29ce77261664080e94809e49ac081cf44ac2953ef434590d8bf853fc6da22d6dee4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch b/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch
new file mode 100644
index 000000000000..38fbccf56c2c
--- /dev/null
+++ b/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch
@@ -0,0 +1,74 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,8 +58,11 @@
+    KIO
+    Plasma
+    WidgetsAddons
+-   NetworkManagerQt
+    )
++find_package (KF5NetworkManagerQt ${KF5_DEP_VERSION})
++if (KF5NetworkManagerQt_FOUND)
++    set (HAVE_NETWORKMANAGER TRUE)
++endif()
+ find_package (KF5SysGuard REQUIRED)
+ 
+ include_directories (
+diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
+@@ -1,3 +1,5 @@
++configure_file (config-plasma-vault.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma-vault.h)
++
+ include_directories (
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/engine
+@@ -85,8 +87,13 @@
+    KF5::SysGuard
+    KF5::WidgetsAddons
+    KF5::ProcessCore
+-   KF5::NetworkManagerQt
+    )
++if (HAVE_NETWORKMANAGER)
++    target_link_libraries (
++       kded_plasmavault
++       KF5::NetworkManagerQt
++    )
++endif ()
+ 
+ 
+ install (
+diff --git a/kded/config-plasma-vault.cmake b/kded/config-plasma-vault.cmake
+new file mode 100644
+--- /dev/null
++++ b/kded/config-plasma-vault.cmake
+@@ -0,0 +1 @@
++#cmakedefine HAVE_NETWORKMANAGER
+diff --git a/kded/service.cpp b/kded/service.cpp
+--- a/kded/service.cpp
++++ b/kded/service.cpp
+@@ -37,7 +37,23 @@
+ 
+ #include <functional>
+ 
++#include <config-plasma-vault.h>
++#ifdef HAVE_NETWORKMANAGER
+ #include <NetworkManagerQt/Manager>
++#else
++namespace NetworkManager
++{
++    bool isNetworkingEnabled()
++    {
++        return true;
++    }
++
++    void setNetworkingEnabled(bool enabled)
++    {
++        Q_UNUSED(enabled);
++    }
++}
++#endif
+ 
+ K_PLUGIN_FACTORY_WITH_JSON(PlasmaVaultServiceFactory,
+                            "plasmavault.json",
+
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.13.2.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.13.2.ebuild
new file mode 100644
index 000000000000..8f2b72196674
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.13.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~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 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-nm-qt-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}