gentoo resync : 05.04.2019

5 files changed, 8 insertions, 74 deletions

diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 80111e08f845..49bbb60dff62 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,7 +1,4 @@
-AUX messagelib-18.08.3-CVE-2018-19516.patch 1088 BLAKE2B 720f3c72fe0e02b68c2d84a0b748dea6bd992ecdd52f40a0e7d5b6955322539db08ab7b4db2a4276f41d831160d4821cfd7460dbf3122fcdafec78bcf6edff90 SHA512 bcf557ea46ab6ed277a3730eff5560912ab0c55dbf48a8a8cb953916c6af887b9d520cb657a3cd6904d67133cf9a4ec8c99b69b9e1648f3b326d46f51d96e075
-AUX messagelib-18.08.3-newmail-crash.patch 1100 BLAKE2B f3f566f1fe5541d5ac4de5193893696cfce8552058300684ae72f28655062347eba83d5f739cb9edfeef6bd4611586df3bcaa7489e3018b405b825334a4a6bc1 SHA512 10775b6ea3cf6cf144aac6214a192bad891f7cfe44e6c373c5da6ca5cb2b1a532b189a569a2a48127ef569713af3fc040d62ba31968a476a83ad7b712549a955
-DIST messagelib-18.08.3.tar.xz 10417308 BLAKE2B 7b2df9549c5b691dbbf902fe9fc74978d1904d7c4e3c64f67a731cc0ac7590a46e9adb3475ad8324c4752a09e2e8a7626bb9e620aefd4f7ad0b0074d8d3fa4b0 SHA512 b7e26a9588c82ee6840602e712e46394b236d65eec55ced005fe5db2c375f99ad684c0e3c4a50e80315db346def9a86b56c403bf084e3face5e29ef7f2eb028b
 DIST messagelib-18.12.3.tar.xz 10428172 BLAKE2B 549089a1cbfa3d27b6a69b8efe11299c377bb761b223d4a3e00bbf241dccf29a7e49607b665e565bb11fa5c2b0d54543ab91a42180122664c47f8f38c45c606b SHA512 06ef96514d4d54d0c25114cac358de039874622c307d71bb9bd23e01c6fb665001e22930e2f2ccf7ef4b083544619a8c382ad8c40c8ee227039a9c33b34cf220
-EBUILD messagelib-18.08.3-r2.ebuild 1990 BLAKE2B c84bc610f23be28f887e0f890b086e5247b4739d35edaadac650b0cae2c284a03ce23e1556537b1b7980aadb725d8962569c9a969378c39272cbed5dd9fe5ed2 SHA512 a6a1b031d1fa88774a1729d00b238063d476b45c95295dd9c71d79988ae09beafb79cb894fa9b170126deaa76d4690e47bddce8181753eb388e34c142bbd0ba9
-EBUILD messagelib-18.12.3.ebuild 1899 BLAKE2B a642085366c909cce71fd95ae89bb5ea5d1590cbddaf8920c32c677b52ccd3017296f3470352be4ce2c793878e2e3cc589b62a4f7a46b24f2fe32e2b67ae58c5 SHA512 b9bcf10a95428df8d10b87640542c2842fc7510ef0fd3f8e8345000cec012b89c8535e7cdbaf0518b6e2d153afec91290f9211a8ce8d92ea20a19e4d9ee8c823
+EBUILD messagelib-18.12.3-r1.ebuild 1920 BLAKE2B d1cb7c72c916b98cc31719b0071f59ed635f979e13ddc7baa568b76721c5a007967b59fc3926d315badd291d1eefdb189487c93915c42608e76eac64ddf80a67 SHA512 47e3ad11b37977b7330e02cd5cc3977e5be845152e432f92534df7a087b497f19493207caedce5140adaaca7496f4a7754051275d64c96d1609b0c5e848bbe27
+EBUILD messagelib-18.12.3.ebuild 1904 BLAKE2B 1edf73ec9d88323fe11871f8001286d9dd3101f7c7cbec49d1d7d853d5abbac5b75ca15822700222ece3042069339e6540e05b927021a9df576a7baf368a0b24 SHA512 4945ba53e3c980e9f83fb171fe5dd81e381f352add2a22dc7999d493df792bbae1c70f88c896b232c024d44ee6ca0c5acfeae854425bc3c0c0953fc97d5b2f46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch b/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch
deleted file mode 100644
index 21108ae1fb6f..000000000000
--- a/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1fd737870f5a9c5bf44ad9fbd153ab4cf44e135d Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Fri, 23 Nov 2018 07:37:02 +0100
-Subject: [PATCH] Exclude Refresh from MetaData (Not necessary)
-
----
- .../src/messagepartthemes/default/defaultrenderer.cpp       | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
-index a7ffe824..d5d41cf6 100644
---- a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
-+++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
-@@ -308,6 +308,12 @@ QString processHtml(const QString &htmlSource, QString &extraHead)
-             return htmlSource;
-         }
-         extraHead = s.mid(startIndex + 6 , endIndex - startIndex - 6);
-+
-+        //Don't authorize to refresh content.
-+        if (s.contains(QStringLiteral("http-equiv=\"REFRESH\""), Qt::CaseInsensitive)) {
-+            extraHead.clear();
-+        }
-+
-         s = s.mid(endIndex + 7).trimmed();
-     }
- 
--- 
-2.19.2
-
diff --git a/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch b/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
deleted file mode 100644
index f80f8201effa..000000000000
--- a/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 32bbd45cdbbb8c60105ced80debab1eb6ed40226 Mon Sep 17 00:00:00 2001
-From: Allen Winter <winter@kde.org>
-Date: Thu, 29 Nov 2018 09:21:24 -0500
-Subject: templateparserextracthtmlinfo.cpp - deleteLater in dtor
-
-ack'd by Laurent
-BUG: 401337
-FIXED-IN: 18.12.0
----
- templateparser/src/templateparserextracthtmlinfo.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/templateparser/src/templateparserextracthtmlinfo.cpp b/templateparser/src/templateparserextracthtmlinfo.cpp
-index 72dddbd..c99eb0a 100644
---- a/templateparser/src/templateparserextracthtmlinfo.cpp
-+++ b/templateparser/src/templateparserextracthtmlinfo.cpp
-@@ -31,8 +31,8 @@ TemplateParserExtractHtmlInfo::TemplateParserExtractHtmlInfo(QObject *parent)
- 
- TemplateParserExtractHtmlInfo::~TemplateParserExtractHtmlInfo()
- {
--    delete mTemplateWebEngineView;
--    delete mExtractHtmlElementWebEngineView;
-+    mTemplateWebEngineView->deleteLater();
-+    mExtractHtmlElementWebEngineView->deleteLater();
- }
- 
- void TemplateParserExtractHtmlInfo::setHtmlForExtractingTextPlain(const QString &html)
--- 
-cgit v0.11.2
diff --git a/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild b/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild
index ef7a91078b58..52a01fdc8e1d 100644
--- a/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild
+++ b/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Libraries for messaging functions"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -34,7 +34,7 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
 	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep grantleetheme)
@@ -67,8 +67,3 @@ RDEPEND="${DEPEND}
 
 # bug 579630
 RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-newmail-crash.patch"
-	"${FILESDIR}/${PN}-18.08.3-CVE-2018-19516.patch"
-)
diff --git a/kde-apps/messagelib/messagelib-18.12.3.ebuild b/kde-apps/messagelib/messagelib-18.12.3.ebuild
index 3c07aeafc154..bb3dd7ee655b 100644
--- a/kde-apps/messagelib/messagelib-18.12.3.ebuild
+++ b/kde-apps/messagelib/messagelib-18.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Libraries for messaging functions"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="