gentoo resync : 18.08.2019

4 files changed, 145 insertions, 1 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 00ab31142fef..105491b1a364 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,3 +1,6 @@
+AUX kmail-19.04.3-missing-header.patch 714 BLAKE2B fc0ab7dd44d7439c22001c1d72944624cdaa005faff4631e6bd673d15b896e9e87ca5b5bdbf2a1adbede7351112dc453e6c1b3a7d64bb6e7662ac4935daabfe4 SHA512 f1e56dc6ccace2e96527d74d848f53e99ada3a460cf0f73493acab6d10bf265fcc61dea3ec553a2214c0b54f03e19b35567249a222331aa12e8333849158d041
 DIST kmail-19.04.3.tar.xz 4717936 BLAKE2B ef449545ddc5be0789089626ca962bca7beea4dc3186279cc86483c443fb8f36710f30bbeb0bfdbd1edeca2ea9d7b99296b7bcc34632da0abe7f96f9c0f7d03d SHA512 96cdf824f16f29ae00d461986990524b22b3774bcda679db5495ab9b127eaf7af2e0ad127cbcb8cedc5b24cf8cbf94d5324d09781583affb140436f67290b08f
-EBUILD kmail-19.04.3.ebuild 3281 BLAKE2B 68905ab87d1262bb566bfc9df783a23ff1a9817fa562a4ed241a7e20dfd5bbfe90c8cd0d5f3079108a35fd8e7fd8b2f9bd5878513bfdd5ff9cb4a2baea1b5be6 SHA512 4ae830b146b4e4926d2e904e820968c5b5ea7bcb7f2cd4390e9a6f17e74903642c5257ab2af385bb83f1b39d148dd1f98c3ed69d55bbd492fece33a9662b2ebf
+DIST kmail-19.08.0.tar.xz 4732772 BLAKE2B 7a18dc1a2e727d3316539e4de999f31c4e9a44742a4c10a5f468e09d00594ea521de608cf07ca9719ca375f8e04deb8b1575a374a23f17d152c8c33617a86e8d SHA512 818a9bf1155bf4339100d8f8a90ec42dd8b51b8c91ee2aba939a30e6851ca69b96f6cf455b358a3767c4fabf75f1bbdf6d15fb7efc1831938ac08558c1ac6c82
+EBUILD kmail-19.04.3.ebuild 3334 BLAKE2B 612ac0a050bc7ef11c318ee57d6fb548647d26a29b98314e17647f0344ad2392c29d0361d60b00a738f34803a7d64e7a881458f8c3338b933029d4a00557b9a3 SHA512 72cef755587afd80e6d9d1002dd00e1fadd8a52f5a8d4bcf5a302db87647e2d5d55e385e15144108f4eff15608d6922cb2ae5bc2e9103d0c2c17274dda0eeb1f
+EBUILD kmail-19.08.0.ebuild 3285 BLAKE2B 5d2c837b815611b47c315b5453a870ed5d1d81a85153066d19baedcbf7b2bb3e67e5c2b58ce876a57431b927e0958bb8bb4d779977ce89a5791bd951f4d55c72 SHA512 53f045ba4de9ecfcf4a5f0a1729722b99607a346737524f7c8ad8692b01ca56d252387d0b4931492d7feaced9f14da88d03c0d796571fbd50a3bd386efa00c4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
new file mode 100644
index 000000000000..6c6cc3092132
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
@@ -0,0 +1,24 @@
+From 201eac97eba591e16f0108e2605b9977e2db9a03 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Thu, 18 Jul 2019 15:35:24 -0400
+Subject: summaryview_part.h - fix build by including QMap
+
+---
+ src/kontactplugin/summary/summaryview_part.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kontactplugin/summary/summaryview_part.h b/src/kontactplugin/summary/summaryview_part.h
+index 542335d..b116e23 100644
+--- a/src/kontactplugin/summary/summaryview_part.h
++++ b/src/kontactplugin/summary/summaryview_part.h
+@@ -25,7 +25,7 @@
+ #define SUMMARYVIEW_PART_H
+ 
+ #include <KParts/ReadOnlyPart>
+-#include <kparts/readonlypart.h>
++#include <QMap>
+ 
+ class DropWidget;
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/kmail/kmail-19.04.3.ebuild b/kde-apps/kmail/kmail-19.04.3.ebuild
index 0b70de2bd9b3..3fb1fb73c9aa 100644
--- a/kde-apps/kmail/kmail-19.04.3.ebuild
+++ b/kde-apps/kmail/kmail-19.04.3.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kmail-account-wizard)
 "
 
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
 RESTRICT+=" test" # bug 616878
 
 src_prepare() {
diff --git a/kde-apps/kmail/kmail-19.08.0.ebuild b/kde-apps/kmail/kmail-19.08.0.ebuild
new file mode 100644
index 000000000000..49369f848aed
--- /dev/null
+++ b/kde-apps/kmail/kmail-19.08.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://kde.org/applications/internet/kmail/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
+"
+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.11.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kldap)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
+"
+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
+
+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)"
+	}
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		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})"
+	fi
+}