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.
Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 157 insertions, 2 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/Manifest b/kde-base/kmail/Manifest
index 1280c36d3a81..14ec60d9bfe8 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,4 +1,5 @@
 AUX kmail-4.1.72-fix.patch 303 RMD160 71a7687bf589cad6189347e960121e5780846f29 SHA1 f34ca2031003a6e29c04cc0f9270b31249f48427 SHA256 9b8c6e387d5b76469350b8f351479b5eab9ca834985d6e29fccfb7a48c803679
+AUX kmail-4.3.1-fix-rename-folder-on-disconnected-IMAP.patch 2768 RMD160 69c22512a2a75bd0442f860f6eca274ad84845a6 SHA1 7ccde57168a535e65861325ad8720ad636a2bafa SHA256 9a9e34dcb6d4fec2c28ce3f7ac6390b4ad7825147d644f3b9da5ff5fda129250
 DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61
 DIST kdepim-3.5-patchset-05.tar.bz2 24339 RMD160 1059e70a9c71197356a9e592a95a53155305cfb0 SHA1 df0426d995b9db6a83679924a97b641ac8e7d997 SHA256 d94b0b3013669501e0cc9816815a4c1809e96861ff14c3067c719b5f6a7a646d
 DIST kdepim-3.5.10.tar.bz2 14559901 RMD160 52a834dc8eb377d397404a16a09c8a59b568b305 SHA1 537da60fe3564ecc0ed2802e744fbf96386909a9 SHA256 95ec92023a25e4868e55389fa4648b337fed870d744d3b63022ed9838ff9b429
@@ -10,6 +11,7 @@ EBUILD kmail-3.5.10.ebuild 2276 RMD160 0914e352750bb398eeddd35736a54c02092a75c4
 EBUILD kmail-3.5.9.ebuild 2268 RMD160 aacf7d5fec3d94bc1e43d07484a2272e29ab46bb SHA1 2e091f9b0f73a82f9a256e50c904b7eabe958b85 SHA256 8ee499c48c8c2bce00fbdda06df8953349ecb6301a94d776c07c28181ae321ef
 EBUILD kmail-4.2.4.ebuild 1272 RMD160 ab45a38dd5093e2709a457beb8ce296e3e69f261 SHA1 78ab10180362d396c815784c037116d0a632f735 SHA256 517eb51025fc98dfae0c3f8da2c42f38876ec8769a6a2ea2251cf1125aa3bd7b
 EBUILD kmail-4.3.0.ebuild 1525 RMD160 f4885df479570ba880a1da4e60a59cd7d0ccde84 SHA1 f375f19dfde30d771c06b671ddd03517f7b6d3ba SHA256 17960688a1ad1af21e59c47ec8b137ab8a32719a8960f19c421a41340f1ed9b5
+EBUILD kmail-4.3.1-r1.ebuild 1823 RMD160 e1e89378435a970ae2da9c62bc1d7aef13d853b7 SHA1 66b4601eb726c67f1b401e8be8f0cae04539901c SHA256 41f0962305c9f9056ab6114833f6d8c4b2345c95b50ad6636c122877bd115a40
 EBUILD kmail-4.3.1.ebuild 1752 RMD160 21241f3e9f12bbefc77869c2c2c6bc6788bc27b3 SHA1 8ae24b1e7d1a1db2c6bd8046087dbf0d687e4ac3 SHA256 ba557274171836747f748f68a430277105437e1657cdf982f0dcd2768b69ec59
-MISC ChangeLog 23527 RMD160 327787bde396af101326763fe48a050594868f19 SHA1 a35f029c3408acb6619195c05d0fdb7d95874f23 SHA256 a88963255f4ea414d62aef0283ca20dac278f846bec9008d51d8d08ed172404c
+MISC ChangeLog 23901 RMD160 e46976b85314cbe2e988fc9df1150cd43708d29b SHA1 88cd85fd9229153a012b8bca8d78cb8d8ad448f6 SHA256 d670ae6b522f37a8c0ff998dd410f6f7095b7635f1ef5ce74bdc84f2da7656e6
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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
+}