commit: 43ba5a04315b0c17613297c2652e2daf93ae37e7 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Tue Jan 10 17:30:38 2017 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Tue Jan 10 17:35:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ba5a04
net-im/choqok: Drop slot 4 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-im/choqok/Manifest | 1 - net-im/choqok/choqok-1.5-r1.ebuild | 49 ------------ .../files/choqok-1.5-kdewebkit-optional.patch | 30 ------- .../files/choqok-1.5-telepathy-optional.patch | 93 ---------------------- 4 files changed, 173 deletions(-) diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest index e4cf726..64c964b 100644 --- a/net-im/choqok/Manifest +++ b/net-im/choqok/Manifest @@ -1,2 +1 @@ -DIST choqok-1.5.tar.xz 1068516 SHA256 5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4 SHA512 fbb31abedd07ea1c674a7d59b4a18808ca03812ac37c60ea67d2d641668be4a9137e9f4573eda1e19425123601e9536971170e3948c1e5098b220991571a2cf3 WHIRLPOOL c4f869bab6a23a2ffa2e8e071414a6c7170816269e6e9f77df4269b94b627248fd259eb3c24217a2a838f74162ba6c198ff5549371b61f516fb142b8690cdce0 DIST choqok-1.6.0.tar.xz 1170748 SHA256 8a7527067b3694ad16faafac754cfd5f1e5f5fd1547f066d8f14fbcf8327310f SHA512 78c03689e40978213f2f9462780fe47507a2778985d4d5b940cab004f0ac52becfa76d7dbaa886df958134c65b27255e49ac68ddbb2a434131fffe9ca9280cbc WHIRLPOOL 57155eea1f9f54113bfad9d883d77c332b97c0ef4512d15db9764056704d9709b6c4e81ec630cb5b60c0b310953deabdf9cb5b2521b41ea016a421562e2d06fd diff --git a/net-im/choqok/choqok-1.5-r1.ebuild b/net-im/choqok/choqok-1.5-r1.ebuild deleted file mode 100644 index 62721c3..00000000 --- a/net-im/choqok/choqok-1.5-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -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 sl sq sv tr ug -uk zh_CN zh_TW" -KDE_HANDBOOK="optional" -WEBKIT_REQUIRED="optional" -inherit kde4-base - -DESCRIPTION="Free/Open Source micro-blogging client by KDE" -HOMEPAGE="http://choqok.gnufolks.org/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -KEYWORDS="amd64 x86" -LICENSE="GPL-2+" -SLOT="4" -IUSE="ayatana debug telepathy" - -RDEPEND=" - dev-libs/libattica - dev-libs/qjson - >=dev-libs/qoauth-1.0.1:0 - ayatana? ( dev-libs/libindicate-qt ) - telepathy? ( net-libs/telepathy-qt[qt4] ) -" -DEPEND="${RDEPEND} - app-arch/xz-utils - sys-devel/gettext -" - -DOCS=( AUTHORS README TODO changelog ) - -PATCHES=( - "${FILESDIR}/${P}-kdewebkit-optional.patch" - "${FILESDIR}/${P}-telepathy-optional.patch" -) - -src_configure(){ - local mycmakeargs=( - -DQTINDICATE_DISABLE=$(usex "!ayatana") - $(cmake-utils_use_find_package telepathy TelepathyQt4) - -DWITH_KDEWEBKIT=$(usex webkit) - ) - kde4-base_src_configure -} diff --git a/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch b/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch deleted file mode 100644 index ee16b93..00000000 --- a/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 091d6b1f0e0b473424dab7caea2e6d4964e0be46 -Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com> -Date: Sun Aug 14 23:16:57 2016 +0200 - - Expose HAVE_KWEBKITPART to CMake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a37bb74..20be9fa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH ${CHOQOK_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) - - option(QTINDICATE_DISABLE "Disable support for notifications via indicator") - -+option(WITH_KDEWEBKIT "Build with kdewebkit support" "ON") -+ - find_package(QJson REQUIRED) - find_package(QCA2 REQUIRED) - find_package(QtOAuth REQUIRED) -@@ -27,6 +29,10 @@ else(QTINDICATE_BUILD) - message(STATUS "Optional dependency libindicate-qt not found: Won't support notifications via indicator") - endif(QTINDICATE_BUILD) - -+if(NOT WITH_KDEWEBKIT) -+ set(HAVE_KWEBKITPART 0) -+endif(NOT WITH_KDEWEBKIT) -+ - set(CHOQOK_INCLUDES - ${KDE4_INCLUDES} - ${QT_INCLUDES} diff --git a/net-im/choqok/files/choqok-1.5-telepathy-optional.patch b/net-im/choqok/files/choqok-1.5-telepathy-optional.patch deleted file mode 100644 index a73a846..00000000 --- a/net-im/choqok/files/choqok-1.5-telepathy-optional.patch +++ /dev/null @@ -1,93 +0,0 @@ -commit 92433189c29c425a9bfb3eb10a0ffe767f23febd -Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com> -Date: Sun Aug 14 23:53:08 2016 +0200 - - Fix build with disabled TelepathyQt4 - -diff --git a/plugins/imstatus/CMakeLists.txt b/plugins/imstatus/CMakeLists.txt -index 19c3ef0..cb45c14 100644 ---- a/plugins/imstatus/CMakeLists.txt -+++ b/plugins/imstatus/CMakeLists.txt -@@ -1,6 +1,8 @@ - find_package(TelepathyQt4) - --configure_file(config-imstatus.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-imstatus.h ) -+if(TelepathyQt4_FOUND) -+ add_definitions( -DTELEPATHY_FOUND ) -+endif() - - include_directories( - ${TELEPATHY_QT4_INCLUDE_DIR} -diff --git a/plugins/imstatus/imqdbus.cpp b/plugins/imstatus/imqdbus.cpp -index 7c78b34..a968269 100644 ---- a/plugins/imstatus/imqdbus.cpp -+++ b/plugins/imstatus/imqdbus.cpp -@@ -30,7 +30,7 @@ - - #include <kdebug.h> - --#if TELEPATHY_FOUND -+#ifdef TELEPATHY_FOUND - #include <TelepathyQt/AccountManager> - #include <TelepathyQt/AccountSet> - #include <TelepathyQt/Account> -@@ -51,7 +51,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*))); - -@@ -65,7 +65,7 @@ void IMQDBus::updateStatusMessage(const QString& im, const QString& statusMessag - if ( im == IM_PSI ) usePsi(statusMessage); - if ( im == IM_SKYPE ) useSkype(statusMessage); - if ( im == IM_PIDGIN ) usePidgin(statusMessage); --#if TELEPATHY_FOUND -+#ifdef TELEPATHY_FOUND - if ( im == IM_TELEPATHY ) useTelepathy(statusMessage); - #endif - } -@@ -182,7 +182,7 @@ void IMQDBus::usePidgin(const QString &statusMessage) - } - } - --#if TELEPATHY_FOUND -+#ifdef TELEPATHY_FOUND - void IMQDBus::useTelepathy(const QString &statusMessage) - { - if (m_accountManager->isReady()) { -@@ -224,7 +224,7 @@ QStringList IMQDBus::scanForIMs() - ims << IM_KOPETE; - if ( QDBusConnection::sessionBus().interface()->isServiceRegistered ( "im.pidgin.purple.PurpleService" ).value() ) - ims << IM_PIDGIN; --#if TELEPATHY_FOUND -+#ifdef TELEPATHY_FOUND - if ( QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.freedesktop.Telepathy.AccountManager" ).value() ) - ims << IM_TELEPATHY; - #endif -diff --git a/plugins/imstatus/imqdbus.h b/plugins/imstatus/imqdbus.h -index 890184a..8b2c245 100644 ---- a/plugins/imstatus/imqdbus.h -+++ b/plugins/imstatus/imqdbus.h -@@ -28,9 +28,7 @@ - #include <QString> - #include <QObject> - --#include "config-imstatus.h" -- --#if TELEPATHY_FOUND -+#ifdef TELEPATHY_FOUND - - #include <TelepathyQt/Types> - -@@ -59,7 +57,7 @@ private: - void useSkype(const QString &statusMessage); - void usePidgin(const QString &statusMessage); - --#if TELEPATHY_FOUND -+#ifdef TELEPATHY_FOUND - private slots: - void slotFinished(Tp::PendingOperation *po); -
