gentoo auto-resync : 29:01:2023 - 02:53:24

22 files changed, 754 insertions, 2 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index f194e2b1283d..d891c3a2145d 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index cc09f47c332a..3a5ac27115eb 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,9 @@
+AUX akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch 1329 BLAKE2B 5b9b79400c52fb3ad8e60eb169ed2240523c755db9104bf2f664794353630e8ce745fcf4dc2f569a571c8dc2025f80ff95386da6f7c5ffe6f2f529fa5a27646c SHA512 ca13afff8e21812bf5044b7d98f61d6524d660d60b6272405f279139b2718308401bf7db7f7f68db4691eac0c96f2dde03651496d88071835ad1b6254d4010be
+AUX akonadi-calendar-22.08.3-fix-hidpi-scaling.patch 1059 BLAKE2B ee8032cb8224323b038d1d6ce9f2a0610334c7c1e36305462df6d51df57f8f28a91a8933367354cae86d7539049d227d665315b8882c60485b8b6c986c64eddf SHA512 4413b0f4e9538ccd40462b962d36ebfe1f780f36ab2f57b6c1359b25842592d9ba82e0dea2306fe4e7d26255f71ed1b2551480c1e7a94aa1618ce9ea67036f8f
+AUX akonadi-calendar-22.08.3-fix-kalendarac-crash.patch 1425 BLAKE2B cc4cb85ae85fc87908068b69f153dd385544da8d18facf04376c897c473db138c05dcef2125e79825ae0f072d88facfcd2a656e1108272f3afe99bb830a48c2b SHA512 d8a36eb4bda36c33181968af31379d6250896b2f58806b1860f030ab8e60f68f22d68e0de7fc5019ec4d70a5ba014c2553a86fb92f2a0af4d056469247958171
 DIST akonadi-calendar-22.08.3.tar.xz 395312 BLAKE2B 0d28e8435014a83625d59ac73137533b87305143a4ba720741bb8374c6cac30ac8af504d7cbe132b7b9e567e7f173ad48f78f1f02d81e6a3356837e0cd0299e2 SHA512 d708a2ebc1ba76115725eeed18685e0cbd0715d730468eff9d9017d35658bb4a264d52b0b083e47fdb790cbad552be4fdac6d505981f7a34acd29eee1576c502
 DIST akonadi-calendar-22.12.1.tar.xz 410000 BLAKE2B a468cc1e2156701a462bf6863119dc46dafd24dbeb813b1ad9bcec5666394635c229067440ac3af46c4c3a9e83096b49d76bcd7551765586d68b5bcb2b7086ea SHA512 3ecbbe45184e355292c444c7cacabe1cd525df4275279ac40a8084491cb8b0c60d860f8370d0cbf146fbe0a429da5a4f7fcf0d9013f60a786c2b1525431148fe
+EBUILD akonadi-calendar-22.08.3-r1.ebuild 1457 BLAKE2B fa80f6af5479d07eb0fce5f4430ea0cb7f76a0488538484bad166569919c75e29062b7cf22cb27fe8d7ecc0c792ca0b2df7391aa06c724b958f496ef1c86446e SHA512 0330e51989a13ff1cb4e40e837e8e5d2a67dd82dc86a06143f0cef4bb799ffe307389d70e8f5740e425c4d834088e8de3ad905a1f709c143237b9c6acc58e0ea
 EBUILD akonadi-calendar-22.08.3.ebuild 1287 BLAKE2B 03fb6b740224bb6ddd8029069f000844c6d6e785cf543cd42cd15e25c313ebcc9c42bc1edcd2893afa683fea30055dfa420d19b7796e258350efb1a64c71778d SHA512 171776fc1217bb97d8a98237b4b8cc0dd3a64e328f1d18b6ea7c2e725059216177b6c90b3a6fa42c16024f70209185721ba30ec51765ebf914d2e9a1bd705be8
-EBUILD akonadi-calendar-22.12.1.ebuild 1291 BLAKE2B 859fb7e677dcbeac782eabda5b6e65477b43c6b99e559413a9c1432c3ccc36ed9e2852faf1278d4f986c6fea438f6b8fd6b37152309c5640b26f8dc24415503e SHA512 028dc228fb2e8f55cc08a8461054ea6a9a8c673f8b3af3cf2513cf990466fbba6cb101344107d23006b0cc0162450b79d5da0fd611c00780a5a4092ed3190d77
+EBUILD akonadi-calendar-22.12.1-r1.ebuild 1375 BLAKE2B d2f3c5445d428da81cf2febaf7537f01441c0d312fbf4623d8104771c0ae809f2ee49e1bce72c0df3363072de2f30f8518d879ede868556e737d2a6fd42affe7 SHA512 a3efeb58b56760b0e331451520c2cc3690a374341ad68920a712e27427836ad8320ca882f9c6d02dc357f063720948469d8e55de1df7067a74b33bb775874de0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild
new file mode 100644
index 000000000000..4880c2331795
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi calendar integration"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-frameworks/kcalendarcore-${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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-hidpi-scaling.patch"
+	"${FILESDIR}/${P}-fix-kalendarac-crash.patch"
+	"${FILESDIR}/${P}-convert-event-start-time-to-local-tz.patch"
+)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1-r1.ebuild
index f2c69b26b283..dd68fabee9f3 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1-r1.ebuild
@@ -45,3 +45,5 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-22.08.3-convert-event-start-time-to-local-tz.patch" )
diff --git a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch
new file mode 100644
index 000000000000..4ede6334a029
--- /dev/null
+++ b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch
@@ -0,0 +1,33 @@
+From fdbd7e42b6707cf99db48f62d43ca104de632159 Mon Sep 17 00:00:00 2001
+From: Kishore Gopalakrishnan <kishore96@gmail.com>
+Date: Sun, 6 Nov 2022 13:03:22 +0530
+Subject: [PATCH] Convert event start time to user's local timezone
+
+Since we don't display the timezone of the event in the notification,
+this is required when the event is in a different timezone from the
+user's local one.
+
+BUG: 453805
+
+
+(cherry picked from commit 750200aa58e3a8c4073e6304a0e214c1c5beafb9)
+---
+ reminder-daemon/alarmnotification.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/reminder-daemon/alarmnotification.cpp b/reminder-daemon/alarmnotification.cpp
+index 6082e9a..27e53e2 100644
+--- a/reminder-daemon/alarmnotification.cpp
++++ b/reminder-daemon/alarmnotification.cpp
+@@ -30,7 +30,7 @@ AlarmNotification::~AlarmNotification()
+ 
+ void AlarmNotification::send(KalendarAlarmClient *client, const KCalendarCore::Incidence::Ptr &incidence)
+ {
+-    const QDateTime startTime = m_occurrence.isValid() ? m_occurrence : incidence->dtStart();
++    const QDateTime startTime = m_occurrence.isValid() ? m_occurrence.toLocalTime() : incidence->dtStart().toLocalTime();
+     const bool notificationExists = m_notification;
+     if (!notificationExists) {
+         m_notification = new KNotification(QStringLiteral("alarm"));
+-- 
+GitLab
+
diff --git a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch
new file mode 100644
index 000000000000..26698be849c4
--- /dev/null
+++ b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch
@@ -0,0 +1,32 @@
+From cb8e88e6b50a6edc399510b1a8d6307177f00bb7 Mon Sep 17 00:00:00 2001
+From: Moody Liu <mooodyhunter@outlook.com>
+Date: Fri, 14 Oct 2022 23:19:25 +0000
+Subject: [PATCH] kalendarac: set AA_EnableHighDpiScaling attribute before
+ constructing QGuiApplication
+
+---
+ reminder-daemon/kalendaracmain.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/reminder-daemon/kalendaracmain.cpp b/reminder-daemon/kalendaracmain.cpp
+index 0566c7f..c0ae2be 100644
+--- a/reminder-daemon/kalendaracmain.cpp
++++ b/reminder-daemon/kalendaracmain.cpp
+@@ -12,10 +12,13 @@
+ 
+ int main(int argc, char **argv)
+ {
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
++    // set this attribute before contructing QGuiApplication
++    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
++#endif
+     QGuiApplication app(argc, argv);
+     app.setQuitOnLastWindowClosed(false);
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+ #endif
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch
new file mode 100644
index 000000000000..64801160d886
--- /dev/null
+++ b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch
@@ -0,0 +1,36 @@
+From 9baa8ca070a73658bec0c5a9a1854e4ec73abd8a Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Fri, 30 Dec 2022 09:29:02 -0500
+Subject: [PATCH] Ensure Akonadi IncidenceChanger doesn't try to show dialogs
+
+Since kalendarac is not a proper QApplication it can't
+show dialogs anyway.  Else you'll see crashes with:
+"QWidget: Cannot create a QWidget without QApplication"
+---
+ reminder-daemon/kalendaralarmclient.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/reminder-daemon/kalendaralarmclient.cpp b/reminder-daemon/kalendaralarmclient.cpp
+index b726ac1..da3b050 100644
+--- a/reminder-daemon/kalendaralarmclient.cpp
++++ b/reminder-daemon/kalendaralarmclient.cpp
+@@ -6,6 +6,7 @@
+ #include "calendarinterface.h"
+ #include "logging.h"
+ 
++#include <Akonadi/IncidenceChanger>
+ #include <KIO/ApplicationLauncherJob>
+ 
+ #include <KCheckableProxyModel>
+@@ -52,6 +53,8 @@ void KalendarAlarmClient::setupAkonadi()
+     const QStringList mimeTypes{Event::eventMimeType(), Todo::todoMimeType()};
+     mCalendar = Akonadi::ETMCalendar::Ptr(new Akonadi::ETMCalendar(mimeTypes));
+     mCalendar->setObjectName(QStringLiteral("KalendarAC's calendar"));
++    Akonadi::IncidenceChanger *changer = mCalendar->incidenceChanger();
++    changer->setShowDialogsOnError(false);
+     mETM = mCalendar->entityTreeModel();
+ 
+     connect(&mCheckTimer, &QTimer::timeout, this, &KalendarAlarmClient::checkAlarms);
+-- 
+GitLab
+
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index d68ffb4f3b47..c4eb1d867d5b 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,11 @@
+AUX kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch 1375 BLAKE2B 9397a09c08410af7725b97aaf4448b336a58580fdbe00535688707663d24f67d136b7123c1b3951b9d1fa2ce58be819784b0a81b3f8741f680efc1a627ed0267 SHA512 34357cf282b44263cd79e4efbed80866d64a39e625603a4a36961c687ea124dc588d7b748170620477df347eef70d69a9aade49d34d83e9240e172fd578a341d
+AUX kmail-22.08.3-fix-crash-on-startup.patch 2553 BLAKE2B de687e9c9f88bbf18a873fbf766cddb344b5925eda0cfe061a73a633ae596cc8cad1802c4d08ca81a5a8acf49acab350d6b06ea299cb6e266360ac200a02bc18 SHA512 eef2be81d85f4102b1b6983757b144c6e855e1a35d18423b400bab918e858ea2ee91299c67b8ca13190cdd2cc26d67fc3c2f0fa68d7df8a7d0460c23cc40da88
+AUX kmail-22.08.3-fix-open-detailed-progress-bar.patch 1750 BLAKE2B eb90b9b6fce055770fcf675393fedd54bc8338349e655b0a42430ac68750327ac3dcf80e27fba9510dbb73c0b07f1e55a694a6843b3b8fb98ebd4e34027e913c SHA512 4da5a9116b0e4da98c2c1b261fb827dd47da1b237c28a4ccd18c92ecda612f00dfe14722f24f9347eab2556bee167f4b350827c0235b6843a2d654b44ee3e5b8
+AUX kmail-22.08.3-fix-random-text-in-config-settings.patch 1286 BLAKE2B 9de421be4e3a21b56502b19abb93bc47645a161f041b205a58fc7dd609964a9fdcadaca8f5af6915a63a2248b920c71b812be4e51fc5f82e08a864eb8e350d7d SHA512 ba87416c02a6d00c800b0973d8a797eaf842d2fb02b8f180e50ae901f9b9be5e413f8215b48babed63d8d04db37646e126ed88b3da8f5e808c1d41dfe12873bd
+AUX kmail-22.08.3-remove-removed-ShowUserAgent.patch 1485 BLAKE2B 13d2e0f1edea73c7754c1d591b2f0dfb93bbd20e2e450ab04a06d89064de6e6168c15e5e5808c2541f9729d71a5333ebbc6cc09c935be7fa839c19da107a2362 SHA512 550a210ba36fc12eebcf22c014608ea354874d67095bf9d45783a9dc4fad01f1dd99d6097527660572fcff6e1eda86444292592e9d064473aabd1d51d207f3b7
 DIST kmail-22.08.3.tar.xz 7119980 BLAKE2B c8712dae42f4124c12bc9eb58428a13844180df4a52ab4748101223d741720be88fb8e7a06e2def75201e73cbbdabd96424e3a011feafc572e8b1d905193abfb SHA512 96e0cf57d0eb6a3802d1f2f57b2ed74ad751acfc76488f99d6c30363cd12eaa34eadc7cb375baf3f2dbfdc76364d10924db40ed1eb8c6b4f4279a399684a15eb
 DIST kmail-22.12.1.tar.xz 7655784 BLAKE2B 40ae95818e90af6d87c9f1d31042395d587fe2fdff5ebd801192fbdb8ee067a1400d36bc515aac580a1f1cca9892f974acca1b424bf4b237c12a3168cc736ec7 SHA512 6ae55ffdaadcc4b07be49e14934d8bceeab77959be3a6ab3e7bb60591b46ac79484098299307c3fce028a631d54af8085a34c9c86e6f694159d01f28e7eb3813
 EBUILD kmail-22.08.3-r1.ebuild 3587 BLAKE2B 15842c5c54bd7323efbb48dd5f16e631614753486fd776d13f85c79fb2c76fcad5d7c58e063ad245e73b2fff1634b289817d5bfe7c9b2d05e0106710078754aa SHA512 065a29b160cdd4dd1fd45be82362b2e9e3912ad0158bf6843aca487c6653ea14a9658ba1d38c94583cdac84049da87514ee81c35ab4146f4775b10ca8dba9231
-EBUILD kmail-22.12.1-r1.ebuild 3591 BLAKE2B 4c8299c9ef4656f482a6bc22b7c588be216bf35a12d125c125350929c0825a93005e04fb07b314a3bb535041a3f9da263eaad73a7ce1db98b25ff279247ab5b8 SHA512 e893215e52025040184675d720d3d1432f7c76c0a4c680916320c3a836c2e1462bb0028a95e69f2ce3c55c6ee592caa0231cc17e7f7f2f3b0d4c66e54f47d989
+EBUILD kmail-22.08.3-r2.ebuild 3899 BLAKE2B 593c5c7c0eeabaf8ab127b953c79b1ff81c2664e498731ca87698ecb6a30f1b1ebf18e1eaecc88dc972c8a6834f0634c137f0723b4b3f642260888c2ddd1e174 SHA512 1e8891fc84869cc7bb90abf019c96c404e62b93606954fdfbbb2de26da0d72ce10c225b8c8aacabca67382e47e68a49d22fd43e968fb5e930d4dfec32aaf6dfb
+EBUILD kmail-22.12.1-r2.ebuild 3679 BLAKE2B dd22eb06a9348cc20523c22136a40eacd9b439b708d8f60610bbbc2f0e6067d193f34aedfdc90a92e971f313c82fcae1e3129d2a9d9a46e1178b56dc5f7f0e4f SHA512 31eaef3b7ecd296f02a196f56c2c7812466d02531ec7eda7e2af964eefbee6f445676a460ccc2cf6cf290cd4cb03a6e3d110ea1753adfc464d39a4267437b708
 MISC metadata.xml 445 BLAKE2B 47e37cd89e22df02281c65a6ef60502f35b58eef37ef35518f0ec66f8ecf75c9aaf94b36aa712b483455c2df11a2d2b72042517bc7db5a8569c3148aa0e028bb SHA512 533627f9773117d39b044a464bf0a075d111168bf5e4f2b222c05ef8f07f9e9139eafbb3b2869bbcc9e46529608679796e9532be55c6b1cb1980c68beb20cc33
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch
new file mode 100644
index 000000000000..5692a4916129
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch
@@ -0,0 +1,38 @@
+From 94e28559c96b71721b02393a23cbfeefa93a607b Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sat, 7 Jan 2023 00:31:18 +0100
+Subject: [PATCH] Fix bug 463935: Crash on attempting to replay a message with
+ an user template
+
+BUG: 463935
+FIXED-IN: 5.22.2
+---
+ src/kmmainwidget.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index b00db6f53..3ab6a18af 100644
+--- a/src/kmmainwidget.cpp
++++ b/src/kmmainwidget.cpp
+@@ -2096,8 +2096,7 @@ void KMMainWidget::slotCustomReplyAllToMsg(const QString &tmpl)
+     qCDebug(KMAIL_LOG) << "Reply to All with template:" << tmpl;
+ 
+     auto command = new KMReplyCommand(this, msg, MessageComposer::ReplyAll, text, false, tmpl);
+-    command->setReplyAsHtml(messageView()->htmlMail());
+-
++    command->setReplyAsHtml(messageView() ? messageView()->htmlMail() : false);
+     command->start();
+ }
+ 
+@@ -4745,7 +4744,7 @@ void KMMainWidget::slotRedirectCurrentMessage()
+ void KMMainWidget::replyMessageTo(const Akonadi::Item &item, bool replyToAll)
+ {
+     auto command = new KMReplyCommand(this, item, replyToAll ? MessageComposer::ReplyAll : MessageComposer::ReplyAuthor);
+-    command->setReplyAsHtml(messageView()->htmlMail());
++    command->setReplyAsHtml(messageView() ? messageView()->htmlMail() : false);
+     command->start();
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch
new file mode 100644
index 000000000000..a798f1afe567
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch
@@ -0,0 +1,47 @@
+From 9d37b837eca35bd7976709a9d25d3700c70e321e Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sat, 31 Dec 2022 10:55:34 +0100
+Subject: [PATCH] Fix bug 460747: Kontact Crashes Upon Start
+
+BUG: 460747
+FIXED-IN: 5.22.1
+---
+ src/kmmainwidget.cpp | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index 8d332b36b..8c7013f8b 100644
+--- a/src/kmmainwidget.cpp
++++ b/src/kmmainwidget.cpp
+@@ -3403,6 +3403,14 @@ void KMMainWidget::setupActions()
+     QAction *act = actionCollection()->addAction(KStandardAction::Undo, QStringLiteral("kmail_undo"));
+     connect(act, &QAction::triggered, this, &KMMainWidget::slotUndo);
+ 
++    mAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Account &Settings"), this);
++    actionCollection()->addAction(QStringLiteral("resource_settings"), mAccountSettings);
++    connect(mAccountSettings, &QAction::triggered, this, &KMMainWidget::slotAccountSettings);
++
++    mRestartAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Restart Account"), this);
++    actionCollection()->addAction(QStringLiteral("resource_restart"), mRestartAccountSettings);
++    connect(mRestartAccountSettings, &QAction::triggered, this, &KMMainWidget::slotRestartAccount);
++
+     menutimer = new QTimer(this);
+     menutimer->setObjectName(QStringLiteral("menutimer"));
+     menutimer->setSingleShot(true);
+@@ -3535,13 +3543,6 @@ void KMMainWidget::setupActions()
+     actionCollection()->addAction(QStringLiteral("remove_duplicate_recursive"), mRemoveDuplicateRecursiveAction);
+     connect(mRemoveDuplicateRecursiveAction, &KToggleAction::triggered, this, &KMMainWidget::slotRemoveDuplicateRecursive);
+ 
+-    mAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Account &Settings"), this);
+-    actionCollection()->addAction(QStringLiteral("resource_settings"), mAccountSettings);
+-    connect(mAccountSettings, &QAction::triggered, this, &KMMainWidget::slotAccountSettings);
+-
+-    mRestartAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Restart Account"), this);
+-    actionCollection()->addAction(QStringLiteral("resource_restart"), mRestartAccountSettings);
+-    connect(mRestartAccountSettings, &QAction::triggered, this, &KMMainWidget::slotRestartAccount);
+     {
+         QList<QAction *> listActions;
+         auto act = new QAction(i18n("Previous Selected Folder"), this); // TODO fix me i18n
+-- 
+GitLab
+
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch
new file mode 100644
index 000000000000..1ff35b388dc7
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch
@@ -0,0 +1,52 @@
+From 437295a534eca2907e749f18d8d895da50d343b9 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sat, 10 Dec 2022 19:55:33 +0100
+Subject: [PATCH] Fix bug 460289:  Opening the detailed progress window does
+ nothing
+
+BUG: 460289
+FIXED-IN: 5.22.1
+---
+ src/kmmainwin.cpp | 5 ++++-
+ src/kmmainwin.h   | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
+index 5900bf309..9952667fe 100644
+--- a/src/kmmainwin.cpp
++++ b/src/kmmainwin.cpp
+@@ -36,7 +36,6 @@ using namespace std::chrono_literals;
+ 
+ KMMainWin::KMMainWin(QWidget *)
+     : KXmlGuiWindow(nullptr)
+-    , mProgressBar(new KPIM::ProgressStatusBarWidget(statusBar(), this))
+     , mMessageLabel(new QLabel(i18n("Starting...")))
+ 
+ {
+@@ -51,6 +50,10 @@ KMMainWin::KMMainWin(QWidget *)
+     resize(700, 500); // The default size
+ 
+     mKMMainWidget = new KMMainWidget(this, this, actionCollection());
++
++    // Don't initialize in constructor. We need this statusbar created
++    // Bug 460289
++    mProgressBar = new KPIM::ProgressStatusBarWidget(statusBar(), this);
+     connect(mKMMainWidget, &KMMainWidget::recreateGui, this, &KMMainWin::slotUpdateGui);
+     setCentralWidget(mKMMainWidget);
+     setupStatusBar();
+diff --git a/src/kmmainwin.h b/src/kmmainwin.h
+index 314f14d47..377f6818b 100644
+--- a/src/kmmainwin.h
++++ b/src/kmmainwin.h
+@@ -57,7 +57,7 @@ private:
+     void updateHamburgerMenu();
+     void slotShortcutSaved();
+     void slotFullScreen(bool t);
+-    KPIM::ProgressStatusBarWidget *const mProgressBar;
++    KPIM::ProgressStatusBarWidget *mProgressBar = nullptr;
+     KMMainWidget *mKMMainWidget = nullptr;
+     KToggleAction *mShowMenuBarAction = nullptr;
+     QLabel *const mMessageLabel;
+-- 
+GitLab
+
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch
new file mode 100644
index 000000000000..282fb6109acc
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch
@@ -0,0 +1,29 @@
+From 6618f8f80ccadff908d11db7506b3af8d15ad032 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 16 Dec 2022 06:59:17 +0100
+Subject: [PATCH] BUG: 459399 Fix Random text in kmail's message list
+ configuration settings
+
+Apply patch from Yaroslav Sidlovsky (thanks)
+BUG: 459399
+FIXED-IN: 5.22.1
+---
+ src/configuredialog/configureappearancepage.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/configuredialog/configureappearancepage.cpp b/src/configuredialog/configureappearancepage.cpp
+index 085179f05..0909db227 100644
+--- a/src/configuredialog/configureappearancepage.cpp
++++ b/src/configuredialog/configureappearancepage.cpp
+@@ -622,7 +622,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab(QWidget *parent)
+                               .subs(DateFormatter::formatCurrentDate(dateDisplayConfig[i].dateDisplay))
+                               .toString(); // i18n(label, DateFormatter::formatCurrentDate(dateDisplayConfig[i].dateDisplay));
+         } else {
+-            buttonLabel = i18n(label);
++            buttonLabel = KLocalizedString(dateDisplayConfig[i].displayName).toString();
+         }
+         if (dateDisplayConfig[i].dateDisplay == DateFormatter::Custom) {
+             auto hbox = new QWidget(this);
+-- 
+GitLab
+
diff --git a/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch b/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch
new file mode 100644
index 000000000000..a6484b11ae50
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch
@@ -0,0 +1,41 @@
+From fc0b487d3f3ac9c9ca0650aa635795b5478de85b Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 16 Dec 2022 07:28:28 +0100
+Subject: [PATCH] Remove info about removed feature (ShowUserAgent)
+
+CCBUG: 448348
+---
+ doc/kmail2/configure.docbook | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/doc/kmail2/configure.docbook b/doc/kmail2/configure.docbook
+index 4916acd8b..bb2648370 100644
+--- a/doc/kmail2/configure.docbook
++++ b/doc/kmail2/configure.docbook
+@@ -4167,23 +4167,6 @@ behavior, add to the [OutOfOffice] section:</para>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+-<varlistentry>
+-<term><guilabel>ShowUserAgent</guilabel></term>
+-<listitem>
+-<para>
+-Starting in version 1.9, &kmail; can show the User-Agent or X-Mailer value
+-from the message header when using Fancy Headers (see <menuchoice><guimenu>View</guimenu>
+-<guisubmenu>Headers</guisubmenu></menuchoice> menu).
+-To enable this feature, add to the <quote>[Reader]</quote> section:</para>
+-<itemizedlist>
+-<listitem><para>Configuration file:</para>
+-<programlisting>ShowUserAgent=true</programlisting></listitem>
+-<listitem><para><command>kwriteconfig</command></para>
+-<para><prompt>&percnt;</prompt> <userinput><command>kwriteconfig</command> <option>--file <replaceable>/path/to/kmail2rc</replaceable> --group Reader --key ShowUserAgent true</option></userinput>
+-</para></listitem>
+-</itemizedlist>
+-</listitem>
+-</varlistentry>
+ </variablelist>
+ </sect1>
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/kmail/kmail-22.08.3-r2.ebuild b/kde-apps/kmail/kmail-22.08.3-r2.ebuild
new file mode 100644
index 000000000000..1bbe4c685f7c
--- /dev/null
+++ b/kde-apps/kmail/kmail-22.08.3-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
+HOMEPAGE="https://apps.kde.org/kmail2/
+https://kontact.kde.org/components/kmail/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+IUSE="pch speech telemetry"
+
+RESTRICT="test" # bug 616878
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.16.0:=[cxx,qt5]
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/libktnef-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+	>=kde-apps/kmail-account-wizard-${PVCUT}:5
+"
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-open-detailed-progress-bar.patch" # bug 891509
+	"${FILESDIR}/${P}-fix-random-text-in-config-settings.patch"
+	"${FILESDIR}/${P}-remove-removed-ShowUserAgent.patch"
+	"${FILESDIR}/${P}-fix-crash-on-startup.patch"
+	"${FILESDIR}/${P}-fix-crash-on-replay-msg-w-user-template.patch"
+)
+
+src_prepare() {
+	ecm_src_prepare
+	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "virus detection" app-antivirus/clamav
+		optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
+		optfeature "fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT}
+		optfeature "crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT}
+		optfeature "import PIM data from other applications" kde-apps/akonadi-import-wizard:${SLOT}
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kmail/kmail-22.12.1-r1.ebuild b/kde-apps/kmail/kmail-22.12.1-r2.ebuild
index 7a2b5b2d6ad9..4130f4de525d 100644
--- a/kde-apps/kmail/kmail-22.12.1-r1.ebuild
+++ b/kde-apps/kmail/kmail-22.12.1-r2.ebuild
@@ -89,6 +89,10 @@ BDEPEND="
 	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-22.08.3-fix-crash-on-replay-msg-w-user-template.patch"
+)
+
 src_prepare() {
 	ecm_src_prepare
 	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 549057a865b7..b5258f43ac57 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,7 @@
+AUX kmailtransport-22.08.3-SmtpJob-fix-use-of-KCompositeJob.patch 1667 BLAKE2B 95513fbca5fdda8be70fd9647c8f8f8d5eeef2d3af5fe3bb621fc7be4369ae989bf58040dbb811418f4d5c91f7c6e9dec33ee5a6e9bde2a4c79633dd487b0fe3 SHA512 4cd007dc3aa89929b2952daa7338d0d8bc8ade1cab547977121fe3355f047e80b31f13934bcdd99c4f3d217f39f53df8151146429d8d59969bef4b3f77b645d7
 DIST kmailtransport-22.08.3.tar.xz 180700 BLAKE2B eadb844341c26acf01481bef6f99f010056e732d0c871be68bb967c3f0c56c930e65808045caddffa156b5a46bb0edf85670bb35efd6a9ecd1069654a93a5341 SHA512 03291b35817ea90fa9952bb234e11c82b3d1504f99d4a762306b684b7fbff9b8b2b4d7330f28cb32017339a8f5700d3d1706aa5dffc35ca3b769da773bb94efb
 DIST kmailtransport-22.12.1.tar.xz 190644 BLAKE2B 242705de1927ae9ddc80bbfed33e5158535a1c8a3c2b9b3fee367bcbd028204f6548bdb54bfdba63e693ecd8356b0bf5907e8032d4527c7c6025e32cff0be976 SHA512 2411ccd17ea7b359eabb6fff8a6aa5ed516ccca3d94cc78e197b037996684b6e62a67580c57ab691e5ed63e9d7a0397165c45882674e7f4ac89f7732cd00bb14
+EBUILD kmailtransport-22.08.3-r1.ebuild 1168 BLAKE2B d2d706ce72deef2802b8b3cc19a13fc9779d28aac59c3a7ee6c7180b84cbafea554e27b55987c01b82b42eb659863ff935d11b74c156090a2a4b857ef12aee02 SHA512 e24a8993aeca5129521a7d1a451bbca7043102cd235eeae428ac848cb330d2b9c95f745392389bb6efad16df9f273554a9d3cefee6865967879c8f276093c706
 EBUILD kmailtransport-22.08.3.ebuild 1094 BLAKE2B 6976ca67171f5f2f39283cf5bbabbd640204b067b13ad77f025894fa5a4c3b4db350fdcf6ba6d70e7abdd299eb1a1d67130c4e07cbddc8a1432edcc642510c2d SHA512 32e8225d4bd1c5b99d9f65b918d088a74805dc138ef65e0c58dbbfa4968c00bc48554a6873651728c629ac421ace90366c23e6938eb1513451eb66ad5258fdac
 EBUILD kmailtransport-22.12.1.ebuild 1098 BLAKE2B 2e98882b2bcba3eba1d85ddc369fe9899c2bccd21f9d83033415c3f55a0137dc1b5695353a690265d9983858d043b5a5d2d5b8b6b35adc10f8d4e4541246e0f4 SHA512 6cd9a15366232ae48b2c40e6cac789eab10784cb8e9229b9a21e7dc2bdb2649d0ef7f12be8a8f388fade73c2b1298d7a07a869f6c985fe030bab77c92d31112d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmailtransport/files/kmailtransport-22.08.3-SmtpJob-fix-use-of-KCompositeJob.patch b/kde-apps/kmailtransport/files/kmailtransport-22.08.3-SmtpJob-fix-use-of-KCompositeJob.patch
new file mode 100644
index 000000000000..4140cb77d21b
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-22.08.3-SmtpJob-fix-use-of-KCompositeJob.patch
@@ -0,0 +1,49 @@
+From 7b2a5ccea0c54b81245acdbbea77a13e570bba2b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 21 Nov 2022 11:57:51 +0100
+Subject: [PATCH] SmtpJob: Fix use of KCompositeJob
+
+SmtpJob overrides slotResult, but this had two issues. First, it connected
+to LoginJob::result itself, though addJob already does that. Second, in two
+cases it did not remove finished jobs from the list of subjobs, leading to
+dangling pointers and messing up state. This was most likely only reached
+in the case of an expired XOAUTH2 access_token and caused the job to fail
+after a successful refresh.
+
+BUG: 406839
+BUG: 409122
+BUG: 421664
+BUG: 456923
+---
+ src/kmailtransport/plugins/smtp/smtpjob.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kmailtransport/plugins/smtp/smtpjob.cpp b/src/kmailtransport/plugins/smtp/smtpjob.cpp
+index 9d565af..5be220a 100644
+--- a/src/kmailtransport/plugins/smtp/smtpjob.cpp
++++ b/src/kmailtransport/plugins/smtp/smtpjob.cpp
+@@ -308,7 +308,6 @@ void SmtpJobPrivate::doLogin()
+         break;
+     }
+ 
+-    q->connect(login, &KJob::result, q, &SmtpJob::slotResult);
+     q->addSubjob(login);
+     login->start();
+     qCDebug(MAILTRANSPORT_SMTP_LOG) << "Login started";
+@@ -352,11 +351,12 @@ bool SmtpJob::doKill()
+ void SmtpJob::slotResult(KJob *job)
+ {
+     if (s_sessionPool.isDestroyed()) {
++        removeSubjob(job);
+         return;
+     }
+-
+     if (qobject_cast<KSmtp::LoginJob *>(job)) {
+         if (job->error() == KSmtp::LoginJob::TokenExpired) {
++            removeSubjob(job);
+             startPasswordRetrieval(/*force refresh */ true);
+             return;
+         }
+-- 
+GitLab
+
diff --git a/kde-apps/kmailtransport/kmailtransport-22.08.3-r1.ebuild b/kde-apps/kmailtransport/kmailtransport-22.08.3-r1.ebuild
new file mode 100644
index 000000000000..1a304ab97eb3
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-22.08.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Mail transport service"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/qtkeychain:=[qt5(+)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/ksmtp-${PVCUT}:5
+	>=kde-apps/libkgapi-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-SmtpJob-fix-use-of-KCompositeJob.patch" )
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 043a153fcf76..0c03aabadfe7 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,8 @@
+AUX libkgapi-22.08.3-AccountManager-dont-keep-finished-promises-in-cache.patch 1070 BLAKE2B d462378f3bec92e36a5fc72b92e58d8dd24ed679c87d1aed2b8328cb6b70bef3e23e2234e8f62a6a45ae76915bbcb49e161e8e87133dfc381b6790543cc569f5 SHA512 8ad8af2ec82a2bb2466048b4fc0832b194403d359b69d51fff3a10e9c55494f3441c3c9f1fc33edd3aefcece1245b01dd2450f1da4718d85d63f631919d43364
+AUX libkgapi-22.08.3-dont-cache-promises-for-AccountManager-findAccount.patch 2937 BLAKE2B 478ff1293905b8af485c2516d5dd6a78f45d8bb2782a3fc852dc46f059480bb4561efabe4fe6578273d5c8331bdc1e8743eaccf63faf6056a4a39cb97924445a SHA512 15a851a436bf7ba7740bb66774361f3a97ae8b8f81728837f42597ae4c8a022d2cd76a8434c956727a407a007ad29eea77fac626314b31aa643da875e422e9f5
 DIST libkgapi-22.08.3.tar.xz 242496 BLAKE2B e38ac44878e5425b4cb6922b13bbca4268795f92a6e50123c3c4ff228f80bec58a0146e4548aa8d5284780f5700236b5f52a96962f2ac8caa3d676847b6ab2db SHA512 b393691240954c2e6262cef32fc04dc2d2137f97256d8bc43d8ed6cb6007122819da43206fca6a5cf3e6c6201fd4b7e43bfc1972733a7b6c25221895eeb91991
 DIST libkgapi-22.12.1.tar.xz 244676 BLAKE2B f65ee13007f915c7c117ced20a0b2ba4a665b792d578a7f1c2c4ee43614658144594da19fec5965ea2469fa817e9c0513864ea69e12c9e1763fe060f1cc9d48c SHA512 12f52bb7c858d339ddf15a54caa6c54e0e434a9f5bd549a8dfdb129791e506ac34a06adb4359d55f572e7e4f162995a0f314d57dc99275601163b23707245d63
+EBUILD libkgapi-22.08.3-r1.ebuild 1539 BLAKE2B 79b88902d43d178b9697b55c85426809da04f5a33752b76da9e692bdfecd1e0d85a08d604ff0e08eaeb165a8c98a08e52376668fe34ba837edbdeb3a13b7ce6f SHA512 823c07b260eb8e7fb9ba96c60b68d10a6719404dd180e176a1e5f66a539213a4da2aa3fc71c80ced3fe7636c0be9326b3e87c7d80cdcaebc0a17e1cf65c6fc95
 EBUILD libkgapi-22.08.3.ebuild 1368 BLAKE2B 422fd8761ce70740e5ee38cd2d85ca0b45549ff00c5bfcd242d0d315258488e5a81f963bfb3b716fcf3bdefedd4d0ac6512d3fc3f694853362a7d52369e3e31f SHA512 524a3923893e4a1c5e231f9ccc1230e82c523bd1637d5ca7f9f9015abe416e57bc01fc7fc30dac4837ccf7ab2ca87f6579ac4d6de2b50bc2e1c453e94041b258
 EBUILD libkgapi-22.12.1.ebuild 1372 BLAKE2B 900d7f2429b9526075d7999f18659a7fcd259df1da2aeb8a34aa602028c9054e3ca1a80e39e107b024f00557f3613091c5c161f471314275f22adf6ab744127d SHA512 6c37493ef5feb0d79a7dfb02570247ff67cfb8c4457ccdcc73e95b672de012183cdc40d1a9087c9cc1dd492344a32ea1e0334c213d5b675cfea195326eb9cdd7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkgapi/files/libkgapi-22.08.3-AccountManager-dont-keep-finished-promises-in-cache.patch b/kde-apps/libkgapi/files/libkgapi-22.08.3-AccountManager-dont-keep-finished-promises-in-cache.patch
new file mode 100644
index 000000000000..485bc7d840f8
--- /dev/null
+++ b/kde-apps/libkgapi/files/libkgapi-22.08.3-AccountManager-dont-keep-finished-promises-in-cache.patch
@@ -0,0 +1,27 @@
+From b5a581d98d9b57363c44bd98eeab7243fbf13a22 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 21 Nov 2022 13:00:41 +0100
+Subject: [PATCH] AccountManager: Don't keep finished promises in the cache
+
+AccountPromises are destroyed one event loop cycle after they finished().
+They won't emit finished() again, so they can't be used.
+---
+ src/core/accountmanager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/accountmanager.cpp b/src/core/accountmanager.cpp
+index 42719c5e..da5c37b6 100644
+--- a/src/core/accountmanager.cpp
++++ b/src/core/accountmanager.cpp
+@@ -134,7 +134,7 @@ public:
+         auto promise = mPendingPromises.value(key, nullptr);
+         if (!promise) {
+             promise = new AccountPromise(q);
+-            QObject::connect(promise, &QObject::destroyed, q, [key, this]() {
++            QObject::connect(promise, &AccountPromise::finished, q, [key, this]() {
+                 mPendingPromises.remove(key);
+             });
+             mPendingPromises.insert(key, promise);
+-- 
+GitLab
+
diff --git a/kde-apps/libkgapi/files/libkgapi-22.08.3-dont-cache-promises-for-AccountManager-findAccount.patch b/kde-apps/libkgapi/files/libkgapi-22.08.3-dont-cache-promises-for-AccountManager-findAccount.patch
new file mode 100644
index 000000000000..b24b80377686
--- /dev/null
+++ b/kde-apps/libkgapi/files/libkgapi-22.08.3-dont-cache-promises-for-AccountManager-findAccount.patch
@@ -0,0 +1,75 @@
+From d677a08c21fd99e7e8be0a0899f797f9237207e4 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 21 Nov 2022 13:02:27 +0100
+Subject: [PATCH] Don't cache promises for AccountManager::findAccount
+
+Unlike AccountManager::getAccount and AccountManager::refreshTokens, this
+method does not return an authenticated account. However, the promises are
+cached for all of them in the same store, so it was possible for a call to
+e.g. refreshTokens to get a promise created by findAccount instead, resulting
+in an unexpected result. Just don't cache promises created by findAccount.
+
+BUG: 406839
+BUG: 409122
+BUG: 421664
+BUG: 456923
+---
+ src/core/accountmanager.cpp | 38 ++++++++++++++++++-------------------
+ 1 file changed, 18 insertions(+), 20 deletions(-)
+
+diff --git a/src/core/accountmanager.cpp b/src/core/accountmanager.cpp
+index da5c37b6..c6b8189d 100644
+--- a/src/core/accountmanager.cpp
++++ b/src/core/accountmanager.cpp
+@@ -265,30 +265,28 @@ AccountPromise *AccountManager::refreshTokens(const QString &apiKey, const QStri
+ 
+ AccountPromise *AccountManager::findAccount(const QString &apiKey, const QString &accountName, const QList<QUrl> &scopes)
+ {
+-    auto promise = d->createPromise(apiKey, accountName);
+-    if (!promise->d->isRunning()) {
+-        QTimer::singleShot(0, this, [=]() {
+-            d->ensureStore([=](bool storeOpened) {
+-                if (!storeOpened) {
+-                    promise->d->setError(tr("Failed to open account store"));
+-                    return;
+-                }
++    auto promise = new AccountPromise(this);
++    QTimer::singleShot(0, this, [=]() {
++        d->ensureStore([=](bool storeOpened) {
++            if (!storeOpened) {
++                promise->d->setError(tr("Failed to open account store"));
++                return;
++            }
+ 
+-                const auto account = d->mStore->getAccount(apiKey, accountName);
+-                if (!account) {
+-                    promise->d->setAccount({});
++            const auto account = d->mStore->getAccount(apiKey, accountName);
++            if (!account) {
++                promise->d->setAccount({});
++            } else {
++                const auto currentScopes = account->scopes();
++                if (scopes.isEmpty() || d->compareScopes(currentScopes, scopes)) {
++                    promise->d->setAccount(account);
+                 } else {
+-                    const auto currentScopes = account->scopes();
+-                    if (scopes.isEmpty() || d->compareScopes(currentScopes, scopes)) {
+-                        promise->d->setAccount(account);
+-                    } else {
+-                        promise->d->setAccount({});
+-                    }
++                    promise->d->setAccount({});
+                 }
+-            });
++            }
+         });
+-        promise->d->setRunning();
+-    }
++    });
++    promise->d->setRunning();
+     return promise;
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/libkgapi/libkgapi-22.08.3-r1.ebuild b/kde-apps/libkgapi/libkgapi-22.08.3-r1.ebuild
new file mode 100644
index 000000000000..a46cb2350c58
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-22.08.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.96.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+DEPEND="
+	dev-libs/cyrus-sasl:2
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-AccountManager-dont-keep-finished-promises-in-cache.patch"
+	"${FILESDIR}/${P}-dont-cache-promises-for-AccountManager-findAccount.patch"
+)
+
+src_test() {
+	local myctestargs=(
+		# Both fail for multiple distros, see bug #832709 for more discussion
+		# Revisit at least once Qt 5.15.3 is in wider distribution (in Gentoo at least):
+		#   contacts-contactcreatejobtest, contacts-contactmodifyjobtest
+		# More failures not specific to Gentoo, bug #852593, KDE-bug #440648:
+		#  calendar-eventcreatejobtest, calendar-eventfetchjobtest, calendar-eventmodifyjobtest
+		-E "(contacts-contactcreatejobtest|contacts-contactmodifyjobtest|calendar-eventcreatejobtest|calendar-eventfetchjobtest|calendar-eventmodifyjobtest)"
+	)
+
+	virtx cmake_src_test
+}