Moved updated kmail ebuild from kde-testing overlay to the tree - thanks to Maciej Mrozowski (reavertm).

Added kmail-4.3.1 patch to fix folder renaming on disconnected IMAP.
(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 154 insertions, 1 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 9dc0f304a3f8..8c08e1c1c25b 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.175 2009/09/01 15:37:02 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.176 2009/10/02 22:42:09 jmbsvicetto Exp $
+
+*kmail-4.3.1-r1 (02 Oct 2009)
+
+  02 Oct 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +kmail-4.3.1-r1.ebuild,
+  +files/kmail-4.3.1-fix-rename-folder-on-disconnected-IMAP.patch:
+  Moved updated kmail ebuild from kde-testing overlay to the tree - thanks
+  to Maciej Mrozowski (reavertm).
+  Added kmail-4.3.1 patch to fix folder renaming on disconnected IMAP.
 
 *kmail-4.3.1 (01 Sep 2009)
 
diff --git a/kde-base/kmail/files/kmail-4.3.1-fix-rename-folder-on-disconnected-IMAP.patch b/kde-base/kmail/files/kmail-4.3.1-fix-rename-folder-on-disconnected-IMAP.patch
new file mode 100644
index 000000000000..d0a7739cb77e
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.3.1-fix-rename-folder-on-disconnected-IMAP.patch
@@ -0,0 +1,75 @@
+Index: kmail/cachedimapjob.cpp
+===================================================================
+--- kmail/cachedimapjob.cpp	(revision 1022962)
++++ kmail/cachedimapjob.cpp	(revision 1022963)
+@@ -510,7 +510,7 @@
+         bool b = kmkernel->iCalIface().isResourceQuiet();
+         kmkernel->iCalIface().setResourceQuiet( true );
+ 
+-        mFolder->take( i );
++        mFolder->takeTemporarily( i );
+         mFolder->addMsgKeepUID( mMsg );
+         mMsg->setTransferInProgress( false );
+ 
+Index: kmail/kmfoldercachedimap.cpp
+===================================================================
+--- kmail/kmfoldercachedimap.cpp	(revision 1022962)
++++ kmail/kmfoldercachedimap.cpp	(revision 1022963)
+@@ -527,6 +527,11 @@
+   return KMFolderMaildir::take( idx );
+ }
+ 
++void KMFolderCachedImap::takeTemporarily( int idx )
++{
++  KMFolderMaildir::take( idx );
++}
++
+ int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
+ {
+   // Possible optimization: Only dirty if not filtered below
+Index: kmail/kmfoldercachedimap.h
+===================================================================
+--- kmail/kmfoldercachedimap.h	(revision 1022962)
++++ kmail/kmfoldercachedimap.h	(revision 1022963)
+@@ -228,10 +228,23 @@
+     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
+     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
+ 
+-    /** Reimplemented from KMFolderMaildir */
+-    virtual KMMessage *take( int idx );
+     bool canDeleteMessages() const;
+ 
++    /**
++     * Reimplemented from KMFolderMaildir
++     * This deletes the message permanently, also from the server. For this,
++     * rememberDeletion() is called, so that the message can be deleted from
++     * the server on the next sync.
++     */
++    virtual KMMessage* take( int idx );
++
++    /**
++     * Like take(), only that the deletion is not remembered, i.e. the
++     * message will not be deleted from the server. Calling this can cause
++     * inconsistencies, so make sure you re-add the message later!
++     */
++    void takeTemporarily( int idx );
++
+     /** Reimplemented from KMFolderMaildir */
+     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
+ 
+Index: kmail/kmfoldercachedimap.cpp
+===================================================================
+--- kmail/kmfoldercachedimap.cpp	(revision 1022963)
++++ kmail/kmfoldercachedimap.cpp	(revision 1022964)
+@@ -1678,6 +1678,11 @@
+     job->start();
+     return true;
+   } else {
++
++    // Nothing to delete on the server, make sure the map is clear again.
++    // Normally this wouldn't be necessary, but there can be stale maps because of
++    // https://issues.kolab.org/issue3833.
++    mDeletedUIDsSinceLastSync.clear();
+     return false;
+   }
+ }
diff --git a/kde-base/kmail/kmail-4.3.1-r1.ebuild b/kde-base/kmail/kmail-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..011a6315e1ca
--- /dev/null
+++ b/kde-base/kmail/kmail-4.3.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.1-r1.ebuild,v 1.1 2009/10/02 22:42:09 jmbsvicetto Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug +handbook +semantic-desktop"
+
+DEPEND="
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkleo-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkpgp-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libksieve-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/mimelib-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kmailcvt-${PV}:${SLOT}[kdeprefix=]
+	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
+"
+
+KMEXTRACTONLY="
+	kaddressbook/org.kde.KAddressbook.Core.xml
+	korganizer/org.kde.Korganizer.Calendar.xml
+	libkleo
+	libkpgp
+	libksieve
+	mimelib
+"
+KMEXTRA="
+	ksendemail/
+	plugins/kmail/
+"
+KMLOADLIBS="libkdepim"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.72-fix.patch"
+	"${FILESDIR}/${P}-fix-rename-folder-on-disconnected-IMAP.patch"
+)
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with semantic-desktop Nepomuk)"
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
+	# Upstream as KDE Bug #198807
+	# (setting via MAKEOPTS to trigger a repoman warning)
+	MAKEOPTS="${MAKEOPTS} -j1"
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+}