gentoo resync : 20.03.2022

5 files changed, 85 insertions, 9 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 197336df5a48..fddd03ba2c15 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,6 @@
+AUX kmail-21.12.3-speech-optional.patch 2622 BLAKE2B 403556173723754264d00b6f9fda84b3367c9680c28327bb333b490486898a59e1b013afdc8f93b4d0d8cc60ca0f2998f768ba312350d58ab5682c528ffadb6a SHA512 788ca301d7677a30fbf53d43ec2da59d710fd6942ffa956f88d2288772f7abaf9611e57529727eb967570e6e4e1c4b987943ef03bfa58ab1dfba8d7081741563
 DIST kmail-21.08.3.tar.xz 6929860 BLAKE2B d6adc4cd78c880dc61aaa6b9e443b658d49513d24f472877f2de3a6f8c383c8dbe7db11614540e00dc01a0e3de918a0df4b11c312287892a1ee66faf64d825b7 SHA512 f92ecb2a3095e5a2f3fec67f476ebf8c7cad38d5e6f23ed6ce67fc6244e5a3ec590aa85cec847bda50b47896a1a77079727980deab5d58e847a0e4b1e224e113
-DIST kmail-21.12.1.tar.xz 7058636 BLAKE2B 1759367a6ccdc91ed5eec3a887dfd083a2c40f6e7df331eb5ce7bf7c84f95a4876be39ba844d5e3988df026d1d3386fef5804cea3af2fa64cf9a3d35f55cf89b SHA512 84634a3e6e86a90f2366bcd68fff3988157066db77503d623f124f03d3261d72edd1f53e3f5f731a02f50dd3fed913b149efe304e54a353490d657086ba0ffdb
-EBUILD kmail-21.08.3.ebuild 3396 BLAKE2B c4ba4e8bea2a71233fa62171150b05d69e8be0830322ebe8958a9d1fc34afef5f3e0205080a4f28f319ca20c333b37c14b2febaa36971cb2b532baede5d84bcb SHA512 8731b2bdfc8ae6b264033edcf40b1058bb82c23c1397de133fecc12a2ca4c092a9987470a47121edbdbb1313d78b36fdfa3b6818fdc8d9611424af4d2ebf339c
-EBUILD kmail-21.12.1.ebuild 3399 BLAKE2B e060b177ddd84c32b1927f7b8b8b497c99a4a058836ff0fae638367361e158e2d5b752fd5ffa3d63e6b5e6082b41203e3c16b9a11270a03012d0530c39ae3dfa SHA512 9daef2dcbf7075f1edb0f689ceb428f82cb191f9937f43f47f31235fc4875c5e2c24528b0007f83d218c613c13c6e96702cbf9c8b58b6b21decf1e43c3a538b1
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+DIST kmail-21.12.3.tar.xz 7145316 BLAKE2B a901631e14b6d4e652877439594fd35a787699a2a8b3787323ebd49f109ef2c527984bb5791a428353f124bb01755a5e475c7c5b39ba1d0277bbfdf0a1dac001 SHA512 7656feaeca6ac664c7bd2402f4bd369c4ce924db812b99d9f27556e0112722eb18a3490ffcd26047653b84f14c2990be53967dc689f277557dd0deac56d03a60
+EBUILD kmail-21.08.3-r1.ebuild 3398 BLAKE2B c64ad45ec311ec959a4a7743bfc90ca7c96ebd4dfd8483f2b7be7adff980f683bb3936ff23ab0fdab67dd561b193366a66c06e4fcd0174fa3340e1824c5ad76f SHA512 68db221e150c625157e188ab1f45579c1b99aab8cac1c7ca095dd9d56589a44e374e6835d37126e445df96130ab72a8caa8a58c224cc110cf6e05c777a112d06
+EBUILD kmail-21.12.3.ebuild 3574 BLAKE2B 874bebcb18732b410faec4ee54458dcb91ceb502ab6e4d5f287fcc05963b203ac2488cd08c0597fa2e71c6d09aa620c46a1b4465189218d8b30e47262beadc05 SHA512 ca4c33249a7c54b824cdf76b4fed3d6a850e4958b5dcf7c27943f057a4b8c5732a1e0210c47355d8b7af3447c75ba6f7221dd308442a19f7ca537410d408bb11
+MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch b/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch
new file mode 100644
index 000000000000..e0c7a4518c46
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch
@@ -0,0 +1,69 @@
+From 817515f9278f97b3fa32bb434cb2bd26816a7838 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 24 Feb 2022 17:28:35 +0100
+Subject: [PATCH] Make it compile without texttospeach
+
+---
+ src/kmmainwidget.cpp    | 5 +++++
+ src/kmreadermainwin.cpp | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index d6d0d40ac..37bbe72a2 100644
+--- a/src/kmmainwidget.cpp
++++ b/src/kmmainwidget.cpp
+@@ -36,7 +36,10 @@
+ #include "widgets/collectionpane.h"
+ #include "widgets/kactionmenuaccount.h"
+ #include "widgets/kactionmenutransport.h"
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeech>
++#endif
+ #include <KSieveUi/SieveDebugDialog>
+ #include <MailCommon/FolderTreeView>
+ #include <MailCommon/MailKernel>
+@@ -2707,10 +2710,12 @@ void KMMainWidget::showMessagePopup(const Akonadi::Item &msg,
+         mMsgActions->addWebShortcutsMenu(&menu, selectedText);
+         menu.addSeparator();
+         menu.addActions(mMsgView->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedSelection));
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+         if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
+             menu.addSeparator();
+             menu.addAction(mMsgView->speakTextAction());
+         }
++#endif
+         menu.addSeparator();
+         menu.addAction(mMsgView->shareTextAction());
+     } else if (!urlMenuAdded) {
+diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp
+index 4967459cc..85c488f97 100644
+--- a/src/kmreadermainwin.cpp
++++ b/src/kmreadermainwin.cpp
+@@ -54,7 +54,10 @@
+ #include <Akonadi/ItemCreateJob>
+ #include <Akonadi/ItemMoveJob>
+ #include <Akonadi/KMime/MessageFlags>
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeech>
++#endif
+ #include <MailCommon/MailUtil>
+ #include <MessageViewer/DKIMViewerMenu>
+ #include <MessageViewer/DKIMWidgetInfo>
+@@ -736,10 +739,12 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg,
+         mMsgActions->addWebShortcutsMenu(menu, selectedText);
+         menu->addSeparator();
+         menu->addActions(mReaderWin->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedSelection));
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+         if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
+             menu->addSeparator();
+             menu->addAction(mReaderWin->speakTextAction());
+         }
++#endif
+         menu->addSeparator();
+         menu->addAction(mReaderWin->shareTextAction());
+     } else if (!urlMenuAdded) {
+-- 
+GitLab
+
diff --git a/kde-apps/kmail/kmail-21.08.3.ebuild b/kde-apps/kmail/kmail-21.08.3-r1.ebuild
index 30253db073be..c2f651e94b36 100644
--- a/kde-apps/kmail/kmail-21.08.3.ebuild
+++ b/kde-apps/kmail/kmail-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
@@ -23,7 +23,7 @@ IUSE="pch telemetry"
 RESTRICT="test" # bug 616878
 
 COMMON_DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	>=app-crypt/gpgme-1.11.1:=[cxx,qt5]
 	>=dev-qt/qtcore-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-apps/kmail/kmail-21.12.1.ebuild b/kde-apps/kmail/kmail-21.12.3.ebuild
index ce16848ddcc4..0af27f6855a5 100644
--- a/kde-apps/kmail/kmail-21.12.1.ebuild
+++ b/kde-apps/kmail/kmail-21.12.3.ebuild
@@ -18,12 +18,12 @@ https://kontact.kde.org/components/kmail.html"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="pch telemetry"
+IUSE="pch speech telemetry"
 
 RESTRICT="test" # bug 616878
 
 COMMON_DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	>=app-crypt/gpgme-1.11.1:=[cxx,qt5]
 	>=dev-qt/qtcore-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=kde-apps/kmailtransport-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
 	>=kde-apps/kontactinterface-${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
@@ -88,6 +88,8 @@ BDEPEND="
 	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional.patch )
+
 src_prepare() {
 	ecm_src_prepare
 	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
@@ -108,6 +110,7 @@ pkg_postinst() {
 		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/metadata.xml b/kde-apps/kmail/metadata.xml
index d925f2439758..fa80953797d0 100644
--- a/kde-apps/kmail/metadata.xml
+++ b/kde-apps/kmail/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>