[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/

[Andreas Sturmlechner]

commit:     a364c9ceea5ed11e7f0d3971c6f37404958898e6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 23:59:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 00:07:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a364c9ce

net-p2p/ktorrent: 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>

 net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild | 83 ++++++++++++++++---------------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
index 95f9bf8408b..cac1657e6a9 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
@@ -3,66 +3,69 @@
 
 EAPI=7
 
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent"
 [[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 arm64 ~x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
 
 BDEPEND="sys-devel/gettext"
 COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(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 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/kcmutils-${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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
 	>=net-libs/libktorrent-2.1.1:5
 	infowidget? ( dev-libs/geoip )
 	kross? (
-		$(add_frameworks_dep karchive)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kross)
+		>=kde-frameworks/karchive-${KFMIN}:5
+		>=kde-frameworks/kitemviews-${KFMIN}:5
+		>=kde-frameworks/kross-${KFMIN}:5
 	)
 	mediaplayer? (
 		media-libs/phonon[qt5(+)]
 		>=media-libs/taglib-1.5
 	)
 	rss? (
-		$(add_frameworks_dep kdewebkit)
-		$(add_frameworks_dep syndication)
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+		>=kde-frameworks/syndication-${KFMIN}:5
 	)
 	search? (
-		$(add_frameworks_dep kdewebkit)
 		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
 	)
-	shutdown? ( $(add_plasma_dep plasma-workspace) )
-	stats? ( $(add_frameworks_dep kplotting) )
-	upnp? ( $(add_frameworks_dep kcompletion) )
-	zeroconf? ( $(add_frameworks_dep kdnssd) )
+	shutdown? ( >=kde-plasma/plasma-workspace-5.15.5 )
+	stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
+	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
+	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -71,8 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	ipfilter? (
 		app-arch/bzip2
 		app-arch/unzip
-		$(add_frameworks_dep ktextwidgets)
-		$(add_kdeapps_dep kio-extras)
+		>=kde-apps/kio-extras-19.04.3
+		>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	)
 "
 
@@ -92,7 +95,7 @@ src_configure() {
 		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
 		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
 		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-		$(cmake-utils_use_find_package rss KF5Syndication)
+		$(cmake_use_find_package rss KF5Syndication)
 		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
 		-DENABLE_SEARCH_PLUGIN=$(usex search)
 		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
@@ -101,6 +104,6 @@ src_configure() {
 		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
 	)
 # add back when ported
-#		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
-	kde5_src_configure
+# 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
+	ecm_src_configure
 }