gentoo resync : 26.11.2017

3 files changed, 108 insertions, 5 deletions

diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 1dd5bd3ebb56..b99ed3ec615c 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,6 +1,7 @@
+AUX messagelib-17.08.3-richtextsetting.patch 1098 BLAKE2B 45a3cbbff333616d1de0a13042482d8bc819d5a8d0ce910739aae4265ca32847355024e84c5029372aee1ddfa2ddb2fb72c6ba5f2fe1c61526aa69d5b567a3dd SHA512 120c7c850947b777b682e56cd24b267344b0434e5dc7f053ba64b55f91f5a5d6f053c2b5d102b9ab80b30e5497256d50dcff34892aa9f4bab33d8dbad42f22ed
 DIST messagelib-17.04.3.tar.xz 10498000 SHA256 53e8c256bb016506ecc163ba3e3a387f6f5c958e325e8cae3e74d6461ce85b96 SHA512 20f9e0089c89cc1c61e887832e1499bf7dedee785679d2b780aa1ef5b9029868cd3269c226c7c0814f7048c9d880cc88f94f8ab2c63e8bf6bda9cbeec9f0fa0c WHIRLPOOL 1fc6a51b14301bc35ef2864591c0e8930843a96e548bc8959a72092a46d268253176f05de34287027a41d0bf811aa65d25bae751b2bd5b1e798082b55bb38ead
-DIST messagelib-17.08.3.tar.xz 10463496 SHA256 b63568097bf8741b0ff5bd1911564449f80c1e6f59ca35907d5b6ee55b3ab1db SHA512 572dbb06aec537e224bc87a7863cec394664969a881f98b065d13a6690e908b7d026bee61f49114bc6f75bc5d4e219cf2d1d9420b6d55f91a14e55595f78904a WHIRLPOOL e4d7b4ec00facfc769e4f91bea09ba902370019beae5fd113b57fddfe8843983fcc641eedecaca055efb583498756ee96446f09cff7db746352b1faa1d8fe719
-EBUILD messagelib-17.04.3.ebuild 2022 SHA256 b76e98611f1a42fb82733b0757b3f16aaa29cf69afceb6964012dd68b3bff2a6 SHA512 eeca384175456539065666ba5b18355bd37c3e342522dc44cdc9f6479a64cd66f75278e351a72de4fead7b947b3b89466156ab0d4af68df4e088589e49eb4893 WHIRLPOOL 18c7f6134eb8b20cada7ae99a4f87eedc2492cc3a21924ffd3b9d4ffdc95ffc7b5abe216c9f751ac0e2b82acce40396446d92d9f31114f67ea387e6303af51c6
-EBUILD messagelib-17.08.3.ebuild 2005 SHA256 ba60d519f9f66bc31ab3e8f45897dcf24ee1db962acfd9d4840ab06b21a2f1b6 SHA512 bd2ecd1360a71ebd61a8c75787c3cee10c516de07b1b0190a812568bc2df6d5e17e7b2c3dfa5787b977b2aa3b01274cb6e56bd5b505c00b0e897435121266118 WHIRLPOOL 03b759880cad7f34153b1ea492414546c01c58a59b76ce446c65ef407175d9e46a86a9a98a1cb34d5744667d3c429d10580a4f7e4c85191c3217e043d808e338
-MISC ChangeLog 1417 SHA256 d64f774fd826e63de3795cac70b7e600aa8ce56057b9526a4d442e680818b1a1 SHA512 02b9ba182e2eb25bb4fea9faca1f4699a79427bd7764eaf54aa17ece021aecbfcd07865a245706ec572d2538e2dc27587c25fe9e3c668361dab32065dd4e6a60 WHIRLPOOL 310e1120635f74bbd8205fc1f1b6d94ca90cefd757073e7e1b5df3e755c03bd9384d336941288c57bda658ee1ad85097368658bc1c6d2751e6c273d37b8e13fd
-MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
+DIST messagelib-17.08.3.tar.xz 10463496 BLAKE2B 612672462e77217555fd48e7038e727d8115d1f151e82720e2934f2c98ac3012abbb3e1402befa4704fbcb7234b604f93ad3d1af4fb853e3f7173758240c6f12 SHA512 572dbb06aec537e224bc87a7863cec394664969a881f98b065d13a6690e908b7d026bee61f49114bc6f75bc5d4e219cf2d1d9420b6d55f91a14e55595f78904a
+EBUILD messagelib-17.04.3.ebuild 2022 BLAKE2B 4cb61d7cf56848ce9b5e5920a52d8ebd76368c38a62361915f45c6aa15ae2856d458f95e2ebbae47102a1ca4fedb6d38128c377390992ac7a120644304f25f58 SHA512 eeca384175456539065666ba5b18355bd37c3e342522dc44cdc9f6479a64cd66f75278e351a72de4fead7b947b3b89466156ab0d4af68df4e088589e49eb4893
+EBUILD messagelib-17.08.3-r1.ebuild 2059 BLAKE2B 9c8ebc5bc8678d304b37583466790ec0d0ae78b898ba221fa6a0816b828759701efb59242cca827e4e51ca1170a45a6587e2887374f2c04a9d864b08e693bdb8 SHA512 011f5af8ece9aa017289cc03cbdbbc1b8ab9b04f8adad376ef2a3e3246d7107e2a436bb479ee03866f80d153d31a80aecb2c9d567e10f9123ef9c13b4c8b9f9b
+EBUILD messagelib-17.08.3.ebuild 2005 BLAKE2B c7ef1a7a583464616d062de5179dead51f8a936940dfba2b804d6a3659b6ba03b09f0ec8743bacadcd4071971ce8931c59b0a7c360f5ec7ac50b061a4f3b1afa SHA512 bd2ecd1360a71ebd61a8c75787c3cee10c516de07b1b0190a812568bc2df6d5e17e7b2c3dfa5787b977b2aa3b01274cb6e56bd5b505c00b0e897435121266118
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/files/messagelib-17.08.3-richtextsetting.patch b/kde-apps/messagelib/files/messagelib-17.08.3-richtextsetting.patch
new file mode 100644
index 000000000000..42cf01165d5c
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-17.08.3-richtextsetting.patch
@@ -0,0 +1,29 @@
+From ece5c76c708797f2b1ec5bb22460089428ab6d80 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@kde.org>
+Date: Thu, 9 Nov 2017 07:48:59 +0100
+Subject: Fix Bug 386660 - Rich text setting is not saved
+
+BUG: 386660
+---
+ templateparser/src/templateparserjob.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/templateparser/src/templateparserjob.cpp b/templateparser/src/templateparserjob.cpp
+index b43e7e6..e836c5b 100644
+--- a/templateparser/src/templateparserjob.cpp
++++ b/templateparser/src/templateparserjob.cpp
+@@ -1115,9 +1115,11 @@ void TemplateParserJob::slotExtractInfoDone(const TemplateParserExtractHtmlInfoR
+     if (mMode == NewMessage && plainBody.isEmpty() && !mExtractHtmlInfoResult.mPlainText.isEmpty()) {
+         plainBody = mExtractHtmlInfoResult.mPlainText;
+     }
++    /*
+     if (mMode == NewMessage && htmlBody.isEmpty() && !mExtractHtmlInfoResult.mHtmlElement.isEmpty()) {
+         htmlBody = mExtractHtmlInfoResult.mHtmlElement;
+     }
++    */
+ 
+     addProcessedBodyToMessage(plainBody, htmlBody);
+     Q_EMIT parsingDone(mForceCursorPosition);
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/messagelib/messagelib-17.08.3-r1.ebuild b/kde-apps/messagelib/messagelib-17.08.3-r1.ebuild
new file mode 100644
index 000000000000..7a14b735d248
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-17.08.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.8.0
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(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_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui '' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-16.08.50:5
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!=kde-apps/kmail-4.4*:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-richtextsetting.patch" )
+
+# bug 579630
+RESTRICT+=" test"