gentoo resync : 29.06.2020

3 files changed, 52 insertions, 4 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 7ee551d229f2..f75a10c1db78 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -3,8 +3,9 @@ AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
 AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 360e27d03d8429d7d2b1c11f9b40ac0049108ab0461e9428cb5f2fe67241708190796d3a60a503e0ab1903dee61c27dfe7d2a187e36032518632a4966fe10215 SHA512 f7367acf43a4c3aed20ee42853fb0657f64182222a208511f97657b734a430eb8d24c6cf10b6a276ae3313d791938905abbc33387adc272725addc606a86f482
 AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
+AUX plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1780 BLAKE2B 1462650fed75b2b33c945e34281cfec1304f9d325a41deeeea5d0030d5469f270e7d2c50cab3b897298229f9c285c335c37f9a5d330d8a19e15da7711a403b50 SHA512 c7fb22f77a8841450c1c6c3f448401bfa29f5ca4bd58d30674dae29b7acc8db9ac367f4eac2cd1dc151893dea526c167744ae2a52d08797d0e8bba8486224bbc
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-DIST plasma-workspace-5.19.1.tar.xz 5683020 BLAKE2B 34d4ac284e35f3bdb56895f4df10345ca1f1c9c100eee77e7d73a8e6c6960d15ae60aadd3ce24a39be65ae54b49b964ac27f9c88c8fa2ac159d7ee8d44f1a51b SHA512 9e8a8af8bbfae07472363386aec41a76c7ea5d5242ccb376a276d546b819f3d28dd6961630c5e38026256a4ca219bdb1d86fe49eecc572327451b28f3c94e692
+DIST plasma-workspace-5.19.2.tar.xz 5676488 BLAKE2B cc7a5a156be2e98a4ddc7e8e80a286844f8438b2d17b79dd5dadd24cb28681b80255bad84c118949a815c47080afab380b81edfc3ba59b43f7b24c916cd62e9d SHA512 1c82ee7e1ea27c37c321487bc7bf109c451b3b966d795c7c3102a21e1bfb75bbd83e0ff2fda76e76ef838af3a054aa81a7aa8f89f789dfc16a234d1db3e03c77
 EBUILD plasma-workspace-5.18.5-r1.ebuild 7241 BLAKE2B 7a1ea14452de71a0d514f8ad75f489ea9a9b549517cc1c51b91cf319c91de6988869fe9b1c962cf0f79a64129464f98410e5e63198c828bb2d0c8f61e739a775 SHA512 8e91e8b6e377aafd493fc6a1b64a797f6ac4a0433f9feeab945e1c48b6146e54fa625720b0995b00f4cf88f49e85af5818234c2088413eb024d65567eb4b6fe2
-EBUILD plasma-workspace-5.19.1.ebuild 6832 BLAKE2B 2ca79d4158d8f1e40b3b936ef64d11e1279c10d8be044576e81ae081ae5b670d98c0ce19f154d4811f598f64dbb7d268b4708a5b4b485a4f9f7990a239e01bb8 SHA512 e553e2c25051163f1cf6c778a199dc5e8e6efef61342adf5ce5fb07c9e0cfec48e87d1cbbff43bad4b80d4f7e6e8223758f0f986f7a4497d5752a9849b90e8a5
+EBUILD plasma-workspace-5.19.2.ebuild 6921 BLAKE2B eef3641660a3c61f611a0684be2476b47236d41af62dae940ea72e3f3af7a6509fece72ccd13e6512be0adb67aa6557bf1c27926c5633e166abbb9ba1a88dd17 SHA512 21954eeb5475c9d4c4b610d532529863a43a07996bed1fef572df75181d84260ee5324bc4d97865c2ade80373297f561669f7e295d19224b8c052b4a74b7943f
 MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
new file mode 100644
index 000000000000..527e199cc66d
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
@@ -0,0 +1,44 @@
+From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 14 Jun 2020 09:08:21 -0600
+Subject: [PATCH] Port applets 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
+---
+ applets/clipboard/contents/ui/Menu.qml                          | 2 +-
+ .../notifications/package/contents/ui/FullRepresentation.qml    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml
+index 0bd6064a5..cac8380db 100644
+--- a/applets/clipboard/contents/ui/Menu.qml
++++ b/applets/clipboard/contents/ui/Menu.qml
+@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea {
+             onAction: menu.action(uuid)
+         }
+ 
+-        Kirigami.PlaceholderMessage {
++        PlasmaExtras.PlaceholderMessage {
+             id: emptyHint
+ 
+             anchors.centerIn: parent
+diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml
+index b34dee7af..989cb4341 100644
+--- a/applets/notifications/package/contents/ui/FullRepresentation.qml
++++ b/applets/notifications/package/contents/ui/FullRepresentation.qml
+@@ -585,7 +585,7 @@ PlasmaComponents3.Page {
+                     }
+                 }
+ 
+-                Kirigami.PlaceholderMessage {
++                PlasmaExtras.PlaceholderMessage {
+                     anchors.centerIn: parent
+                     width: parent.width - (units.largeSpacing * 4)
+ 
+-- 
+2.27.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild
index f7be49afa76c..f7116713959b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.70.0
+KFMIN=5.71.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
@@ -123,7 +123,10 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+)
 
 RESTRICT+=" test"