[gentoo-commits] repo/gentoo:master commit in: kde-misc/kimtoy/

[Andreas Sturmlechner]

commit:     69cd97b62ad3e9b2fdf062875eddac60ebe30766
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 00:24:59 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 01:26:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cd97b6

kde-misc/kimtoy: Port to ecm.eclass and kde.org.eclass

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild | 66 ++++++++++++++------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild b/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
index 0efb2e94e07..9c204ca7344 100644
--- a/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
+++ b/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
@@ -3,38 +3,44 @@
 
 EAPI=7
 
+KFMIN=5.60.0
+QTMIN=5.12.3
 COMMIT="c8b3da65bfd289d0a0262aa673aa6b697022d4a3"
-inherit kde5
+inherit ecm kde.org
 
-DESCRIPTION="An input method frontend for Plasma"
+DESCRIPTION="Input method frontend for Plasma"
 HOMEPAGE="https://www.linux-apps.com/content/show.php?content=140967"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+SLOT="5"
 IUSE="libressl scim semantic-desktop"
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
 	app-i18n/ibus
 	dev-libs/glib:2
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
 	media-libs/libpng:0=[apng]
 	x11-libs/libX11
 	!libressl? ( dev-libs/openssl:0= )
@@ -43,15 +49,17 @@ DEPEND="
 		>=app-i18n/scim-1.4.9
 		dev-libs/dbus-c++
 	)
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	!kde-misc/kimtoy:4
 	>=app-i18n/fcitx-4.0
 "
 
+S="${WORKDIR}/${PN}-${COMMIT}"
+
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	# bug 581736
 	cmake_comment_add_subdirectory po
@@ -59,12 +67,10 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package scim DBusCXX)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package scim DBusCXX)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
-
-S="${WORKDIR}/${PN}-${COMMIT}"