gentoo resync : 05.04.2019

5 files changed, 19 insertions, 52 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index d3563e3df940..abf7a36f8300 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,6 +1,4 @@
-AUX kdepim-runtime-18.08.3-gmail-resource-crash.patch 766 BLAKE2B 10d5a43d3c4a9322e8e7c864193880de226c70a1ebe25376ee133662cae0e8846d56d982c3b8255be55976cf03e1ee4c7323d99a47d189f4abb3c510227c1724 SHA512 4de43ca3b38a042b1f519616563cddefa522929f0e7ff9898d7cc5da3616bdf9aecbc981f50f7dffe47058580c7bb248ec864a27eb36ca88873005cb979c57fe
-DIST kdepim-runtime-18.08.3.tar.xz 1752272 BLAKE2B b3bdac2cdd6a741d1af60881b7e923485272edd8a0edb6c1dcc51cf961e0c25e005946467d7fa467d4ee266fd08bf2e7de5878a990ef88c19a614f9c4cc28a7f SHA512 b2520e1eab7f722eeaf8c34a554db86aa5ee7bbfdf11e31c471f06c67c50426327fae1319f747ae240d8919ee12259c34ecdee0ce0a83cbee5df5c3b481b76ec
 DIST kdepim-runtime-18.12.3.tar.xz 1773576 BLAKE2B a8ed822a507380fbfcb48a60765370f108d9468ca0be406b29b4c0b0a2e3424cf58928c6913d517e2c05f8f8d85b7b47dcabf4e520d77c38a9c83f0c51e141dc SHA512 cf65ac59519fc37f4b52025a07271fb655b746446a97299675a289a96bcb9fd94080c224bd231c40c45fe81fd5dcc1cf8a0ed60ddce1bb4750c598715bd27279
-EBUILD kdepim-runtime-18.08.3-r1.ebuild 2309 BLAKE2B 125c80cb8273e6d651c5872aeb0b1be57e3687802c93858d9511def314109f9823163d43dc9ac11ba29260dc931a79ae418e7f2c1d63efcd5a68c3ca1d098145 SHA512 bc78143b32b741f3f1e8bdd35d7e6293434e4e53ecf19d2af6df5c5b5f76079d6989e1e58a93138132e29e0a1fcc016599ce533e9ae32c259c8b6fd1b1a13431
-EBUILD kdepim-runtime-18.12.3.ebuild 2190 BLAKE2B 501c40600ad7e3c498640b00c0779844ef59fe81875aee3f644b4517bce6fc65a50e574ce02af0698ec616de70fd525bb73a4b753ffdd7ac59e9ba0a85860733 SHA512 69e523c9c88fd62f8ab71a18c907f3aa78d93360f395a53c19d7cf3ff8baf1142a42690dc48aba58955051612b4b0f553fa8a6ce83deb2edcebc28b0b837acd2
-MISC metadata.xml 431 BLAKE2B 55fb350365eb22d45202e33da2e0fc7e7f713e363760376a7fce354422d1b3723baf558cdf3301aac10f71e9df2541404995574e982493132a1298eda0b9c13f SHA512 1cdd40774926be019a6d332c2acb9ba00ba07fa794d42125ed0993c324058742287fd1961db5d59ea061a3653b79af5dfe7ae0774a036e53006b044cbc7df3c6
+EBUILD kdepim-runtime-18.12.3-r1.ebuild 2211 BLAKE2B 8f7677901029b4ddb7aad4762d50099588aa20a0137c64970ef6ac4a34ecaa379df0f8fe4e1be227e3ede65f30d15b46a685d34408cc2d6f34de504edd3e799f SHA512 5eb232a8dbb67438dd0532b34411da0e0894ac753139c31038511fe04598d4ecc5f0bbbf526cf838fbd5a7535a38a9fea2ddf1cb75e999ef11745ce572575d9e
+EBUILD kdepim-runtime-18.12.3.ebuild 2195 BLAKE2B f2383b7578c23bad0e19a4aaee7b25c929290b683576e795024d21a89ebaa425e472e2a2b2b820614ac9aeddf0808dc8117fc48d5849c526610e7d6a5fa24108 SHA512 217f07c155462f91aeb6a406600712ee558d461442f73247d95a25a9b901d2375c3a933d246ec73d08ffdd6b8c285c4d6e16004ca944d3fe03de84ca5307cd9a
+MISC metadata.xml 372 BLAKE2B 8382dc1d98fd3c3469050db63809759b933bf746b9e2dc6cb44c0da79514f691e6d22b3e6eb187e7a8f0863637cb902b6e709b84ff8df376e2e54d8279757189 SHA512 7f174eef1d2f2cf9231b625c711b44278e354ce5025a143158eb62628c5b28abddc5c7537eeed2498b92f0c573b0adfcb24dc6838787a41a57436fff79a5dc3e
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch
deleted file mode 100644
index 37b67fd180f5..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a4316a290e243fd71a565a9b936012d27f116029 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Sun, 28 Oct 2018 20:38:49 +0100
-Subject: Fix crash in failing GMail resource
-
-BUG: 400400
----
- resources/imap/gmailpasswordrequester.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/resources/imap/gmailpasswordrequester.h b/resources/imap/gmailpasswordrequester.h
-index b5b8aa8..6f013c9 100644
---- a/resources/imap/gmailpasswordrequester.h
-+++ b/resources/imap/gmailpasswordrequester.h
-@@ -45,7 +45,7 @@ private Q_SLOTS:
- 
- private:
-     ImapResourceBase *mResource = nullptr;
--    KGAPI2::AccountPromise *mPendingPromise = nullptr;
-+    QPointer<KGAPI2::AccountPromise> mPendingPromise;
- };
- 
- #endif
--- 
-cgit v0.11.2
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3-r1.ebuild
index 26e7b043d577..30f15b29e772 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3-r1.ebuild
@@ -1,7 +1,7 @@
-# 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_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
@@ -10,17 +10,21 @@ inherit kde5
 
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE="speech"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+oauth"
 
 # TODO kolab
-CDEPEND="
+BDEPEND="
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
 	$(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 kholidays)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
@@ -34,7 +38,7 @@ CDEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
 	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
@@ -54,37 +58,28 @@ CDEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtspeech)
 	$(add_qt_dep qtwebengine 'widgets')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-libs/cyrus-sasl:2
 	dev-libs/libical:=
-	speech? ( $(add_qt_dep qtspeech) )
+	oauth? ( $(add_qt_dep qtnetworkauth) )
 "
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtxmlpatterns)
-	dev-libs/libxslt
 	test? ( $(add_kdeapps_dep kimap 'test') )
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 	!kde-misc/akonadi-ews
-	$(add_frameworks_dep oxygen-icons)
 "
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${P}-gmail-resource-crash.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	# We don't build kolab, so we can disable this
-	punt_bogus_dep KF5 KDELibs4Support
-}
-
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package oauth Qt5NetworkAuth)
 	)
 
 	kde5_src_configure
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3.ebuild
index ee891f62e8a4..fed996f72fce 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+oauth"
 
 # TODO kolab
diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
index 3959ad670767..bf1135a3070a 100644
--- a/kde-apps/kdepim-runtime/metadata.xml
+++ b/kde-apps/kdepim-runtime/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="oauth">Enable support OAuth authentication for EWS via <pkg>dev-qt/qtnetworkauth</pkg></flag>
-		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
 </pkgmetadata>