gentoo resync : 29.01.2021

4 files changed, 2 insertions, 115 deletions

diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index c885b25ab8cd..e8713819fa8f 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,6 +1,3 @@
-AUX plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1928 BLAKE2B c7fc121bd0956d00f51831e92f7178f134cd777f50529a9f3269ee7248e2c984f44285b870f57b7e8252c3a7a74affcd0b0d5bcea8948d6e9e0c1c68c3e536cb SHA512 2dfeaa620444df7d6f5a36c9a4957c9783b8f37c2c75576a21712558b81f7b027f5753aa5b62560045476e26de822f0047d3670c8b3560d8f1606ed169b0e6c9
-DIST plasma-vault-5.19.5.tar.xz 145448 BLAKE2B 3b9dff74ab3c7120d9fe1c40007333d514d6773602941987bed55b977c46f7e2b8a27c125c258030a5da638c30e83186d0097ca553e437c2efc13e390b7471db SHA512 d2c00601dae41b924ffb174a7fca9b508ff6e6ae052dd72fa2d9b6767718b4d40a25a7b7c9131f197d25e113c23d74df36829634ce8d83d4a76355aa66ce5771
 DIST plasma-vault-5.20.5.tar.xz 159080 BLAKE2B 2aa427337eb69b016eef9d5849c465cc8f55a900cd35739a88c51f622ce01d5b4a8676442ba78fc0b555e09de7a31b3ed6499c85968f5178d3613b88a6d114fc SHA512 2e3d6b221fdf363763b732f2e0d82afc63aaa727bae8755940c6e53eecb9ad6526071162202a24c93065a3e80598b3c25a71255a2fe032c71a771e611bc80c9d
-EBUILD plasma-vault-5.19.5.ebuild 1406 BLAKE2B cca54b9f66bade1812e2419327ab7a7fe5a553c69d1bb4e872dbbde0fee3ec957547b25683141ab1a7a43b7aa35465e7aec518ce859e5d54e830fd759b1fae8f SHA512 6a5faa085e8fb38d80d1d861e62bedeeda9f76705357d15ac66aa7b37c6d9eb96f6a648e47d6219492eb4bab8161bf212e70f5cdb81100c60392a323c438aab9
-EBUILD plasma-vault-5.20.5.ebuild 1276 BLAKE2B 7cad1b3b96e091a6d3028fcb29a86c32bf824c2592bb51ea488baaf809ed548d5721fc17324d1ce669859d7baf546a255eedd0b7b4ced5d95154b77ee95ea505 SHA512 b3781453c4b814ba0b2b4b9b1d2e207d57ead76e7e55645f30bc24a498819a3821928e090ad2493431c7233e2749b74f1b38a982ef7d27ee62525f0a513c19c1
+EBUILD plasma-vault-5.20.5.ebuild 1274 BLAKE2B d58ac0f5516afb9df2192abcc98f61fbc6f1b626e76723a3a963859e7acd6242b1c3a91e5879c34608c161a1d841b310f7aa52e669e4f1824cb803396ad4b7d7 SHA512 6c9dc99f2a4e04a382b91b822ffb2a363c8952ed111159b8e1da9703ef553e813574a3cdc89497e29706074f6709d90eabebd6d7525d20bbcf5c63bace02d8da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
deleted file mode 100644
index 9e5785d9d527..000000000000
--- a/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f8f7179824f5540ee64900d20af39dfc9bacd490 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 14 Jun 2020 09:09:48 -0600
-Subject: [PATCH] Port applet to use PlasmaExtras.PlaceholderMessage
-
-The Kirigami version uses QQC2 elements which don't respect the plasma
-theme and color scheme, leading to thing slooking out of place
-especially when using a dark color theme or scheme.
-
-Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
----
- CMakeLists.txt                      | 6 ------
- plasma/package/contents/ui/main.qml | 4 +---
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7aa0df..bc7c260 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,12 +66,6 @@ if (KF5NetworkManagerQt_FOUND)
- endif()
- find_package (KSysGuard REQUIRED)
- 
--find_package(KF5Kirigami2 ${KF5_DEP_VERSION} CONFIG)
--set_package_properties(KF5Kirigami2 PROPERTIES
--    DESCRIPTION "A QtQuick based components set"
--    TYPE RUNTIME
--)
--
- include_directories (
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/common
-diff --git a/plasma/package/contents/ui/main.qml b/plasma/package/contents/ui/main.qml
-index 22c7428..bfac7a9 100644
---- a/plasma/package/contents/ui/main.qml
-+++ b/plasma/package/contents/ui/main.qml
-@@ -26,8 +26,6 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- 
--import org.kde.kirigami 2.12 as Kirigami
--
- Item {
-     property var vaultsModel: plasmoid.nativeInterface.vaultsModel
-     property var vaultsModelActions: plasmoid.nativeInterface.vaultsModel.actionsModel()
-@@ -77,7 +75,7 @@ Item {
- 
-             interactive: false
- 
--            Kirigami.PlaceholderMessage {
-+            PlasmaExtras.PlaceholderMessage {
-                 id: noVaultsMessage
- 
-                 anchors.centerIn: parent
--- 
-2.27.0
-
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
deleted file mode 100644
index 8d48bdb0e505..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-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="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=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
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild
index ea7da4aa91b5..3504bc63378c 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.20.5.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 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="networkmanager"
 
 DEPEND="