gentoo resync : 24.03.2019

4 files changed, 87 insertions, 14 deletions

diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest
index 6fa2f9fd2e5f..a096a2a71a8f 100644
--- a/media-gfx/symboleditor/Manifest
+++ b/media-gfx/symboleditor/Manifest
@@ -1,3 +1,5 @@
+AUX symboleditor-2.0.0-cmake.patch 1248 BLAKE2B 09298608568c20dc29b8139abbd83544862fdcb84ac67ed6c1d3094b16fd864647d686b0685df0891ef74227038a61c40e42d0fa24ebe9e8faffa4729d39f2a8 SHA512 bfb9ae87492675cfcd19abfcf255aa720196129a8715b6315a9b6cd5cfa199b63be98a891d1c068c2feb789e6ec0bbc88a4f24cf23b766aec0953e39f6f7ecd0
+AUX symboleditor-2.0.0-doc-optional.patch 798 BLAKE2B d3ff8e71c6adc72f0cfb8914723eeaa7f4b80f07d5433638546536e018d4256b2d130e47b1963c5a11ca9338934c295019b7db8ea29475b9df2e4a7c01cce9e9 SHA512 2f84f7e772fe74dbc6733861d2f4a48adf95dab1ec33e4ef6e56c85123a190a17af1ed04ce554f95a5bd3ce80a402c6239c31ba20a8ac128c7362abc26a84281
 DIST SymbolEditor-2.0.0.tar.bz2 544789 BLAKE2B 2d0566d1e4b765e4cccec93def5fb184a27edbeb90bed8a76514e880e49a9c4139d4679f380c6c831c3f25a857af2df367d9ef96c56009189b2db9f964202e73 SHA512 8baee88fd8ff5f2b6334e80fe7c3fe8044ae521e5a8ffa2588f37dc4a8bf0495c902789bfaaed21a6eaf3c4f6380d18550aaed8046e84b396317104c8a49c993
-EBUILD symboleditor-2.0.0.ebuild 1030 BLAKE2B 4e2cecde14a23c4aae6dc4df71522b958eb9c56d52ebc39880f3b08e2cfb906ca067a2342a3f827cb9f07b3a173c89b315c69e4800433748173243fe360b52c5 SHA512 83f82650e0811e2669f00b03e3b0bfb6253543914225e8691fff6344296ba5f8bc692e816170f01c0c89ded7a30b7f0c4327e64a3eb961c8c6ee5bb3d02ceb31
+EBUILD symboleditor-2.0.0-r1.ebuild 1019 BLAKE2B a73fd66ba9ebdb1a95a5b69ed8e2da4ec67a4c8155785960b4bd70fd12f7ccec5b65e8e5289630183bdf346b2cfa8f8bbc5e665a240428b2a1c53efc596a4ea9 SHA512 a1c52dc93b696da3d8d94448d0af55cdedfa02f319d0a8f0e085df9266ff0667a0cce91111b0ecc009bed941f9df3f328a930669dc4a5f6a7ddef2b41fd1aea3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch b/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch
new file mode 100644
index 000000000000..ab0bd049bef3
--- /dev/null
+++ b/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch
@@ -0,0 +1,41 @@
+From 8739cd6f5fe0f2ed0cf9913170573c62ee246c63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Burkhard=20L=C3=BCck?= <lueck@hube-lueck.de>
+Date: Thu, 22 Sep 2016 21:17:07 +0200
+Subject: cleanup CMakeLists.txt
+
+remove qt5_wrap_ui wrong because the app uses xgettext and line 60 already has ki18n_wrap_ui
+remove add_definitions (-DTRANSLATION_DOMAIN=SymbolEditor), that is only for libraries
+and
+src/Main.cpp:84:    KLocalizedString::setApplicationDomain(SymbolEditor);
+is used to load the translation catalog
+REVIEW:128126
+---
+ CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d1016cb..d88174a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,10 +64,6 @@ add_subdirectory (doc)
+ 
+ kconfig_add_kcfg_files (SymbolEditor_SRCS SymbolEditor.kcfgc)
+ 
+-qt5_wrap_ui (SymbolEditor_SRCS
+-    ui/EditorConfigPage.ui
+-)
+-
+ ecm_install_icons (ICONS sc-apps-SymbolEditor.svgz DESTINATION ${ICON_INSTALL_DIR})
+ 
+ add_executable (SymbolEditor ${SymbolEditor_SRCS})
+@@ -89,8 +85,6 @@ add_definitions (
+     -DKDE_NO_COMPAT
+ )
+ 
+-add_definitions (-DTRANSLATION_DOMAIN="SymbolEditor")
+-
+ if (SILENCE_DEPRECATED)
+     add_definitions( -Wno-deprecated-declarations )
+ endif (SILENCE_DEPRECATED)
+-- 
+cgit v1.1
diff --git a/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch b/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch
new file mode 100644
index 000000000000..3434e90c6122
--- /dev/null
+++ b/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch
@@ -0,0 +1,28 @@
+From 2b809c68d40a3d0af2da668bad3f4d9ced86f56e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 10 Mar 2016 20:26:57 +0100
+Subject: KF5DocTools is optional, so add doc subdir conditionally
+
+REVIEW: 127336
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d88174a..da7458f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,7 +60,10 @@ file (GLOB SymbolEditor_UI ${CMAKE_CURRENT_SOURCE_DIR}/ui/*.ui)
+ ki18n_wrap_ui (SymbolEditor_SRCS ${SymbolEditor_UI})
+ 
+ add_subdirectory (icons)
+-add_subdirectory (doc)
++
++if (KF5DocTools_FOUND)
++    add_subdirectory (doc)
++endif (KF5DocTools_FOUND)
+ 
+ kconfig_add_kcfg_files (SymbolEditor_SRCS SymbolEditor.kcfgc)
+ 
+-- 
+cgit v1.1
diff --git a/media-gfx/symboleditor/symboleditor-2.0.0.ebuild b/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild
index 194321ebd65b..3661330a67f4 100644
--- a/media-gfx/symboleditor/symboleditor-2.0.0.ebuild
+++ b/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="optional"
 inherit kde5
 
-DESCRIPTION="Application to create libraries of QPainterPath objects with redering hints"
+DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints"
 HOMEPAGE="https://userbase.kde.org/SymbolEditor"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	MY_P=SymbolEditor-${PV}
@@ -18,7 +18,10 @@ LICENSE="GPL-2"
 KEYWORDS="amd64"
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -29,17 +32,16 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/symboleditor:4
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-doc-optional.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package handbook KF5DocTools)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 	)
 
 	kde5_src_configure