app-office/kmymoney: Port to ecm and kde.org, restore KEYWORDS

Closes: https://bugs.gentoo.org/692732
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

1 files changed, 47 insertions, 46 deletions

diff --git a/app-office/kmymoney/kmymoney-5.0.7.ebuild b/app-office/kmymoney/kmymoney-5.0.7.ebuild
index 326c361fbcd0..d152f89f7ec3 100644
--- a/app-office/kmymoney/kmymoney-5.0.7.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.7.ebuild
@@ -5,83 +5,84 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-inherit kde5 python-single-r1
+inherit ecm kde.org python-single-r1
 
 DESCRIPTION="Personal finance manager based on KDE Frameworks"
 HOMEPAGE="https://kmymoney.org"
+
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-# 	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
+SLOT="5"
 IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	>=app-crypt/gpgme-1.7.1-r1[cxx]
 	>=app-office/libalkimia-7.0.0:=
 	dev-libs/gmp:0=
 	dev-libs/kdiagram:5
 	dev-libs/libgpg-error
-	activities? ( $(add_frameworks_dep kactivities) )
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	addressbook? (
-		|| (
-			$(add_frameworks_dep kcontacts)
-			$(add_kdeapps_dep kcontacts)
-		)
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kidentitymanagement)
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+		kde-apps/akonadi:5
+		kde-apps/kidentitymanagement:5
 	)
 	calendar? ( dev-libs/libical:= )
 	hbci? (
 		>=net-libs/aqbanking-5.99.40_beta
 		>=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5]
 	)
-	holidays? ( $(add_frameworks_dep kholidays) )
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	ofx? ( dev-libs/libofx )
 	webkit? (
-		$(add_frameworks_dep kdewebkit)
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
 		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
 	)
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 	weboob? (
 		${PYTHON_DEPS}
-		$(add_qt_dep qtconcurrent)
+		>=dev-qt/qtconcurrent-${QTMIN}:5
 		www-client/weboob[${PYTHON_USEDEP}]
 	)
 "
@@ -95,7 +96,7 @@ RDEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	use weboob && python_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -113,7 +114,7 @@ src_configure() {
 		-DENABLE_WEBOOB=$(usex weboob)
 		$(cmake-utils_use_find_package weboob PythonLibs)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_test() {
@@ -122,5 +123,5 @@ src_test() {
 		-E "(reports-chart-test|qsqlcipher-test)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }