rm old files

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

2 files changed, 5 insertions, 54 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index dcad40049be5..8b19a97d642f 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.267 2011/12/11 18:52:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.268 2011/12/12 01:17:55 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/kmail-4.4.10-asyncako.patch:
+  rm old files
 
 *kmail-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/kmail/files/kmail-4.4.10-asyncako.patch b/kde-base/kmail/files/kmail-4.4.10-asyncako.patch
deleted file mode 100644
index b8c07165de72..000000000000
--- a/kde-base/kmail/files/kmail-4.4.10-asyncako.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit cfa404b7188e4c26bddbc9579728f6d25f8cd214
-Author: Stephen Kelly <steveire@gmail.com>
-Date:   Tue Apr 5 11:09:43 2011 +0200
-
-    Start kdepim 4.4 asynchronously if built against 4.6.
-    
-    The synchronous mechanism doesn't have enough time to start
-    before it reports failure.
-
-diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
-index a31973a..10b14e4 100644
---- a/kmail/kmmainwidget.cpp
-+++ b/kmail/kmmainwidget.cpp
-@@ -165,6 +165,9 @@ using KMail::TemplateParser;
- 
- #include <errno.h> // ugh
- 
-+#include <akonadi/control.h>
-+#include <akonadi/servermanager.h>
-+
- #include "kmmainwidget.moc"
- 
- K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
-@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
-     mVacationIndicatorActive( false ),
-     mGoToFirstUnreadMessageInSelectedFolder( false )
- {
-+#if KDE_IS_VERSION(4,6,0)
-+  Akonadi::Control::widgetNeedsAkonadi(this);
-+  Akonadi::ServerManager::start();
-+#endif
-   // must be the first line of the constructor:
-   mStartupDone = false;
-   mWasEverShown = false;
-diff --git a/kmail/main.cpp b/kmail/main.cpp
-index f39ca5f..c2dd1c3 100644
---- a/kmail/main.cpp
-+++ b/kmail/main.cpp
-@@ -145,12 +145,14 @@ int main(int argc, char *argv[])
-   app.setEventLoopReached();
-   app.delayedInstanceCreation();
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   // Start Akonadi
-   if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
-     //TODO: add message box after string freeze
-     kWarning() << "Unable to start Akonadi server, exit application";
-     return 1;
-   }
-+#endif
- 
-   // Go!
-   int ret = qApp->exec();