gentoo resync : 13.10.2019

4 files changed, 60 insertions, 6 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 81131dda4938..e7c7f404a60c 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,6 +1,7 @@
+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.1.tar.xz 1732760 BLAKE2B 5a015f6efb2bc3b58be40705d8d000e62071979c5acbc1e729aa8b79334b2e37f6f7def4180e5886f75f1b7bbba3dc56b09a7be316dea0b6907640acd85fd208 SHA512 49af06f758c9abd5022ce6b5b5c7d2c811bca71e04185475a9caaba83583ff16aadecbd355cc017890c2cb356e31f711a789103cf062000e4145a8627a6285c7
-EBUILD kdepim-runtime-19.04.3.ebuild 2318 BLAKE2B 2f87170fa860eca6ca888b77d80690e3af6fd3731e98651a3aada8c4fd5098af6666289211289d70868addefbdeb146a266bd1d74316bba5b8457de6e47f2f31 SHA512 48c5a2bbc7ee1c0f96314ab7f6f8f639a4f53c7b993b591296e7e8928deb795776af097a5f5106022cd0513a7a9a50deaec27706062374cab6efb8e67d017f7e
-EBUILD kdepim-runtime-19.08.1.ebuild 2257 BLAKE2B 7864a1d461daaef7916141e64fe499bae3fddec5c3c29987ddd20d026b801a2679637724009e2f8e470ca0f11e2b72dc6265223c6cd55dc91297879846804367 SHA512 272c25209abdf6175e272ddfb340f5fd969918e1830edc75cd4c405d12ef94e97f8ea3892ebffeb90335302aeba1613b017b3268c55a39f6fea13c84e302feb4
+DIST kdepim-runtime-19.08.2.tar.xz 1731932 BLAKE2B 34b17d3f991c0f6c1f5f3fa6e217350cc09232abd52ec902579d5706320ab6fa7267d3a9a4dd78e6c789b51084eb1cf336f5b9befeb1f80dbb7583444ec12e37 SHA512 02dd5a5db0df0491afd2521eccde6a5e6bb0e4cb4f8d620e2a9336029b1463a35b210084cc8874506f144049ec7d83e84dff255c44a399b543321058457611c9
+EBUILD kdepim-runtime-19.04.3.ebuild 2375 BLAKE2B f969c73e048eb3f2a7d067a7e760bd4b02db3990962ddba8d3690648dceccc9d7e8850fca243fb11d764eac48197779f0b0b8182cc8bff2929bed49c45c34351 SHA512 6ff7d679669e61e8af338b2cfc308384392d596d531cd1803f2b12960cce749aa5b7a13f7a9fb1d7e88df82416a597c9976507de4564d7c8f9e9e0a93157505f
+EBUILD kdepim-runtime-19.08.2.ebuild 2268 BLAKE2B 8d12886ba20f4630561fda34521ba43dd88706dc38006b6c1403d8b29dd0d33f9f371f4290609b1007f82e4b497293c2442544c0e9ff4c44c73393f8a2c61062 SHA512 22fa1de37e776f2693f3d5dc9c780f925464bb3a10de150857ad45e29301ad937a63b0e52836130eda76a2e77dd8820b2b803eb69c2c267533e59cfff5cbf1ca
 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
new file mode 100644
index 000000000000..cfee20094953
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch
@@ -0,0 +1,50 @@
+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/kdepim-runtime-19.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
index a187fe09102e..418ba9202700 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
@@ -74,7 +74,10 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-misc/akonadi-ews
 "
 
-PATCHES=( "${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch"
+	"${FILESDIR}/${P}-ui_compactpage-race-condition.patch"
+)
 
 RESTRICT+=" test"
 
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.2.ebuild
index 1afb7ce36c0e..b73b75384bdb 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.2.ebuild
@@ -18,10 +18,12 @@ BDEPEND="
 	dev-libs/libxslt
 "
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kholidays)
@@ -43,9 +45,7 @@ COMMON_DEPEND="
 	$(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)