From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- kde-plasma/plasma-vault/Manifest | 7 +- .../files/plasma-vault-5.13.2-nm-qt-optional.patch | 74 ---------------------- kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild | 45 ------------- kde-plasma/plasma-vault/plasma-vault-5.14.3.ebuild | 2 +- kde-plasma/plasma-vault/plasma-vault-5.14.4.ebuild | 43 +++++++++++++ 5 files changed, 47 insertions(+), 124 deletions(-) delete mode 100644 kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch delete mode 100644 kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild create mode 100644 kde-plasma/plasma-vault/plasma-vault-5.14.4.ebuild (limited to 'kde-plasma/plasma-vault') diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest index 06099f822463..dec442e1ebf5 100644 --- a/kde-plasma/plasma-vault/Manifest +++ b/kde-plasma/plasma-vault/Manifest @@ -1,6 +1,5 @@ -AUX plasma-vault-5.13.2-nm-qt-optional.patch 1679 BLAKE2B f49742dda0b7de7bc76ec11002043093d2d955d3f53501096b7f66e3d031727a28e6f97dd85ab27d2b4d7c4413ff2831c79595e73ea76daaf0b4704c993c5e89 SHA512 faed86fca848ea89d3d00f5f72bae9c18aad2e5f091eb78a89c91b9f2e9c979e61d9f720ea9cbbb312fdd54b9b0da26559c6263b90c037934bb296c4ef5caa1d -DIST plasma-vault-5.13.5.tar.xz 114908 BLAKE2B 8043b46b5f8c0d2b6f22e6afedabc3b8116aadf47a5cdd1ca690ba2a232e5b6b7deb8de3bfd58a3566880f0b6c445e5d8ddec3165a6b74ecbf5d51ee3c981422 SHA512 f6579fd9134039c105f3399818520077e080a603459ad20d08825f00f341930dd84c0e6cb1ced8d722efd941a40751e7025a74098c4c1d4daca3b8f284fe38bd DIST plasma-vault-5.14.3.tar.xz 121448 BLAKE2B 554ad3ce9699ae937c5bb0759f994a4cbf53d72606e9eb6fae5bd39136be3c47a4fa5aecb9eda335f13e939fb349d37088e389ea7036ad97ed348837a3197e11 SHA512 243c9201644f0c1408f5911e21eacd447d2f13133fec6bfdd540fdc7e49afd59fc0f5c090d315b6b48bfcd42848fb6f2d9738c14701f8815e719c6e1f18a1456 -EBUILD plasma-vault-5.13.5.ebuild 1132 BLAKE2B 312a8ee062aaf47aea7d6e9b1a98ec2aa60316ee8e6c434291d1dbc53ef40e8004b570d1b2801476317338d1652e5ec5cc4820c518a4bb8b80d66bf9dbdb6654 SHA512 5b601579eea03c6e06ed11e29c137bc4e8ed893c74f731b87614149c396c279b519119e8275ac47ad91266c11a7db02674da3482f79ec6c38e7139aca55fc4c0 -EBUILD plasma-vault-5.14.3.ebuild 1073 BLAKE2B 214470e62ad0800c231c907dc29aefee6b3fc34637680e8c57949a0e89810b7076e95eb75e3e98f5c666faef690336485194290bee367c10daff9c8b1e181594 SHA512 023b791cc132616ca2db3cac07d70d7d87c196cf423495a36a6d650bb84792ba4f1393bf3c973a6d13e251828661fb674989311363d860c0ec2754f2ae9f4951 +DIST plasma-vault-5.14.4.tar.xz 120612 BLAKE2B 5a765537202863100e148ddf8b50ce3dfa5c1bd75b43bb17efe0fd3822967f61695e7f12ac86c7adec26b70e6d737e24738930b647ca9f3ea3a51364d876b4f4 SHA512 87775543da9927a84d3f1a1f8fd567a758703bcebb723a0fbc8766482e575d8fc0f6be9b30e78233ac16f8bdd1867f02ffa0e0ab5891f030a0696ba30c06158a +EBUILD plasma-vault-5.14.3.ebuild 1071 BLAKE2B a889ddfde73eb0abaf4e224bc398a707b48ea6f8bacd405b82a516fefcb8f7a105f5306b9bd644b0f481e2e918c59d1a9225370b94a6a892dca6618f3bf80aca SHA512 ba68590eb31fd416c4218c89b943af386f17be7b52a8ef663428fcd1f13375299b3516547b25572b4e4c1c322a3b95959b78f5943dfc3241634954aff8418c47 +EBUILD plasma-vault-5.14.4.ebuild 1073 BLAKE2B 214470e62ad0800c231c907dc29aefee6b3fc34637680e8c57949a0e89810b7076e95eb75e3e98f5c666faef690336485194290bee367c10daff9c8b1e181594 SHA512 023b791cc132616ca2db3cac07d70d7d87c196cf423495a36a6d650bb84792ba4f1393bf3c973a6d13e251828661fb674989311363d860c0ec2754f2ae9f4951 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 deleted file mode 100644 index 38fbccf56c2c..000000000000 --- a/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch +++ /dev/null @@ -1,74 +0,0 @@ -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 - -+#include -+#ifdef HAVE_NETWORKMANAGER - #include -+#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.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild deleted file mode 100644 index f536e2a31b4c..000000000000 --- a/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# 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}/${PN}-5.13.2-nm-qt-optional.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt) - ) - - kde5_src_configure -} diff --git a/kde-plasma/plasma-vault/plasma-vault-5.14.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.3.ebuild index 29978f62b899..bd556f2358de 100644 --- a/kde-plasma/plasma-vault/plasma-vault-5.14.3.ebuild +++ b/kde-plasma/plasma-vault/plasma-vault-5.14.3.ebuild @@ -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.14.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.4.ebuild new file mode 100644 index 000000000000..29978f62b899 --- /dev/null +++ b/kde-plasma/plasma-vault/plasma-vault-5.14.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 ) +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt) + ) + + kde5_src_configure +} -- cgit v1.2.3