gentoo resync : 16.02.1018

6 files changed, 39 insertions, 4 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 6208020d0aba..4a4c03e2d787 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 4ae562bf2aae..27cc8cc079cc 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-18.08.3.tar.xz 52419996 BLAKE2B 3b591f4feb4614dccc477bc22b67b4e00ba4a499f63d4cf74d38f98f23094018578793fe93f6e393003ad3bd9ac8ba934b665522e8fe75bf9e48ee92c8bcc238 SHA512 c719f78bbae194760ee41ef8926e88edf727089857949ba40dfb51f1e87f640c3553e1a32e5c04757b705641c354009ce0e0fed3ed31d01eea2005686df0d5b9
 DIST marble-18.12.2.tar.xz 52414944 BLAKE2B f3c091cbaaa4974c1a46caab4e870db133683ea95a0aa583ee19cc389644df9bea6b85c347b3f1c7523605d6e20a3be006d9dfd55bfb6368e16f680a5ba15be9 SHA512 74dba5cfc7c5b9995445817667148417fdd36994ddf105484e2d13f4a5dff7654f98d84680ff26c5057a60d0d9cbfbe7dbc3e7d3413e081fb67f3ced2783286c
 EBUILD marble-18.08.3.ebuild 2243 BLAKE2B 4ef171f5aa0fb4b1d28ab9fe80d2ad1763680501255569898e235ed777216e5f8e5240d7d09d24953622644e00edd85069bebb8a5a5844b514e9dc6b0c6c6760 SHA512 8944e1a251ed5f80c14c45a4bd11fa3c8d5c4b9003798222231ae9cd63509b9d7b8bd9f7d1063673fcda1c5a686be4c090f3507d8dac88ad4eb6fd098c6c8a16
-EBUILD marble-18.12.2.ebuild 2286 BLAKE2B 487b7a116c38b3ec46fad67fbe7ec62ba07889d0f7b0853663a28d10d059ab51df9747edb485f11808cb5baf7d0001a322a3ef02389d5cf16772276f5cbed6a1 SHA512 86ce2d822d56ef8984df40c8d79018bd3f8b31ab808efad7a5dc174190ebad6801a25046728296a7ed38b80deae46eab5e42117109ae27106e0d380ecdaf66fc
+EBUILD marble-18.12.2.ebuild 2322 BLAKE2B 2625ade0f25ce7f70d6c0a159bac2731e434c1b76447ca7dc1b656493674dc36b6de9dbe8b7ede271ba40fef03f25744d910c5da3351edcd6a69fea15d213ee5 SHA512 6d410e879f38b57f5c137a8af4bd91751efdab6f0b20c0108c53468fdf1c9fa22929affb21aa3e9babc1f4bef332ce39c0442911aaa25ef9d704a493d6406709
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-18.12.2.ebuild b/kde-apps/marble/marble-18.12.2.ebuild
index 42758843a965..2b79d10aad21 100644
--- a/kde-apps/marble/marble-18.12.2.ebuild
+++ b/kde-apps/marble/marble-18.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
+KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
 KDE_SUBSLOT="true"
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index f1d4376ed4cf..dd8169d4dc38 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,6 @@
+AUX umbrello-18.08.3-kf-5.54.patch 892 BLAKE2B f9c8601fb32b698e7e45ff51d67a0911a9b3cf3337ca86cb0362eb967df2093679bd73bc3674d442ad4a4d111e7604c13d91d314ee53408f4792c020be9eaa07 SHA512 912666ef5bcbc665482d0dbef4ec3e7f50aa0cd2ff87216a2ec3b6410f2ef0cfed4d4240784aad7d7e76ca026de17ef6fc366a85e96073a63e32c8850db18fa6
 DIST umbrello-18.08.3.tar.xz 3048228 BLAKE2B 0aeb03360ac8633a738f8066816376991bba83569b4c3d5ada61c481a7009866497da6315b6bbe474a180ce779c5421d90e415ac26ebea8ee32cae961250926e SHA512 2aaceb8e351e4a0a13834ce6ad1c8dd5575ea591e4c69ac080ad53798338200fa9768460ee63f7462941e372ddb9458afba8b602843c63c9cad2cee6f763d6b1
 DIST umbrello-18.12.2.tar.xz 3054440 BLAKE2B 36ac05cdf7bd2e7a35f2a7749a9e7d5827e9e6536f5a846a403a64248e47f55d59a169b3f5f390f2cb8f09d3bb5c2e400123eaa36b62cf614e582d68077e2a13 SHA512 b251425ef28e656d258ed6dec9fa737115c16d3fa0f663de734f2c27200c92f158cd2b22b2f2786c9bb721961feca014408d42c101f87fcaf9af8b06bfd7234b
-EBUILD umbrello-18.08.3.ebuild 1369 BLAKE2B e5dc34a20a9b3747064d73002d6f6d853cf2f6982f82133137f0284732dfa4a73bd48ea3ec8c0038ea330084db0d0491be7f326965d08ff2d53bfd41793704ba SHA512 34179cc8cb4f5cbab83459ee483df4bb0336a40c17fa7af914609b32da9dad92bc458a0fdb078ef6c5a658891976e73fcc2ad6d0c0ac4f296f27c8e8cf5a46e3
+EBUILD umbrello-18.08.3.ebuild 1415 BLAKE2B aa0bddca04db4dba15093bdee3dd98ca4b6ce974da869ca526d68b060f3665d336f2470735b7eab9c8c38f9d2aee1efc914b4f991ce8f62e146a2e307833932a SHA512 1a668d61d106a7cc152148ad6268353aa2ec1aefca2c5262f99ce7067007823305ee042b3dd527ceddfcefc9f5ed62297202b2dccfb2c0c13d611b16f6862f6e
 EBUILD umbrello-18.12.2.ebuild 1388 BLAKE2B 6613720cd30f0aba0fe99fe13230fa74746826ad3ee2234bf0c3601af928fd461a2e7e6a607dcce14054760d291d3459f3a13b7225bfa1ed7c3533c235b84ac9 SHA512 7cc6923810ee7ec9ec56755bd5e0f295b7df22e1dce70b2808b14fba42bf317b01073647bb0c5e356f0ef8df41988e607bfaf6e5478978dc50d0b57674ab0f43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch b/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch
new file mode 100644
index 000000000000..2cf4e6a72ee4
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch
@@ -0,0 +1,32 @@
+From 62a9e5e6afdd920779f1211afb0381857659e578 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Thu, 6 Dec 2018 13:36:34 +0100
+Subject: Fix KDE CI compile error with Qt 5.10 on linux
+
+The error was "specialization of template<class T>
+struct QMetaTypeId in different namespace [-fpermissive]"
+
+The Qt 5.10 related issue is fixed by using another approach
+to exclude KF5 class KAboutData.
+---
+ umbrello/main.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/umbrello/main.cpp b/umbrello/main.cpp
+index e3315fa..9d2acd8 100644
+--- a/umbrello/main.cpp
++++ b/umbrello/main.cpp
+@@ -19,9 +19,8 @@
+ 
+ // kde includes
+ #if QT_VERSION > 0x050000
+-namespace dummy {
+-#include <kaboutdata.h>
+-}
++// prevent including of <kaboutdata.h>
++#define KABOUTDATA_H
+ #include <k4aboutdata.h>
+ #define KAboutData K4AboutData
+ #include <KCrash>
+-- 
+cgit v1.1
diff --git a/kde-apps/umbrello/umbrello-18.08.3.ebuild b/kde-apps/umbrello/umbrello-18.08.3.ebuild
index c570c012f3e5..2afd90e22b90 100644
--- a/kde-apps/umbrello/umbrello-18.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-18.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,6 +48,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kde4-l10n-17.07.80
 "
 
+PATCHES=( "${FILESDIR}/${P}-kf-5.54.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_KF5=ON