gentoo resync : 18.08.2019

4 files changed, 117 insertions, 1 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index c363d9c5448a..6dabfa4a7607 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,3 +1,6 @@
+AUX kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch 1166 BLAKE2B 9934885d03138569c68d133cec4cffd79e8612e4f7c3054be1a1e767bf82deab71c9b9a1a7928966b69f46ab14b7eb303ec337d12d273e37bc40d300efeefb03 SHA512 16ae60212b2aedd6108f249d18d08d6f7acda1d26594cb3660b98dff1707b9434b5326f613f4d241bc936a57b906ed480419fd2d2ee6d73929fb6765e9a89ffd
 DIST kdepim-runtime-19.04.3.tar.xz 1762728 BLAKE2B 29e0226af7044ad595ed7ea547e73efaf234abcf4b643d6b0fa38ae5148c27ba603115d28d6f0eb15b196ce8a8054697e61d3dd89783bbd24d79f1cd197bc060 SHA512 4680954fdec3a3c37dc4947019188ff8978ecf6bf6722e89c2613887104ef7e41c6184c5c061a60664785152c1d590889cb35332740cfc5da56c901aa164ba41
-EBUILD kdepim-runtime-19.04.3.ebuild 2249 BLAKE2B f4b91306d46481950ffc5242323a2b8c7f884086f123bcbef88fb57474b0a7aa4db56dfaa0924283b16638871158bd1cce5434d362496bfb9e980f44ac2da430 SHA512 f1e14eecef1f259ab5ab4e716f97030997070e137f833f7c49f89f4c002e67b1d98e2d4f7f20582ac49e80c8889e15cebc18b04a3c48bbe7778cbecdb48d1f36
+DIST kdepim-runtime-19.08.0.tar.xz 1730452 BLAKE2B aa678efbcc1f979a9f164366bdda5646057d15cfc4c79691f21c7b116a2081d28d8cd1cc31d8c656a26ca542e3bef9c95183f343be60ee1a7d39e37ada69826f SHA512 372e2b848a81587d07ba5c8ef5d4f7dde8c090248e7d768190aef0e04888267c0cc9dced2cdd8da44246a7b16936d00ebf567167a802ce8dcb8bcc4fa4de35c8
+EBUILD kdepim-runtime-19.04.3.ebuild 2318 BLAKE2B 2f87170fa860eca6ca888b77d80690e3af6fd3731e98651a3aada8c4fd5098af6666289211289d70868addefbdeb146a266bd1d74316bba5b8457de6e47f2f31 SHA512 48c5a2bbc7ee1c0f96314ab7f6f8f639a4f53c7b993b591296e7e8928deb795776af097a5f5106022cd0513a7a9a50deaec27706062374cab6efb8e67d017f7e
+EBUILD kdepim-runtime-19.08.0.ebuild 2131 BLAKE2B 2f1789ea56aa34ad0c120b9f51129272895c58907c7f1d1f99ba45c7729bcf4ec52b9115a2ff5f2b2e762ede5d2112bc134a961702d06f0e518e0957308129ea SHA512 e06a471e8974b51382b7a30a1e726e570bd23e25e05cc19696dced9d85045b52976d25da930a3ddc8802e5e287b20116a5c6c6225b0f66faef93f1e6776144cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
new file mode 100644
index 000000000000..850c65862be3
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
@@ -0,0 +1,27 @@
+From 4585292dd34f894505f8fc19e2bf51263768d688 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Fri, 9 Aug 2019 12:54:01 +0200
+Subject: Fix another race condition found while packaging the 19.08.0 release
+
+BUG: 410474
+FIXED-IN: 19.08.0
+
+CCMAIL: cfeck@kde.org
+---
+ resources/mbox/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/resources/mbox/CMakeLists.txt b/resources/mbox/CMakeLists.txt
+index c6fa693..c52230f 100644
+--- a/resources/mbox/CMakeLists.txt
++++ b/resources/mbox/CMakeLists.txt
+@@ -17,6 +17,7 @@ set( mboxresource_SRCS
+ # Fix a race condition. mboxresource.cpp needs compactpage.h which includes ui_compactpage.h.
+ # Make sure the ui file is generated before building the akonadi_mbox_resource target.
+ set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h)
++set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h)
+ 
+ ecm_qt_declare_logging_category(mboxresource_SRCS HEADER mboxresource_debug.h IDENTIFIER MBOXRESOURCE_LOG CATEGORY_NAME org.kde.pim.mboxresource)
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
index 5b9598cec0a8..a187fe09102e 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-misc/akonadi-ews
 "
 
+PATCHES=( "${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch" )
+
 RESTRICT+=" test"
 
 src_prepare() {
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.0.ebuild
new file mode 100644
index 000000000000..c312abe1ea9f
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.0.ebuild
@@ -0,0 +1,84 @@
+# 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="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# TODO kolab
+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 kholidays)
+	$(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_kdeapps_dep libkgapi)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtnetworkauth)
+	$(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:=
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_kdeapps_dep kimap 'test') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-misc/akonadi-ews
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+	)
+	kde5_src_configure
+}