From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 media-video/kaffeine/Manifest               |  2 +-
 media-video/kaffeine/kaffeine-2.0.18.ebuild | 48 ++++++++++++++++-------------
 2 files changed, 27 insertions(+), 23 deletions(-)

(limited to 'media-video/kaffeine')

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 3df23e7c53f5..ee6e2d0a4776 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,3 @@
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
-EBUILD kaffeine-2.0.18.ebuild 1307 BLAKE2B b0edff04fb85d8c1030067e597ae4c8a53759ca696967cdb4757904f778e8acea8cba4beb33246c53d54ba359e58b25b35c7ccf5294ebb512890b70f6b3f5536 SHA512 08442396edb506fa76751e44c66b2344d9709c36f3b9d9c64ed56a07f5985fcc5f6cfd05e31e3148cdf1669ad9ff322e159a102a54eaf3f175162d1999e91ba3
+EBUILD kaffeine-2.0.18.ebuild 1444 BLAKE2B ea8a713fc0aaa108c6e28db08a760a0271222318f615a67d006b7295f9f20ac04a14606540cd959773213ed3be28a27f69c9e01224b88542af0fa87a3e097d16 SHA512 34dfcd7123d8d19d3d8079242b89e88f416e7e374ba97751099adca93346ce8c0bbe02b739c3d2ffb6437dbbdf496d555114f50b8b2fced45d6af7122a171832
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.18.ebuild b/media-video/kaffeine/kaffeine-2.0.18.ebuild
index 3c10640660ee..b59bb75d5120 100644
--- a/media-video/kaffeine/kaffeine-2.0.18.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.18.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=7
 
-KDE_HANDBOOK="optional"
-inherit kde5
+ECM_HANDBOOK="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Media player with digital TV support by KDE"
 HOMEPAGE="https://userbase.kde.org/Kaffeine"
+
 LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+SLOT="5"
 IUSE="dvb"
 
 BDEPEND="
@@ -21,23 +25,23 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}: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/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
 	media-video/vlc[X]
 	x11-libs/libXScrnSaver
 	dvb? ( media-libs/libv4l )
@@ -50,8 +54,8 @@ src_configure() {
 	# tools working on $HOME directory for a local git checkout
 	local mycmakeargs=(
 		-DBUILD_TOOLS=OFF
-		$(cmake-utils_use_find_package dvb Libdvbv5)
+		$(cmake_use_find_package dvb Libdvbv5)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
-- 
cgit v1.2.3