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

[Michael Palimaka]

commit:     8f64eed90b14a4223bc53c1507543d294921e503
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 24 01:36:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 18:18:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f64eed9

net-im/choqok: Frameworks merged to master, bug 550694

Package-Manager: portage-2.2.26

 net-im/choqok/choqok-9999.ebuild | 68 ++++++++++++++++++++++++++--------------
 net-im/choqok/metadata.xml       |  3 +-
 2 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/net-im/choqok/choqok-9999.ebuild b/net-im/choqok/choqok-9999.ebuild
index a32d5d6..632a682 100644
--- a/net-im/choqok/choqok-9999.ebuild
+++ b/net-im/choqok/choqok-9999.ebuild
@@ -4,42 +4,64 @@
 
 EAPI=5
 
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl
-hr hu is it ja km lt mr ms nb nds nl pa pl pt pt_BR ro ru sk sq sl sv tr ug
-uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_GCC_MINIMAL="4.9"
+KDE_HANDBOOK="forceoptional"
+QT_MINIMAL="5.5.1"
+inherit kde5
 
 DESCRIPTION="Free/Open Source micro-blogging client for KDE"
 HOMEPAGE="http://choqok.gnufolks.org/"
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
 LICENSE="GPL-2+"
-SLOT="4"
-IUSE="ayatana debug"
+IUSE="attica konqueror"
 
-RDEPEND="
-	dev-libs/libattica
+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 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)
+	app-crypt/qca[qt5]
 	dev-libs/qjson
-	>=dev-libs/qoauth-1.0.1
-	ayatana? ( dev-libs/libindicate-qt )
+	dev-libs/qoauth:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	net-libs/telepathy-qt[qt5]
+	attica? ( dev-libs/libattica )
+	konqueror? (
+		$(add_frameworks_dep kparts)
+		$(add_frameworks_dep kdewebkit)
+	)
 "
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
+RDEPEND="${DEPEND}
+	!net-im/choqok:4
 "
 
 DOCS=( AUTHORS README TODO changelog )
 
-src_prepare(){
+src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use !ayatana QTINDICATE_DISABLE)
+		$(cmake-utils_use_find_package attica KF5Attica)
+		$(cmake-utils_use_find_package konqueror KF5Parts)
+		$(cmake-utils_use_find_package konqueror KF5WebKit)
 	)
 
-	kde4-base_src_prepare
+	kde5_src_configure
 }

diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index f0a0113..fdeebea 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="ayatana">Build in support for Ayatana notification using the libindicate-qt plugin.</flag>
+		<flag name="attica">Build Open Collaboration Services plugin using <pkg>dev-libs/libattica</pkg></flag>
+		<flag name="konqueror">Build Konqueror Choqok plugin</flag>
 	</use>
 </pkgmetadata>