gentoo resync : 18.11.2019

2 files changed, 40 insertions, 36 deletions

diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index c7d19614b66a..063de295d4a0 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,2 +1,2 @@
-EBUILD simon-9999.ebuild 2056 BLAKE2B ce24a11f4546204f91713d353b5f43e25aa152b2908b72d104a6a76c3e4d650621104f7059b82b25394c4bad416a30de61df4f08eb35b54e83dd10c3fe022c92 SHA512 e9644177580668ab9b063327ca63c0c7e87677af9fee050b17e495ec580ee238df5675dc3b130e6bf6283d13f795dc9f900ab573ae0ba6786d08f15d3e817276
+EBUILD simon-9999.ebuild 1939 BLAKE2B e61384925067d62645e423f6e30f60eeda947049a8d49b30f764044813712b6208e4f2746e392110c53519ff95f63e121c9982ffa9eaab93a17d2f1fd36ff173 SHA512 75f642f0b61f42746d23c4a4d6528aae615854262079921538047ef0918bdbeb38155b1602d4a9245ad359eee43e54bc0366bfc2ac294bfd864db0c19b6c2a0f
 MISC metadata.xml 526 BLAKE2B 90a5578ad2dd40b107c0a810ac487cf2c952f056bc8c6bb109cfceda2b66cdfc2ccc027e741d2eb0a4ee77e9ac349f43f7724b126d077c988ba4dd3c0c940375 SHA512 ab2dbc917334c5877b7654179b0f28e7d2824d98ba68c62e13ab912f5c1010198b8891ea5764c9e304727ac18be28b758f23f414e145047f99caef335006659d
diff --git a/app-accessibility/simon/simon-9999.ebuild b/app-accessibility/simon/simon-9999.ebuild
index 8c9e1d6bf7f0..3115d4658433 100644
--- a/app-accessibility/simon/simon-9999.ebuild
+++ b/app-accessibility/simon/simon-9999.ebuild
@@ -4,51 +4,55 @@
 EAPI=7
 
 EGIT_BRANCH="kf5"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+inherit ecm kde.org
 
 DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
 HOMEPAGE="https://simon-listens.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+	KEYWORDS=""
+fi
 
 LICENSE="GPL-2"
-KEYWORDS=""
+SLOT="5"
 IUSE="libsamplerate opencv pim sphinx"
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep okular)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtx11extras)
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	kde-apps/okular:5
+	kde-frameworks/karchive:5
+	kde-frameworks/kcmutils:5
+	kde-frameworks/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kdbusaddons:5
+	kde-frameworks/kdelibs4support:5
+	kde-frameworks/kguiaddons:5
+	kde-frameworks/khtml:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kiconthemes:5
+	kde-frameworks/kio:5
+	kde-frameworks/kparts:5
+	kde-frameworks/ktexteditor:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kxmlgui:5
 	media-libs/alsa-lib
 	media-libs/libqaccessibilityclient:5
 	x11-libs/libX11
 	x11-libs/libXtst
-	x11-libs/qwt:6=[qt5]
+	x11-libs/qwt:6=
 "
 RDEPEND="${DEPEND}"
 
@@ -65,11 +69,11 @@ src_configure() {
 		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	elog "Optional dependency:"
 	use sphinx && elog "  app-accessibility/julius (alternative backend)"