gentoo resync : 29.01.2021

20 files changed, 193 insertions, 190 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 227661cf6ad0..8c42ef801f63 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index aebc22887458..5a866cf84970 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,6 @@
+AUX kcompletion-5.78.0-fix-klineedit.patch 984 BLAKE2B e970829543133b400942216cfd652a5a164f9a20084030566e7b6401c4a7f5699cbcdc02b427c4a98baff193bd3b9d6438b619410e70d44851dcc23a6a142f27 SHA512 9b5cc02440ba49f457113736aadc8ae7e9ac9f73fa14e0371426661378663af17de68b179e323cecea0ec2d0b08620d2c897981aae640abbec27d9bcec27b080
 DIST kcompletion-5.77.0.tar.xz 121432 BLAKE2B ca1b4bd3cd2459891dbe44a90fdd48a6f2a14529598f70dfa354e0fc44a840b2f058e7aa43cf030cf0c98b37e001f2cc18a618ad39d5e04dc576ce2b7064a925 SHA512 1dbce42fab7d640083ec936586d89878d2b05c2a341bf6cdd58571b306600b8864d100a84cbfbc4d110bc5c87f6b07fe20859558d9b60e1927a012b98a67b87e
 DIST kcompletion-5.78.0.tar.xz 121480 BLAKE2B 3904ef1a7130b4d05f09399994ce4cc56078d9cdcab9dd6edd302477bd681ec7dfd5f71d338ae6e15f310877ece58f6728b1eaa478083222ee4c4972e7193dcd SHA512 29fbc9c56a34601a4c674c45d04a3d2b79beebe0484c2dc80bf7a9a71de9c8ee82b548bd8d3df521593a60e37f0789d9e23eec5058fab9c3bfee2e53c8d6f58a
 EBUILD kcompletion-5.77.0.ebuild 736 BLAKE2B dd8ee95c13a903a46a563b9b0b7bdcb94effa6a7a9b36cf2b40bf2be1a592d407ac38c06307d0619a44f5de19a650d2d493c1fc42340a0b700b1c657113b13b7 SHA512 a1b13b4f2c1c664c5726105a54bfd611bc254b5e3f6e54843323ae40599db92ed5bcfc1b9e40b75d6d40495287d9aa0fb4b49e7eeb9a49c42423af8910a8eabb
-EBUILD kcompletion-5.78.0.ebuild 739 BLAKE2B 3c690915ec8e45b0a46630ba64b821147d3783f557a75c54a09a0fe8722af11bac006e0b7fc845cfdd174a2aaf8ca309fbb7fd6492ab33df0bd4f56990537a5d SHA512 4cb9e0d478ae9be0d0701112bf22740fea79fd88701fe1fa54576ac38ea5c21b4f5cdee8f943916476dedb5cd67cfe9b5a9fba475ca3721e0a11d2f32daf4f41
+EBUILD kcompletion-5.78.0-r1.ebuild 808 BLAKE2B a5a8d9cbab89cc2c2319777c9bfec3b4f30356408e8405cb95b9d9fb2ab415c8f0962af1f04c6a67688c6c1dffa4e7a4cf278c4414d43089ba89cbe8bd5951bf SHA512 d981c034a13d0e5fcbabc7881fc79d806d716cb471600a8ce446fcf6d46fdaeeda63a46e8b2ceb2c234fecfeae15ec32b38b46c814bd873cfdaf0bd04774fdf7
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kcompletion/files/kcompletion-5.78.0-fix-klineedit.patch b/kde-frameworks/kcompletion/files/kcompletion-5.78.0-fix-klineedit.patch
new file mode 100644
index 000000000000..0dd7ace61cd9
--- /dev/null
+++ b/kde-frameworks/kcompletion/files/kcompletion-5.78.0-fix-klineedit.patch
@@ -0,0 +1,27 @@
+From 7acda936f06193e9fc85ae5cf9ccc8d65971f657 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Tue, 12 Jan 2021 23:43:19 +0100
+Subject: [PATCH] Fix regression caused due to porting from operator+ to
+ operator|
+
+BUGS: 431493
+---
+ src/klineedit.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/klineedit.cpp b/src/klineedit.cpp
+index 1cc9316..8201259 100644
+--- a/src/klineedit.cpp
++++ b/src/klineedit.cpp
+@@ -1222,7 +1222,7 @@ bool KLineEditPrivate::overrideShortcut(const QKeyEvent *e)
+     // but doesn't dare force as "stronger than kaction shortcuts"...
+     else if (e->matches(QKeySequence::SelectAll)) {
+         return true;
+-    } else if (qApp->platformName() == QLatin1String("xcb") && (key == Qt::CTRL | Qt::Key_E || key == Qt::CTRL | Qt::Key_U)) {
++    } else if (qApp->platformName() == QLatin1String("xcb") && (key == (Qt::CTRL | Qt::Key_E) || key == (Qt::CTRL | Qt::Key_U))) {
+         return true;
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kcompletion/kcompletion-5.78.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.78.0-r1.ebuild
index 3381e8ca5305..e75d75f2fc92 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.78.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.78.0-r1.ebuild
@@ -25,6 +25,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-fix-klineedit.patch" ) # KDE-Bug 431493
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c1857471fab5..c7bfb4ea860e 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,6 +1,7 @@
 AUX kio-5.77.0-crashfix.patch 902 BLAKE2B 5b129abe281a871d7d7a3e068fe17744078acb33ef53efb50499e86ec2c0f85d29e87c6c1e78fc486379fae748741bebd29917611d44e1ff056ab7f7aa246db8 SHA512 df49c4c858051f01f5a5cb9b0733caaee8b9ffee31400954dfab4947f5eb7a52a4805b9d4c9c6214113aed9ecd4d072e4ad0821cf6993fe51e4256936dbb1d99
+AUX kio-5.77.0-gcc11.patch 857 BLAKE2B a57f60686001fb291a4eebb548ece5b57ec523547f01cb878f98648a38685ecd1c29f2e3330ef1ed3a3de10034e6fb102a6b2e19d2579f52d61b19e70815e89f SHA512 fd2b82fad35328bb65237a1d96f02b127b1c8b6eb48014b7d7ef32fb597fd64368a5959b459cfc35ae078a05331e38e6333e67268b0c80a56f5b4258398be0af
 DIST kio-5.77.0.tar.xz 3293128 BLAKE2B 67c4d637d3497ca1d488ee2d73e85cfd81950bb0fc5fe8968a0c7a6d1603f1b6a4ff3acd9f944c1314138c53fdba90f3fdf8efed2340bcb10e6aa92b757f8f38 SHA512 36760771dd152d4da4d2f8905ee7d978a2b7718e286ffe2323f1ac1b7975a5577e47e6145a4592b9700a8069867b42f55fd6e4eee4a006318483e5e0ee06ee4c
 DIST kio-5.78.0.tar.xz 3308004 BLAKE2B b21cdde13013d7a3df91e821c8562df650b727e521b6552e9875c9aa74a97bb8b8b4a1d8b8cfd8f7d2c2eb68989ba2b7efc0fe77d46e57759e34ac1b39f9999c SHA512 55996a35f77442f3cc2ff98708da6dfd2734b0afffd7b3b90b5b2845c9770f3ec68a1e4e72d21b1c4e41d06778ab376b96ab64d958c89dd4f8b7fad6501a5db7
-EBUILD kio-5.77.0-r1.ebuild 2379 BLAKE2B f0db345b0e2701f0484df38f76728a09f368fc1132c6fd19bc278f1e48b843b888f6743fa17a07da558a532ff14f51c5ec8bb5623f8ecc682816ece4086a95b9 SHA512 784a5beb1dabd60af33fa0236cb838f8972aa7686b8caac377d5daf0a92901f711aa4cdd675565631c0716717bfe32b6846ec386c1e078c9267ddfff350590fe
-EBUILD kio-5.78.0.ebuild 2335 BLAKE2B e9241ac082650c7bcd5d363974f5f3f6b8ea105d51d1d336a709fffcfbb333c0498488f0d4696a0ada178e8173100e2eea5db3e4957fd51415890ea7746303a2 SHA512 019448bf143a475464e1e5789f24dfd6705139374ed7f70c29b61bc5113106d0a31a4f232653c65553cfd63439b50d4bf0505d287e237f04377c27423b4c7a23
+EBUILD kio-5.77.0-r1.ebuild 2425 BLAKE2B 160ed5b733deabdcff51093ec622a8f4e717338a02dfd46788faff0b1c5256b7902f86377644c2801f475389d176a57b6cb3e6de7d35515d7b0e7180033910af SHA512 f09524897dcc1d31e6542d8aeb91002251cf78da37cefe8b55af75df7120e126f9f8642e46e294f250fc9a4146a74afe50486ee730b5c44210752f4dfce9efbe
+EBUILD kio-5.78.0.ebuild 2400 BLAKE2B ce9147cafc66ba000f9ebbd941561857c4df8165827cb327ea8419e6dbd0a6a2f076ad2639ebd3b3f81aeb1ce28cfc569c0e5a4355ab2b201f25d94397232590 SHA512 9af4aeed6718371b5618e08c028894de3c8e7fb52ac27597e164b858cda753882ea4bdf398a93ba8bed26e187d55f1ba81d6de456132009965fb3e91df5fd532
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
new file mode 100644
index 000000000000..7432364a9864
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
@@ -0,0 +1,32 @@
+From 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Sun, 24 Jan 2021 11:10:27 +0200
+Subject: [PATCH] Fix build with gcc11
+
+Apparently now we need to #include <limit>.
+
+Patch by Geoff Leach:
+https://bugs.gentoo.org/766480
+https://invent.kde.org/frameworks/kio/-/issues/3
+
+NO_CHANGELOG
+---
+ src/kntlm/des.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp
+index 18d85bfd..65c86f06 100644
+--- a/src/kntlm/des.cpp
++++ b/src/kntlm/des.cpp
+@@ -29,6 +29,8 @@
+ #include <string.h>
+ #include <qendian.h>
+ 
++#include <limits>
++
+ static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
+ static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
+ static void perminit_ip(DES_KEY *key);
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.77.0-r1.ebuild b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
index 6b8abe7e5b5e..7219074c6230 100644
--- a/kde-frameworks/kio/kio-5.77.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
@@ -16,6 +16,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
+# tests hang
+RESTRICT+=" test"
+
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -68,10 +71,10 @@ PDEPEND="
 	>=kde-frameworks/kded-${PVCUT}:5
 "
 
-# tests hang
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-gcc11.patch" # bug 766480
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-frameworks/kio/kio-5.78.0.ebuild b/kde-frameworks/kio/kio-5.78.0.ebuild
index 04866eaeffa4..4b22f628f1f7 100644
--- a/kde-frameworks/kio/kio-5.78.0.ebuild
+++ b/kde-frameworks/kio/kio-5.78.0.ebuild
@@ -16,6 +16,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
+# tests hang
+RESTRICT+=" test"
+
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -68,8 +71,7 @@ PDEPEND="
 	>=kde-frameworks/kded-${PVCUT}:5
 "
 
-# tests hang
-RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${PN}-5.77.0-gcc11.patch" ) # bug 766480
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 8e3fe21951df..9606bbdaf26d 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,7 @@
+AUX kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch 1253 BLAKE2B 5b2711b4d853f6966d91c07ad33d36aeeacbe523166e3f16587f6ef0d16bc93f67dd1a4c62d79bc9969354aba28490b4690e047407c953971f09813329afaacb SHA512 7c846700da32d118d2662560760cd2d662856bed1a0c353b39fa25785cb18ab97614bfb599c1bff6208662bdd8b6270519e9b739a12d7785c1b4d49ffb046508
 DIST kirigami2-5.77.0.tar.xz 297028 BLAKE2B b75781fb89b3feec655fb6bc288e0c9ccdfc04d8a507c307001fdfd3c18a7204e4ea75be906d3f36595c12831d2d85b847a5fbf7e795d9b71289b305c27bbf83 SHA512 06e68f649f4cb93606eba2d0e726c004339a5410d5f559184c80e904841952af422d44db663add1144be626c4ac8b5f26eee2df8e0327d51b473027838be5bd6
 DIST kirigami2-5.78.0.tar.xz 299628 BLAKE2B 15adf9840618ec9aee218bee34a264c9ea41f87ead46dc3785caa430a25424d972ba80b1053ffd7eb537a0e9fe25d8f00603a0bca348eb21caaf426f1ebab76c SHA512 11789fe6d9cc6c3213e37d47c0dbe6f7cb180e6fadfb16ff461c5d6f60fa896d201694f49984a7db0e44589ff5b7af4772d924641e4aa5d59da4c6f55827285e
+EBUILD kirigami-5.77.0-r1.ebuild 1083 BLAKE2B 32cfc3318ce1dba1a988138a7e20fec7fa2c534bed7e5afaad0886ab319097a9509f592af401fbc79787169f3dffcdbb61a1736d57c545a4198f6d52023f7bac SHA512 ee2408ebcf2be2d312908cbd719cde79dd39305f7bd3669c990480c1d551b8a9668cc976a8ac4cef4df2a55b1ac98d80aab9aacc697b62e435dce93a5949b175
 EBUILD kirigami-5.77.0.ebuild 975 BLAKE2B 581843601075e0596538ddb0bc6bd86844b27b353ad6b3ed454c485f949a42795f98133e22117b81cb2681a8cc558d0cd34a8e23f927b9f612dc31ed2c0071e5 SHA512 cef74f4222bcd56ca0b63085f044d8cae2d5dfefac8f60f926ae62dd11d3f74b07ca2854a3eca44db9ce414fcaf49252178031ce1b5df2ce42eea55f73c9f477
-EBUILD kirigami-5.78.0.ebuild 978 BLAKE2B 61a5d76a6254940582f9713d6017fcc04961d3b7df0216de275d02fccea681843a4bfc8ba608846b2e4f3de40d86bb0bc193ec71851f1811e4ed53764a7f8ac9 SHA512 3f941589dfe8c3f3670d1208736eab20772a0be94453ce9a2fee0dfa14ad24d669b9da07dd253a19c5f3acdc64c8b23fbd0970f96a3c308f43f41244e9a2fbef
+EBUILD kirigami-5.78.0-r1.ebuild 1094 BLAKE2B 4c51e098b599b9cce2d7d1122019b4e8f0d38c358434dde39fdf450adef23b7d3dde6f7869c4cba27abfb34c082e84ccd46039ca7f5ae29fcc75c08250469ca1 SHA512 02a253005533e63e90d7c9806131846efde478c9fb32a43451bcec71f6c19393dcaa9be7809dd514fae0a04c36cfa86eb1f260fe82295b968d60c8f8dc8c7cc4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch b/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch
new file mode 100644
index 000000000000..5bda9da38249
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch
@@ -0,0 +1,35 @@
+From b4a6c562cde4e064494e261bc3f64000cbf628a5 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 14 Jan 2021 15:23:39 +0100
+Subject: [PATCH] Don't manually call reverseTwinsChanged when destructing
+ FormLayout
+
+This line causes a crash when destructing the screenlocker KCM.
+It doesn't seem to be caused by reverseTwinsChanged itself but rather by
+accessing the Qt object. I don't fully undestand the root cause.
+
+However the call itself appears to be unnecessary since in the line
+above we write to reverseTwins and that triggers the changed signal if
+needed.
+
+BUG: 431419
+BUG: 428461
+---
+ src/controls/FormLayout.qml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/controls/FormLayout.qml b/src/controls/FormLayout.qml
+index 74292fda..a27903f2 100644
+--- a/src/controls/FormLayout.qml
++++ b/src/controls/FormLayout.qml
+@@ -84,7 +84,6 @@ Item {
+     Component.onDestruction: {
+         for (let i in twinFormLayouts) {
+             twinFormLayouts[i].children[0].reverseTwins = twinFormLayouts[i].children[0].reverseTwins.filter(function(value, index, arr){ return value != root;})
+-            Qt.callLater(() => twinFormLayouts[i].children[0].reverseTwinsChanged());
+         }
+     }
+     GridLayout {
+-- 
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild
new file mode 100644
index 000000000000..bbe9de249552
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE=""
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+PATCHES=(
+	# KDE-Bugs #428461, #431419
+	"${FILESDIR}/${P}-no-reverseTwinsChanged-destr-FormLayout.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kirigami/kirigami-5.78.0.ebuild b/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild
index cf073175ace8..e44584cc323e 100644
--- a/kde-frameworks/kirigami/kirigami-5.78.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild
@@ -18,6 +18,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+# requires package to already be installed
+RESTRICT+=" test"
+
 BDEPEND="
 	>=dev-qt/linguist-tools-${QTMIN}:5
 "
@@ -34,8 +37,10 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 "
 
-# requires package to already be installed
-RESTRICT+=" test"
+PATCHES=(
+	# KDE-Bugs #428461, #431419
+	"${FILESDIR}/${PN}-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index de0772d6e002..75b262105d17 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,5 @@
 DIST purpose-5.77.0.tar.xz 158016 BLAKE2B 51e26b284bbeb8ac07690f4b9c571f58b89c977e87a5bdad8f56a5aaacb69b2d1130b08169fcdc7848925b1811d4e632e4c3e9c453e30482a4ed80c4d329c81f SHA512 61261ae4d5ae2327100629ace3e6b2cade9b2894bb21e817700a1265c5283b13a6f828bec47dfd8efa118fadad0f5cc89cbf8fd3e637497dd68345eefaa53956
 DIST purpose-5.78.0.tar.xz 158484 BLAKE2B 4e0873c6e37b8eab75bfa487649bcc45731ad443eda84c637a46a8fa8bab14f71e2abc396d7ccce26ff1901e660f5aa3f5217954ad83264d44948fda37821f72 SHA512 793540ecb069ab89f685eb8a37509f547d3de6e84e8e56f9fb5b3f19f307f527f9e9141188f8a5a4f1ec2d10a9f2cdebe99440561797a35146e78b956b4db881
-EBUILD purpose-5.77.0.ebuild 1634 BLAKE2B 7f82f2116ea54e59577365e30004c50db04748900a6c05969e614b83dc9fecaebb49ce46ec39b257bdb04def63502c2e9abe73c57f27fec1903c726dd4b8ea63 SHA512 543489cccbce003e14b13af01d62bcbe9a9d6cb2faa188a17eab3cb8b7f7bedeb5d1c306281a8a2cadb0a57785c8e47ebbd66cd9523c3b704782e422db25b08c
-EBUILD purpose-5.78.0.ebuild 1637 BLAKE2B ede8559e389e89863d52e95ac1ba9267870ed0b7975d2d3a695a4afbaf78ebad3bc156b78c0d5429094663cec8c3cedd34af60a7e96d6d7c07e739f0d1bd7af0 SHA512 0fdaac5fa75112afb383b3c98949e09d6a850b11664fa87cd5b074ce6e60c89ef86635b3205f79b42a54a912c732c101df0efc67e14d78f232a1c04eacd3b6a1
+EBUILD purpose-5.77.0-r1.ebuild 1654 BLAKE2B f243e023a17dba7d35125cd5fe5ffd19046c8e019d9778e6e470bf4869c918911149148ad96f6d40bb085f722320a0368f15f6064c7ee0f17b60492d54e5a38f SHA512 dab47c4c94e5ba43d8c5c115f43ca1f38c410d3edfac5922f681d4399ebd9b2d60959ee882ac5138892cc80f76f1620ff4ffaf87973d20fa575201936dd167f5
+EBUILD purpose-5.78.0-r1.ebuild 1657 BLAKE2B b2dbdf7320164987c67f1f1d558bd3ab2f2ce38f87fe3a99613c3af38024d3629e3138c9cbd2ab30a7bf749fe9188be5135e5715325ea8883df1882c5d779b40 SHA512 67c9e1d6e4725576a61dbdbc1d02bf1867cb09ab774119af1ef8b85b8f3a698c99630c4b93eb781943d6b1580ce0e21d4a05ffa369ed406bbb00c7180e41fee7
 MISC metadata.xml 441 BLAKE2B bedd6e101cd0b4233d383352c66125b30508c7bbb5f597bdd6854e02b89004e2e9aa968de63357f58fd5e196de40b7f1e4816572f828a7cc5307a657125bf21c SHA512 7d5fce42c371a15a6d05866d5d40436a05b8ec34538ce5fab7d4f47a9dd6ae4312ac4096e646df230ee611bddd040f58fa93f41688517b4205d3785f1ce56acc
diff --git a/kde-frameworks/purpose/purpose-5.77.0.ebuild b/kde-frameworks/purpose/purpose-5.77.0-r1.ebuild
index 2a38cdbeb63c..b00835aa55bf 100644
--- a/kde-frameworks/purpose/purpose-5.77.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.77.0-r1.ebuild
@@ -42,7 +42,9 @@ RESTRICT+=" test"
 
 src_prepare() {
 	ecm_src_prepare
-	cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+
+	use bluetooth ||
+		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
 }
 
 src_configure() {
diff --git a/kde-frameworks/purpose/purpose-5.78.0.ebuild b/kde-frameworks/purpose/purpose-5.78.0-r1.ebuild
index c03ada7bf4cc..1911a132479c 100644
--- a/kde-frameworks/purpose/purpose-5.78.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.78.0-r1.ebuild
@@ -42,7 +42,9 @@ RESTRICT+=" test"
 
 src_prepare() {
 	ecm_src_prepare
-	cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+
+	use bluetooth ||
+		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
 }
 
 src_configure() {
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index b73e7189dd1c..b39ae1820b07 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,9 +1,8 @@
-AUX syntax-highlighting-5.77.0-bash-zsh-fix.patch 6963 BLAKE2B 9d78a32f3ee42f9861c0bc58c0d0c006b051f415bbc4874ee0fe89952d5557b846581be7c0390f551230598e001e71cc45cb667f5eee68cb57061fa9eb16cbe4 SHA512 1a9b8e67dab8eb7b1eafa0d37c4bf2dfdd15f0bfff17f1380bb7771eebd17b8ce33bc684e2c3b5514fde17064af8d77f96d44895836bf1889593c241079a20a8
-AUX syntax-highlighting-5.77.0-bash-zsh-version.patch 2125 BLAKE2B b12c649b444595caee9bc28b3991c66b4c11260c55b56900894a922e53fc2aea46f1a374f7fe0787967619f98c7862db6645c5e2f02053f7a25da688f9c80b92 SHA512 1dc6b08f651f647e5442de9bfb91babec5f2bfdfdd1da9dc1809a58e0b7750b9e7ba1e60279fb7c99e66a0a5a9d291ec136cd4183b156b37ce1a9f7581257eac
 DIST syntax-highlighting-5.77.0-bash-zsh-fixes.patch.xz 91824 BLAKE2B 4d201e62aecc7126f11d52ef2d68c308e61f7e167312270baf093eab379a7d95efaa38fec604701ad0fc15e8e050191a00a4075dac488c957fabe4dc4994065f SHA512 598eb3ed82f2bd072750730e6f9492d821a63cc2ebb4877e83aa482597a6cfb50ac721945f5c176c45d75de970dfba3c79f0e048db9076d7451743e672512c97
+DIST syntax-highlighting-5.77.0-bash-zsh-fixes.tar.xz 95008 BLAKE2B 9fe2a2121687070f176633334ddb853f4d34ab6a5dbdff69f081d8a79785dfb1b989feb564f6a7304a6c008e4a79df8091e3e89b3afe6c5f8e6b1ead676f7bfe SHA512 e2ea8caeb75f8cf2b98060f44d39db4019cdca9b318dc7d34b538fb98659a8f98b0771a89ddaf57d35f9a33e9643dabf4eb16ce218538f1680df4e306640bdfc
 DIST syntax-highlighting-5.77.0.tar.xz 2145120 BLAKE2B de91836509fd6264fe0b79f1a7153c4d581913870ec207bd4d69ce24c5d00d92e49ebc70d147715a732626805cf68045be6490ff6ae7e199454c53a4c82ec2dd SHA512 057e9be24608cd856ee8aea355ddc63da9a11d50c388ae303e1f34cdf3a7ac99c592de51e0f04fa2254246ad796ced5029117b22ca71420b6089139d827a31b9
 DIST syntax-highlighting-5.78.0.tar.xz 2201352 BLAKE2B 6cd72e85d43d5061a490da6ff13f16c6e3ad2decd4efc65b8a5ec82f1815102bab0a546cd929a8ce82bccc163a809efb8cc5c82ecba98a410d0debef16b47884 SHA512 e9d47f69a14a890a4c5c0e9c33cce51fa6fef93d5c50b565b4d6e2d1978cddd8ffb4239534ddb02decf75190ec3b5446ca387901cda9f27f59088b6853c76843
 EBUILD syntax-highlighting-5.77.0-r1.ebuild 702 BLAKE2B 31ebfd8db51b156d515477ae8d0fa4783287fde242b0d9bcc99bc9b5438980c83e5692bc653e3402b65504e333539cf33cf71a9bc68c80b53afefb983b9d0d02 SHA512 1fb527d9ffa2e1a343d7527a7bd8f6827296862639017f225fe20580ce287687f192a3d04ea0ec255e57aa6e67f92d3ae8685ef03720a7523d2245cc52c6782d
-EBUILD syntax-highlighting-5.77.0-r2.ebuild 803 BLAKE2B e3ddcbbacbbcf5413c26b6a55b0d364c0c474c41687080a655fd4d7e26e2377f433c1b43acaef44e310371cba574ff85319e4edbdf506bc154182bd88c80f30a SHA512 a0860f527d684b89486221baeb7566ee766244ee8d8e8f8f15be7d799e32c7e4f5516398b312a538b4c7d1915fba226318400d06614f941b3b35f49dc07a345a
-EBUILD syntax-highlighting-5.78.0-r1.ebuild 630 BLAKE2B 63db421310600183db8612af671075644d4e98375dcc838eb5573c389f4cd5f16d17a33a6eaacdd6fb0dea78affe2db3d6114dc247e503bea0f4d31652fb175b SHA512 33e8463a49ad5770160681a96760af50cfb7fa5ab5c272c5ed6dbe18bab41133f32edb57d68dae6fee2decfda770549af93560d367180e13038d223a158a3a9a
+EBUILD syntax-highlighting-5.77.0-r3.ebuild 694 BLAKE2B 6950b7bb5a5ce43ed7e0fc036aa081ab03dbf1268e047934ad446aeb1da8d0ed71b04976145607002fc4760d2d197d5df99d2fb0d2630a87e98c38a3ec2eb8df SHA512 4f925b469cff2925b86dbeecaa28ef41264fad07286661d5a226b7a6765dca30fdda84c6323eaa9f0449047d271d193191db15f5e54c1f7a37329ca5827efe6e
+EBUILD syntax-highlighting-5.78.0-r2.ebuild 959 BLAKE2B 5dafcb9be5132561744d1807711e9fcd7bcb3a7399f1afc3183e814769f64437aa120883045a04e299d0200cc10780f331175823407173b75953f2d3851e019a SHA512 9713171bb8e112f816e6709419b758c7376f788495251476c256ba2fff94a03b2f6fe6b37d53589aef54fbb0fa2592e3efb87cddf8cbcdcf7ad36ab102a1a37d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch
deleted file mode 100644
index 2ec92edb9c8f..000000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From ba9b3c5e0ed2fb33b9a896ec910590410978befe Mon Sep 17 00:00:00 2001
-From: Jonathan Poelen <jonathan.poelen@gmail.com>
-Date: Mon, 11 Jan 2021 01:29:01 +0100
-Subject: [PATCH] Bash: fix #5: $ at the end of a double quoted string
-
----
- autotests/folding/highlight.sh.fold   | 1 +
- autotests/html/highlight.sh.dark.html | 1 +
- autotests/html/highlight.sh.html      | 1 +
- autotests/input/highlight.sh          | 1 +
- autotests/reference/highlight.sh.ref  | 1 +
- data/syntax/bash.xml                  | 5 +++--
- data/syntax/zsh.xml                   | 3 +--
- 7 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/autotests/folding/highlight.sh.fold b/autotests/folding/highlight.sh.fold
-index 652fef8f..d7a6b210 100644
---- a/autotests/folding/highlight.sh.fold
-+++ b/autotests/folding/highlight.sh.fold
-@@ -16,6 +16,7 @@ echo 'single quoted string'
- echo "double quoted string"
- echo $'string with esc\apes\x0din it'
- echo $"string meant to be translated"
-+echo "$"
- 
- 
- # comments:
-diff --git a/autotests/html/highlight.sh.dark.html b/autotests/html/highlight.sh.dark.html
-index d1d4fb8a..8cbd0929 100644
---- a/autotests/html/highlight.sh.dark.html
-+++ b/autotests/html/highlight.sh.dark.html
-@@ -22,6 +22,7 @@
- <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">&quot;double quoted string&quot;</span>
- <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">$'string with esc</span><span style="color:#2980b9;">\a</span><span style="color:#f44f4f;">pes</span><span style="color:#2980b9;">\x0d</span><span style="color:#f44f4f;">in it'</span>
- <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">$&quot;</span><span style="color:#f44f4f;">string meant to be translated&quot;</span>
-+<span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">&quot;$&quot;</span>
- 
- 
- <span style="color:#7a7c7d;"># comments:</span>
-diff --git a/autotests/html/highlight.sh.html b/autotests/html/highlight.sh.html
-index 5d687d86..d176b1cb 100644
---- a/autotests/html/highlight.sh.html
-+++ b/autotests/html/highlight.sh.html
-@@ -22,6 +22,7 @@
- <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">&quot;double quoted string&quot;</span>
- <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">$'string with esc</span><span style="color:#0057ae;">\a</span><span style="color:#bf0303;">pes</span><span style="color:#0057ae;">\x0d</span><span style="color:#bf0303;">in it'</span>
- <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">$&quot;</span><span style="color:#bf0303;">string meant to be translated&quot;</span>
-+<span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">&quot;$&quot;</span>
- 
- 
- <span style="color:#898887;"># comments:</span>
-diff --git a/autotests/input/highlight.sh b/autotests/input/highlight.sh
-index 177e104f..5c2ae7b1 100644
---- a/autotests/input/highlight.sh
-+++ b/autotests/input/highlight.sh
-@@ -16,6 +16,7 @@ echo 'single quoted string'
- echo "double quoted string"
- echo $'string with esc\apes\x0din it'
- echo $"string meant to be translated"
-+echo "$"
- 
- 
- # comments:
-diff --git a/autotests/reference/highlight.sh.ref b/autotests/reference/highlight.sh.ref
-index 181c36af..edaf18ab 100644
---- a/autotests/reference/highlight.sh.ref
-+++ b/autotests/reference/highlight.sh.ref
-@@ -16,6 +16,7 @@
- <Builtin>echo</Builtin><Normal Text> </Normal Text><String DoubleQ>"double quoted string"</String DoubleQ><br/>
- <Builtin>echo</Builtin><Normal Text> </Normal Text><String SingleQ>$'string with esc</String SingleQ><String Escape>\a</String Escape><String SingleQ>pes</String SingleQ><String Escape>\x0d</String Escape><String SingleQ>in it'</String SingleQ><br/>
- <Builtin>echo</Builtin><Normal Text> </Normal Text><String Transl.>$"</String Transl.><String DoubleQ>string meant to be translated"</String DoubleQ><br/>
-+<Builtin>echo</Builtin><Normal Text> </Normal Text><String DoubleQ>"$"</String DoubleQ><br/>
- <Normal Text></Normal Text><br/>
- <Normal Text></Normal Text><br/>
- <Comment># comments:</Comment><br/>
-diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
-index 3171247b..3b804f90 100644
---- a/data/syntax/bash.xml
-+++ b/data/syntax/bash.xml
-@@ -30,7 +30,7 @@
-         <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
- ]>
- 
--<language name="Bash" version="20" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="21" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
-@@ -943,7 +943,8 @@
-         <DetectChar attribute="Backquote" context="RegularBackq" char="`"/>
-       </context>
-       <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQDispatchVariables">
--        <IncludeRules context="DispatchVariables"/>
-+        <IncludeRules context="DispatchSubstVariables"/>
-+        <IncludeRules context="DispatchVarnameVariables"/>
-         <DetectChar attribute="String DoubleQ" context="#pop" char="$"/>
-       </context>
-       <context attribute="String DoubleQ" lineEndContext="#pop" name="StringDQEscape">
-diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml
-index ada258c8..5aa83290 100644
---- a/data/syntax/zsh.xml
-+++ b/data/syntax/zsh.xml
-@@ -55,7 +55,7 @@
-         <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
-         <!ENTITY exp "(?:[eE][-+]?&int;)">
- ]>
--<language name="Zsh" version="12" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT">
-+<language name="Zsh" version="13" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT">
- 
-   <highlighting>
-     <list name="keywords">
-@@ -893,7 +893,6 @@
-       </context>
-       <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQDispatchVariables">
-         <IncludeRules context="DispatchSubstVariables"/>
--        <Detect2Chars attribute="String SingleQ" context="#pop!StringEsc" char="$" char1="'"/>
-         <IncludeRules context="DispatchVarNameVariables"/>
-         <DetectChar attribute="String DoubleQ" context="#pop" char="$"/>
-       </context>
--- 
-GitLab
-
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch
deleted file mode 100644
index 2a7f2684bfb8..000000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 70b56cf8b3d1a85e15d1e09aa8490e5183967de0 Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Wed, 30 Dec 2020 17:35:48 +0100
-Subject: [PATCH] increment version
-
----
- data/syntax/bash.xml | 2 +-
- data/syntax/zsh.xml  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
-index 676b630d..3171247b 100644
---- a/data/syntax/bash.xml
-+++ b/data/syntax/bash.xml
-@@ -30,7 +30,7 @@
-         <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
- ]>
- 
--<language name="Bash" version="19" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="20" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
-diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml
-index 120b345e..ada258c8 100644
---- a/data/syntax/zsh.xml
-+++ b/data/syntax/zsh.xml
-@@ -55,7 +55,7 @@
-         <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
-         <!ENTITY exp "(?:[eE][-+]?&int;)">
- ]>
--<language name="Zsh" version="11" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT">
-+<language name="Zsh" version="12" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT">
- 
-   <highlighting>
-     <list name="keywords">
--- 
-2.30.0
-
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r3.ebuild
index 4dabf263ae74..5528791bfb1b 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r3.ebuild
@@ -8,8 +8,10 @@ QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Framework for syntax highlighting"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-bash-zsh-fixes.tar.xz"
+
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
@@ -23,9 +25,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch
-)
+PATCHES=( "${WORKDIR}"/${P}-bash-zsh-fixes )
 
 src_install() {
 	ecm_src_install
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r2.ebuild
index 24d0f786f3e3..95a0b82859d9 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r2.ebuild
@@ -8,10 +8,10 @@ QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Framework for syntax highlighting"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-bash-zsh-fixes.patch.xz"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.77.0-bash-zsh-fixes.tar.xz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
 
 BDEPEND="
@@ -26,9 +26,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${WORKDIR}"/${P}-bash-zsh-fixes.patch
-	"${FILESDIR}"/${PN}-5.77.0-bash-zsh-version.patch
-	"${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch
+	"${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0010-Bash-fix-5-at-the-end-of-a-double-quoted-string.patch
+	"${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0011-Bash-fix-in-xy-and-more-Parameter-Expansion-Operator.patch
+	"${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0012-Bash-Zsh-fix-cmd-in-a-case.patch
 )
 
 src_install() {