[gentoo-commits] proj/kde:master commit in: net-libs/libktorrent/, net-libs/libmediawiki/, net-libs/libkvkontakte/, ...

[gentoo-commits] proj/kde:master commit in: net-libs/libktorrent/, net-libs/libmediawiki/, net-libs/libkvkontakte/, ...

[Andreas Sturmlechner]

commit:     a3e225a2f9e33b89ff39a4ff1ed27e09686e360b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 01:46:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 01:59:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3e225a2

net-libs: Port to ecm.eclass and kde.org.eclass

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

 net-libs/libktorrent/libktorrent-9999.ebuild       | 32 ++++++++++++----------
 net-libs/libkvkontakte/libkvkontakte-9999.ebuild   | 23 +++++++++-------
 net-libs/libmediawiki/libmediawiki-9999.ebuild     | 11 +++++---
 .../telepathy-logger-qt-9999.ebuild                |  6 ++--
 4 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/net-libs/libktorrent/libktorrent-9999.ebuild b/net-libs/libktorrent/libktorrent-9999.ebuild
index b1b01e11e0..bb07109cdf 100644
--- a/net-libs/libktorrent/libktorrent-9999.ebuild
+++ b/net-libs/libktorrent/libktorrent-9999.ebuild
@@ -3,31 +3,35 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent
+https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
 COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxml)
 	app-crypt/qca:2[qt5(+)]
 	>=dev-libs/gmp-6.0.0a:0=
 	dev-libs/libgcrypt:0=
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -37,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
 	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
@@ -52,5 +56,5 @@ src_test() {
 		-E "(fin|packetloss|send|transmit)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }

diff --git a/net-libs/libkvkontakte/libkvkontakte-9999.ebuild b/net-libs/libkvkontakte/libkvkontakte-9999.ebuild
index cb7cebc806..eaea981394 100644
--- a/net-libs/libkvkontakte/libkvkontakte-9999.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-9999.ebuild
@@ -3,26 +3,29 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdewebkit-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
 

diff --git a/net-libs/libmediawiki/libmediawiki-9999.ebuild b/net-libs/libmediawiki/libmediawiki-9999.ebuild
index 4359659388..f1a5cfd3ef 100644
--- a/net-libs/libmediawiki/libmediawiki-9999.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-9999.ebuild
@@ -3,18 +3,21 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtnetwork)
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
 
@@ -26,5 +29,5 @@ src_test() {
 		-j1
 		-E "(libmediawiki-logintest|libmediawiki-logouttest|libmediawiki-queryimageinfotest|libmediawiki-queryimagestest|libmediawiki-queryinfotest|libmediawiki-querysiteinfousergroupstest)"
 	)
-	kde5_src_test
+	ecm_src_test
 }

diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
index 9837dfaeaa..43caf618ce 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-any-r1
+QTMIN=5.12.3
+inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Qt bindings for the Telepathy logger"
 HOMEPAGE="https://cgit.kde.org/telepathy-logger-qt.git"
@@ -15,14 +16,15 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="LGPL-2.1"
+SLOT="5"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}"
 DEPEND="
-	$(add_qt_dep qtdbus)
 	dev-libs/dbus-glib
 	dev-libs/glib:2
 	dev-libs/libxml2
+	>=dev-qt/qtdbus-${QTMIN}:5
 	net-im/telepathy-logger
 	net-libs/telepathy-glib
 	net-libs/telepathy-qt[qt5(+)]