gentoo resync : 30.09.2020

14 files changed, 83 insertions, 13 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 4cea1f83570a..13c719cd19ec 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 761d5da10739..730a615b42a4 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -3,5 +3,5 @@ AUX kdeplasma-addons-5.19.5-fix-potd.patch 2485 BLAKE2B cddf302e5956c3c215c51c08
 DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6
 DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731
 EBUILD kdeplasma-addons-5.18.5.ebuild 1752 BLAKE2B 010e42c867df1157c15996b23f68cbaf268508a53842c76caff7831975f60c9a3099798e9579167bd093584d690390ce9d43524ec3e7aba12a7c3d94c70ec2f4 SHA512 253c8e7abef4701ba3ec136ea225a4c181491056cf66ff3a4114522a041d6bcf36bd14da939d3e3979d793de50e845207dd4f9453b0a5d9335668373f79c479c
-EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2153 BLAKE2B 89416f80a529fd1ab2ceb6359fe53fbfee8feca5af0a06ff8d55a1170ebaed10f1e3fb8bb3087e0026cd6527c3d5841aead4821770c990da82a6bd4f3e30cd7d SHA512 bb465fe76aea7ab07e58d81ac2fd87d946b71c6c622d88d355aa490c30a1dc33870826b3cd6e2aa73a0d330b0d1269a5aef6fa2f559ae6c27366423bf467e530
+EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2185 BLAKE2B c917128a820f56cd8d01e8a75d076b437651e167b38fdba2834667c0229292a952edecba8ea9b3fbe0c0a58a97a00e628707b3f5a161640b8a8ddf424279b359 SHA512 3b0097081115e210f94b09d4ad6026978feacb2dc3a5188fa6de204a139545e843e48ed21b8382c38a34e6f6f9ef95748d6d716b9408d1d412eec755e2584247
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
index 509b4e256841..3dc39311c4ce 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
@@ -16,6 +16,8 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+comic share webengine"
 
+RESTRICT+=" test" # bug 727846
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 7802479faa89..22ae77c90f1d 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -3,5 +3,5 @@ DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26
 DIST kinfocenter-5.18.5.tar.xz 1256744 BLAKE2B d67951273bece9cd106a3d10857b18d005e6bc03faec8e9749b2111016c318c4c518611bb50240a01395b59838a47a6ce24df06ab870092aa425f04854fdf3ad SHA512 c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886
 DIST kinfocenter-5.19.5.tar.xz 1265760 BLAKE2B 3af323d32e07d310aa224f47c292ae03748aacea0d7cf56770e5a301f9698d1767159f97e0d43733d9a09d6cfe56c41a4a44f988e3000a1dfc06f271accef0f4 SHA512 732d6111f59e099fb032966667b6d7907e607939884714a95f0a2e48903f8a0d7e2331a87611ee058a4bc18bcb012c92040415812243fab4d618a07f2e7dccaa
 EBUILD kinfocenter-5.18.5.ebuild 2837 BLAKE2B 4d8a032e2c3bd1c6b21110d3eb0268d1303c20a66c4d85eab8c1edf5770f9fcd580046307397a254bb41b038e69cc777f7c93eccc55cfa33a48a3c7438ef8b58 SHA512 7544ecb8264e79e29a8fb8541461c0af09bf099fc94e7f7c45d22fb3db3d8c6cb9c7ac2d936b5cbf34c61e5b860e1c0a3e024a70c398c9824c0a241741d1f2df
-EBUILD kinfocenter-5.19.5.ebuild 2840 BLAKE2B cf486851eb10292e142b9b35d6a4a071fa93582959f6cb4ddc1722205a83f91d66819aceaaa295402e489e9cfa3446622927e4c728380c7784c9c9a80ff60e7f SHA512 7339640232d3194be80a501ca833f4eb1f7a44d202875d0450525f3904cbc649c6da14e345386fb4c1fc3dba8f851bf8e0467a35bb77eb80ad9fb412f941dc4c
+EBUILD kinfocenter-5.19.5.ebuild 2763 BLAKE2B 6b141716d89837ea694e9699a2077cc8c580f4fe3233e036e149d9bc32a3edd824edcddf2b4520f5cebd27bd27e35b404e1cb73b9b18c8dc71dae180869ece7e SHA512 39078cd8c51a809566792de366a5899090b622e8fba47755f6b481269c2e17709dd14d2cad69dddbc191b13f8f2fdb2ad58bf015ecd4424053e4d8daf32b5daa
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
index 09e428ef13f6..c6c5f5f40bc7 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
@@ -21,7 +21,7 @@ IUSE="gles2-only ieee1394 +opengl +pci wayland"
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
 
 BDEPEND=">=dev-util/cmake-3.14.3"
-COMMON_DEPEND="
+DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
@@ -55,10 +55,7 @@ COMMON_DEPEND="
 		media-libs/mesa[egl]
 	)
 "
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index a3017a82636b..d4438f5a3c6e 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.18.5.tar.xz 517648 BLAKE2B b50623c28a3884adc5db326d7b0745c558f02e1f515efa9a5d591948026447f427e08cb72805d7f1c8821cdb0038c894e4322520cf2630656e464da6f69af401 SHA512 2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3
 DIST ksysguard-5.19.5.tar.xz 542628 BLAKE2B 3aeacb401c79723aa46e9eb5df32785e314d7a52704d983e5c6b48dd841e908ec84c5b28c609accec990d6011d5355ba3363329973a68149f03b0b20d5d59265 SHA512 5dd3503e3792c247fa2dab274347ae00ac3ddd0090b8b5115abc90c84630e0f7376ce2ec43a853e2a9cfdadb31b142ea70190b54b65c7a45b5839b1dde5a1feb
 EBUILD ksysguard-5.18.5.ebuild 1393 BLAKE2B 9252e8b44a28642a7f25d46e402e091850761f287aaf9fe85353ead5d60ac43ebc24cbeed8ea0aedd5708911224e7211f302e766711b6279de51bba55b364c50 SHA512 d5b2f2a5d1581b86bb86824848ad4e492335a3d079779136e8e94cd7ad5e2437ba9b605e56ec35fdb3e7d6d264271b5085cf5bd26903dd8d3d1dc9075bd38f84
-EBUILD ksysguard-5.19.5.ebuild 1383 BLAKE2B 2adb0e407f05069fafb1af0ae59578573092472691883e97bc61cea14f642e1f388cb4d16731209b388f7754629d916dc09cb0fca9c2b2ba43c862626c206ae2 SHA512 f38db3f3e6ac0242a81b3c98b88e1d98299351396a6f012d1c260556a059d55a6d9af538714bc5ca61eb1a54c54a052388ac3632d596ac8d35079c8620ab4b48
+EBUILD ksysguard-5.19.5.ebuild 1415 BLAKE2B 10df42e645d99d3b448f37872f3439a1c558a5de8b0771b19c24bf01837ce7baf38b88b68578d06799f21743c221746bd5f6d3b84c9031a3a51a774aed604d81 SHA512 a5bb21cb3418e07882c3f59e2e5ed0d8933d0ab8f240297907d275717168d2ba4f54c8f6e59919919f256009dccb340a485d15f2477bdbad62af72f456c01f14
 MISC metadata.xml 373 BLAKE2B 8d97f1bf96cb523b2832ca4bbb01ee86cf1d13b0b1b75809046da8601254283fa079361c1cf55708c851a08fb31b27beb8cf2df24ea9e14e4c32b8ca0692a7f9 SHA512 c1df9a56aba68a93ceae7cb2b9ea9216c40b6f619263cd8025cde82264206019a6b9d0eecb24f3a798d4f6e1a772752ceec500827e96caf8f050b0b132b08051
diff --git a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
index 9805a99934a3..c55c40f19f8c 100644
--- a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
@@ -16,6 +16,8 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="lm-sensors pcap"
 
+RESTRICT+=" test" # bug 727848
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 9755bcad6bac..c9af113e7ffa 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -5,10 +5,11 @@ AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf
 AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
 AUX plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch 6390 BLAKE2B fb0f4c70c94dc583745f92d14f4cb479d71da7c115f58d187ae6931c2dd3435abcfe9c2b773fc851f44fe605f47e2242d801da18a23f7943c025a901da8f28ee SHA512 d5f3820ee21422d46112bd9635bd65ce11068f9cf3bb14cd23c0050f35256b09344d934534794685997e8daeaae709c81e53b5b6ad54e7ecd709c6e5624be040
 AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
+AUX plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch 980 BLAKE2B b7b9cb993d7209182f92fa1924e28b66aadeca88eab3ceb98db1edea10c9d2fe65128cf0f019791478a270d645d6bbd9115a9a9372c6d4e63c8806b5bc06029f SHA512 e184cfaec2910a7389309e43c1f550c48de6b2c6c23a522a1c8bd5f6087fc57b2f3533e6b862d5801aa97f1eee8cc22ea0c4e415b44bef873f612ee039aefdb0
 DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
 DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 EBUILD plasma-desktop-5.18.5-r1.ebuild 4865 BLAKE2B 87cf5b0e69bda73c0241cb0059e92b2344a87e625479201b683f20edc96f295dc5e80dfc46b234b5a513721d368c53d26d7df56425a434ee41adad44dc46dec5 SHA512 3290f48cf99c6810874e8c152d171770e57ee8d1400a2acb8d67046dab374c33c2ef2d454464e642b0a1f372742f8d79c9f26af2c4f49be31aab7640386edf46
 EBUILD plasma-desktop-5.18.5-r2.ebuild 4935 BLAKE2B 1334ac02567ae7992a6a8b7f7b94cf54348df407dbe4ef5130dd76bf2df43bcf66949105dfd23ac49aecfd55d63fbdea1026edf43d48d9fc5966fc0ead46ed89 SHA512 a5686e7f768aa87e67b6abbcb20478954027e63d5cea5cd9d545e9ac5699ec1be029d8badad7250b00aab12621b005c196a0b8d64c43b15252e13caaa4c51534
-EBUILD plasma-desktop-5.19.5.ebuild 4556 BLAKE2B 317513f08054224a6bad77bfcecc072e74039a45afc505ccb68f0c5a833e695e2fa4bb43ee7be0af6a6502d0cb58b74e649b8c7afa1d4c2ee00982d1fde41468 SHA512 2c6a23555243ca530f6df35d765a06ace6b41c72a8bc1ff14c262adf848637b9c662cd6058aa6cfc5a9113974da208e6ddf6f74cb7626a53b94ff7def0666bf0
-MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5
+EBUILD plasma-desktop-5.19.5.ebuild 4717 BLAKE2B 6a1fe126b3d55789ed56d0c1c3c1074793d18a2971b91d5960ac0346f626be2e9d934e9571ba9d9cd52e3e95b5ce62c08bcb940c792f51bf4a12e0d5ff5ed33f SHA512 80430feece9661d318b53258e63e28c10d6c39690c37354d7f05f0918e4e6193ec887f43cb816dac15e881103327a538f512bacab63212d594bb5cf32e1eb721
+MISC metadata.xml 540 BLAKE2B 3953467f0fea68209d7b5cbb5f5d23bc1b1aadf0e88ec5dfc28d688f7d68e560fda165330da32940bbf43d82f6f7bc178451977870cf3e2e69f4159e4c2018d8 SHA512 5d48a9f5bd4e990a52eaa894e3572bfa66d966a0665b495a5539484cb29f6a2a4f81193c80556cf712a76e3661ac575bc582276be22acc3817e7758e727065a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch
new file mode 100644
index 000000000000..69f33cb402e8
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch
@@ -0,0 +1,24 @@
+From e7cb58f156a240c70c085be38a12e2a01dc5ede6 Mon Sep 17 00:00:00 2001
+From: Guo Yunhe <i@guoyunhe.me>
+Date: Sun, 20 Sep 2020 21:12:08 +0300
+Subject: [PATCH] Force Emojier using color emoji font
+
+---
+ applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
+index 858cbd935..e7198156b 100644
+--- a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
++++ b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
+@@ -113,6 +113,7 @@ Kirigami.ScrollablePage
+         delegate: MouseArea {
+             QQC2.Label {
+                 font.pointSize: 25
++                font.family: 'emoji' // Avoid monochrome fonts like DejaVu Sans
+                 fontSizeMode: model.display.length > 5 ? Text.Fit : Text.FixedSize
+                 minimumPointSize: 10
+                 text: model.display
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 52f99fa25fe2..49d2b2bec6af 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
 	</use>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
index 6b5dc7ffb412..da3b4ac5fc3f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+fontconfig ibus scim +semantic-desktop"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop"
 
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -80,6 +80,11 @@ COMMON_DEPEND="
 	x11-libs/libXi
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbfile
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
+	)
 	fontconfig? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -116,6 +121,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-force-emojier-use-color-emoji-font.patch"
 )
 
 src_prepare() {
@@ -137,7 +143,7 @@ src_configure() {
 		$(cmake_use_find_package scim SCIM)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
-	if ! use ibus; then
+	if ! use emoji && ! use ibus; then
 		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
 	fi
 
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 57b0a5ac2daa..b1c6e08d6440 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,6 @@
+AUX plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch 1327 BLAKE2B 6a9f02c1fb516bb7d3c5bf261ab4b6b6ea1f4a225df1db8f564b25ec6205db89060451362a18d0facf32637a6af6b25c8101b28f0095970e7a1135f6f8fe5f3a SHA512 f38145990ac03799724d7f579ba98baa0078b4cc07805ad5d12b6266ab0bdf3c4dd4999151d0005b0217430197cef74514b330ee1ac14b9530d63e9c8364ed00
 DIST plasma-integration-5.18.5.tar.xz 57656 BLAKE2B 3cf445f5d84de07e82369a3057a0ac390961634f8926d3491ca8dd0d603d4e4ff9e7487b69c1fbea44a4296c8960f4e3ef677e1bfd183154a36799fc95dbf3c8 SHA512 d217c49555ee17e3b18d006368ec7aa4d8585c05070bcf3a3c7e471b1c7dc830080d0405209979d8a27c7c2fc2adcd3d248e595f43f0b4a2928683f93c6d4b48
 DIST plasma-integration-5.19.5.tar.xz 57464 BLAKE2B ef5ec9f849087ae738a1ff1de14a77994b4486f89b632777caa8e0aad67cad8553bdf1d0553893361ab4c11ddba0caf32464cb49f08047cf2d40375f789c166e SHA512 9e17e1720e5d5c1d3cada3f1eb891d27fd189eb65378c2e0be6547c79d93d5df2f785a3c67d35a4a374d320b118ad3b7d3fb7d968a7f5b629e505d21c83cfe36
 EBUILD plasma-integration-5.18.5.ebuild 1235 BLAKE2B f1f0e5a637021d9d0ae8c0c3b6680a1f4ac63c8e2e4203bb8936f8693839bde3fa9f7e28082b5a4dca7c2dcabca95f7f18f0bb694e60d79421f10286c4446db5 SHA512 4877687f7608f7a8a1c24e6c8823ef4670ec5307996dcfec8e6682be227bb8e06a29e2c456d1e30f711d76f89855e70250904d3a602f2cbf2e9d45bb93e34dfd
-EBUILD plasma-integration-5.19.5.ebuild 1238 BLAKE2B 6a27dd2928dadef3f89ded1b45bf2f336522fd0f93dc6a53c789c1f73f7676b7c5d56fc374997596d7813f4148be7bb30bc14e2584fee9a9646f758af7e8ed4c SHA512 bd68e4c0012a9261dfeda4e148a02e3084ee7f3bc5e1bad155e9abff1fcfaefee651fd5e4790f9a012061658a325ea3e0cb60e00f5edd900aa85a1083fb28d13
+EBUILD plasma-integration-5.19.5-r1.ebuild 1320 BLAKE2B 3c50f0efd871c28c18900847e8982231059fb9a66f91669030e0ccaeba9c0b3f790d5261884af7344e03a6b12393aa7f8e3f26be4b97d2139dbdb4a67e57970b SHA512 7bd2a4d97e23f5124fe795eda494fb1e56e89de5b651e7577e1f9300007774a49537358bdb178e6f04ca213e6d4c7af54dc6c3a4d1fd3c0bf79a384b8b8b4c42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch
new file mode 100644
index 000000000000..7405dace6be1
--- /dev/null
+++ b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch
@@ -0,0 +1,34 @@
+From 15c7926377065da0fea111be303816dca91d087a Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 15 Sep 2020 13:31:48 -0600
+Subject: [PATCH] Use KDE shortcuts for "move to trash" action coming from
+ QStandardKey
+
+QKeySequence::Delete is the Qt "Move to trash" action, which, by
+default, includes Ctrl+D as a shortcut. This is something we don't want
+in KDE software, so we need to intercept this action in our integration
+plugin and give it the standard KDE shortcuts instead, as we do for
+other actions.
+
+BUG: 426573
+FIXED-IN: 5.20
+---
+ src/platformtheme/kdeplatformtheme.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/platformtheme/kdeplatformtheme.cpp b/src/platformtheme/kdeplatformtheme.cpp
+index 24ac7e7..18b3f6f 100644
+--- a/src/platformtheme/kdeplatformtheme.cpp
++++ b/src/platformtheme/kdeplatformtheme.cpp
+@@ -257,6 +257,8 @@ QList<QKeySequence> KdePlatformTheme::keyBindings(QKeySequence::StandardKey key)
+         return KStandardShortcut::shortcut(KStandardShortcut::TabNext);
+     case QKeySequence::PreviousChild:
+         return KStandardShortcut::shortcut(KStandardShortcut::TabPrev);
++    case QKeySequence::Delete:
++        return KStandardShortcut::shortcut(KStandardShortcut::MoveToTrash);
+     default:
+         return QPlatformTheme::keyBindings(key);
+     }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
index fbf43a6fc30e..51a301c73ca7 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
@@ -46,3 +46,5 @@ RDEPEND="${DEPEND}
 
 # requires running kde environment
 RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-use-standard-kde-shortcut-for-move-to-trash.patch )