gentoo resync : 15.01.2020

2 files changed, 37 insertions, 31 deletions

diff --git a/kde-misc/kimtoy/Manifest b/kde-misc/kimtoy/Manifest
index 2db938e104ed..6d6c31a625d4 100644
--- a/kde-misc/kimtoy/Manifest
+++ b/kde-misc/kimtoy/Manifest
@@ -1,3 +1,3 @@
 DIST kimtoy-1.92_pre20190225.tar.gz 435142 BLAKE2B 86f40774cc5c01a49996f80a4257c3ad18787a9e269a0cddb489530ac1d0a7b84dc5f6eace35374975f24fc15738c02d03da6637e6e6edcba48b27e235ca030e SHA512 9b6b6c316e683d3ae80226e91e17a367970a9380ee6f100798be48f1e29c14b39b9ca679a36b26cfe6a09aae4deaee2f7db4b2a1a7b587e3d7b26983ae6eaffb
-EBUILD kimtoy-1.92_pre20190225.ebuild 1680 BLAKE2B 4b2fee446d1a3feb84f1280db53c16a36ab04cf8d50c7030049a0972252a7de9bc48329cc57b07e64314dcf9d44ba54424ceeb61d391759dc498718dfcf4e5fa SHA512 525762acdd5597f63e253bd384f390e6f32002ba841ca0cd45211e4dbb95d2ce8b80b6ed51f3b2841aa2b23ae8be366494470ffcd442cce2bd28b57bf9ed7986
+EBUILD kimtoy-1.92_pre20190225.ebuild 1882 BLAKE2B a54202fdb0b88690eb2c699dd9fd93a2e23f21bae0fd69388a683db64fedce687f70b3ab349c1e3c3e59275c16dabf7a9ef5b5fe6e4a055f1756ec6edc140801 SHA512 8007f396b186438d4a68d3366902281ee43aec3014483960e730c1ad7dcd12691254f27c0d3ae31b41f8944a213effb9790baa5abaf60269fa836da0423155e6
 MISC metadata.xml 332 BLAKE2B 76b0c29f1f9f6a1ae4c576ebfeaaa4faeb0b8ad04b1bf354a23c358c2c7fc73fadc27e19d68e1bf8b7436fdae5ed896c98018f43d76abfd303cc3868678bc080 SHA512 ef7ec3391d65f9fb9bf6d7efe6ca50137f7668dbc855694e14a8999eb48a7277bf64d0480e4a91d3ce2d74e144d4424576522f4e15ed6bb57a0b9f24c16cb285
diff --git a/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild b/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
index 0efb2e94e073..9c204ca7344b 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}"