gentoo resync : 20.03.2022

6 files changed, 432 insertions, 5 deletions

diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index ad9155b66c70..ef1795468af0 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,8 @@
+AUX kpimtextedit-21.12.3-speech-optional-1.patch 10518 BLAKE2B d9f7eac9018034573d7454b85a1a942f99999b2a59f628cf969895b576986e4b7dc3ab6a07aa824fd6ee042dc45f474fcf2a96ae77be4a7b21ce5416d7fd31a5 SHA512 57e97ba8c66d5aa7be34cf43ba2129fc804b39504d65853482e58141844650f427b68d17930b83d6d53fe49542b9d9e48de89be198869f0674882cede4c6e5e4
+AUX kpimtextedit-21.12.3-speech-optional-2.patch 688 BLAKE2B 1a210bc6d38ac9078bd69df4cf576d6a8727aa008e026e6ec1033089bd55444fdceec33a565c7c8060470018dce8dc26497d462d85312b2f8b411c60fe6fe893 SHA512 f3c6842cef52af589dd03d64393bd12dc38a8e042aae14b1d1ae4645821522a9937d3131264563c77e3385de7b63ab9d316f58c04a3a325989a71901a76ce599
+AUX kpimtextedit-21.12.3-speech-optional-3.patch 3446 BLAKE2B 1d14e6f4815a3d806f131ebf90e245f087921890ae8410016cdb0f885eb8dc629008234a3fe4a1d60a73dbe25d5fd2ed5b64f406e12774ff15473effb75f89e6 SHA512 cdf481e4e816b35679dc2dae7fad0068b8eae3a7efd26747589b172281c9610dc01a17c9982bcf474efbe7745c12fe131f6003ac90e9ecbb1d2ff718051d4181
 DIST kpimtextedit-21.08.3.tar.xz 204960 BLAKE2B 1355f96646d34393177ac2b41b6bcb563840db9d97087027dab55cae3b9fa92814d729106a815d2044211db58a03282a2909da17784b9e1d02628b9f92d69ce9 SHA512 7cb07eeeb7c630eb0251f21de1aeaa8ac6b92bc5a5e951548544db2c48d01eda46ea1c546aef340044a26a29597d91189de1705c688d1b9aa4f9e06027e885e2
-DIST kpimtextedit-21.12.1.tar.xz 211648 BLAKE2B c684f3846be28f68a1f72699362ac56cbaeafc1f9bc12222ba2f88067ab60404218de8fa8c21b0f2181b3f2ab01b681e3fdee4a6237666c899860f7656603f66 SHA512 0ed8bb1bbf7d0edbbfb1f702caac05e08da2a974e1f251ce31d5842b68ee269f58a1c247594da1f6cb107721e02a3d24f04c58d54d842a25010b7487aee2a3bd
+DIST kpimtextedit-21.12.3.tar.xz 211716 BLAKE2B 44a936e68752daeb2d7b4fe56c41ec6577eb112d695b048e5c9f7eb6e80037af795a381e14061ac8312babb33245eb0ec09cfecef20a36877e8118cf98f3f1e6 SHA512 85614f77c59d533ee9c947f61e7c78b9846e8f3df03f7331f86549c8ba06a9627f70dcf4743810c2fbae57615b79bd889db975c0fb69e8bcce05d17b44eda0fb
 EBUILD kpimtextedit-21.08.3.ebuild 991 BLAKE2B 86b5a2a70550cf082526cfa5a155b87eaf539c9131f8816914953a8c49102a016dca812360e5f163a79f991707b92e662b6cc7065e2419638e2b7cf26619d18f SHA512 b09d2c802aacb101d95493bb4c6d5ce5df7255bc0dca7f630257bfe443faaadf1316651135223a71adb88f69e45fb49e536ab9122dccdf9e870b9673c872782b
-EBUILD kpimtextedit-21.12.1.ebuild 1012 BLAKE2B bb501d60b5cf3d19e6119d03c3785f939253d3cc6f3e8e0a0dc2c8d8f654586676011205a96ef2c39e3814048465fa2211662ec6cb54ed6f110a3a058e96ffe0 SHA512 d4bde1174427b29bd16179f59fbc72a160600a8727497626cb5ff960a8cfc183448657494f604e28aa923bbf186d4a2bdb2e5ca28a27b29d0d95ccc4b99433fb
-MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
+EBUILD kpimtextedit-21.12.3.ebuild 1216 BLAKE2B 07a513b5d1899522890c46e5fa853a5de35afe5917538988671eff6a1830ae705efa98677bb302fbda95c608c1644ed098db5c8586b1293e588958152c5104a0 SHA512 ee2d50577593e8771dac77a21f11a9015a15f743bfb9b90be8627babca44e2460ece27a882b9705b8dbe51315b807882a228e0ed37104d69bc5b77176cf447cd
+MISC metadata.xml 468 BLAKE2B 7d0732951e5cb3f8fa895bcd7646ad46f2834c8a67324cd12aecd43de9d525cce139bb78704e32f9d43f3c3e9dc8b6d785182306e846387ea872965561bfcff8 SHA512 0d1f7883fa05a190c019d5ab1d0d6fd54e73ccd0b9f09c790f7c818636c5961331aa17058d0fe5ac0bd8f90736fc7148cd2b40c4cc772039e875057a60d501b4
diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch
new file mode 100644
index 000000000000..d7fa7474a4bf
--- /dev/null
+++ b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch
@@ -0,0 +1,289 @@
+From 53f187315f51e7d53a03c4ed464812b388465c10 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 27 Dec 2021 07:53:16 +0100
+Subject: [PATCH] Add support for building without texttospeech as for the
+ moment we don't
+
+have it in qt6
+---
+ CMakeLists.txt                                | 10 +++++-
+ src/CMakeLists.txt                            | 34 ++++++++++++++-----
+ .../plaintexteditor/plaintexteditor.cpp       |  4 +++
+ .../plaintexteditor/plaintexteditorwidget.cpp | 10 ++++--
+ .../richtexteditor/richtexteditor.cpp         |  5 ++-
+ .../richtexteditor/richtexteditorwidget.cpp   |  9 ++++-
+ 6 files changed, 59 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae59804..d1a0181 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,15 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
+ add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055A00)
+ 
+ 
+-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS TextToSpeech)
++find_package(Qt5TextToSpeech ${QT_REQUIRED_VERSION} CONFIG)
++set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
++    "Add support for texttospeed"
++    TYPE OPTIONAL
++)
++if(TARGET Qt5::TextToSpeech)
++    set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
++    add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
++endif()
+ 
+ if(BUILD_TESTING)
+    find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2720e0a..98e2854 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -53,7 +53,7 @@ target_sources(KF5PimTextEdit PRIVATE
+     composer-ng/richtextcomposeremailquotehighlighter.h
+     composer-ng/richtextcomposerwidget.h
+     )
+-
++if (HAVE_TEXT_TO_SPEECH_SUPPORT)
+ target_sources(KF5PimTextEdit PRIVATE
+     texttospeech/texttospeech.cpp
+     texttospeech/texttospeechwidget.cpp
+@@ -76,6 +76,7 @@ target_sources(KF5PimTextEdit PRIVATE
+     texttospeech/texttospeechlanguagecombobox.h
+     texttospeech/texttospeechactions.h
+     )
++endif()
+ 
+ target_sources(KF5PimTextEdit PRIVATE
+     grantleebuilder/plaintextmarkupbuilder.cpp
+@@ -168,7 +169,12 @@ target_link_libraries(KF5PimTextEdit
+     KF5::SyntaxHighlighting
+     Qt::TextToSpeech
+     )
+-
++if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++    target_link_libraries(KF5PimTextEdit
++        PRIVATE
++        Qt::TextToSpeech
++        )
++endif()
+ set_target_properties(KF5PimTextEdit PROPERTIES
+     VERSION ${KPIMTEXTEDIT_VERSION}
+     SOVERSION ${KPIMTEXTEDIT_SOVERSION}
+@@ -240,7 +246,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS
+     )
+ 
+ 
+-
++if (HAVE_TEXT_TO_SPEECH_SUPPORT)
+ ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS
+     HEADER_NAMES
+     TextToSpeech
+@@ -252,7 +258,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS
+     PREFIX KPIMTextEdit
+     RELATIVE texttospeech
+     )
+-
++endif()
+ ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS
+     HEADER_NAMES
+     RichTextComposer
+@@ -269,11 +275,22 @@ ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS
+ 
+ 
+ ########### install files ###############
++if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++    install(FILES
++        ${KPimTextEdit_texttospeechs_HEADERS}
++        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPIMTextEdit/kpimtextedit
++        COMPONENT Devel
++        )
++    install(FILES
++        ${KPimTextEdit_CamelCasetexttospeechs_HEADERS}
++        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPIMTextEdit/KPIMTextEdit/
++        COMPONENT Devel
++        )
++endif()
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit_export.h
+     ${kpimtextedit_HEADERS}
+-    ${KPimTextEdit_texttospeechs_HEADERS}
+     ${KPimTextEdit_richtexteditor_HEADERS}
+     ${KPimTextEdit_texteditor_commonwidget_HEADERS}
+     ${KPimTextEdit_plaintexteditor_HEADERS}
+@@ -288,7 +305,6 @@ install(FILES
+     ${KPimTextEdit_CamelCase_HEADERS}
+     ${KPimTextEdit_CamelCasetextrichtexteditor_HEADERS}
+     ${KPimTextEdit_CamelCaseplaintexteditor_HEADERS}
+-    ${KPimTextEdit_CamelCasetexttospeechs_HEADERS}
+     ${KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS}
+     ${KPimTextEdit_Camelcasecomposerng_HEADERS}
+     ${KPimTextEdit_CamelCaseemoticon_HEADERS}
+@@ -306,8 +322,10 @@ if (BUILD_TESTING)
+     add_subdirectory(texteditor/commonwidget/autotests)
+     add_subdirectory(texteditor/plaintexteditor/tests)
+     add_subdirectory(texteditor/richtexteditor/tests)
+-    add_subdirectory(texttospeech/autotests)
+-    add_subdirectory(texttospeech/tests)
++    if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++        add_subdirectory(texttospeech/autotests)
++        add_subdirectory(texttospeech/tests)
++    endif()
+     add_subdirectory(composer-ng/autotests)
+     add_subdirectory(composer-ng/tests)
+     add_subdirectory(grantleebuilder/autotests)
+diff --git a/src/texteditor/plaintexteditor/plaintexteditor.cpp b/src/texteditor/plaintexteditor/plaintexteditor.cpp
+index cfa0741..4559568 100644
+--- a/src/texteditor/plaintexteditor/plaintexteditor.cpp
++++ b/src/texteditor/plaintexteditor/plaintexteditor.cpp
+@@ -18,7 +18,9 @@
+ #include <QActionGroup>
+ #include <QIcon>
+ 
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+ #include "texttospeech/texttospeech.h"
++#endif
+ #include <Sonnet/Dialog>
+ #include <sonnet/backgroundchecker.h>
+ 
+@@ -181,6 +183,7 @@ void PlainTextEditor::contextMenuEvent(QContextMenuEvent *event)
+             }
+         }
+         if (d->supportFeatures & TextToSpeech) {
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+             if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
+                 if (!emptyDocument) {
+                     QAction *speakAction = popup->addAction(i18n("Speak Text"));
+@@ -188,6 +191,7 @@ void PlainTextEditor::contextMenuEvent(QContextMenuEvent *event)
+                     connect(speakAction, &QAction::triggered, this, &PlainTextEditor::slotSpeakText);
+                 }
+             }
++#endif
+         }
+         if (webShortcutSupport() && textCursor().hasSelection()) {
+             popup->addSeparator();
+diff --git a/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp b/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp
+index 3251ea3..77a9b45 100644
+--- a/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp
++++ b/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp
+@@ -8,8 +8,9 @@
+ #include "plaintexteditfindbar.h"
+ #include "plaintexteditor.h"
+ #include "slidecontainer.h"
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+ #include "texttospeech/texttospeechwidget.h"
+-
++#endif
+ #include <QTextCursor>
+ #include <QVBoxLayout>
+ 
+@@ -21,7 +22,9 @@ public:
+ 
+     KPIMTextEdit::PlainTextEditFindBar *mFindBar = nullptr;
+     PlainTextEditor *mEditor = nullptr;
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+     KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr;
++#endif
+     KPIMTextEdit::SlideContainer *mSliderContainer = nullptr;
+ };
+ 
+@@ -75,16 +78,19 @@ void PlainTextEditorWidget::init(PlainTextEditor *customEditor)
+ {
+     auto lay = new QVBoxLayout(this);
+     lay->setContentsMargins({});
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+     d->mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
+     lay->addWidget(d->mTextToSpeechWidget);
++#endif
+     if (customEditor) {
+         d->mEditor = customEditor;
+     } else {
+         d->mEditor = new PlainTextEditor;
+     }
+     lay->addWidget(d->mEditor);
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+     connect(d->mEditor, &PlainTextEditor::say, d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
+-
++#endif
+     d->mSliderContainer = new KPIMTextEdit::SlideContainer(this);
+ 
+     d->mFindBar = new KPIMTextEdit::PlainTextEditFindBar(d->mEditor, this);
+diff --git a/src/texteditor/richtexteditor/richtexteditor.cpp b/src/texteditor/richtexteditor/richtexteditor.cpp
+index dfdf7c5..a004434 100644
+--- a/src/texteditor/richtexteditor/richtexteditor.cpp
++++ b/src/texteditor/richtexteditor/richtexteditor.cpp
+@@ -26,7 +26,9 @@
+ #include <sonnet/backgroundchecker.h>
+ #include <sonnet/spellcheckdecorator.h>
+ #include <sonnet/speller.h>
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+ #include <texttospeech/texttospeech.h>
++#endif
+ 
+ #include <QApplication>
+ #include <QClipboard>
+@@ -247,7 +249,7 @@ QMenu *RichTextEditor::mousePopupMenu(QPoint pos)
+             allowTabAction->setChecked(!tabChangesFocus());
+             connect(allowTabAction, &QAction::triggered, this, &RichTextEditor::slotAllowTab);
+         }
+-
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+         if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
+             if (!emptyDocument) {
+                 QAction *speakAction = popup->addAction(i18n("Speak Text"));
+@@ -255,6 +257,7 @@ QMenu *RichTextEditor::mousePopupMenu(QPoint pos)
+                 connect(speakAction, &QAction::triggered, this, &RichTextEditor::slotSpeakText);
+             }
+         }
++#endif
+         if (webShortcutSupport() && textCursor().hasSelection()) {
+             popup->addSeparator();
+             const QString selectedText = textCursor().selectedText();
+diff --git a/src/texteditor/richtexteditor/richtexteditorwidget.cpp b/src/texteditor/richtexteditor/richtexteditorwidget.cpp
+index d0d8e14..d84cf3f 100644
+--- a/src/texteditor/richtexteditor/richtexteditorwidget.cpp
++++ b/src/texteditor/richtexteditor/richtexteditorwidget.cpp
+@@ -10,8 +10,9 @@
+ 
+ #include <QTextCursor>
+ #include <QVBoxLayout>
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+ #include <texttospeech/texttospeechwidget.h>
+-
++#endif
+ #include "slidecontainer.h"
+ 
+ using namespace KPIMTextEdit;
+@@ -23,7 +24,9 @@ public:
+ 
+     KPIMTextEdit::RichTextEditFindBar *mFindBar = nullptr;
+     RichTextEditor *mEditor = nullptr;
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+     KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr;
++#endif
+     KPIMTextEdit::SlideContainer *mSliderContainer = nullptr;
+ };
+ 
+@@ -97,14 +100,18 @@ void RichTextEditorWidget::init(RichTextEditor *customEditor)
+ {
+     auto lay = new QVBoxLayout(this);
+     lay->setContentsMargins({});
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+     d->mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
+     lay->addWidget(d->mTextToSpeechWidget);
++#endif
+     if (customEditor) {
+         d->mEditor = customEditor;
+     } else {
+         d->mEditor = new RichTextEditor;
+     }
++#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
+     connect(d->mEditor, &RichTextEditor::say, d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
++#endif
+     lay->addWidget(d->mEditor);
+ 
+     d->mSliderContainer = new KPIMTextEdit::SlideContainer(this);
+-- 
+GitLab
+
diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch
new file mode 100644
index 000000000000..a078840af05c
--- /dev/null
+++ b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch
@@ -0,0 +1,25 @@
+From 3596c0a90f590c409654a9aec2b087809cff0a79 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 28 Dec 2021 12:26:25 +0100
+Subject: [PATCH] Fix build without TextToSpeech available
+
+(the linking happens again further down, inside the if)
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 98e2854..a08978e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -167,7 +167,6 @@ target_link_libraries(KF5PimTextEdit
+     KF5::XmlGui
+     KF5::I18n
+     KF5::SyntaxHighlighting
+-    Qt::TextToSpeech
+     )
+ if (HAVE_TEXT_TO_SPEECH_SUPPORT)
+     target_link_libraries(KF5PimTextEdit
+-- 
+GitLab
+
diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch
new file mode 100644
index 000000000000..617864cd7b02
--- /dev/null
+++ b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch
@@ -0,0 +1,100 @@
+From b248e11f0c6f4e389052e616e6dd262135a23f3c Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 14 Feb 2022 18:58:34 +0100
+Subject: [PATCH] Add info about texttospeech support
+
+---
+ CMakeLists.txt                    |  7 +++++--
+ kpimtextedit-texttospeech.h.cmake |  2 ++
+ src/CMakeLists.txt                | 11 ++++++-----
+ 3 files changed, 14 insertions(+), 8 deletions(-)
+ create mode 100644 kpimtextedit-texttospeech.h.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1c48c8..a00bdeb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,10 +82,13 @@ set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
+     TYPE OPTIONAL
+ )
+ if(TARGET Qt5::TextToSpeech)
+-    set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
+-    add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
++    add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
++    set(KPIMTEXTEDIT_TEXT_TO_SPEECH TRUE)
+ endif()
+ 
++configure_file(kpimtextedit-texttospeech.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit-texttospeech.h )
++
++
+ if(BUILD_TESTING)
+     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test)
+     add_definitions(-DBUILD_TESTING)
+diff --git a/kpimtextedit-texttospeech.h.cmake b/kpimtextedit-texttospeech.h.cmake
+new file mode 100644
+index 0000000..c82af97
+--- /dev/null
++++ b/kpimtextedit-texttospeech.h.cmake
+@@ -0,0 +1,2 @@
++#cmakedefine01 KPIMTEXTEDIT_TEXT_TO_SPEECH 
++
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3e24a2f..4e02e5f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -53,7 +53,7 @@ target_sources(KF5PimTextEdit PRIVATE
+     composer-ng/richtextcomposeremailquotehighlighter.h
+     composer-ng/richtextcomposerwidget.h
+     )
+-if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+ target_sources(KF5PimTextEdit PRIVATE
+     texttospeech/texttospeech.cpp
+     texttospeech/texttospeechwidget.cpp
+@@ -168,7 +168,7 @@ target_link_libraries(KF5PimTextEdit
+     KF5::I18n
+     KF5::SyntaxHighlighting
+     )
+-if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+     target_link_libraries(KF5PimTextEdit
+         PRIVATE
+         Qt5::TextToSpeech
+@@ -245,7 +245,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS
+     )
+ 
+ 
+-if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+ ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS
+     HEADER_NAMES
+     TextToSpeech
+@@ -274,7 +274,7 @@ ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS
+ 
+ 
+ ########### install files ###############
+-if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+     install(FILES
+         ${KPimTextEdit_texttospeechs_HEADERS}
+         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPIMTextEdit/kpimtextedit
+@@ -289,6 +289,7 @@ endif()
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit_export.h
++    ${CMAKE_CURRENT_BINARY_DIR}/../kpimtextedit-texttospeech.h
+     ${kpimtextedit_HEADERS}
+     ${KPimTextEdit_richtexteditor_HEADERS}
+     ${KPimTextEdit_texteditor_commonwidget_HEADERS}
+@@ -321,7 +322,7 @@ if (BUILD_TESTING)
+     add_subdirectory(texteditor/commonwidget/autotests)
+     add_subdirectory(texteditor/plaintexteditor/tests)
+     add_subdirectory(texteditor/richtexteditor/tests)
+-    if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++    if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+         add_subdirectory(texttospeech/autotests)
+         add_subdirectory(texttospeech/tests)
+     endif()
+-- 
+GitLab
+
diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.12.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild
index 8ef4a064d94b..c57fb845be41 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-21.12.1.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild
@@ -16,13 +16,12 @@ DESCRIPTION="Extended text editor for PIM applications"
 LICENSE="LGPL-2.1+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
+IUSE="speech"
 
 RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -35,7 +34,17 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
+
+PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional-{1,2,3}.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kpimtextedit/metadata.xml b/kde-apps/kpimtextedit/metadata.xml
index 0bc83685a440..c28e75b42460 100644
--- a/kde-apps/kpimtextedit/metadata.xml
+++ b/kde-apps/kpimtextedit/metadata.xml
@@ -10,5 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
 </pkgmetadata>