Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

4 files changed, 98 insertions, 2 deletions

diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 7faf736c6327..83c5daaabbb5 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,3 +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.3.tar.xz 3055608 BLAKE2B 0ddec66157bf4ec0de91f81063fe9cfd7d24fa8c05f7d9704108a9cdb4455e119f84b7e30785f2a1749612c53ef148791b9a6a68002c3d460fd83055a393ae64 SHA512 b7ba29b05e5997d9e7ef07c261198bc47910e75668bd619e1f14bb850d5e09fd07948e7d56e2604287384e1c331a882f40b4540c116e9a7b2cfa2078f57b4a90
-EBUILD umbrello-18.12.3.ebuild 1393 BLAKE2B 915ba75e4cbe6c5d6e05b57fdfed277f406ffeb89313e5b7cd8154160e8aafedf8a9b349437971b5a2887cfcacdde66a1e5fa4e061da5df598b4f30bfef9be37 SHA512 764da3e1179a6bc512ac411d913d3cedb47daef7cae0b6026e1ceb1d6a700cfe6de12ce2e06f78ce5cf979b545f13e710098fc463c127f85a978a713d118b6ca
+EBUILD umbrello-18.08.3.ebuild 1415 BLAKE2B aa0bddca04db4dba15093bdee3dd98ca4b6ce974da869ca526d68b060f3665d336f2470735b7eab9c8c38f9d2aee1efc914b4f991ce8f62e146a2e307833932a SHA512 1a668d61d106a7cc152148ad6268353aa2ec1aefca2c5262f99ce7067007823305ee042b3dd527ceddfcefc9f5ed62297202b2dccfb2c0c13d611b16f6862f6e
+EBUILD umbrello-18.12.3.ebuild 1395 BLAKE2B a3d73eb150ba4424ea2cb3c2a26f18f2dc68fcb0efcd47bf73d0ddb770e850968994d0fabde236c59761df6effd3ca4e9c885a8334a8a1b2b05beaebc5b5709d SHA512 c0706ac04baee613a3cd782442632af6bbbd413451588f956d2aee5ff8579f276add5ec4febdde80dbf869f548b2a7f9ab8d5b8e8007bd1a12897cd8cdade60d
 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
new file mode 100644
index 000000000000..2afd90e22b90
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-18.08.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="
+	https://www.kde.org/applications/development/umbrello
+	https://umbrello.kde.org
+"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdelibs4support)
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+PATCHES=( "${FILESDIR}/${P}-kf-5.54.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KF5=ON
+		-DBUILD_unittests=$(usex test)
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
+
+	kde5_src_configure
+}
diff --git a/kde-apps/umbrello/umbrello-18.12.3.ebuild b/kde-apps/umbrello/umbrello-18.12.3.ebuild
index c30d7b813152..eb4d103425c8 100644
--- a/kde-apps/umbrello/umbrello-18.12.3.ebuild
+++ b/kde-apps/umbrello/umbrello-18.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/development/umbrello
 	https://umbrello.kde.org
 "
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="