gentoo resync : 15.12.2019

2 files changed, 39 insertions, 36 deletions

diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 119c75a9afa3..8fb6ab7034a2 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,4 +1,4 @@
 AUX basket-2.49b-xdg_mime_install_dir.patch 1429 BLAKE2B cc1177ec5d9675d2a85c81bcbee77b02ee1fcf11f9d609e7298d4b1c067c07c818fe18d2d1aaa1fc0c159fa5fc7a2d84322eddbd82eff2dddedd81b446a01879 SHA512 224c3dae19c80ae8f0826f2bee6429391998c3baadf708aac3353ca0962646de595d9498e003b1d9d87a9e321858dc43de39a9f0866e4894791a05b28fde05f6
 DIST basket-2.49b.tar.gz 4686990 BLAKE2B 6915d673abae6902bd2a0073a88cdf5bc497a7e7eec47dc87dbafcce68915e55bb02505c81a24cc00ed081e60b4c135afd337c6c4d08843182175f42c39e9119 SHA512 70d4241928712a7366cbc592e414864896cfb27bea251e5e4d3606b34534a932d7c208f98a8f48b49c11234c52f78d9003ca00af979e61112dbe139627e6f134
-EBUILD basket-2.49b.ebuild 1867 BLAKE2B 35d8812cb706ae892ca9a1a21cb47d394a6d06aec0ac48c9912d7513b5b9e30e60ecf07ff7055c1c22724c6298f28adc39f71fdcbe7a531801064b95afce9ac8 SHA512 bd5f975500ed8b3fbd52a2b48170f49097f617da60eb5d3c961c22e8c07ce8287c7433ba7adf100dde39482590be095cac3b94e29dee39bebf5ad49838e3cab7
+EBUILD basket-2.49b.ebuild 2055 BLAKE2B 3061cc80844f137980275f9bb5988695aedc8910740e98951f6b862a547009e757d3f65485e031cb02ca10aa33f86776899c82226c100da913e0a5a7d24f4b7d SHA512 bd86d89396f8ed172a97657d97f4f10d6088009edf691d5dfe2461b97ba61ba068ad925a3633ae82eac167395124d17297d00e4e3e67064e6520f2d060771bce
 MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0
diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild
index 7a67ebb6fc1a..335ddfe9281b 100644
--- a/kde-misc/basket/basket-2.49b.ebuild
+++ b/kde-misc/basket/basket-2.49b.ebuild
@@ -3,61 +3,64 @@
 
 EAPI=7
 
-KDE_TEST="true"
-KDE_HANDBOOK="forceoptional"
+ECM_TEST="true"
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm
 
 DESCRIPTION="Multiple information organizer - a DropDrawers clone"
 HOMEPAGE="https://github.com/basket-notepads/basket"
 SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 x86"
 IUSE="crypt git"
 
 BDEPEND="git? ( virtual/pkgconfig )"
 RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(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 kfilemetadata)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	crypt? ( app-crypt/gpgme:= )
 	git? ( dev-libs/libgit2:= )
 "
 DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
 PATCHES=( "${FILESDIR}/${P}-xdg_mime_install_dir.patch" )
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	if ! use test; then
 		sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die
 	fi
@@ -65,8 +68,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package crypt Gpgme)
-		$(cmake-utils_use_find_package git Libgit2)
+		$(cmake_use_find_package crypt Gpgme)
+		$(cmake_use_find_package git Libgit2)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }