net-im/choqok: Add USE=telepathy

Package-Manager: portage-2.2.28

4 files changed, 111 insertions, 5 deletions

diff --git a/net-im/choqok/choqok-1.5.85.ebuild b/net-im/choqok/choqok-1.5.85.ebuild
index 0499b7aab3..4f3c2b8ae5 100644
--- a/net-im/choqok/choqok-1.5.85.ebuild
+++ b/net-im/choqok/choqok-1.5.85.ebuild
@@ -7,13 +7,13 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="Free/Open Source micro-blogging client for KDE"
+DESCRIPTION="Free/Open Source micro-blogging client by KDE"
 HOMEPAGE="http://choqok.gnufolks.org/"
 SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
-IUSE="attica konqueror"
+IUSE="attica konqueror telepathy"
 
 DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -40,13 +40,13 @@ DEPEND="
 	$(add_qt_dep qtxml)
 	app-crypt/qca[qt5]
 	dev-libs/qoauth:5
-	net-libs/telepathy-qt[qt5]
 	attica? ( $(add_frameworks_dep attica) )
 	konqueror? (
 		$(add_frameworks_dep kparts)
 		$(add_frameworks_dep kdewebkit)
 		$(add_qt_dep qtwebkit)
 	)
+	telepathy? ( net-libs/telepathy-qt[qt5] )
 "
 RDEPEND="${DEPEND}
 	!net-im/choqok:4
@@ -54,11 +54,14 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS README TODO changelog )
 
+PATCHES=( "${FILESDIR}/${P}-telepathy-optional.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package attica KF5Attica)
 		$(cmake-utils_use_find_package konqueror KF5Parts)
 		$(cmake-utils_use_find_package konqueror KF5WebKit)
+		$(cmake-utils_use_find_package telepathy TelepathyQt5)
 	)
 
 	kde5_src_configure
diff --git a/net-im/choqok/choqok-9999.ebuild b/net-im/choqok/choqok-9999.ebuild
index 742b1dd5c0..676783873b 100644
--- a/net-im/choqok/choqok-9999.ebuild
+++ b/net-im/choqok/choqok-9999.ebuild
@@ -7,11 +7,11 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="Free/Open Source micro-blogging client for KDE"
+DESCRIPTION="Free/Open Source micro-blogging client by KDE"
 HOMEPAGE="http://choqok.gnufolks.org/"
 
 LICENSE="GPL-2+"
-IUSE="attica konqueror"
+IUSE="attica konqueror telepathy"
 
 DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -45,6 +45,7 @@ DEPEND="
 		$(add_frameworks_dep kdewebkit)
 		$(add_qt_dep qtwebkit)
 	)
+	telepathy? ( net-libs/telepathy-qt[qt5] )
 "
 RDEPEND="${DEPEND}
 	!net-im/choqok:4
@@ -57,6 +58,7 @@ src_configure() {
 		$(cmake-utils_use_find_package attica KF5Attica)
 		$(cmake-utils_use_find_package konqueror KF5Parts)
 		$(cmake-utils_use_find_package konqueror KF5WebKit)
+		$(cmake-utils_use_find_package telepathy TelepathyQt5)
 	)
 
 	kde5_src_configure
diff --git a/net-im/choqok/files/choqok-1.5.85-telepathy-optional.patch b/net-im/choqok/files/choqok-1.5.85-telepathy-optional.patch
new file mode 100644
index 0000000000..1e3ec5f96b
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.5.85-telepathy-optional.patch
@@ -0,0 +1,100 @@
+commit 4dad707126176aadf7904660e7d11e0e9fc3d99f
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Mon Aug 15 00:46:02 2016 +0200
+
+    Fix build with disabled TelepathyQt5
+
+diff --git a/plugins/imstatus/CMakeLists.txt b/plugins/imstatus/CMakeLists.txt
+index 7756eb8..55154eb 100644
+--- a/plugins/imstatus/CMakeLists.txt
++++ b/plugins/imstatus/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ find_package(TelepathyQt5)
+ 
+-configure_file(config-imstatus.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-imstatus.h)
++if(TelepathyQt5_FOUND)
++    add_definitions( -DTELEPATHY_FOUND )
++endif()
+ 
+ include_directories(
+     ${CHOQOK_INCLUDES}
+diff --git a/plugins/imstatus/config-imstatus.h.cmake b/plugins/imstatus/config-imstatus.h.cmake
+deleted file mode 100644
+index 12a498a..0000000
+--- a/plugins/imstatus/config-imstatus.h.cmake
++++ /dev/null
+@@ -1 +0,0 @@
+-#define TELEPATHY_FOUND ${TelepathyQt5_FOUND}
+diff --git a/plugins/imstatus/imqdbus.cpp b/plugins/imstatus/imqdbus.cpp
+index 5840035..ce11790 100644
+--- a/plugins/imstatus/imqdbus.cpp
++++ b/plugins/imstatus/imqdbus.cpp
+@@ -28,7 +28,7 @@
+ #include <QDBusReply>
+ #include <QDebug>
+ 
+-#if TELEPATHY_FOUND
++#ifdef TELEPATHY_FOUND
+ #include <TelepathyQt/Account>
+ #include <TelepathyQt/AccountManager>
+ #include <TelepathyQt/AccountSet>
+@@ -49,7 +49,7 @@ IMQDBus::IMQDBus(QObject *parent) : QObject(parent)
+     - qutIM (>0.3)
+     - gajim ( doesn't want work :( )
+     */
+-#if TELEPATHY_FOUND
++#ifdef TELEPATHY_FOUND
+     m_accountManager =  Tp::AccountManager::create(Tp::AccountFactory::create(QDBusConnection::sessionBus(), Tp::Account::FeatureCore));
+     connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(slotFinished(Tp::PendingOperation*)));
+ 
+@@ -71,7 +71,7 @@ void IMQDBus::updateStatusMessage(const QString &im, const QString &statusMessag
+     if (im == IM_PIDGIN) {
+         usePidgin(statusMessage);
+     }
+-#if TELEPATHY_FOUND
++#ifdef TELEPATHY_FOUND
+     if (im == IM_TELEPATHY) {
+         useTelepathy(statusMessage);
+     }
+@@ -190,7 +190,7 @@ void IMQDBus::usePidgin(const QString &statusMessage)
+     }
+ }
+ 
+-#if TELEPATHY_FOUND
++#ifdef TELEPATHY_FOUND
+ void IMQDBus::useTelepathy(const QString &statusMessage)
+ {
+     if (m_accountManager->isReady()) {
+@@ -235,7 +235,7 @@ QStringList IMQDBus::scanForIMs()
+     if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String("im.pidgin.purple.PurpleService")).value()) {
+         ims << IM_PIDGIN;
+     }
+-#if TELEPATHY_FOUND
++#ifdef TELEPATHY_FOUND
+     if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String("org.freedesktop.Telepathy.AccountManager")).value()) {
+         ims << IM_TELEPATHY;
+     }
+diff --git a/plugins/imstatus/imqdbus.h b/plugins/imstatus/imqdbus.h
+index 6546e20..c9564df 100644
+--- a/plugins/imstatus/imqdbus.h
++++ b/plugins/imstatus/imqdbus.h
+@@ -27,9 +27,7 @@
+ #include <QObject>
+ #include <QString>
+ 
+-#include "config-imstatus.h"
+-
+-#if TELEPATHY_FOUND
++#ifdef TELEPATHY_FOUND
+ #include <TelepathyQt/Types>
+ 
+ namespace Tp
+@@ -58,7 +56,7 @@ private:
+     void useSkype(const QString &statusMessage);
+     void usePidgin(const QString &statusMessage);
+ 
+-#if TELEPATHY_FOUND
++#ifdef TELEPATHY_FOUND
+ private Q_SLOTS:
+     void slotFinished(Tp::PendingOperation *po);
+ 
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index fdeebeaa21..468d03a98f 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="attica">Build Open Collaboration Services plugin using <pkg>dev-libs/libattica</pkg></flag>
 		<flag name="konqueror">Build Konqueror Choqok plugin</flag>
+		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
 </pkgmetadata>