gentoo resync : 28.04.2019

4 files changed, 37 insertions, 57 deletions

diff --git a/dev-util/kdstatemachineeditor/Manifest b/dev-util/kdstatemachineeditor/Manifest
index 67ad1ed115d4..41c3d59c3a0c 100644
--- a/dev-util/kdstatemachineeditor/Manifest
+++ b/dev-util/kdstatemachineeditor/Manifest
@@ -1,5 +1,4 @@
-AUX kdstatemachineeditor-1.2.3-qt-5.11.patch 590 BLAKE2B 144a8c7624e18cd606d14cbc624cb492a162f9adb74b8ba209718f30e5c16004c7540c881462a988705451f5e1588af0c80c070ea195b775254300df5182d8ac SHA512 3edec760b30ef84f77f0494b11b0b9156790d7468e2b108aea19244a4879b4a6aaf78f23135fe1b39cd8ac0b8ee24b5cbab4567a63a5105155c938c39832ae9c
-DIST kdstatemachineeditor-1.2.3.tar.gz 222134 BLAKE2B 3a6360331f314cfe2e57abb2e909a886f4613dc86bf7f542feabf218e2f623366679a339b5ebc941e015fca35c617152ad9ca7e3cb492d01b48f791a39d38ec1 SHA512 1a2cbe980da5e1634abc842834fbb8883fa8919dc3246436f36bb232a29c57255235df1c041353d3e6d2ee82fc8d688cefa7ecec1a7750aae3fe6f13627d0850
-EBUILD kdstatemachineeditor-1.2.3.ebuild 1082 BLAKE2B 6a61691a29ff0e3496c57af5feaead523cf369bfd9f7357410d6aff1e53016df3d0bb3abfe9c9ca106e6b388fd95b14ea1065829055df7fb66837ccbfbd14fa6 SHA512 e209ececcebb8c3bff176f2c6fa755f45ceff409660677b4612655e46b84719f44950c27fd51c85f1a5db3bd12be170aca9e82a77823af41d72a11cf10fe130a
-EBUILD kdstatemachineeditor-9999.ebuild 1036 BLAKE2B 4f40b1751b7373759f72ccdb609e35f8af04f5f54ad0a0b9565c9f9d6b24a3ee190e277bec2831a49a0b4d83c808711cd86439e52bb0c77526ec33e3d90a1c0b SHA512 885c12113c7bd45ac691055f92e46ccd6db010a82b6d52a35efc9c88e8212d2f9a3e89326f8b34d256489f6ad43f93d16f4ea373c81eec3572ef280aa2f15a38
+DIST kdstatemachineeditor-1.2.4.tar.gz 222160 BLAKE2B c0194282b1f17c550454d16fb3790e6747c785b01f867aa115134a3f1298c7d0bdd522d07bdc26ab4353d62482a8602c1418dd8e480a6b5b5665b8dfe8ca1d93 SHA512 f1c076a8646a26d3a6629298523b02589fcf53fc8ac01d93928b1bc42179d3a26c7f90d595e2226e5cf3d54d90d143719e72854f3b756489f6d0b8643810675f
+EBUILD kdstatemachineeditor-1.2.4.ebuild 1058 BLAKE2B 195cedc4077bee3188d1b0f2c684770e7ad17d797388d8c2bd2e82dab5c51af9863d86e6f3ac665a5445bacee8607797cbc2cb5e694327c955568099eca73b6a SHA512 5f6661e71ebdf676480c94dc6f165ae34c68ea8c2fdac9394a00092e408af740cb6948cad223ad7fc807f708dea2fb293809759ab04c7b29d5799e216123d0bf
+EBUILD kdstatemachineeditor-9999.ebuild 1058 BLAKE2B 195cedc4077bee3188d1b0f2c684770e7ad17d797388d8c2bd2e82dab5c51af9863d86e6f3ac665a5445bacee8607797cbc2cb5e694327c955568099eca73b6a SHA512 5f6661e71ebdf676480c94dc6f165ae34c68ea8c2fdac9394a00092e408af740cb6948cad223ad7fc807f708dea2fb293809759ab04c7b29d5799e216123d0bf
 MISC metadata.xml 361 BLAKE2B 679b7e05175ee00d4293a2e6fcc3a0215cc154cfe1bb6436267a4c6e4b4d9bf096b2bd934ce1e3c95458c3f957cf8263fa3f8e09cd9bcce8061e28e868e59dc5 SHA512 63eeeed36b35609aba151c2dcbe1e501355b3e56c0febd52f394a20b5a27871c6d69164b854a05769d3cd0eadf245f23ef4153fd8a2e9208dfb079381bbc0a41
diff --git a/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch b/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch
deleted file mode 100644
index 04a9ac9306b6..000000000000
--- a/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 63ca52af50f94b396182638224fe2c50b4cb7043 Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Thu, 5 Apr 2018 10:07:01 -0400
-Subject: [PATCH] src/core/model/element.h - fix compile on with XCode (include QPointF)
-
----
- src/core/model/element.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/model/element.h b/src/core/model/element.h
-index ec32cfc..c20ac6f 100644
---- a/src/core/model/element.h
-+++ b/src/core/model/element.h
-@@ -30,6 +30,7 @@
- 
- #include <QObject>
- #include <QMetaType>
-+#include <QPointF>
- 
- QT_BEGIN_NAMESPACE
- class QPainterPath;
\ No newline at end of file
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.3.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
index 70c5c471dd00..5e4355d14c07 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.3.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils kde5-functions
+inherit cmake-utils qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -21,32 +21,32 @@ IUSE="doc test"
 SLOT="0"
 
 RDEPEND="
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
 "
-
 DEPEND="${RDEPEND}
-	doc? (
-		$(add_qt_dep qthelp)
-		app-doc/doxygen
-	)
 	test? (
-		$(add_qt_dep qttest)
-		$(add_qt_dep qtxmlpatterns)
+		dev-qt/qttest:5
+		dev-qt/qtxmlpatterns:5
 	)
+"
+BDEPEND="
 	media-gfx/graphviz
+	doc? (
+		app-doc/doxygen
+		dev-qt/qthelp:5
+	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_TESTING=$(usex test)
+		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
index 5711b07e35a0..5e4355d14c07 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils kde5-functions
+inherit cmake-utils qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -21,23 +21,24 @@ IUSE="doc test"
 SLOT="0"
 
 RDEPEND="
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
 "
-
 DEPEND="${RDEPEND}
-	doc? (
-		$(add_qt_dep qthelp)
-		app-doc/doxygen
-	)
 	test? (
-		$(add_qt_dep qttest)
-		$(add_qt_dep qtxmlpatterns)
+		dev-qt/qttest:5
+		dev-qt/qtxmlpatterns:5
 	)
+"
+BDEPEND="
 	media-gfx/graphviz
+	doc? (
+		app-doc/doxygen
+		dev-qt/qthelp:5
+	)
 "
 
 src_configure() {
@@ -45,6 +46,7 @@ src_configure() {
 		-DBUILD_EXAMPLES=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_TESTING=$(usex test)
+		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
 	)
 	cmake-utils_src_configure
 }