gentoo resync : 02.08.2019

4 files changed, 2 insertions, 195 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index d7a04d18637a..00ab31142fef 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,6 +1,3 @@
-AUX kmail-19.04.2-crash-on-exit.patch 2253 BLAKE2B a5d650ca1a9830c4c03e11f5a96c1ee784657aaa03a365529db33d458c47e4e065c2bee5c354a22bab465bb9f3a3f7f63ed4a60b2c4e75a5c41694b12b4488e1 SHA512 fa29b08e2cca64b67db7f8982f12b6703e686f607720bcbb86e57be1cd09caac3f6698f28bc1af7a999704738802cc5e498e03639a061d89ed8ce29a005e2746
-DIST kmail-18.12.3.tar.xz 4724432 BLAKE2B 60b9eb05fd8847afd75e6bc780c6b2a44193216ae0a02fb46ec5dc8c7228c83cb043b2a4bd61126f228a6a0c1a1a005cb3a95856a3af62ccc012f00776146310 SHA512 579f44be2d6aef1759cdcc0fd1c596872ede5007122d9d537fd11c2f876c8f623bb398e17f407f203476ffce22fc665e878ab40518074abe4a6a96bd15c1a93a
 DIST kmail-19.04.3.tar.xz 4717936 BLAKE2B ef449545ddc5be0789089626ca962bca7beea4dc3186279cc86483c443fb8f36710f30bbeb0bfdbd1edeca2ea9d7b99296b7bcc34632da0abe7f96f9c0f7d03d SHA512 96cdf824f16f29ae00d461986990524b22b3774bcda679db5495ab9b127eaf7af2e0ad127cbcb8cedc5b24cf8cbf94d5324d09781583affb140436f67290b08f
-EBUILD kmail-18.12.3-r1.ebuild 3341 BLAKE2B 0da2f0d5bf0df80deebd7327fbca2a3c7cb2f308e0219246538beecd8ed8e56a90cc00f484d192fa245298486f8a3ef45778f66c309538897b4704acaac8fb9f SHA512 e3f6b79009d9ce02df7e574ea0fe8b764aa1e9d1175c135f0502ad9573c0a41e1d6a4491938730b488b3eb00b6b2d921d4ff74cd801de1dfc67d47f0c51f6f5d
-EBUILD kmail-19.04.3.ebuild 3284 BLAKE2B edc7acad6373741943966ae3e5c21ffb55c3338e4b5aa2ce563605670b1232383865f85cc48420ef378158a7dd7f2b443a6cc8a58c32d110e90a1536ca5ab8e9 SHA512 aab977cd486f7e59a824441de006dc90450955c97e1c6cbdb960c94bed9282517d938220ad3abad72b9375aa49b43d9fc1fd7b1363038b9a4b8d09978c001e33
+EBUILD kmail-19.04.3.ebuild 3281 BLAKE2B 68905ab87d1262bb566bfc9df783a23ff1a9817fa562a4ed241a7e20dfd5bbfe90c8cd0d5f3079108a35fd8e7fd8b2f9bd5878513bfdd5ff9cb4a2baea1b5be6 SHA512 4ae830b146b4e4926d2e904e820968c5b5ea7bcb7f2cd4390e9a6f17e74903642c5257ab2af385bb83f1b39d148dd1f98c3ed69d55bbd492fece33a9662b2ebf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch b/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch
deleted file mode 100644
index 5817694013a7..000000000000
--- a/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 97e165dcf5a851ee10526631d24f9af7736da2e6 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 6 Jun 2019 18:10:42 +0200
-Subject: Fix kontact crash on logout.
-
-Summary:
-KMail was creating new Akonadi jobs during mainwindow destruction,
-due to not testing the bool in GuiActivateEvent.
-
-Same bt in bug 404881, apparently quitting from the akregator tray icon
-[which quits all of kontact... separate issue...] gave the same crash.
-
-BUG: 404881
-FIXED-IN: 19.04.2
-
-Test Plan: Run kontact, logout. Hello Drkonqi.
-
-Reviewers: mlaurent, winterz
-
-Reviewed By: mlaurent, winterz
-
-Subscribers: kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D21626
----
- src/kmail_part.cpp | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/src/kmail_part.cpp b/src/kmail_part.cpp
-index 703a1ee..96c4c07 100644
---- a/src/kmail_part.cpp
-+++ b/src/kmail_part.cpp
-@@ -33,6 +33,7 @@
- 
- #include <QVBoxLayout>
- 
-+#include <KParts/GUIActivateEvent>
- #include <kparts/statusbarextension.h>
- #include <kparts/mainwindow.h>
- #include <kpluginfactory.h>
-@@ -129,18 +130,18 @@ bool KMailPart::openFile()
- void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
- {
-     KParts::ReadOnlyPart::guiActivateEvent(e);
--    mainWidget->initializeFilterActions();
--    mainWidget->tagActionManager()->createActions();
--    mainWidget->folderShortcutActionManager()->createActions();
--    mainWidget->populateMessageListStatusFilterCombo();
--    mainWidget->initializePluginActions();
--    /*
--    FIXME it doesn't work when we switch component.
--    const QString title = mainWidget->fullCollectionPath();
--    if (!title.isEmpty()) {
--        Q_EMIT setWindowCaption(title);
-+    if (e->activated()) {
-+        mainWidget->initializeFilterActions();
-+        mainWidget->tagActionManager()->createActions();
-+        mainWidget->folderShortcutActionManager()->createActions();
-+        mainWidget->populateMessageListStatusFilterCombo();
-+        mainWidget->initializePluginActions();
-+
-+        const QString title = mainWidget->fullCollectionPath();
-+        if (!title.isEmpty()) {
-+            Q_EMIT setWindowCaption(title);
-+        }
-     }
--    */
- }
- 
- void KMailPart::exit()
--- 
-cgit v1.1
diff --git a/kde-apps/kmail/kmail-18.12.3-r1.ebuild b/kde-apps/kmail/kmail-18.12.3-r1.ebuild
deleted file mode 100644
index 437ff33d8ed0..000000000000
--- a/kde-apps/kmail/kmail-18.12.3-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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://www.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' 18.12.3-r1) )
-"
-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 '' 18.12.3-r1)
-	$(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)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite' 18.12.3-r1) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-	!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
-}
diff --git a/kde-apps/kmail/kmail-19.04.3.ebuild b/kde-apps/kmail/kmail-19.04.3.ebuild
index b7cf3b96c179..0b70de2bd9b3 100644
--- a/kde-apps/kmail/kmail-19.04.3.ebuild
+++ b/kde-apps/kmail/kmail-19.04.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="