[gentoo-commits] proj/kde:master commit in: kde-base/kdepim-runtime/, kde-base/kdepim-runtime/files/4.4/

[gentoo-commits] proj/kde:master commit in: kde-base/kdepim-runtime/, kde-base/kdepim-runtime/files/4.4/

[Johannes Huber]

commit:     66b85d208eef75aeca9cdc531bbae3feba4a0547
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 20:08:34 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 20:08:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=66b85d20

[kde-base/kdepim-runtime] Moved oldpim compat to tree

Package-Manager: portage-2.2.7

---
 ...gs-when-building-against-a-new-kdepimlibs.patch |  24 -----
 ...Implement-readOnly-for-Akonadi-kresources.patch | 119 ---------------------
 .../files/4.4/9996-no-knut-anymore.patch           |  12 ---
 .../files/4.4/9997-the-future-is-here.patch        |  23 ----
 .../files/4.4/9998-external-akonadi-xml.patch      |  53 ---------
 .../files/4.4/9999-no-akonadi-xml.patch            |  11 --
 .../kdepim-runtime-4.4.11.1-r2.ebuild              |  44 --------
 7 files changed, 286 deletions(-)

diff --git a/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch b/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch
deleted file mode 100644
index 662f38f..0000000
--- a/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ab29b74fe8ec830c6d4c896900939c98d22c0e96 Mon Sep 17 00:00:00 2001
-From: Thomas McGuire <mcguire@kde.org>
-Date: Mon, 25 Apr 2011 00:36:43 +0100
-Subject: [PATCH 1/2] Less warnings when building against a new kdepimlibs.
-
----
- kresources/CMakeLists.txt |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt
-index 9fd1b37..a746796 100644
---- a/kresources/CMakeLists.txt
-+++ b/kresources/CMakeLists.txt
-@@ -1,4 +1,7 @@
- add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-+add_definitions(-DWANT_DEPRECATED_KCAL_API)
-+add_definitions(-DWANT_DEPRECATED_KABC_API)
-+add_definitions(-DWANT_DEPRECATED_KRESOURCE_API)
- include_directories (${kdepim-runtime_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT_QTDBUS_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/shared)
- 
- # include (ConfigureChecks.cmake)
--- 
-1.7.9.2
-

diff --git a/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch b/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch
deleted file mode 100644
index df3967c..0000000
--- a/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 8f85db2a32cab4bad987b2100424fbaf42f6ed26 Mon Sep 17 00:00:00 2001
-From: Thomas McGuire <mcguire@kde.org>
-Date: Mon, 25 Apr 2011 00:50:43 +0100
-Subject: [PATCH 2/2] Implement readOnly() for Akonadi kresources.
-
-Now it doesn't ask me if I want to save in my local calendar
-or in my Facebook folder anymore, since only the local calendar
-is writeable.
-
-REVIEW: 101229
----
- kresources/kabc/resourceakonadi.cpp       |    5 +++++
- kresources/kabc/resourceakonadi.h         |    2 ++
- kresources/kcal/resourceakonadi.cpp       |    5 +++++
- kresources/kcal/resourceakonadi.h         |    2 ++
- kresources/shared/sharedresourceprivate.h |    5 +++++
- kresources/shared/subresourcemodel.h      |   13 +++++++++++++
- 6 files changed, 32 insertions(+)
-
-diff --git a/kresources/kabc/resourceakonadi.cpp b/kresources/kabc/resourceakonadi.cpp
-index d2ea349..39edf6e 100644
---- a/kresources/kabc/resourceakonadi.cpp
-+++ b/kresources/kabc/resourceakonadi.cpp
-@@ -249,5 +249,10 @@ void ResourceAkonadi::setSubresourceCompletionWeight( const QString &subResource
-   }
- }
- 
-+bool ResourceAkonadi::readOnly() const
-+{
-+  return d->isReadOnly();
-+}
-+
- #include "resourceakonadi.moc"
- // kate: space-indent on; indent-width 2; replace-tabs on;
-diff --git a/kresources/kabc/resourceakonadi.h b/kresources/kabc/resourceakonadi.h
-index f2075a4..747a0c1 100644
---- a/kresources/kabc/resourceakonadi.h
-+++ b/kresources/kabc/resourceakonadi.h
-@@ -73,6 +73,8 @@ class ResourceAkonadi : public ResourceABC, public SharedResourceIface
-     virtual QStringList subresources() const;
-     virtual QMap<QString, QString> uidToResourceMap() const;
- 
-+    virtual bool readOnly() const;
-+
-     StoreConfigIface &storeConfig();
- 
-   public Q_SLOTS:
-diff --git a/kresources/kcal/resourceakonadi.cpp b/kresources/kcal/resourceakonadi.cpp
-index d2c9415..9552ffa 100644
---- a/kresources/kcal/resourceakonadi.cpp
-+++ b/kresources/kcal/resourceakonadi.cpp
-@@ -432,6 +432,11 @@ void ResourceAkonadi::doClose()
-   d->doClose();
- }
- 
-+bool ResourceAkonadi::readOnly() const
-+{
-+  return d->isReadOnly();
-+}
-+
- #include "resourceakonadi.moc"
- 
- // kate: space-indent on; indent-width 2; replace-tabs on;
-diff --git a/kresources/kcal/resourceakonadi.h b/kresources/kcal/resourceakonadi.h
-index a220616..f7ee77d 100644
---- a/kresources/kcal/resourceakonadi.h
-+++ b/kresources/kcal/resourceakonadi.h
-@@ -140,6 +140,8 @@ class ResourceAkonadi : public ResourceCalendar, public SharedResourceIface
- 
-     virtual QString infoText() const;
- 
-+    virtual bool readOnly() const;
-+
-   protected:
-     virtual bool doLoad( bool syncCache );
- 
-diff --git a/kresources/shared/sharedresourceprivate.h b/kresources/shared/sharedresourceprivate.h
-index 8019204..ea551d5 100644
---- a/kresources/shared/sharedresourceprivate.h
-+++ b/kresources/shared/sharedresourceprivate.h
-@@ -68,6 +68,11 @@ class SharedResourcePrivate : public ResourcePrivateBase
-       return mModel.subResource( id );
-     }
- 
-+    bool isReadOnly() const
-+    {
-+      return !mModel.hasWritableSubResource();
-+    }
-+
-   protected:
-      SubResourceModelClass mModel;
- 
-diff --git a/kresources/shared/subresourcemodel.h b/kresources/shared/subresourcemodel.h
-index b6f4dc2..956a0ff 100644
---- a/kresources/shared/subresourcemodel.h
-+++ b/kresources/shared/subresourcemodel.h
-@@ -97,6 +97,19 @@ class SubResourceModel : public AbstractSubResourceModel
-       return result;
-     }
- 
-+    bool hasWritableSubResource() const
-+    {
-+      Akonadi::MimeTypeChecker mimeChecker;
-+      mimeChecker.setWantedMimeTypes( SubResourceClass::supportedMimeTypes() );
-+
-+      foreach ( const SubResourceClass *subResource, mSubResourcesByColId ) {
-+        if ( subResource->isWritable() && mimeChecker.isWantedCollection( subResource->collection() ) ) {
-+          return true;
-+        }
-+      }
-+      return false;
-+    }
-+
-     SubResourceClass *findSubResourceForMappedItem( const QString &kresId ) const
-     {
-       foreach ( SubResourceClass *subResource, mSubResourcesByColId ) {
--- 
-1.7.9.2
-

diff --git a/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch b/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch
deleted file mode 100644
index 3383024..0000000
--- a/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index d436115..8f1033c 100644
---- a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -30,7 +30,6 @@ add_subdirectory( ical )
- add_subdirectory( imap )
- add_subdirectory( kabc )
- add_subdirectory( kcal )
--add_subdirectory( knut )
- add_subdirectory( kolabproxy )
- add_subdirectory( localbookmarks )
- add_subdirectory( maildir )

diff --git a/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch b/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch
deleted file mode 100644
index 5a9b886..0000000
--- a/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.cpp kdepim-runtime-4.4.11.1/resourcetester/xmloperations.cpp
---- kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.cpp	2013-12-15 15:41:43.629536906 +0100
-+++ kdepim-runtime-4.4.11.1/resourcetester/xmloperations.cpp	2013-12-15 15:42:33.492539695 +0100
-@@ -34,7 +34,6 @@
- #include <QStringList>
- 
- using namespace Akonadi;
--using namespace AkonadiFuture;
- 
- template <typename T> QTextStream& operator<<( QTextStream &s, const QSet<T> &set )
- {
-diff -ruN kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.h kdepim-runtime-4.4.11.1/resourcetester/xmloperations.h
---- kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.h	2013-12-15 15:41:43.629536906 +0100
-+++ kdepim-runtime-4.4.11.1/resourcetester/xmloperations.h	2013-12-15 15:42:22.195539063 +0100
-@@ -114,7 +114,7 @@
- 
-   private:
-     Akonadi::Collection::List mRoots;
--    AkonadiFuture::XmlDocument mDocument;
-+    Akonadi::XmlDocument mDocument;
-     QString mFileName;
-     QString mErrorMsg;
-     CollectionFields mCollectionFields;

diff --git a/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch b/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch
deleted file mode 100644
index 1358a02..0000000
--- a/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ae557eb6f7c106012a96e6dcc86bc15c71c48c7f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
-Date: Wed, 9 Oct 2013 13:17:28 +0200
-Subject: [PATCH] Fix build of resourcetester against akonadi-xml in kdepimlibs
-
----
- resourcetester/CMakeLists.txt    | 2 +-
- resourcetester/xmloperations.cpp | 2 +-
- resourcetester/xmloperations.h   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/resourcetester/CMakeLists.txt b/resourcetester/CMakeLists.txt
-index 74bd851..c9d0313 100644
---- a/resourcetester/CMakeLists.txt
-+++ b/resourcetester/CMakeLists.txt
-@@ -20,7 +20,7 @@ set( resourcetester_SRCS
- kde4_add_executable(resourcetester ${resourcetester_SRCS})
- 
- target_link_libraries( resourcetester
--  akonadi-xml
-+  ${KDEPIMLIBS_AKONADI_XML_LIBS}
-   ${KDEPIMLIBS_AKONADI_LIBS}
-   ${QT_QTCORE_LIBRARY}
-   ${QT_QTGUI_LIBRARY}
-diff --git a/resourcetester/xmloperations.cpp b/resourcetester/xmloperations.cpp
-index 9bc5202..59b5754 100644
---- a/resourcetester/xmloperations.cpp
-+++ b/resourcetester/xmloperations.cpp
-@@ -25,7 +25,7 @@
- #include <akonadi/collectionfetchscope.h>
- #include <akonadi/itemfetchjob.h>
- #include <akonadi/itemfetchscope.h>
--#include "xml/xmlwritejob.h"
-+#include <akonadi/xml/xmlwritejob.h>
- 
- #include <KDebug>
- 
-diff --git a/resourcetester/xmloperations.h b/resourcetester/xmloperations.h
-index c32b622..e75ad59 100644
---- a/resourcetester/xmloperations.h
-+++ b/resourcetester/xmloperations.h
-@@ -22,7 +22,7 @@
- 
- #include <akonadi/collection.h>
- #include <akonadi/item.h>
--#include "xml/xmldocument.h"
-+#include <akonadi/xml/xmldocument.h>
- 
- #include <QtCore/QMetaEnum>
- #include <QtCore/QObject>
--- 
-1.8.5.1
-

diff --git a/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch b/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch
deleted file mode 100644
index 35c88a3..0000000
--- a/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN kdepim-runtime-4.4.11.1.orig/CMakeLists.txt kdepim-runtime-4.4.11.1/CMakeLists.txt
---- kdepim-runtime-4.4.11.1.orig/CMakeLists.txt	2011-04-21 15:41:44.000000000 +0200
-+++ kdepim-runtime-4.4.11.1/CMakeLists.txt	2013-12-15 14:29:33.078294758 +0100
-@@ -102,7 +102,6 @@
- ############### Now, we add the components ###############
- 
- add_subdirectory(libkdepim-copy)
--add_subdirectory(xml)
- add_subdirectory(resourcetester)
- add_subdirectory(resources)
- add_subdirectory(agents)

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
deleted file mode 100644
index 22061ca..0000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-if [[ ${PV} = *9999* ]]; then
-	KMNAME="kdepim"
-	KMMODULE="runtime"
-	inherit kde4-meta
-else
-	inherit kde4-base
-fi
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs
-
-COMMON_DEPEND="
-	app-misc/strigi
-	>=app-office/akonadi-server-1.3.1
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	$(add_kdebase_dep kdelibs 'semantic-desktop' 4.12)
-	$(add_kdebase_dep kdepimlibs '' 4.12)
-	$(add_kdebase_dep libkdepim)
-	x11-misc/shared-mime-info
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdebase_dep kdepim-icons)
-"
-
-add_blocker akonadi '<4.3.90'
-
-PATCHES=(
-	"${FILESDIR}/4.4/"000[1-2]-*.patch
-	"${FILESDIR}/4.4/"999[6-9]-*.patch
-)