Mbox and imap fixes.

(Portage version: 2.0.54)

5 files changed, 94 insertions, 34 deletions

diff --git a/kde-base/kdepim-kioslaves/ChangeLog b/kde-base/kdepim-kioslaves/ChangeLog
index aba2266af415..886256e9a902 100644
--- a/kde-base/kdepim-kioslaves/ChangeLog
+++ b/kde-base/kdepim-kioslaves/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-kioslaves
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.43 2006/04/06 01:36:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.44 2006/04/22 10:55:50 carlo Exp $
+
+*kdepim-kioslaves-3.5.2-r1 (22 Apr 2006)
+
+  22 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdepim-kioslaves-3.5.2-fixes.diff,
+  +kdepim-kioslaves-3.5.2-r1.ebuild:
+  Mbox and imap fixes.
 
   05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -kdepim-kioslaves-3.5.0.ebuild, -kdepim-kioslaves-3.5.1.ebuild:
diff --git a/kde-base/kdepim-kioslaves/Manifest b/kde-base/kdepim-kioslaves/Manifest
index a81488eaa289..d930ac33c039 100644
--- a/kde-base/kdepim-kioslaves/Manifest
+++ b/kde-base/kdepim-kioslaves/Manifest
@@ -1,43 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0ccfbdccc9e81ca7ab545c43f7754a20 ChangeLog 6210
-RMD160 9fc6ab5456e1433739fa37648ddb4eab2d5737de ChangeLog 6210
-SHA256 e99bcf8f69eafe40846e679612599e0195448ed7d0729b01d979f08339fbc5cc ChangeLog 6210
+MD5 b3e806ea680f10b9652016d3b8c45b1e ChangeLog 6406
 MD5 4781ed6b323012399cdd6a4c4f5070f0 files/configure-fix-kdepim-sasl.patch 1750
-RMD160 12241086d3236561dbfd0b6327e2e74d14d36fe2 files/configure-fix-kdepim-sasl.patch 1750
-SHA256 f2be81ff5a865624f5b55613ea5aa1ecf45f5c7fa99bec514e0ab973fe2bdc9a files/configure-fix-kdepim-sasl.patch 1750
 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kdepim-kioslaves-3.4.1 208
-RMD160 a6185d391139f96c8706b8459f811267aa8254f4 files/digest-kdepim-kioslaves-3.4.1 208
-SHA256 13d734567761359795df4277f8e107a116627d38aca0531bfb91f1a0f4bf6e2f files/digest-kdepim-kioslaves-3.4.1 208
 MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kdepim-kioslaves-3.4.2 282
-RMD160 6c21b8a8578c49208c6a35e538dce0577c45e1b9 files/digest-kdepim-kioslaves-3.4.2 282
-SHA256 68f1cbf0899c203a29e8a535da6e3df2f97811b7e967b76cabc15200470b270b files/digest-kdepim-kioslaves-3.4.2 282
 MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kdepim-kioslaves-3.4.3 67
-RMD160 2b704341b9b6cd49f646304700670dd2324e4ee3 files/digest-kdepim-kioslaves-3.4.3 67
-SHA256 53a597b89fa83f7e953fd6c3565b00cbbceb08c07211f1ba11d1e24883cd82fe files/digest-kdepim-kioslaves-3.4.3 67
 MD5 4b77483fe398773d23a75714c3dd6223 files/digest-kdepim-kioslaves-3.5.2 247
-RMD160 6593013cc2b82f2b51819d483733f409262d7d91 files/digest-kdepim-kioslaves-3.5.2 247
-SHA256 316a6c56abca376dcc823a955f36bb4a04daf20009db56ff7cd3f6f38f150c5e files/digest-kdepim-kioslaves-3.5.2 247
+MD5 342529061ff068b5002fa430c5c6b20c files/digest-kdepim-kioslaves-3.5.2-r1 67
+MD5 9a96c94ff9bc1bbd832aecdf10ba3d9c files/kdepim-kioslaves-3.5.2-fixes.diff 1655
 MD5 58e12ae1cb38bb037aca5d8f4f5f6dcc kdepim-kioslaves-3.4.1.ebuild 600
-RMD160 61a4ac8c5e4618106006af7a4215111c4f4b02e8 kdepim-kioslaves-3.4.1.ebuild 600
-SHA256 4347542c667d59d46da8d5f28048983cd80d3fa6e60cec4e5864a91a8a90bf53 kdepim-kioslaves-3.4.1.ebuild 600
 MD5 129500cb7462d0899369a77aacc3f993 kdepim-kioslaves-3.4.2.ebuild 716
-RMD160 bdb86a29fd8eb9168358a1356ec043ffa713d899 kdepim-kioslaves-3.4.2.ebuild 716
-SHA256 11ff4fdf87a2e9de66ef78e9e0e1806ab710992e126f0840e0487af069d9dde1 kdepim-kioslaves-3.4.2.ebuild 716
 MD5 b6560bfad14a08b0198917343ac20a0f kdepim-kioslaves-3.4.3.ebuild 717
-RMD160 edaf263d9d7953a9fab079cdb2e78ee8929b61cc kdepim-kioslaves-3.4.3.ebuild 717
-SHA256 50168152006a9cd5e4bd9540282796469d00b7f0a1a07cb64088cabd69ff127c kdepim-kioslaves-3.4.3.ebuild 717
+MD5 de9753a18315e7d20d26ba02093650a9 kdepim-kioslaves-3.5.2-r1.ebuild 727
 MD5 04c7787e15aa016897419f1492725ebc kdepim-kioslaves-3.5.2.ebuild 672
-RMD160 632efbb263e50b54bde5fd8832aace9bfd14807b kdepim-kioslaves-3.5.2.ebuild 672
-SHA256 4a267cbf89ca4e263d6c5a377fd2b7eab1abb54fcc4de7894695c8e73e3b7ded kdepim-kioslaves-3.5.2.ebuild 672
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENHAhAiZjviIA2XgRAo74AJ9dh9QIjo6EjuwT0lsYRmvvPbeLtQCgmc3d
-o4MKJdDYbmhTexwr5qHtXM4=
-=J24m
------END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r1 b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r1
new file mode 100644
index 000000000000..9ee81dd048d6
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r1
@@ -0,0 +1 @@
+MD5 ac6b3b503e27a65a7b883c1e0a57262e kdepim-3.5.2.tar.bz2 12887336
diff --git a/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes.diff b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes.diff
new file mode 100644
index 000000000000..4f755073ba20
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes.diff
@@ -0,0 +1,57 @@
+--- kdepim/kioslaves/imap4/imap4.cc	2005/09/14 19:43:34	460690
++++ kdepim/kioslaves/imap4/imap4.cc	2006/04/05 20:34:16	526879
+@@ -2232,6 +2232,10 @@
+           path += item.hierarchyDelimiter();
+         }
+         path += mailboxName;
++        if (path.upper() == "/INBOX/") {
++            // make sure the client can rely on INBOX
++            path = path.upper();
++        }
+       }
+       aURL.setPath(path);
+       atom.m_str = aURL.url(0, 106); // utf-8
+--- kdepim/kioslaves/imap4/imapparser.cc	2006/03/14 18:28:14	518628
++++ kdepim/kioslaves/imap4/imapparser.cc	2006/04/05 20:32:16	526877
+@@ -1745,10 +1745,15 @@
+   {
+     QString temp = (*it);
+ 
+-    // if we have a '/' separator we'll just nuke it
+     int pt = temp.find ('/');
+-    if (pt > 0)
+-      temp.truncate(pt);
++    if (pt > 0) 
++    {
++      if (temp.findRev ('"', pt) == -1 || temp.find('"', pt) == -1)
++      {
++        // if we have non-quoted '/' separator we'll just nuke it
++        temp.truncate(pt);
++      }
++    }
+     if (temp.find ("section=", 0, false) == 0)
+       _section = temp.right (temp.length () - 8);
+     else if (temp.find ("type=", 0, false) == 0)
+--- kdepim/kioslaves/mbox/readmbox.cc	2005/12/27 12:43:58	491743
++++ kdepim/kioslaves/mbox/readmbox.cc	2006/04/14 17:45:24	529892
+@@ -142,8 +142,10 @@
+ 
+ void ReadMBox::rewind()
+ {
+-	if( m_stream )
+-		m_stream->device()->reset();
++	if( !m_stream )
++		return; //Rewinding not possible
++	
++	m_stream->device()->reset();
+ 	m_atend = m_stream->atEnd();
+ }
+ 
+@@ -178,6 +180,7 @@
+ 	if( !m_file->open( IO_ReadOnly ) )
+ 	{
+ 		delete m_file;
++		m_file = 0;
+ 		return false;
+ 	}
+ 	m_stream = new QTextStream( m_file );
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r1.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..23409d42e849
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r1.ebuild,v 1.1 2006/04/22 10:55:50 carlo Exp $
+
+KMNAME=kdepim
+KMMODULE=kioslaves
+
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="kioslaves from kdepim package"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="sasl"
+DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
+	$(deprange 3.5.0 $MAXKDEVER kde-base/libkmime)"
+
+myconf="$myconf $(use_with sasl)"
+
+KMCOPYLIB="libkmime libkmime/"
+KMEXTRACTONLY="libkmime/"
+KMCOMPILEONLY="libemailfunctions"
+
+PATCHES="${FILESDIR}/kdepim-kioslaves-3.5.2-fixes.diff"
\ No newline at end of file