gentoo resync : 20.03.2022

7 files changed, 299 insertions, 9 deletions

diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 8044855969a8..8c110d24cf78 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,8 @@
+AUX messagelib-21.12.3-speech-optional-1.patch 4953 BLAKE2B 702a443ee3fdd6c6e4fb4dab639e1d3a9362e160797352801a1f5a48c3b7a55cb422cb7fff484a2968ff2bd038bbdb452bb57f038b1763f67ab1714ab2abb703 SHA512 b0ebde21aa5dfaf0f58377f45312e37b690280c1f391b56f5b64e01d0556ba092f84261b0f9169e347d9c8e852f4d6ded47fcbcbca671353fb58b0969df7b287
+AUX messagelib-21.12.3-speech-optional-2.patch 4109 BLAKE2B dc0d13bbb4f4af80b7314099e0149775eb3172efabafb97e0325f1ac162ebac3212a4cfdf1c6133af6f6480f36d6193ea5908fcd1f2b4b28eee7acdfc695215a SHA512 fb3300d9dc2f5206263c4655e5947e3948f727f8a0e32d19482b56b3b55a1d2beab524bf6f3d00a4baf4e817eb990cdd22413e7606514836f9ceaea136a73456
+AUX messagelib-21.12.3-speech-optional-3.patch 2154 BLAKE2B c203513df203f37b6a3455c98c92306b3a7b77670e80ba41dbd7d8c7d2fe8e38a7a59778b162b31980e1793d81fe801603b6c2d1659d4440fcdedad90c519c90 SHA512 47dcca09d8578b0b1a01e6b6ca2663d3851d780324253b43564ea41699fe1d309f256726c29d84d876b9616acaea44249ddfae73cbe8c575df6e36b3f56f3bad
 DIST messagelib-21.08.3.tar.xz 10789696 BLAKE2B 8c70e63d6ac731cfbdc5cf4ac1c9534a7826f382f420a28f222706e2901b0fb4e05cecc95219cd9919c0a4fb348fda614e1c1cf0e8e244f93523eec5708d6d57 SHA512 bb4371b8cebfda476ac950158df5ee7c6ae5cefe6022a51cb23fccdd9b2469a5ec79001187cf61bca5fb7e44af0f0bd434e695044f4f54fb4256f9d1f5b37cf2
-DIST messagelib-21.12.1.tar.xz 10857692 BLAKE2B 32d5caf9da88d70facfe74237b64343b3e376987239727ac74923b19d1af481a714ed2795b70a8cede3a13dc9821d0870d63bca5438cf956d93261a6150d40f1 SHA512 0ddb74ffda4d18f663f22cab584b69a4db435ea370e896831ecbe0c276cf7fd53a43b65969df713403c3730b6c2504f4f25fb70940d8993bac90768f464d76e3
-EBUILD messagelib-21.08.3.ebuild 2167 BLAKE2B c4b44836806f72f3fe9afac72ffeb51c44fc521ef5ccf486c1eb31a1e7656481f32b0c03c45340ccecbd1b37f547489f195742a9b7bb919ffac67f929ec37a62 SHA512 6601f09f39a8a98bae5d0b7cf859777cc0d5fafd030827d990176a7e4c6b466b06b0991eeff91602338231137c80e9963fb585406e05c103fe760a5aad78e138
-EBUILD messagelib-21.12.1.ebuild 2188 BLAKE2B 7457b1873b4aa97b049a78b922cebee81fa39e5db5e563cf9a020049f1844e0f38f7a3c0c1622572c0938546c66ad2a69d594e65c85e91554cefb5847d4ecb4f SHA512 3535bfc69a5cb62fecaeaa680d3aead3f775d56e63759c0b93837ca36a5091ed2f9a196512ebd3583880dc5575add724283e19b7cc75cee83fb70ba351ea6e39
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+DIST messagelib-21.12.3.tar.xz 10810568 BLAKE2B c57ba79b28f249f0471c091d642061f0e150d4ec9ab88a1e639aaa5fa3ba600e0523667e0638eeec833baedd3ee20eec0178f8bea4857f89dd4627c0a1846cf3 SHA512 e777ae2d1aa37edfff23e0ea47f10bf5e1e021469b7af6b6858b1720f4133d9ca9d60625d6bf4a6aee482df9ee9b0f90d10d8a352ef2ee64fd113aa3ecbe777b
+EBUILD messagelib-21.08.3-r1.ebuild 2169 BLAKE2B 79ec6609258b6435d7fbf3a1c2c0b1652f75407b9f748ce759b77183bf9ad1085bf2fa3a66a4e0354145ce5329d5ff7ae2970db346719f04bdcd6c04593edf6b SHA512 37582e08f5f334b6910ddb5b89df138653a375c6eae33e45d6b54cd6dadfc3279108c6de32013941feb381f4783f00762b1de0abb3357bf0112e0c47d0c9772a
+EBUILD messagelib-21.12.3.ebuild 2276 BLAKE2B fe49dd551bc935d0e513fdae989cea9dc1277fb19ddbc61be49d79bac4a09ab8a20ac2d4ad090618acd887d50b55d635f24e46046fac184ff93b0f653df4ca28 SHA512 a3ec44d5ffcaa950d9afee06285f36a1e05a96cf45354e3576f42fac9e21016088e5e91a83dba87eb396872d5fbec29a48fcd0d8bf3a312bc209d02cda69a98a
+MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-1.patch b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-1.patch
new file mode 100644
index 000000000000..39f48362a4ce
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-1.patch
@@ -0,0 +1,131 @@
+From a8d74999570b1dd6025548593e2d06b37afadce0 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 14 Feb 2022 19:07:53 +0100
+Subject: [PATCH] Fix build without texttospeech
+
+---
+ .../mailsourceviewtextbrowserwidget.cpp       | 19 ++++++++++++++++---
+ .../widgets/mailsourceviewtextbrowserwidget.h |  9 +++++++++
+ 2 files changed, 25 insertions(+), 3 deletions(-)
+
+diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
+index 5c0050002..0e5b61c1e 100644
+--- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
++++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
+@@ -38,16 +38,20 @@ using namespace MessageViewer;
+ MailSourceViewTextBrowserWidget::MailSourceViewTextBrowserWidget(const QString &syntax, QWidget *parent)
+     : QWidget(parent)
+     , mSliderContainer(new KPIMTextEdit::SlideContainer(this))
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     , mTextToSpeechWidget(new KPIMTextEdit::TextToSpeechWidget(this))
++#endif
+ {
+     auto lay = new QVBoxLayout(this);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     lay->setContentsMargins({});
+     mTextToSpeechWidget->setObjectName(QStringLiteral("texttospeech"));
+     lay->addWidget(mTextToSpeechWidget);
+-
+     auto textToSpeechInterface = new KPIMTextEdit::TextToSpeechInterface(mTextToSpeechWidget, this);
+-
+     mTextBrowser = new MailSourceViewTextBrowser(textToSpeechInterface);
++#else
++    mTextBrowser = new MailSourceViewTextBrowser(this);
++#endif
+     mTextBrowser->setObjectName(QStringLiteral("textbrowser"));
+     mTextBrowser->setLineWrapMode(QPlainTextEdit::NoWrap);
+     mTextBrowser->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+@@ -104,12 +108,17 @@ MessageViewer::MailSourceViewTextBrowser *MailSourceViewTextBrowserWidget::textB
+ {
+     return mTextBrowser;
+ }
+-
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ MailSourceViewTextBrowser::MailSourceViewTextBrowser(KPIMTextEdit::TextToSpeechInterface *textToSpeechInterface, QWidget *parent)
+     : QPlainTextEdit(parent)
+     , mTextToSpeechInterface(textToSpeechInterface)
+ {
+ }
++#endif
++MailSourceViewTextBrowser::MailSourceViewTextBrowser(QWidget *parent)
++    : QPlainTextEdit(parent)
++{
++}
+ 
+ void MailSourceViewTextBrowser::contextMenuEvent(QContextMenuEvent *event)
+ {
+@@ -117,6 +126,7 @@ void MailSourceViewTextBrowser::contextMenuEvent(QContextMenuEvent *event)
+     if (popup) {
+         popup->addSeparator();
+         popup->addAction(KStandardAction::find(this, &MailSourceViewTextBrowser::findText, this));
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+         // Code from KTextBrowser
+         if (mTextToSpeechInterface->isReady()) {
+             popup->addSeparator();
+@@ -125,6 +135,7 @@ void MailSourceViewTextBrowser::contextMenuEvent(QContextMenuEvent *event)
+                              this,
+                              &MailSourceViewTextBrowser::slotSpeakText);
+         }
++#endif
+         popup->addSeparator();
+         popup->addAction(KStandardAction::saveAs(this, &MailSourceViewTextBrowser::slotSaveAs, this));
+ 
+@@ -140,6 +151,7 @@ void MailSourceViewTextBrowser::slotSaveAs()
+ 
+ void MailSourceViewTextBrowser::slotSpeakText()
+ {
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     QString text;
+     if (textCursor().hasSelection()) {
+         text = textCursor().selectedText();
+@@ -147,4 +159,5 @@ void MailSourceViewTextBrowser::slotSpeakText()
+         text = toPlainText();
+     }
+     mTextToSpeechInterface->say(text);
++#endif
+ }
+diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
+index 84f0eb8ae..500402f9a 100644
+--- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
++++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
+@@ -12,6 +12,8 @@
+ #include <KSyntaxHighlighting/Repository>
+ #include <QPlainTextEdit>
+ #include <QSyntaxHighlighter>
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++
+ namespace KPIMTextEdit
+ {
+ class SlideContainer;
+@@ -50,14 +52,19 @@ private:
+     MailSourceViewTextBrowser *mTextBrowser = nullptr;
+     FindBarSourceView *mFindBar = nullptr;
+     KPIMTextEdit::SlideContainer *const mSliderContainer;
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     KPIMTextEdit::TextToSpeechWidget *const mTextToSpeechWidget;
++#endif
+ };
+ 
+ class MailSourceViewTextBrowser : public QPlainTextEdit
+ {
+     Q_OBJECT
+ public:
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     explicit MailSourceViewTextBrowser(KPIMTextEdit::TextToSpeechInterface *textToSpeechInterface, QWidget *parent = nullptr);
++#endif
++    explicit MailSourceViewTextBrowser(QWidget *parent);
+ 
+ protected:
+     void contextMenuEvent(QContextMenuEvent *event) override;
+@@ -67,6 +74,8 @@ Q_SIGNALS:
+ private:
+     void slotSpeakText();
+     void slotSaveAs();
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     KPIMTextEdit::TextToSpeechInterface *mTextToSpeechInterface = nullptr;
++#endif
+ };
+ }
+-- 
+GitLab
+
diff --git a/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-2.patch b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-2.patch
new file mode 100644
index 000000000000..a00fab7d585f
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-2.patch
@@ -0,0 +1,95 @@
+From da4ba2b7dc18ba20994dad54e754ed1d9d9c7a48 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 14 Feb 2022 19:16:56 +0100
+Subject: [PATCH] Compile without text to speech support
+
+---
+ messageviewer/src/viewer/viewer_p.cpp | 10 ++++++----
+ messageviewer/src/viewer/viewer_p.h   |  8 +++++---
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
+index 5e7af8e01..15e71482f 100644
+--- a/messageviewer/src/viewer/viewer_p.cpp
++++ b/messageviewer/src/viewer/viewer_p.cpp
+@@ -1403,11 +1403,11 @@ void ViewerPrivate::createWidgets()
+     mOpenSavedFileFolderWidget = new OpenSavedFileFolderWidget(readerBox);
+     mOpenSavedFileFolderWidget->setObjectName(QStringLiteral("opensavefilefolderwidget"));
+     readerBoxVBoxLayout->addWidget(mOpenSavedFileFolderWidget);
+-
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(readerBox);
+     mTextToSpeechWidget->setObjectName(QStringLiteral("texttospeechwidget"));
+     readerBoxVBoxLayout->addWidget(mTextToSpeechWidget);
+-
++#endif
+     mViewer = new MailWebEngineView(mActionCollection, readerBox);
+     mViewer->setViewer(this);
+     readerBoxVBoxLayout->addWidget(mViewer);
+@@ -1609,12 +1609,12 @@ void ViewerPrivate::createActions()
+     ac->setDefaultShortcut(loadExternalReferenceAction, QKeySequence(Qt::SHIFT | Qt::CTRL | Qt::Key_R));
+     connect(loadExternalReferenceAction, &QAction::triggered, this, &ViewerPrivate::slotLoadExternalReference);
+     MessageViewer::Util::addHelpTextAction(loadExternalReferenceAction, i18n("Load external references from the Internet for this message."));
+-
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     mSpeakTextAction = new QAction(i18n("Speak Text"), this);
+     mSpeakTextAction->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-text-to-speech")));
+     ac->addAction(QStringLiteral("speak_text"), mSpeakTextAction);
+     connect(mSpeakTextAction, &QAction::triggered, this, &ViewerPrivate::slotSpeakText);
+-
++#endif
+     auto purposeMenuWidget = new MailfilterPurposeMenuWidget(mViewer, this);
+     mShareTextAction = new QAction(i18n("Share Text..."), this);
+     mShareTextAction->setMenu(purposeMenuWidget->menu());
+@@ -2605,10 +2605,12 @@ void ViewerPrivate::replyMessage(KMime::Content *atmNode, bool replyToAll)
+ 
+ void ViewerPrivate::slotSpeakText()
+ {
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     const QString text = mViewer->selectedText();
+     if (!text.isEmpty()) {
+         mTextToSpeechWidget->say(text);
+     }
++#endif
+ }
+ 
+ QUrl ViewerPrivate::imageUrl() const
+diff --git a/messageviewer/src/viewer/viewer_p.h b/messageviewer/src/viewer/viewer_p.h
+index 88cb605e5..467163a2a 100644
+--- a/messageviewer/src/viewer/viewer_p.h
++++ b/messageviewer/src/viewer/viewer_p.h
+@@ -13,18 +13,18 @@
+ #include "messageviewer_private_export.h"
+ #include "viewer.h" //not so nice, it is actually for the enums from MailViewer
+ #include "widgets/opensavedfilefolderwidget.h"
+-#include <PimCommon/ShareServiceUrlManager>
+-#include <WebEngineViewer/CheckPhishingUrlUtil>
+-
+ #include <Akonadi/Item>
+ #include <Akonadi/Monitor>
+ #include <Akonadi/Session>
+ #include <KIO/Job>
+ #include <KMime/Message>
+ #include <KService>
++#include <PimCommon/ShareServiceUrlManager>
+ #include <QPointer>
+ #include <QUrl>
+ #include <QVector>
++#include <WebEngineViewer/CheckPhishingUrlUtil>
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
+ 
+ #include <QObject>
+ #include <QTimer>
+@@ -695,7 +695,9 @@ public:
+     MessageViewer::OpenSavedFileFolderWidget *mOpenSavedFileFolderWidget = nullptr;
+     WebEngineViewer::SubmittedFormWarningWidget *mSubmittedFormWarning = nullptr;
+     WebEngineViewer::TrackingWarningWidget *mMailTrackingWarning = nullptr;
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr;
++#endif
+     Viewer::DisplayFormatMessage mDisplayFormatMessageOverwrite;
+     KPIMTextEdit::SlideContainer *mSliderContainer = nullptr;
+     PimCommon::ShareServiceUrlManager *mShareServiceManager = nullptr;
+-- 
+GitLab
+
diff --git a/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-3.patch b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-3.patch
new file mode 100644
index 000000000000..092df18f4498
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-3.patch
@@ -0,0 +1,56 @@
+From 141b7862a292323fa41c9f863e16f49e548d8bfa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Feb 2022 16:04:59 +0100
+Subject: [PATCH] Fix build without texttospeech
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ messageviewer/src/utils/messageviewerutil.cpp                 | 1 -
+ messageviewer/src/viewer/viewer_p.cpp                         | 2 ++
+ messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp | 2 ++
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/messageviewer/src/utils/messageviewerutil.cpp b/messageviewer/src/utils/messageviewerutil.cpp
+index 607fa65cb..e2446c13a 100644
+--- a/messageviewer/src/utils/messageviewerutil.cpp
++++ b/messageviewer/src/utils/messageviewerutil.cpp
+@@ -41,7 +41,6 @@
+ #include "MessageCore/StringUtil"
+ #include "messageviewer_debug.h"
+ #include "messageviewerutil_p.h"
+-#include <KPIMTextEdit/TextToSpeech>
+ #include <MimeTreeParser/NodeHelper>
+ 
+ #include <PimCommon/RenameFileDialog>
+diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
+index b989b294a..22587635c 100644
+--- a/messageviewer/src/viewer/viewer_p.cpp
++++ b/messageviewer/src/viewer/viewer_p.cpp
+@@ -129,7 +129,9 @@
+ #include <Akonadi/CollectionFetchScope>
+ 
+ #include <KJobWidgets/KJobWidgets>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeechWidget>
++#endif
+ #include <QApplication>
+ #include <QStandardPaths>
+ #include <QWebEngineSettings>
+diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
+index 0e5b61c1e..67ac5bf1a 100644
+--- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
++++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
+@@ -13,8 +13,10 @@
+ #include "messageviewer/messageviewerutil.h"
+ #include "messageviewer_debug.h"
+ #include <KPIMTextEdit/SlideContainer>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeechInterface>
+ #include <KPIMTextEdit/TextToSpeechWidget>
++#endif
+ #include <PimCommon/PimUtil>
+ 
+ #include <KSyntaxHighlighting/Definition>
+-- 
+2.35.1
+
diff --git a/kde-apps/messagelib/messagelib-21.08.3.ebuild b/kde-apps/messagelib/messagelib-21.08.3-r1.ebuild
index 7e17702a12c3..c5eec953e87a 100644
--- a/kde-apps/messagelib/messagelib-21.08.3.ebuild
+++ b/kde-apps/messagelib/messagelib-21.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	>=app-crypt/gpgme-1.8.0-r1:=[cxx,qt5]
 	>=app-crypt/qca-2.3.0:2
 	>=dev-libs/grantlee-5.2.0:5
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-apps/messagelib/messagelib-21.12.1.ebuild b/kde-apps/messagelib/messagelib-21.12.3.ebuild
index 642131d53de1..d6a7caa8e219 100644
--- a/kde-apps/messagelib/messagelib-21.12.1.ebuild
+++ b/kde-apps/messagelib/messagelib-21.12.3.ebuild
@@ -16,13 +16,13 @@ DESCRIPTION="Libraries for messaging functions"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
+IUSE="speech"
 
 # bug 579630
 RESTRICT="test"
 
 DEPEND="
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	>=app-crypt/gpgme-1.8.0-r1:=[cxx,qt5]
 	>=app-crypt/qca-2.3.0:2
 	>=dev-libs/grantlee-5.2.0:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -41,7 +41,7 @@ DEPEND="
 	>=kde-apps/kmailtransport-${PVCUT}:5
 	>=kde-apps/kmbox-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
 	>=kde-apps/libgravatar-${PVCUT}:5
 	>=kde-apps/libkdepim-${PVCUT}:5
 	>=kde-apps/libkleo-${PVCUT}:5
@@ -71,3 +71,5 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional-{1,2,3}.patch )
diff --git a/kde-apps/messagelib/metadata.xml b/kde-apps/messagelib/metadata.xml
index d925f2439758..fa80953797d0 100644
--- a/kde-apps/messagelib/metadata.xml
+++ b/kde-apps/messagelib/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="speech">Enable text-to-speech support</flag>
+	</use>
 </pkgmetadata>