Remove old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 5 insertions, 131 deletions

diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index 0d570f442cd4..c698de595335 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.266 2014/05/08 07:32:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.267 2014/05/08 21:09:08 johu Exp $
+
+  08 May 2014; Johannes Huber <johu@gentoo.org>
+  -files/kdepimlibs-4.11.2-sentuuid.patch, -kdepimlibs-4.11.5.ebuild:
+  Remove old.
 
   08 May 2014; Agostino Sarubbo <ago@gentoo.org> kdepimlibs-4.12.5.ebuild:
   Stable for ppc64, wrt bug #504210
diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.11.2-sentuuid.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.11.2-sentuuid.patch
deleted file mode 100644
index b7b6beaf3440..000000000000
--- a/kde-base/kdepimlibs/files/kdepimlibs-4.11.2-sentuuid.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 498d6678f478bd1bd9bdc944bb790f6b16b7ade4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
-Date: Wed, 30 Oct 2013 16:46:45 +0100
-Subject: [PATCH] Wait for changes from resource to be written to Akonadi
- before marking change as processed
-
-This fixes a problem with invalid RIDs after inter-resource moves.
-When there is an another changeReplay for the just moved item
-scheduled in the new parent resource, the item will have invalid RID
-(or rather RID assigned to it by the previous parent resource).
-It's because the ItemModifyJob dispatched from ResourceBase::changesCommitted()
-with the new RID is not finished yet when the next task is dispatched,
-and so the item in resource's EntityCache is not invalidated
-and the resource will use it instead of the updated one.
-
-By waiting for the ItemModifyJob dispatched from changesCommited()
-to finish before marking the change as processed and dispatching
-next task we make sure that in case the next task involves the
-same item the change will be stored in Akonadi and the item will
-be invalidated in local caches, forcing the resource to fetch the
-item again from Akonadi before starting the task.
-
-This fixes 'Invalid uidset' error reported by IMAP resources after
-the MailDispatcher agent moves the mail from local Outbox to remote
-Sent folder and updates it's flags.
-
-BUG: 323762
-BUG: 324807
-CCBUG: 314964
-FIXED-IN: 4.11.3
----
- akonadi/resourcebase.cpp | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/akonadi/resourcebase.cpp b/akonadi/resourcebase.cpp
-index 70c8286..2383ba0 100644
---- a/akonadi/resourcebase.cpp
-+++ b/akonadi/resourcebase.cpp
-@@ -670,12 +670,11 @@ void ResourceBase::changeCommitted( const Item& item )
- 
- void ResourceBase::changesCommitted(const Item::List& items)
- {
--  Q_D( ResourceBase );
-   ItemModifyJob *job = new ItemModifyJob( items );
-   job->d_func()->setClean();
-   job->disableRevisionCheck(); // TODO: remove, but where/how do we handle the error?
-   job->setIgnorePayload( true ); // we only want to reset the dirty flag and update the remote id
--  d->changeProcessed();
-+  connect( job, SIGNAL(finished(KJob*)), this, SLOT(changeCommittedResult(KJob*)) );
- }
- 
- void ResourceBase::changeCommitted( const Collection &collection )
-@@ -687,9 +686,16 @@ void ResourceBase::changeCommitted( const Collection &collection )
- void ResourceBasePrivate::changeCommittedResult( KJob *job )
- {
-   Q_Q( ResourceBase );
--  if ( job->error() )
--    emit q->error( i18nc( "@info", "Updating local collection failed: %1.", job->errorText() ) );
--  mChangeRecorder->d_ptr->invalidateCache( static_cast<CollectionModifyJob*>( job )->collection() );
-+  if ( qobject_cast<CollectionModifyJob*>( job ) ) {
-+    if ( job->error() ) {
-+      emit q->error( i18nc( "@info", "Updating local collection failed: %1.", job->errorText() ) );
-+    }
-+    mChangeRecorder->d_ptr->invalidateCache( static_cast<CollectionModifyJob*>( job )->collection() );
-+  } else {
-+    // TODO: Error handling for item changes?
-+    // Item cache is invalidated by ItemModifyJob
-+  }
-+
-   changeProcessed();
- }
- 
--- 
-1.8.3.2
-
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild
deleted file mode 100644
index 74816d38cb65..000000000000
--- a/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild,v 1.7 2014/04/21 13:39:56 johu Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE PIM apps."
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug ldap prison"
-
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
-RESTRICT="test"
-
-DEPEND="
-	!kde-misc/akonadi-social-utils
-	$(add_kdebase_dep nepomuk-core)
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	>=app-crypt/gpgme-1.1.6
-	>=app-office/akonadi-server-1.10.1[soprano(+)]
-	>=dev-libs/boost-1.35.0-r5:=
-	dev-libs/libgpg-error
-	>=dev-libs/libical-0.43
-	dev-libs/cyrus-sasl
-	>=dev-libs/qjson-0.8.1
-	media-libs/phonon
-	x11-misc/shared-mime-info
-	prison? ( media-libs/prison )
-	ldap? ( net-nds/openldap )
-"
-# boost is not linked to, but headers which include it are installed
-# bug #418071
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_find_package ldap)
-		$(cmake-utils_use_find_package prison)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-	rm "${ED}"/usr/share/apps/cmake/modules/FindQJSON.cmake
-	rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with	net-im/choqok
-}