summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2014-03-12 11:21:07 +0000
committerJohannes Huber <johu@gentoo.org>2014-03-12 11:21:07 +0000
commit82be990b3e85ce2c511a20645843fd6c793dbb17 (patch)
treec2e05cff1e920f3c1495b012090890e17a897b52 /net-im/ktp-accounts-kcm
parentVersion bump for the 3.4 series, remove old. (diff)
downloadgentoo-2-82be990b3e85ce2c511a20645843fd6c793dbb17.tar.gz
gentoo-2-82be990b3e85ce2c511a20645843fd6c793dbb17.tar.bz2
gentoo-2-82be990b3e85ce2c511a20645843fd6c793dbb17.zip
Remove KDE Telepathy 0.6.3.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'net-im/ktp-accounts-kcm')
-rw-r--r--net-im/ktp-accounts-kcm/ChangeLog7
-rw-r--r--net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch41
-rw-r--r--net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch27
-rw-r--r--net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.6.3.ebuild33
4 files changed, 6 insertions, 102 deletions
diff --git a/net-im/ktp-accounts-kcm/ChangeLog b/net-im/ktp-accounts-kcm/ChangeLog
index d00a96ba1552..ac5ef98bc22d 100644
--- a/net-im/ktp-accounts-kcm/ChangeLog
+++ b/net-im/ktp-accounts-kcm/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/ktp-accounts-kcm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ChangeLog,v 1.26 2014/03/12 10:49:14 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ChangeLog,v 1.27 2014/03/12 11:21:06 johu Exp $
+
+ 12 Mar 2014; Johannes Huber <johu@gentoo.org> -ktp-accounts-kcm-0.6.3.ebuild,
+ -files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch,
+ -files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch:
+ Remove KDE Telepathy 0.6.3.
*ktp-accounts-kcm-0.8.0 (12 Mar 2014)
diff --git a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch
deleted file mode 100644
index b20536db4605..000000000000
--- a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit ce0b5d9b435f4102aae35b3a3d5e9e6d0cb27154
-Author: Anant Kamath <kamathanant@gmail.com>
-Date: Mon Oct 7 04:15:55 2013 +0530
-
- Fixed to use ModemManagerQt 0.5.1 API correctly
-
- BUG: 325377
-
-diff --git a/plugins/pintxo/modem-combobox.cpp b/plugins/pintxo/modem-combobox.cpp
-index db949c4..9e15c0c 100644
---- a/plugins/pintxo/modem-combobox.cpp
-+++ b/plugins/pintxo/modem-combobox.cpp
-@@ -33,8 +33,8 @@ ModemComboBox::ModemComboBox(QWidget* parent) : QComboBox(parent)
- Q_FOREACH(ModemManager::ModemInterface::Ptr modem, modems) {
- ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modem->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
- if(!simCard.isNull()) {
-- QString simIdent = simCard->getSimIdentifier();
-- QDBusReply<QString> spn = simCard->getSpn();
-+ QString simIdent = simCard->simIdentifier();
-+ QDBusReply<QString> spn = simCard->serviceProviderName();
- addItem(spn.isValid() ? spn.value() : QLatin1String("Unknown modem"));
- }
- }
-@@ -51,7 +51,7 @@ QString ModemComboBox::selectedSimIdentifier()
- if(!modem.isNull()){
- ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modems.at(currentIndex())->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
- if(!simCard.isNull()) {
-- return simCard->getSimIdentifier();
-+ return simCard->simIdentifier();
- }
- }
- return QString();
-@@ -64,7 +64,7 @@ void ModemComboBox::setSelectedModem(const QString &selectedSimIdentifier)
- Q_FOREACH(ModemManager::ModemInterface::Ptr modem, modems) {
- ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modem->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
- if(!simCard.isNull()) {
-- QString simIdent = simCard->getSimIdentifier();
-+ QString simIdent = simCard->simIdentifier();
- if (simIdent == selectedSimIdentifier) {
- setCurrentIndex(i);
- return;
diff --git a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch
deleted file mode 100644
index 54f15344597b..000000000000
--- a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit de71c97def75f047ec0dbaabffb8bc698938e84f
-Author: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed Oct 30 19:19:23 2013 +0100
-
- Make each plugin optional
-
-diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index e270078..e752ef1 100644
---- a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -1,8 +1,8 @@
--add_subdirectory (gabble)
--add_subdirectory (butterfly)
--add_subdirectory (idle)
--add_subdirectory (haze)
--add_subdirectory (rakia)
--add_subdirectory (salut)
--add_subdirectory (sunshine)
--add_subdirectory (pintxo)
-+macro_optional_add_subdirectory (gabble)
-+macro_optional_add_subdirectory (butterfly)
-+macro_optional_add_subdirectory (idle)
-+macro_optional_add_subdirectory (haze)
-+macro_optional_add_subdirectory (rakia)
-+macro_optional_add_subdirectory (salut)
-+macro_optional_add_subdirectory (sunshine)
-+macro_optional_add_subdirectory (pintxo)
diff --git a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.6.3.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.6.3.ebuild
deleted file mode 100644
index 2c65faed54ca..000000000000
--- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.6.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.6.3.ebuild,v 1.1 2013/09/14 15:11:49 johu Exp $
-
-EAPI=5
-
-KDE_MINIMAL="4.7"
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia it
-ja kk km lt mai mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv tr ug uk vi wa zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
- >=net-im/ktp-common-internals-${PV}
- net-im/telepathy-mission-control
- net-libs/telepathy-glib
- >=net-libs/telepathy-qt-0.9.3
-"
-RDEPEND="${DEPEND}
-"