gentoo resync : 15.12.2019

6 files changed, 94 insertions, 178 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 4512b6f2780c..48d9e9ff94de 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,7 +1,5 @@
-AUX kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch 2069 BLAKE2B fa9acfe1cac9ae5985c7c2142e4ebf85a04af7ca0bf71ac2aaa5ff78dc308cdd46acfc4fc114adc8a78a32a3124881301c25edc1f7da137a054390fcf3ad574c SHA512 4d99c1927265e49a9b18d20ad7bf29847a0e062a6a832c41b44315a1d5cff60125e3baf9486f9ddaf9e4fbd773aab2e39635af66c78ec2b4b827f22030177d2f
-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
 DIST kdepim-runtime-19.08.3.tar.xz 1733348 BLAKE2B 4c78c0e4e3fddbb9694fb877390a6f781e822b4152216946c86da01a29fd55ed06bddae5e159d1e0150ed5dff92a2061237c38616b087ebdbace3a7bad4c6433 SHA512 acdaca2111e2e9542a6c13dca6f43dda5a82f9c6a3905a2f3002c93abb6481e405b6f318c7a3424c2d8aa214b579894a31a3fe86703c479bdd38539f27579098
-EBUILD kdepim-runtime-19.04.3.ebuild 2375 BLAKE2B f969c73e048eb3f2a7d067a7e760bd4b02db3990962ddba8d3690648dceccc9d7e8850fca243fb11d764eac48197779f0b0b8182cc8bff2929bed49c45c34351 SHA512 6ff7d679669e61e8af338b2cfc308384392d596d531cd1803f2b12960cce749aa5b7a13f7a9fb1d7e88df82416a597c9976507de4564d7c8f9e9e0a93157505f
-EBUILD kdepim-runtime-19.08.3.ebuild 2555 BLAKE2B bdd3bc769d4aabb1c5162bbf9b77eea0a6e326219753c6ec79716b59db528d7955802a87b586b51ff7d4623d438b1d0838dfc173738345cd961fa7f1ef62197c SHA512 022e851ef2d6146899c2f361e065c92fdbee558b5ebd66e08d5e09c1e87ddcdddd06aaced2ebbca97eb2853688681d95b0cce2b02cf42d23ca968368fbfdd248
+DIST kdepim-runtime-19.12.0.tar.xz 1731636 BLAKE2B d34180014941107cd05b061fa4f7a2397a158b94f85c3eaba2aa7bd935aeb03b051831f34f07a4fc5824c5cb31854633acd6a8d5d56acc09d2f41ba82240df25 SHA512 c437285bff1a12fc62f722954d7df927282c463d90069bd08fd7dfe2cd566bce3d333fd6498ff0c2964f1c6a9809f9e0ca457ba3c8bbd6021bb84b3676f58b18
+EBUILD kdepim-runtime-19.08.3.ebuild 2552 BLAKE2B 1a5069076bd9d59b20ec8474ae7264d845aadbc89dc1522dcdee32f9e8016689f09878bc087f9543aabf2f445fab6e04c1a53ff46e8ce2464fda597bc09a43ee SHA512 2bbebfb99fee7f57ed961e799589747c5b83c6126271da3b4167f1688da520396826f02257767bd3a8f29db4ca05e0faffd5dbace5e59ec617feca082852afe3
+EBUILD kdepim-runtime-19.12.0.ebuild 2494 BLAKE2B 949e4569c48e4b3de02493986d5839a3554d1af1c3b496d087f0c5fac7322643d6b2237588b0a731842b711f379afd50b3441d0c75e59844366bce5406597ab4 SHA512 6e76756b9f5743fa150eb5f3d148dcf13e45a217950cac027c6a3f73ebb96f2aaf319f1323863ed64c839f825dc14a83bd4b8c013cc23611bda217ba72bbe00a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch
deleted file mode 100644
index cfee20094953..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8ec4db907c403b24685a961b48be5f8a288d9bd9 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Wed, 2 Oct 2019 11:26:29 +0200
-Subject: Fix the dependencies on generated files differently.
-
-Some Gentoo users were still having build issues with the mbox resource.
-
-BUG: 410474
-FIXED-IN: 19.08.1
----
- resources/mbox/CMakeLists.txt | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/resources/mbox/CMakeLists.txt b/resources/mbox/CMakeLists.txt
-index c52230f..ca8bc1e 100644
---- a/resources/mbox/CMakeLists.txt
-+++ b/resources/mbox/CMakeLists.txt
-@@ -14,10 +14,18 @@ set( mboxresource_SRCS
-   ${mboxresource_common_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)
-+# mboxresource.cpp needs UI files generated for another target. We must be sure the files
-+# were created before building the akonadi_mbox_resource target.
-+add_custom_target(generated_headers
-+  DEPENDS
-+  ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h
-+  ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h
-+)
-+set_source_files_properties(
-+  ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h
-+  ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h
-+  PROPERTIES GENERATED TRUE
-+)
- 
- ecm_qt_declare_logging_category(mboxresource_SRCS HEADER mboxresource_debug.h IDENTIFIER MBOXRESOURCE_LOG CATEGORY_NAME org.kde.pim.mboxresource)
- 
-@@ -29,6 +37,7 @@ qt5_add_dbus_adaptor(mboxresource_SRCS
- )
- 
- add_executable(akonadi_mbox_resource ${mboxresource_SRCS})
-+add_dependencies(akonadi_mbox_resource generated_headers)
- 
- if( APPLE )
-   set_target_properties(akonadi_mbox_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
--- 
-cgit v1.1
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
deleted file mode 100644
index 850c65862be3..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 418ba9202700..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
+++ /dev/null
@@ -1,95 +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="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
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch"
-	"${FILESDIR}/${P}-ui_compactpage-race-condition.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	# We don't build kolab, so we can disable this
-	punt_bogus_dep KF5 KDELibs4Support
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild
index 361533872488..0bc9250432fb 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # TODO kolab
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.0.ebuild
new file mode 100644
index 000000000000..fd31f77b9fae
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# TODO kolab
+BDEPEND="
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/kalarmcal-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kdav-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmbox-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkgapi-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${QTMIN}:5
+	>=dev-qt/qtspeech-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-misc/akonadi-ews
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+	)
+	ecm_src_configure
+}