commit: a0026bbc1a51dce1471ab4646859a5ca7f5e8931 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sat Oct 8 08:14:37 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Oct 8 15:58:15 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a0026bbc
net-im/choqok: Drop old Package-Manager: portage-2.3.0 net-im/choqok/choqok-1.5.85.ebuild | 68 -------------- .../files/choqok-1.5.85-telepathy-optional.patch | 100 --------------------- 2 files changed, 168 deletions(-) diff --git a/net-im/choqok/choqok-1.5.85.ebuild b/net-im/choqok/choqok-1.5.85.ebuild deleted file mode 100644 index 4f3c2b8..0000000 --- a/net-im/choqok/choqok-1.5.85.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -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 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 qtwidgets) - $(add_qt_dep qtxml) - app-crypt/qca[qt5] - dev-libs/qoauth:5 - 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 -" - -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/files/choqok-1.5.85-telepathy-optional.patch b/net-im/choqok/files/choqok-1.5.85-telepathy-optional.patch deleted file mode 100644 index 1e3ec5f..0000000 --- a/net-im/choqok/files/choqok-1.5.85-telepathy-optional.patch +++ /dev/null @@ -1,100 +0,0 @@ -commit 4dad707126176aadf7904660e7d11e0e9fc3d99f -Author: Andreas Sturmlechner <[email protected]> -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); -
