gentoo resync : 22.10.2018

6 files changed, 267 insertions, 7 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index d15937c1fa84..c93ffffd5f50 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,8 @@
+AUX kmail-18.04.3-no-sync-after-save.patch 2855 BLAKE2B 596c70f83acc4ec9a4468b4de3c27f67b79c900a8c1de292dafd055ca784f5b8d5a02da16ef2779ef0c15a5990d61c7dcea06e7a15884efc815800a1e75deb0e SHA512 7f0e6ddc04ab25a927a1bbca3190a5ba1ae3f31c2183f9052bbc003a5a6a26acd8b16326f23216a6576ff6c85f9fb2ed76f095238a2076eb1f8e6ce86e58f5c5
+AUX kmail-18.04.3-setAutoSaveSettings.patch 1768 BLAKE2B 55517b2e889cea2bbe6729c176f4f32275fd92026bd6c2d55bda68a711b861915ae71a591a541d7fcb90decfea5d1d54ec09d40d6054e6905d3f39043467af2d SHA512 ca4d7636c4913b4a4534cb8975663181968c10c3e93a3ffc78f51a48f3b9a4ed5d007f87473570238e2321b21a6ebbdfa3a29f753d8789ba0f637cffb29b2887
 DIST kmail-18.04.3.tar.xz 4757552 BLAKE2B 281c4e131518dd6efb9172d5db83e6945570943f7942ace28a9d5542130ea9636191894a72043410c641b9d3d8731efdf5b72d0e25ee5058948e6f1bfdd2f3f8 SHA512 216f57078ea32ba4d9cae70e7c2aaa28957c677e9c0eef9f4ed32fd405f63e02881f87b6a44530d9ca65839535c775de4913aad83bec8e253ff6fd01a45f61b1
-DIST kmail-18.08.1.tar.xz 4778308 BLAKE2B 5fa86a8023afbd3a60b62fcc16c70833adf093d7f9fa0fb544dde9490c241d2291167d36e75f808ab251adae01534963103a79a41862fbe83b80234f2d17a133 SHA512 426bbce3fa86e01fd8fa8f62cd68542cbc71206a9110565e5ceba92dc447d3763267791d42d75c95842b1dc1ca140b51615e816b09281016c9adc88b60b106aa
-EBUILD kmail-18.04.3.ebuild 3180 BLAKE2B da8d524844c0f15733102a4ed5a9dc899a016bf301ab686ec0b159a8c0b0d983a53233a00de82438c4b756e4cf9775c17faf1e9350ca003d75ecd292bb3f8e3c SHA512 84a8c96c3e6af5fbdc6258e63af1f218c7991d5e84ac772d2031241cb6de1c2beb93657f948c960854a8f58532b7da3983a5d895036fe29281cdab077b71ae4e
-EBUILD kmail-18.08.1.ebuild 3182 BLAKE2B ca1c1db4d7c158360d8d5f41057d4c35df7b588e3dcd8687ac6be1bccee6e199d9b6cd3a39192045fba959e410ad0bdef24383834a5ea4946160c32d11ab5d7e SHA512 2e653f8da18b09d27bd8e4a25af283860836ffc41136c5c792beb3e6dbc0da95ad8567d320c9c744424071b09d7fdc8b5039ebf360c9a9043fd06efac0ef3dda
+DIST kmail-18.08.2.tar.xz 4777920 BLAKE2B ec9d2b97ca3a7e80bd0e24eab81d2d605460d79d2fb9a8bb809459d8c78a1c650182866d8b49d522fa5cf627f323b9b17caed49ba66b762590dc25dc9808284e SHA512 a8329fcefe7142089f60bce3703bbde79bb0a01d7a748937a665e534695c91edc6f490d7096d2f80d5a16266f3b4cf777d58763220033ce054c3f6c232df32bf
+EBUILD kmail-18.04.3-r1.ebuild 3276 BLAKE2B 25eb03f9eafa05d731a2ccaf2d7e15862db7b4ba97b27c7528c7cd975b48450a39cceaf3554cbba6b084860c78275bf8bb3d22f6b37ede3be0e86a61da5511d2 SHA512 e96071bf6f344e952e42fd4b7e1b9f5ac3d1bb4a97648f294cf070f6a29428861ce5938999fec46ebefdc3cd9fccf9821e55271dda2c59858aa6d63447221e40
+EBUILD kmail-18.04.3.ebuild 3170 BLAKE2B 0959bb4a869f93c30655327319568fa4ba6017e1d83522012f5a463b89e1a31742bda341a40f02f093f118bef807b41276d607bd90404c27b8de0f4378343fe0 SHA512 d32da391c2f2b3a78e82d1405fcecd5967262a26dcd7adfbb7ccc9d9dc10ba5dbdca7a50322a28dc866f69a8bc697b77182a2b84cca87ca6ab69004557181b69
+EBUILD kmail-18.08.2.ebuild 3172 BLAKE2B 1adfcc5906b6209567caf6f9d440de033c9901b0dc810e874f2e159422845321e1279523c892db94a04d6d9580ccabb404d91996ab75e78763b5161b5bf81c7e SHA512 d367827f076b74198c3b4c44f9036e3084e23128f0aa248c23ae20a828a4ba7d41aef7489c89300a0a4d6e27789ceeaf990dc51a53219f7f7e56a79252c0e840
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch b/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
new file mode 100644
index 000000000000..c770dac239b4
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
@@ -0,0 +1,90 @@
+From fcd21f9712143afb956dca2f67fb930fffc074fd Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 31 Jul 2018 11:59:24 +0200
+Subject: KMail: don't sync after save, don't reload after last sync
+
+Summary:
+* save() takes care of sync() already, if anything changed.
+* When quitting there's no reason to reload the configuration.
+
+Test Plan: None yet
+
+Reviewers: mlaurent
+
+Reviewed By: mlaurent
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D14509
+---
+ src/kmkernel.cpp | 26 +++++++++++++++-----------
+ src/kmkernel.h   |  1 +
+ 2 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
+index aafb9ee..7af593d 100644
+--- a/src/kmkernel.cpp
++++ b/src/kmkernel.cpp
+@@ -231,7 +231,7 @@ KMKernel::~KMKernel()
+     mMailService = nullptr;
+ 
+     stopAgentInstance();
+-    slotSyncConfig();
++    saveConfig();
+ 
+     delete mAutoCorrection;
+     delete mMailCommonSettings;
+@@ -1172,16 +1172,7 @@ void KMKernel::slotRequestConfigSync()
+ 
+ void KMKernel::slotSyncConfig()
+ {
+-    PimCommon::PimCommonSettings::self()->save();
+-    MessageCore::MessageCoreSettings::self()->save();
+-    MessageViewer::MessageViewerSettings::self()->save();
+-    MessageComposer::MessageComposerSettings::self()->save();
+-    TemplateParser::TemplateParserSettings::self()->save();
+-    MessageList::MessageListSettings::self()->save();
+-    mMailCommonSettings->save();
+-    Gravatar::GravatarSettings::self()->save();
+-    KMailSettings::self()->save();
+-    KMKernel::config()->sync();
++    saveConfig();
+     //Laurent investigate why we need to reload them.
+     PimCommon::PimCommonSettings::self()->load();
+     MessageCore::MessageCoreSettings::self()->load();
+@@ -1195,6 +1186,19 @@ void KMKernel::slotSyncConfig()
+     KMKernel::config()->reparseConfiguration();
+ }
+ 
++void KMKernel::saveConfig()
++{
++    PimCommon::PimCommonSettings::self()->save();
++    MessageCore::MessageCoreSettings::self()->save();
++    MessageViewer::MessageViewerSettings::self()->save();
++    MessageComposer::MessageComposerSettings::self()->save();
++    TemplateParser::TemplateParserSettings::self()->save();
++    MessageList::MessageListSettings::self()->save();
++    mMailCommonSettings->save();
++    Gravatar::GravatarSettings::self()->save();
++    KMailSettings::self()->save();
++}
++
+ void KMKernel::updateConfig()
+ {
+     slotConfigChanged();
+diff --git a/src/kmkernel.h b/src/kmkernel.h
+index e7fc071..f5da22d 100644
+--- a/src/kmkernel.h
++++ b/src/kmkernel.h
+@@ -487,6 +487,7 @@ private:
+     void resourceGoOnLine();
+     void openReader(bool onlyCheck);
+     QSharedPointer<MailCommon::FolderSettings> currentFolderCollection();
++    void saveConfig();
+ 
+     KMail::UndoStack *the_undoStack = nullptr;
+     MessageComposer::AkonadiSender *the_msgSender = nullptr;
+-- 
+cgit v0.11.2
diff --git a/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch b/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
new file mode 100644
index 000000000000..a7377b61f190
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
@@ -0,0 +1,52 @@
+From 814f0db2a1ae5b15bf91909ce80a5d6792f9aeed Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 29 Jul 2018 13:05:38 +0200
+Subject: Port to setAutoSaveSettings so that saving happens before hiding.
+
+Summary:
+See d35a882895 in kxmlgui for more complete explanation.
+
+BUG: 396339
+CCBUG: 395988
+
+Test Plan: kmail ; Alt+F4 ; kmail -> now the statusbar and toolbar are visible again
+
+Reviewers: ngraham, elvisangelaccio, broulik, cfeck, mlaurent
+
+Reviewed By: mlaurent
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D14454
+---
+ src/kmmainwin.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
+index ce3b042..f3550ba 100644
+--- a/src/kmmainwin.cpp
++++ b/src/kmmainwin.cpp
+@@ -76,7 +76,7 @@ KMMainWin::KMMainWin(QWidget *)
+     createGUI(QStringLiteral("kmmainwin.rc"));
+ 
+     //must be after createGUI, otherwise e.g toolbar settings are not loaded
+-    applyMainWindowSettings(KMKernel::self()->config()->group("Main Window"));
++    setAutoSaveSettings(KMKernel::self()->config()->group("Main Window"));
+ 
+     connect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg,
+             this, &KMMainWin::displayStatusMessage);
+@@ -94,10 +94,6 @@ KMMainWin::~KMMainWin()
+     // Avoids a crash if there are any Akonadi jobs running, which may
+     // attempt to display a status message when they are killed.
+     disconnect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg, this, nullptr);
+-
+-    KConfigGroup grp(KMKernel::self()->config()->group("Main Window"));
+-    saveMainWindowSettings(grp);
+-    KMKernel::self()->config()->sync();
+ }
+ 
+ KMMainWidget *KMMainWin::mainKMWidget() const
+-- 
+cgit v0.11.2
diff --git a/kde-apps/kmail/kmail-18.04.3-r1.ebuild b/kde-apps/kmail/kmail-18.04.3-r1.ebuild
new file mode 100644
index 000000000000..80a2769dd4ac
--- /dev/null
+++ b/kde-apps/kmail/kmail-18.04.3-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kldap)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-sync-after-save.patch"
+	"${FILESDIR}/${P}-setAutoSaveSettings.patch"
+)
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	elog "KMail supports the following runtime dependencies:"
+	elog "  Virus detection:"
+	elog "    $(pkg_is_installed app-antivirus/clamav)"
+	elog "  Spam filtering:"
+	elog "    $(pkg_is_installed mail-filter/bogofilter)"
+	elog "    $(pkg_is_installed mail-filter/spamassassin)"
+	elog "  Fancy e-mail headers and various useful plugins:"
+	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+	elog "  Crypto config and certificate details GUI:"
+	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+}
diff --git a/kde-apps/kmail/kmail-18.04.3.ebuild b/kde-apps/kmail/kmail-18.04.3.ebuild
index 990a482098e6..7edc02c76e08 100644
--- a/kde-apps/kmail/kmail-18.04.3.ebuild
+++ b/kde-apps/kmail/kmail-18.04.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -83,7 +83,7 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test" # bug 616878
 
 src_prepare() {
-	cmake-utils_src_prepare
+	kde5_src_prepare
 
 	if ! use handbook; then
 		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
diff --git a/kde-apps/kmail/kmail-18.08.1.ebuild b/kde-apps/kmail/kmail-18.08.2.ebuild
index 42818ab48cd1..56e4cd96e314 100644
--- a/kde-apps/kmail/kmail-18.08.1.ebuild
+++ b/kde-apps/kmail/kmail-18.08.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -83,7 +83,7 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test" # bug 616878
 
 src_prepare() {
-	cmake-utils_src_prepare
+	kde5_src_prepare
 
 	if ! use handbook; then
 		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die