gentoo resync : 29.06.2020

3 files changed, 65 insertions, 3 deletions

diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index c982c5cd44ef..e947f3e35639 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,6 @@
+AUX plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1928 BLAKE2B c7fc121bd0956d00f51831e92f7178f134cd777f50529a9f3269ee7248e2c984f44285b870f57b7e8252c3a7a74affcd0b0d5bcea8948d6e9e0c1c68c3e536cb SHA512 2dfeaa620444df7d6f5a36c9a4957c9783b8f37c2c75576a21712558b81f7b027f5753aa5b62560045476e26de822f0047d3670c8b3560d8f1606ed169b0e6c9
 DIST plasma-vault-5.18.5.tar.xz 136900 BLAKE2B 29b538760dbfae8cb83d820d51101bbf27436e46cff034fbc9b7541998ed6bc1870435d7fac9894b7bf105e173121e791c9d387a3c5c9476dfddc3a4b335e072 SHA512 66fcd87dee7e696aa0f5fa41adcb41134bb0da1ee9920f51057ee8729f8d88052b28f4e422795fc229767b7861226d1386086748afb356f4cb7281c1da4af7e8
-DIST plasma-vault-5.19.1.tar.xz 144888 BLAKE2B 8a9db49fbad1ae99f61aab841f7d2c29c632149bbda0b2d0827b01cdb75122ef4bc8fdef58182794b13286c3edc4ba61a56f17bb2b08510827206a6ad4d40007 SHA512 fb891dfc754572bf430a8ed812555e3c6da5141d04309aee9ad440831dceb808ad4a9b8344931b5c48073c0d7a840e91b1ca93f6bebcb8bc648a312b8e17c20d
+DIST plasma-vault-5.19.2.tar.xz 144952 BLAKE2B fc229de526e851af62e9382e3c6cfb1d54cc8bd8b97fe05798773b21c3f90f8b7b1e35412202fdd459ac7702af3a9e4ff050f3f6cd1ef82493cb4a2d7b3a2e0a SHA512 a2953087462bc68914a5ef6cf0b9fbe5bc35b0ccd86138542a0cecec91f996f5e7ea02f2ad8643bbe24b90649e9d39486feb014ff4d55d8b240f70de843c0e12
 EBUILD plasma-vault-5.18.5.ebuild 1229 BLAKE2B 3820124d691b0eb7422dd9967facc5c0a500e1bca599c5c295dc521a0d9d5e546b1613015679307cf0c65a5db0f92a6b60d396ed5f2c40f4cadaf3dea1b7d13f SHA512 7459542ca31413e9b88f3f9fb096757a5d699dda153839610d9b74a24f60ede9523715b267c76031502e6e48f2b809482a3577e774ed4c316780ad048c064a11
-EBUILD plasma-vault-5.19.1.ebuild 1227 BLAKE2B 9c5571a40b6e74308c6040a90739c642d5e0531da8cebd4ae5a487569b8f331291da95fcdcb66218a6f6b3c822c6c3e92d97ff7f278f0c88219d32570932336f SHA512 79f12f2797fb83c8fb0b38eb3b334e888cf3c1eafa21a1e73d73d57a25018de1362db4600d7e3199022a17cd4d94fc174885aa9765f3cc22db87fa1ad29ef1ed
+EBUILD plasma-vault-5.19.2.ebuild 1328 BLAKE2B c4e178e0ee023f0aeea99ded2ab0f77f435d8b06144094def5ead26825eb2a76b2e0e70ef413abac31dfe61c332991d4b7988e0f634b24f124a5bf3973fd5465 SHA512 aee6d5ea72df194fef42a535fc4c64874c7bb17b7aac67092074142ffd078001b929e50960b60be227538500a640eeae4267c1e0836a7959c3d785396c97c124
 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
new file mode 100644
index 000000000000..9e5785d9d527
--- /dev/null
+++ b/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
@@ -0,0 +1,57 @@
+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.1.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild
index 03c0886e44e2..954b81f723f0 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.19.1.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KFMIN=5.70.0
+KFMIN=5.71.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.14.2
 inherit ecm kde.org
@@ -38,6 +38,10 @@ RDEPEND="${DEPEND}
 	|| ( >=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)