gentoo resync : 18.08.2019

5 files changed, 2 insertions, 123 deletions

diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest
index af41558d442d..5e908a8a2576 100644
--- a/media-gfx/symboleditor/Manifest
+++ b/media-gfx/symboleditor/Manifest
@@ -1,7 +1,3 @@
-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
 DIST symboleditor-2.1.0.tar.xz 495416 BLAKE2B 5f5d5a60806ebf0dacce5dcff538ac0f2c4966b2f2bda79450f66515d8572dd61a67db5e4d0f91b548a62c14e4e14aea283b710dc2a7c84770eb35dd22e20699 SHA512 dc83f3f80b12d8217a230d8c951e90bcc6246c4460d987efb140c54c1e88a8f5d607ac7ebfe706399cd0917e22a2089df6742afadd28305d39ceeff0c55da535
-EBUILD symboleditor-2.0.0-r1.ebuild 1019 BLAKE2B a73fd66ba9ebdb1a95a5b69ed8e2da4ec67a4c8155785960b4bd70fd12f7ccec5b65e8e5289630183bdf346b2cfa8f8bbc5e665a240428b2a1c53efc596a4ea9 SHA512 a1c52dc93b696da3d8d94448d0af55cdedfa02f319d0a8f0e085df9266ff0667a0cce91111b0ecc009bed941f9df3f328a930669dc4a5f6a7ddef2b41fd1aea3
-EBUILD symboleditor-2.1.0.ebuild 880 BLAKE2B 4c250c242e781518b2e07e5e2fa9042a5431b04f025aaf32b0ea0428bf15fe56c4d68e4001e14736961c0faa05b9ad03be4500fbaa3ebf27ace2d005835e7b69 SHA512 3032c4f85a268bb19fe8a6ed458140e6ed1b5c90139d2ff04ccb639a87190ed9f057aefcc4be1a0de95b740b819635e90daebe148d46f184b7321bc02242aed2
+EBUILD symboleditor-2.1.0.ebuild 883 BLAKE2B 70944d0701dd56a8981b0e51aa120bbb6dbfb5bca1407b88960377f9745dd14e03229f623514e17e593cc7dd7c9271cd679da19979e1a7f91a50f9d1a7b7be60 SHA512 f687f83d98c0f3ca554b616439861a1d2c334cd9a3d38c103b65e94964e41d091665e48e4cf15a7e6b337644152b6bb5a050c070969fc4a31a5cd7073e09539c
 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
deleted file mode 100644
index ab0bd049bef3..000000000000
--- a/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 3434e90c6122..000000000000
--- a/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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-r1.ebuild b/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild
deleted file mode 100644
index 3661330a67f4..000000000000
--- a/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-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}
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${MY_P}.tar.bz2"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-doc-optional.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
index 51277528791d..30fbc9684832 100644
--- a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
+++ b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Application to create libraries of QPainterPath objects with render
 HOMEPAGE="https://userbase.kde.org/SymbolEditor"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"