[gentoo-commits] repo/gentoo:master commit in: net-im/choqok/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     0ada49b09d6e22c8a8dfdfcaf1f3b49073c9a0b1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 01:49:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 17:36:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ada49b0

net-im/choqok: 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-im/choqok/choqok-1.6.0_p20190726.ebuild | 73 ++++++++++++++++-------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
index 96d27704336..c6bfef43b41 100644
--- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
+++ b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
@@ -1,49 +1,56 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Free/Open Source micro-blogging client by KDE"
-HOMEPAGE="https://choqok.kde.org/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+HOMEPAGE="https://choqok.kde.org/
+https://kde.org/applications/internet/org.kde.choqok"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+SLOT="5"
 IUSE="attica konqueror telepathy"
 
 DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetworkauth)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	app-crypt/qca[qt5(+)]
-	attica? ( $(add_frameworks_dep attica) )
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${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/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
 	konqueror? (
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep kdewebkit)
 		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+		>=kde-frameworks/kparts-${KFMIN}:5
 	)
 	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
 "
@@ -57,7 +64,7 @@ src_configure() {
 		$(cmake_use_find_package telepathy TelepathyQt5)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )