gentoo resync : 25.03.2022

4 files changed, 91 insertions, 4 deletions

diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index 11e071388f30..d80cd7216045 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,7 +1,8 @@
 AUX kjots-5.1.0-akonadi-21.12.0.patch 8215 BLAKE2B a192b70f325a84423b88144fdb5dc70a07b10c84cb0feb8faf74859fd1668f97db6972841bad74e313afba46c09cd2d882297cc72b1c8c00e9b5dfe68874fb75 SHA512 5487f7ea196479a64e72d8a8fe2f9f7ba7ed60c3932703795f0698325c737d08aff3c63d36ef60a9c66f2660f6c5318239c493db926d50a98df61256be0b9f65
 AUX kjots-5.1.0-implicit-dep.patch 983 BLAKE2B ca6a6b7b8e72aa0729d3e7ca9d5ecdf24673ef33ef8b752dd5513b93fd25d4b6c1adebd8a8b238d29d04c2bd6802f3303d968effed54d16dca30d6a96815fc11 SHA512 7c68f0807d764222b5b4b8114d4cbd7bfc4922d735b1a12de621bed943d666a4fefbf17ce7ea43eb6cca029cb77b1fb7d217279b3be1cb5a99a3db0f5fc530b8
 AUX kjots-5.1.0-missing-lib.patch 683 BLAKE2B 719f3c4ef39856c33b683f4c7edca664f89510f6b1f21ffd2ca285eb63db4b729c9b2091c704452adbda326eaef61ebba9b3ccce643548c1bdd2f3044687af92 SHA512 c87c741b036b5958faa3a9c892be469ea73e8809807da8f000fc55ae4219996731907d458cacae3f08eb0c3fb8d40e391490f03047dbfed900a3253bb46536c3
+AUX kjots-5.1.0-speech-optional.patch 2921 BLAKE2B daa773ddf2c40dce83891a3afc35c209343d2e9a71673dce669132aa998fdfa225eab03fa8df0bcdd0a1c9694ebfa117c4fe9da129b63979aa37fe797a74edc7 SHA512 a7f4b30b04e1bf6bc403a9baad213d92f96fe147b7f5a279a2f19d3f0758714dfc3c99bbeced7bea6bc2a36e3246407152e4e276c162ade88f1de71fed0b2af8
 AUX kjots-5.1.0-unused-dep.patch 1423 BLAKE2B 154509cafb0c5822e5ceff10513967e3899d474fb471bb312e0686d6e2875d57c5a7bb8b7392efb211c74f0d31e274a62643998132bdcfc09334ffb26c78c1b7 SHA512 ebad6d5f26af8ca1c55302f9a2fbedcfb70f07bf09cfc8fa4446bdac7ac9ec182523659701e35a69d559772e65786958d3ef434fef4bdf9d75420b5c41241269
 DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
-EBUILD kjots-5.1.0-r1.ebuild 1415 BLAKE2B a1e6a7c83209627ec20b9f6a9b470964dbbb2d94f09e3950c11b6d7414538592c501f09f0aef808c87fe8f4194b9627a92f8759af47a534292e73719fd022e73 SHA512 c6708d59c260f9637d3fe653629810a94b564145c0d076d743aba934fc8ad008e8aeaf79d1f895ce3df0f49764b300a8afdfcd76bcca12ab7acbd7c5592fa7b7
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD kjots-5.1.0-r2.ebuild 1488 BLAKE2B 14a659b4a2e627fbeb9112ea16568dcf459ccfecb586aa59a2f4b9d6a552503bce68b8061fe9b28200fc36a54475d7b4c884931f100a6ee4141dfde39c730c44 SHA512 4ef7c7e3753bb342042cc8c933bd488b35b620d1ab1d3f591caa3aa57b06a7cd403839881319e3ff3bec475406258c5678d0404914052032d39cf1a065cecce4
+MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/app-text/kjots/files/kjots-5.1.0-speech-optional.patch b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch
new file mode 100644
index 000000000000..95c3309bd5b9
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch
@@ -0,0 +1,82 @@
+From c552b158e46ccdefc5c8382911aca907e177d63d Mon Sep 17 00:00:00 2001
+From: Igor Poboiko <igor.poboiko@gmail.com>
+Date: Sat, 19 Mar 2022 15:44:50 +0100
+Subject: [PATCH] Allow compiling without KPIMTextEdit/TextToSpeech
+
+---
+ src/kjotsbrowser.cpp | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/src/kjotsbrowser.cpp b/src/kjotsbrowser.cpp
+index fd6e6dd..8864f79 100644
+--- a/src/kjotsbrowser.cpp
++++ b/src/kjotsbrowser.cpp
+@@ -15,9 +15,13 @@
+ #include "kjotsmodel.h"
+ 
+ #include <KPIMTextEdit/RichTextEditFindBar>
+-#include <KPIMTextEdit/TextToSpeechWidget>
+ #include <KPIMTextEdit/SlideContainer>
+ 
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
++#include <KPIMTextEdit/TextToSpeechWidget>
++#endif
++
+ #include <QHelpEvent>
+ #include <QToolTip>
+ #include <QVBoxLayout>
+@@ -37,14 +41,18 @@ public:
+         : mBrowser(std::move(browser))
+         , mSliderContainer(widget)
+         , mFindBar(mBrowser.get(), &mSliderContainer)
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+         , mTextToSpeechWidget(widget)
++#endif
+     {
+     }
+ 
+     std::unique_ptr<KJotsBrowser> mBrowser;
+     KPIMTextEdit::SlideContainer mSliderContainer;
+     KPIMTextEdit::RichTextEditFindBar mFindBar;
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     KPIMTextEdit::TextToSpeechWidget mTextToSpeechWidget;
++#endif
+ };
+ 
+ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QWidget *parent)
+@@ -56,11 +64,15 @@ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QW
+     d->mFindBar.setHideWhenClose(false);
+ 
+     connect(&d->mFindBar, &KPIMTextEdit::RichTextEditFindBar::hideFindBar, this, &KJotsBrowserWidget::slotHideFindBar);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     connect(d->mBrowser.get(), &KJotsBrowser::say, &d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
++#endif
+ 
+     QVBoxLayout *lay = new QVBoxLayout(this);
+     lay->setContentsMargins(0, 0, 0, 0);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     lay->addWidget(&d->mTextToSpeechWidget);
++#endif
+     lay->addWidget(d->mBrowser.get());
+     lay->addWidget(&d->mSliderContainer);
+ }
+@@ -129,6 +141,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event)
+     popup->addSeparator();
+     popup->addAction(m_actionCollection->action(QString::fromLatin1(KStandardAction::name(KStandardAction::Find))));
+     popup->addSeparator();
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     if (!document()->isEmpty() && KPIMTextEdit::TextToSpeech::self()->isReady()) {
+         QAction *speakAction = popup->addAction(i18nc("@info:action", "Speak Text"));
+         speakAction->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-text-to-speech")));
+@@ -137,6 +150,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event)
+                 Q_EMIT say(text);
+             });
+     }
++#endif
+     popup->exec(event->globalPos());
+     delete popup;
+ }
+-- 
+GitLab
+
diff --git a/app-text/kjots/kjots-5.1.0-r1.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild
index dd1910ad60f6..a948d3a45db6 100644
--- a/app-text/kjots/kjots-5.1.0-r1.ebuild
+++ b/app-text/kjots/kjots-5.1.0-r2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE=""
+IUSE="speech"
 
 DEPEND="
 	dev-libs/grantlee:5
@@ -30,7 +30,7 @@ DEPEND="
 	>=kde-apps/akonadi-notes-20.12.2:5
 	>=kde-apps/kmime-20.12.2:5
 	>=kde-apps/kontactinterface-20.12.2:5
-	>=kde-apps/kpimtextedit-20.12.2:5
+	>=kde-apps/kpimtextedit-20.12.2:5[speech(+)=]
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -50,4 +50,5 @@ PATCHES=(
 	"${FILESDIR}/${P}-implicit-dep.patch"
 	"${FILESDIR}/${P}-missing-lib.patch"
 	"${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580
+	"${FILESDIR}/${P}-speech-optional.patch" # bug 835128
 )
diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml
index d925f2439758..fa80953797d0 100644
--- a/app-text/kjots/metadata.xml
+++ b/app-text/kjots/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>