3 files changed, 0 insertions, 135 deletions
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 63fb65726b6a..72581dbf6571 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,3 +1,2 @@
-DIST kdepim-runtime-17.04.0.tar.xz 1492136 SHA256 b46d3db769de31b758c49a881b8e0b1869ada82f39ac282c28280980b1a59201 SHA512 43a0e4973ba15a26b7e7f77ecda3883479650a759b8754d05ce237375d2f10b9b57b5512e54b1a5bf7ef131adb5cfee1a7d9ec8285668e7bcf42c1bab53a647f WHIRLPOOL cd96098787624b50ae177dbbccdb9842697cf882ffbce020528012372d06c63f95637d6168cfd6bda5c7bf4d5795e8988c9f7467e36a3ecadd8fd73c939e18ee
 DIST kdepim-runtime-17.04.1.tar.xz 1491996 SHA256 421c040d0228c3ac280a4ceb97daf52a2fd06c4c7c9527cb94960940d3f9921f SHA512 d7176ad1a3eb3b91cb160434fdbf7b47dcba69567dccd83bc6902d103d720f431067e0e99f398169f8cee58a52e8440ef7edd526fdbdad968b7bb111ad13c47a WHIRLPOOL 78d2c5334d9cc33b10f1dcf7905bf39fa4975d02606392b810c4dae65abb7152b399bf6018cd2813d33c917680c6c67ac9b7ea0b4ae95a4ef8fe8817b4c89c89
 DIST kdepim-runtime-4.14.11_pre20160211.tar.gz 1655057 SHA256 00d0c78d84850b1619c22550fd938c0e016d1765a04623bac25dafffc6105b49 SHA512 6aeb3b35dc84a1cacc18619af5f7ab65175a31fbfb9a1d11d30dc98c6dcd3f40ebd18a90d2d02421b6a38fdc4b4d77f9fa6853c523a60910e92367f25932c45e WHIRLPOOL c14c3f9b85b7b157a9f274f4c74c687ae0e85e8b3ea6aa0756c640ff8f5dbcb3311366e3ff6c490a29ed7697a7a51c75ca6de6cef8b3ebf28f7da640e7eb149e
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.0-gmail-migration.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.0-gmail-migration.patch
deleted file mode 100644
index 5ea301ccec86..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.0-gmail-migration.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c9ae16363e68d6958db0cd835cb0180b340594b5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Sat, 22 Apr 2017 13:31:42 +0200
-Subject: [IMAP] Fix migration to new Gmail authentication
-
-Currently the settings would be migrated only if user opened the
-Settings dialog. The GmailPasswordRequester expects that the server
-settings is migrated correctly and always tries to authenticate via
-XOAUTH2, even if the configuration says "PLAIN" or other mechanism.
-This breaks login as we try to send XOAUTH2 tokens as PLAIN credentials.
-
-This change ensures that the encryption and auth mechanism settings
-is correctly migrated on resource startup.
-
-CCBUG: 378857
-CCBUG: 378876
----
- resources/imap/settings.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/resources/imap/settings.cpp b/resources/imap/settings.cpp
-index 53296b8..6a599ea 100644
---- a/resources/imap/settings.cpp
-+++ b/resources/imap/settings.cpp
-@@ -23,6 +23,7 @@
- 
- #include "imapaccount.h"
- #include "utils.h"
-+#include "config.h"
- 
- #include <kwallet.h>
- using KWallet::Wallet;
-@@ -78,6 +79,17 @@ Settings::Settings(WId winId) : SettingsBase(), m_winId(winId)
- {
-     load();
- 
-+#ifdef WITH_GMAIL_XOAUTH2
-+    // Make sure that Gmail configuration is correctly migrated even if the user
-+    // did not open the configuration dialog
-+    if (Utils::isGmail(imapServer())) {
-+        setImapPort(993);
-+        setSafety(QStringLiteral("SSL"));
-+        setAuthentication(MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
-+        save();
-+    }
-+#endif
-+
-     new SettingsAdaptor(this);
-     QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"), this, QDBusConnection::ExportAdaptors | QDBusConnection::ExportScriptableContents);
- }
--- 
-cgit v0.11.2
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild
deleted file mode 100644
index e15f7f928e95..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Runtime plugin collection to extend the functionality of KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="google"
-
-# TODO kolab, Qt5TextToSpeech
-CDEPEND="
-	$(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 kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdav)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	google? ( $(add_kdeapps_dep libkgapi) )
-"
-DEPEND="${CDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/libxslt
-"
-RDEPEND="${CDEPEND}
-	!kde-apps/kdepim-kioslaves
-	!kde-apps/kdepim-l10n
-	$(add_frameworks_dep oxygen-icons)
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-gmail-migration.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package google KPimGAPI)
-	)
-
-	kde5_src_configure
-}