Add two patches to fix serious issues coming from upstream. Remove stale patches.

(Portage version: 2.1.2-r4)

12 files changed, 107 insertions, 618 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index dc82e8a2231c..7448d867c3ef 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.245 2007/01/27 15:13:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.246 2007/01/27 18:51:23 flameeyes Exp $
+
+*kdepim-3.5.6-r1 (27 Jan 2007)
+
+  27 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdepim-3.2.3-cjk.diff, -files/kdepim-3.4.1-akregator-unread.patch,
+  -files/kdepim-3.4.1-kpilot-fix.patch,
+  -files/kmail-3.4.1-shift+click-crash.diff,
+  -files/kdepim-3.4.2-gcc32.patch, -files/kdepim-3.4.2-partnode.patch,
+  -files/kdepim-3.4-configure.patch,
+  +files/kmail-3.5.6-kde-bug-140660.patch,
+  +files/kmail-3.5.6-templates.patch, +kdepim-3.5.6-r1.ebuild:
+  Add two patches to fix serious issues coming from upstream. Remove stale
+  patches.
 
   27 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kdepim-3.5.5-r2.ebuild,
   kdepim-3.5.6.ebuild:
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.6-r1 b/kde-base/kdepim/files/digest-kdepim-3.5.6-r1
new file mode 100644
index 000000000000..7ae1b4cdfda6
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.5.6-r1
@@ -0,0 +1,6 @@
+MD5 7c13008b1ca98351b461cac5dd183d9a kdepim-3.5-patchset-02.tar.bz2 4208
+RMD160 93e1e0c760278b233ff3d7096154168f6fbcf65a kdepim-3.5-patchset-02.tar.bz2 4208
+SHA256 8c91e5359e58710b5bc8e51b30058f41870a93bbda8b1a5fffc1af91a82128dd kdepim-3.5-patchset-02.tar.bz2 4208
+MD5 e37e6173fe9fd7f242c9502a4ae1d7de kdepim-3.5.6.tar.bz2 13643798
+RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb kdepim-3.5.6.tar.bz2 13643798
+SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 kdepim-3.5.6.tar.bz2 13643798
diff --git a/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff b/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff
deleted file mode 100644
index 3f523611eff9..000000000000
--- a/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -ruN kdepim-3.2.2/knode/knarticlewidget.cpp kdepim-3.2.2.cjk/knode/knarticlewidget.cpp
---- kdepim-3.2.2/knode/knarticlewidget.cpp	2004-04-04 06:14:03.000000000 -0300
-+++ kdepim-3.2.2.cjk/knode/knarticlewidget.cpp	2004-06-04 19:33:25.754204504 -0300
-@@ -191,7 +191,7 @@
-   QStringList cs=KGlobal::charsets()->availableEncodingNames();
-   cs.prepend(i18n("Automatic"));
-   a_ctSetCharset->setItems(cs);
--  a_ctSetCharset->setCurrentItem(0);
-+  a_ctSetCharset->setCurrentItem(34);
-   connect(a_ctSetCharset, SIGNAL(activated(const QString&)),
-           this, SLOT(slotSetCharset(const QString&)));
-   a_ctSetCharsetKeyb = new KAction(i18n("Charset"), Key_C, this,
-diff -ruN kdepim-3.2.2/knode/knconfig.cpp kdepim-3.2.2.cjk/knode/knconfig.cpp
---- kdepim-3.2.2/knode/knconfig.cpp	2003-10-26 06:57:45.000000000 -0400
-+++ kdepim-3.2.2.cjk/knode/knconfig.cpp	2004-06-04 19:43:24.030252720 -0300
-@@ -979,7 +979,7 @@
-     c_omposerCharsets=QStringList::split(',',"us-ascii,utf-8,iso-8859-1,iso-8859-2,"
-     "iso-8859-3,iso-8859-4,iso-8859-5,iso-8859-6,iso-8859-7,iso-8859-8,"
-     "iso-8859-9,iso-8859-10,iso-8859-13,iso-8859-14,iso-8859-15,koi8-r,koi8-u,"
--    "iso-2022-jp,iso-2022-jp-2,iso-2022-kr,euc-jp,euc-kr,Big5,gb2312");
-+    "iso-2022-jp,iso-2022-jp-2,iso-2022-kr,euc-jp,euc-kr,Big5,gb2312,gb18030");
- 
-   c_harset=conf->readEntry("Charset").latin1();
-   if (c_harset.isEmpty()) {
-diff -ruN kdepim-3.2.2/knode/kngroup.cpp kdepim-3.2.2.cjk/knode/kngroup.cpp
---- kdepim-3.2.2/knode/kngroup.cpp	2003-08-08 06:09:07.000000000 -0300
-+++ kdepim-3.2.2.cjk/knode/kngroup.cpp	2004-06-04 20:44:14.870240680 -0300
-@@ -38,7 +38,7 @@
- KNGroup::KNGroup(KNCollection *p)
-   : KNArticleCollection(p), n_ewCount(0), l_astFetchCount(0), r_eadCount(0),
-     l_astNr(0), m_axFetch(0), d_ynDataFormat(1), f_irstNew(-1), l_ocked(false),
--    u_seCharset(false), s_tatus(unknown), i_dentity(0)
-+    u_seCharset(true), s_tatus(unknown), i_dentity(0)
- {
- }
- 
-@@ -85,7 +85,7 @@
-   f_irstNr = info.readNumEntry("firstMsg",0);
-   l_astNr = info.readNumEntry("lastMsg",0);
-   d_ynDataFormat = info.readNumEntry("dynDataFormat",0);
--  u_seCharset = info.readBoolEntry("useCharset", false);
-+  u_seCharset = info.readBoolEntry("useCharset", true);
-   d_efaultChSet = info.readEntry("defaultChSet").latin1();
-   QString s = info.readEntry("status","unknown");
-   if (s=="readOnly")
-diff -ruN kdepim-3.2.2/knode/kngroupmanager.cpp kdepim-3.2.2.cjk/knode/kngroupmanager.cpp
---- kdepim-3.2.2/knode/kngroupmanager.cpp	2003-08-08 06:09:07.000000000 -0300
-+++ kdepim-3.2.2.cjk/knode/kngroupmanager.cpp	2004-06-04 20:47:44.375391056 -0300
-@@ -115,18 +115,18 @@
-       sepPos1 = line.find(' ');
- 
-       if (sepPos1==-1) {        // no description
--        name = QString::fromUtf8(line);
-+        name = QString::fromLocal8Bit(line);
-         description = QString::null;
-         status = KNGroup::unknown;
-       } else {
--        name = QString::fromUtf8(line.left(sepPos1));
-+        name = QString::fromLocal8Bit(line.left(sepPos1));
- 
-         sepPos2 = line.find(' ',sepPos1+1);
-         if (sepPos2==-1) {        // no status
--          description = QString::fromUtf8(line.right(line.length()-sepPos1-1));
-+          description = QString::fromLocal8Bit(line.right(line.length()-sepPos1-1));
-           status = KNGroup::unknown;
-         } else {
--          description = QString::fromUtf8(line.right(line.length()-sepPos2-1));
-+          description = QString::fromLocal8Bit(line.right(line.length()-sepPos2-1));
-           switch (line[sepPos1+1]) {
-             case 'u':   status = KNGroup::unknown;
-                         break;
-@@ -171,7 +171,7 @@
- 
-   if(f.open(IO_WriteOnly)) {
-     for (KNGroupInfo *i=groups->first(); i; i=groups->next()) {
--      temp = i->name.utf8();
-+      temp = i->name.local8Bit();
-       switch (i->status) {
-         case KNGroup::unknown: temp += " u ";
-                                break;
-@@ -182,7 +182,7 @@
-         case KNGroup::moderated: temp += " m ";
-                                  break;
-       }
--      temp += i->description.utf8() + "\n";
-+      temp += i->description.local8Bit() + "\n";
-       f.writeBlock(temp.data(),temp.length());
-     }
-     f.close();
-diff -ruN kdepim-3.2.2/knode/knnntpclient.cpp kdepim-3.2.2.cjk/knode/knnntpclient.cpp
---- kdepim-3.2.2/knode/knnntpclient.cpp	2004-01-17 08:55:17.000000000 -0400
-+++ kdepim-3.2.2.cjk/knode/knnntpclient.cpp	2004-06-04 22:20:45.024553432 -0300
-@@ -113,7 +113,7 @@
-     } else {
-       s[0] = 0;    // cut string
- 
--      name = QString::fromUtf8(line);
-+      name = QString::fromLocal8Bit(line);
- 
-       if (target->subscribed.contains(name)) {
-         target->subscribed.remove(name);    // group names are unique, we wont find it again anyway...
-@@ -182,7 +182,7 @@
-           s++;
-           while (*s == ' ' || *s == '\t') s++;    // go on to the description
- 
--          name = QString::fromUtf8(line);
-+          name = QString::fromLocal8Bit(line);
-           if (target->codecForDescriptions)          // some countries use local 8 bit characters in the tag line
-             description = target->codecForDescriptions->toUnicode(s);
-           else
-@@ -248,7 +248,7 @@
- #endif
-     } else {
-       s[0] = 0;    // cut string
--      name = QString::fromUtf8(line);
-+      name = QString::fromLocal8Bit(line);
- 
-       while (s[1]!=0) s++;   // the last character determines the moderation status
-       switch (s[0]) {
-@@ -284,7 +284,7 @@
-     int rep;
- 
-     for (KNGroupInfo *group=tmpList.first(); group; group=tmpList.next()) {
--      if (!sendCommand(cmd+group->name.utf8(),rep))
-+      if (!sendCommand(cmd+group->name.local8Bit(),rep))
-         return;
-       if (rep != 215)        // 215 informations follows
-         break;
-@@ -339,7 +339,7 @@
-               .arg(account.server()).arg(target->groupname());
- 
-   cmd="GROUP ";
--  cmd+=target->groupname().utf8();
-+  cmd+=target->groupname().local8Bit();
-   if (!sendCommandWCheck(cmd,211)) {       // 211 n f l s group selected
-     return;
-   }
-@@ -440,7 +440,7 @@
-     QString groupName = static_cast<KNGroup*>(target->collection())->groupname();
-     if (currentGroup != groupName) {
-       cmd="GROUP ";
--      cmd+=groupName.utf8();
-+      cmd+=groupName.local8Bit();
-       if (!sendCommandWCheck(cmd,211))       // 211 n f l s group selected
-         return;
-       currentGroup = groupName;
-diff -ruN kdepim-3.2.2/libkdenetwork/kmime_headers.cpp kdepim-3.2.2.cjk/libkdenetwork/kmime_headers.cpp
---- kdepim-3.2.2/libkdenetwork/kmime_headers.cpp	2003-07-28 04:09:53.000000000 -0300
-+++ kdepim-3.2.2.cjk/libkdenetwork/kmime_headers.cpp	2004-06-04 22:22:54.000946040 -0300
-@@ -946,14 +946,14 @@
- 
- void Newsgroups::fromUnicodeString(const QString &s, const QCString&)
- {
--  g_roups=s.utf8();
-+  g_roups=s.local8Bit();
-   e_ncCS=cachedCharset("UTF-8");
- }
- 
- 
- QString Newsgroups::asUnicodeString()
- {
--  return QString::fromUtf8(g_roups);
-+  return QString::fromLocal8Bit(g_roups);
- }
- 
- 
diff --git a/kde-base/kdepim/files/kdepim-3.4-configure.patch b/kde-base/kdepim/files/kdepim-3.4-configure.patch
deleted file mode 100644
index d7024288d3e7..000000000000
--- a/kde-base/kdepim/files/kdepim-3.4-configure.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Nur kdepim-3.4.2.orig/configure.in.in kdepim-3.4.2/configure.in.in
---- kdepim-3.4.2.orig/configure.in.in	2005-07-20 12:03:13.000000000 +0200
-+++ kdepim-3.4.2/configure.in.in	2005-07-26 14:12:19.000000000 +0200
-@@ -46,7 +46,6 @@
- [
-   KDE_CHECK_HEADERS(gnokii.h)
-   AC_REQUIRE([AC_HAVE_XPM])
--  LIB_GNOKII=
-   AC_CHECK_LIB(gnokii, gn_cfg_read,
-        [ LIB_GNOKII="-lgnokii $LIB_BLUETOOTH" ],
-        [
-@@ -58,6 +57,21 @@
-   AC_SUBST(LIB_GNOKII)
- ])
- 
-+AC_ARG_WITH(gnokii,
-+  [AC_HELP_STRING(--with-gnokii,
-+    [enable support for mobile phones through gnokii @<:@default=check@:>@])],
-+  [], with_gnokii=check)
-+
-+LIB_GNOKII=
-+if test "x$with_gnokii" != xno; then
-+  # for kaddressbook/xxport/ and kmobile/devices/gnokii/
-+  KDE_CHECK_BLUETOOTH
-+  KDE_CHECK_GNOKII
-+
-+  if test "x$with_gnokii" != xcheck && test -z "$LIB_GNOKII"; then
-+    AC_MSG_ERROR([--with-gnokii was given, but test for gnokii failed])
-+  fi
-+fi
- 
- dnl the below is copied from kdenetwork's configure as too many apps moved
- dnl and noone can say which tests are needed and which are obsolete for kdepim ;(
-diff -Nur kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.bot kdepim-3.4.2/kaddressbook/xxport/configure.in.bot
---- kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.bot	2005-05-23 14:12:19.000000000 +0200
-+++ kdepim-3.4.2/kaddressbook/xxport/configure.in.bot	2005-07-26 14:11:23.000000000 +0200
-@@ -1,4 +1,4 @@
--if test -z "$LIB_GNOKII"; then
-+if test "x$with_gnokii" = xcheck && test -z "$LIB_GNOKII"; then
-   echo ""
-   echo "libgnokii (http://www.gnokii.org) is missing. The KDE Addressbook mobile phone import/export filter will not be available."
-   echo ""
-diff -Nur kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.in kdepim-3.4.2/kaddressbook/xxport/configure.in.in
---- kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.in	2005-05-23 14:12:19.000000000 +0200
-+++ kdepim-3.4.2/kaddressbook/xxport/configure.in.in	2005-07-26 14:11:23.000000000 +0200
-@@ -1,6 +1,2 @@
- # $Id: kdepim-3.4-configure.patch,v 1.1 2005/07/28 12:58:14 greg_g Exp $
--
--KDE_CHECK_BLUETOOTH
--KDE_CHECK_GNOKII
--
- AM_CONDITIONAL(compile_GNOKIIXXPORT, test -n "$LIB_GNOKII")
-diff -Nur kdepim-3.4.2.orig/kioslaves/configure.in.bot kdepim-3.4.2/kioslaves/configure.in.bot
---- kdepim-3.4.2.orig/kioslaves/configure.in.bot	2005-05-23 14:12:02.000000000 +0200
-+++ kdepim-3.4.2/kioslaves/configure.in.bot	2005-07-26 14:11:34.000000000 +0200
-@@ -1,4 +1,4 @@
--if test -z "$SASL2_LIBS"; then
-+if test "x$with_sasl" = xcheck && test -z "$SASL2_LIBS"; then
-   echo ""
-   echo "cyrus-sasl 2 library is missing. The sieve ioslave will not be built, and imap4 will lack of a lot of authentication methods."
-   echo ""
-diff -Nur kdepim-3.4.2.orig/kioslaves/configure.in.in kdepim-3.4.2/kioslaves/configure.in.in
---- kdepim-3.4.2.orig/kioslaves/configure.in.in	2005-05-23 14:12:02.000000000 +0200
-+++ kdepim-3.4.2/kioslaves/configure.in.in	2005-07-26 14:12:33.000000000 +0200
-@@ -1,16 +1,27 @@
- KDE_CHECK_SSL
- 
-+AC_ARG_WITH(sasl,
-+  [AC_HELP_STRING(--with-sasl,
-+    [enable support for authentication through cyrus-sasl @<:@default=check@:>@])],
-+  [], with_sasl=check)
-+
- sasl2_header="no"
- SASL2_LIBS=""
-+if test "x$with_sasl" != xno; then
-+  KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
-+  if test "$sasl2_header" = "yes" ; then
-+    KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")
-+  fi
- 
--KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
--if test "$sasl2_header" = "yes" ; then
--  KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")
--fi
-+  if test "x$SASL2_LIBS" != "x" ; then
-+    AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries])
-+  fi
- 
--if test "x$SASL2_LIBS" != "x" ; then
--  AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries])
-+  if test "x$with_sasl" != xcheck && test -z "$SASL2_LIBS"; then
-+    AC_MSG_ERROR([--with-sasl was given, but test for cyrus-sasl failed])
-+  fi
- fi
-+
- AC_SUBST(SASL2_LIBS)
- 
- AM_CONDITIONAL(compile_kio_sieve, test -n "$SASL2_LIBS")
-diff -Nur kdepim-3.4.2.orig/kmobile/devices/gnokii/configure.in.in kdepim-3.4.2/kmobile/devices/gnokii/configure.in.in
---- kdepim-3.4.2.orig/kmobile/devices/gnokii/configure.in.in	2005-05-23 14:11:26.000000000 +0200
-+++ kdepim-3.4.2/kmobile/devices/gnokii/configure.in.in	2005-07-26 14:11:23.000000000 +0200
-@@ -1,7 +1,2 @@
- # $Id: kdepim-3.4-configure.patch,v 1.1 2005/07/28 12:58:14 greg_g Exp $
--
--# check for libgnokii (Nokia mobile phone library)
--KDE_CHECK_GNOKII
--
--AM_CONDITIONAL(include_gnokii_device, [test -n "$LIB_GNOKII"])
--
-+AM_CONDITIONAL(include_gnokii_device, test -n "$LIB_GNOKII")
diff --git a/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch b/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch
deleted file mode 100644
index 52bb1026b9a6..000000000000
--- a/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur kdepim-3.4.1.orig/akregator/src/myarticle.cpp kdepim-3.4.1/akregator/src/myarticle.cpp
---- kdepim-3.4.1.orig/akregator/src/myarticle.cpp	2005-05-23 14:11:26.000000000 +0200
-+++ kdepim-3.4.1/akregator/src/myarticle.cpp	2005-06-08 16:54:10.000000000 +0200
-@@ -100,8 +100,7 @@
-         uint parsed = hashStr.toUInt(&parsedOk, 16);
-         if (!parsedOk)
-         {
--            d->hash = calcHash(title() + description() + link().url() + commentsLink().url()
--                    + QString::number(comments()) );
-+            d->hash = calcHash(title() + description() + link().url() + commentsLink().url());
-         }
-         else
-             d->hash = parsed;
diff --git a/kde-base/kdepim/files/kdepim-3.4.1-kpilot-fix.patch b/kde-base/kdepim/files/kdepim-3.4.1-kpilot-fix.patch
deleted file mode 100644
index a6dcc7702e35..000000000000
--- a/kde-base/kdepim/files/kdepim-3.4.1-kpilot-fix.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -Nur kdepim-3.4.1.orig/kpilot/conduits/memofileconduit/memofile-conduit.cc kdepim-3.4.1/kpilot/conduits/memofileconduit/memofile-conduit.cc
---- kdepim-3.4.1.orig/kpilot/conduits/memofileconduit/memofile-conduit.cc	2005-05-23 14:12:37.000000000 +0200
-+++ kdepim-3.4.1/kpilot/conduits/memofileconduit/memofile-conduit.cc	2005-05-27 17:27:52.000000000 +0200
-@@ -114,7 +114,7 @@
- 	setFirstSync( _memofiles->isFirstSync() );
- 	addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory));
- 
--	if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || isFirstSync() ) {
-+	if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
- 		addSyncLogEntry(i18n(" Copying Pilot to PC..."));
- #ifdef DEBUG
- 		DEBUGCONDUIT << fname << ": copying Pilot to PC." << endl;
-@@ -474,17 +474,11 @@
- 	// Note: This will reset both fCategories and fMemoAppInfo, so
- 	//       after this, we need to reinitialize our memofiles object...
- 	setAppInfo();
--	cleanup();
- 
- 	// re-create our memofiles helper...
- 	delete _memofiles;
- 	_memofiles = new Memofiles(fCategories, *fMemoAppInfo, _memo_directory);
- 
--	// make sure we are starting with a clean database on both ends...
--	fDatabase->deleteRecord(0, true);
--	fLocalDatabase->deleteRecord(0, true);
--	cleanup();
--
- 	_memofiles->load(true);
- 
- 	QPtrList<Memofile> memofiles = _memofiles->getAll();
-@@ -496,11 +490,39 @@
- 	}
- 
- 	_memofiles->save();
--
-+	
-+	// now that we've copied from the PC to our handheld, remove anything extra from the
-+	// handheld...
-+	deleteUnsyncedHHRecords();
-+	
- 	return true;
- 
- }
- 
-+void MemofileConduit::deleteUnsyncedHHRecords()
-+{
-+	FUNCTIONSETUP;
-+	if ( syncMode()==SyncMode::eCopyPCToHH )
-+	{
-+		RecordIDList ids=fDatabase->idList();
-+		RecordIDList::iterator it;
-+		for ( it = ids.begin(); it != ids.end(); ++it )
-+		{
-+			if (!_memofiles->find(*it))
-+			{
-+#ifdef DEBUG
-+				DEBUGCONDUIT << fname
-+				<< "Deleting record with ID "<<*it <<" from handheld "
-+				<< "(is not on PC, and syncing with PC->HH direction)"
-+				<< endl;
-+#endif
-+				fDatabase->deleteRecord(*it);
-+				fLocalDatabase->deleteRecord(*it);
-+			}
-+		}
-+	}
-+}
-+
- int MemofileConduit::writeToPilot(Memofile * memofile)
- {
- 	FUNCTIONSETUP;
-diff -Nur kdepim-3.4.1.orig/kpilot/conduits/memofileconduit/memofile-conduit.h kdepim-3.4.1/kpilot/conduits/memofileconduit/memofile-conduit.h
---- kdepim-3.4.1.orig/kpilot/conduits/memofileconduit/memofile-conduit.h	2005-05-23 14:12:37.000000000 +0200
-+++ kdepim-3.4.1/kpilot/conduits/memofileconduit/memofile-conduit.h	2005-05-27 17:27:52.000000000 +0200
-@@ -88,6 +88,7 @@
- 
- 	bool	copyHHToPC();
- 	bool	copyPCToHH();
-+	void	deleteUnsyncedHHRecords();
- 	bool	sync();
- 
- 	int 	writeToPilot(Memofile * memofile);
-diff -Nur kdepim-3.4.1.orig/kpilot/lib/pilotDatabase.cc kdepim-3.4.1/kpilot/lib/pilotDatabase.cc
---- kdepim-3.4.1.orig/kpilot/lib/pilotDatabase.cc	2005-05-23 14:12:43.000000000 +0200
-+++ kdepim-3.4.1/kpilot/lib/pilotDatabase.cc	2005-05-27 17:27:52.000000000 +0200
-@@ -185,7 +185,7 @@
- 	int len = CATEGORY_NAME_SIZE - 1;
- 	QCString t = PilotAppCategory::codec()->fromUnicode(s,len);
- 	memset(categoryInfo()->name[i],0,CATEGORY_NAME_SIZE);
--	qstrncpy(categoryInfo()->name[i],t,kMin(len,(int)CATEGORY_NAME_SIZE));
-+	qstrncpy(categoryInfo()->name[i],t,CATEGORY_NAME_SIZE);
- 	return true;
- }
- 
-diff -Nur kdepim-3.4.1.orig/kpilot/lib/pilotDatabase.h kdepim-3.4.1/kpilot/lib/pilotDatabase.h
---- kdepim-3.4.1.orig/kpilot/lib/pilotDatabase.h	2005-05-23 14:12:43.000000000 +0200
-+++ kdepim-3.4.1/kpilot/lib/pilotDatabase.h	2005-05-27 17:27:52.000000000 +0200
-@@ -279,9 +279,12 @@
- 		int appLen = MAX_APPINFO_SIZE;
- 		unsigned char buffer[MAX_APPINFO_SIZE];
- 
--		appLen = d->readAppBlock(buffer,appLen);
--
--		(*unpack)(&fInfo, buffer, appLen);
-+		if (d && d->isDBOpen())
-+		{
-+			appLen = d->readAppBlock(buffer,appLen);
-+			(*unpack)(&fInfo, buffer, appLen);
-+		}
-+		// fInfo is just a struct, so we can point to it anyway.
- 		init(&fInfo.category,appLen);
- 	} ;
- 
-@@ -289,6 +292,10 @@
- 	{
- 		FUNCTIONSETUP;
- 		unsigned char buffer[MAX_APPINFO_SIZE];
-+		if (!d || !d->isDBOpen())
-+		{
-+			return -1;
-+		}
- 		int appLen = (*pack)(&fInfo, buffer, length());
- 		if (appLen > 0)
- 		{
-diff -Nur kdepim-3.4.1.orig/kpilot/lib/pilotLocalDatabase.cc kdepim-3.4.1/kpilot/lib/pilotLocalDatabase.cc
---- kdepim-3.4.1.orig/kpilot/lib/pilotLocalDatabase.cc	2005-05-23 14:12:43.000000000 +0200
-+++ kdepim-3.4.1/kpilot/lib/pilotLocalDatabase.cc	2005-05-27 17:27:52.000000000 +0200
-@@ -618,7 +618,7 @@
- 
- 	int count;
- 	pi_file_get_entries(dbFile, &count);
--	if (count > 0)
-+	if (count >= 0)
- 	{
- 		KPILOT_DELETE(d);
- 		d = new Private(count);
diff --git a/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch b/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch
deleted file mode 100644
index e81200a10c50..000000000000
--- a/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_oe.cxx kdepim-3.4.2/kmailcvt/filter_oe.cxx
---- kdepim-3.4.2.orig/kmailcvt/filter_oe.cxx	2005-05-23 14:12:15.000000000 +0200
-+++ kdepim-3.4.2/kmailcvt/filter_oe.cxx	2005-07-26 16:33:01.000000000 +0200
-@@ -389,15 +389,15 @@
- {
-     bool found = false;
-     bool foundFilename = false;
--    QString folder = "";
-+    QString folder;
-     // we must do this because folder with more than one upper letter
-     // at start have maybe not a file named like the folder !!!
-     QString search = filename.lower();
-     
-     while (!found)
-     {
--        for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
--            QString tmp[4] = *it;
-+        for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
-+            FolderStructure tmp = *it;
-             if(foundFilename == false) {
-                 QString _tmpFileName = tmp[1];
-                 _tmpFileName = _tmpFileName.lower();
-@@ -410,7 +410,7 @@
-                 QString _currentID = tmp[2];
-                 QString _parentID = tmp[3];
-                 if(_currentID == search) {
--                    if(_parentID == "") { // this is the root of the folder
-+                    if(_parentID.isEmpty()) { // this is the root of the folder
-                         found = true;
-                         break;
-                     } else {
-@@ -421,7 +421,7 @@
-             }
-         }
-         // need to break the while loop maybe in some cases
--        if((foundFilename == false) && (folder == "")) return folder;
-+        if((foundFilename == false) && (folder.isEmpty())) return folder;
-     }
-     return folder;
- }
-diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_oe.hxx kdepim-3.4.2/kmailcvt/filter_oe.hxx
---- kdepim-3.4.2.orig/kmailcvt/filter_oe.hxx	2005-05-23 14:12:15.000000000 +0200
-+++ kdepim-3.4.2/kmailcvt/filter_oe.hxx	2005-07-26 16:33:01.000000000 +0200
-@@ -61,8 +61,17 @@
-     bool parsedFolder;
-     /** true if the current parsing file is the folder file */
-     bool currentIsFolderFile;
-+
-+    /** Folder structure with following  4 entries:
-+        1. descriptive folder name 
-+        2. filename 
-+        3. ID of current folder
-+        4. ID of parent folder 
-+    */
-+    typedef FolderStructureBase<4> FolderStructure;
-     /** matrix with information about the folder structure*/
--    QValueList<QString[4]> folderStructure;
-+    QValueList<FolderStructure> folderStructure;
-+    typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
- 
-     /** name of the current folder */
-     QString folderName;
-diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_pmail.cxx kdepim-3.4.2/kmailcvt/filter_pmail.cxx
---- kdepim-3.4.2.orig/kmailcvt/filter_pmail.cxx	2005-05-23 14:12:15.000000000 +0200
-+++ kdepim-3.4.2/kmailcvt/filter_pmail.cxx	2005-07-26 16:33:01.000000000 +0200
-@@ -325,8 +325,8 @@
-     
-     while (!found)
-     {
--        for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
--            QString tmp[5] = *it;
-+        for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
-+            FolderStructure tmp = *it;
-             
-             QString _ID = tmp[2];
-             if(_ID == search) {
-diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_pmail.hxx kdepim-3.4.2/kmailcvt/filter_pmail.hxx
---- kdepim-3.4.2.orig/kmailcvt/filter_pmail.hxx	2005-05-23 14:12:15.000000000 +0200
-+++ kdepim-3.4.2/kmailcvt/filter_pmail.hxx	2005-07-26 16:33:01.000000000 +0200
-@@ -50,8 +50,18 @@
-     QDir dir;
-     /**  pointer to the info */
-     FilterInfo * inf;
--    /** QStringList with the foldernames, First String contains the ID, the second the folder */
--    QValueList<QString[5]> folderMatrix;
-+
-+    /** Folder structure here has 5 entries. */
-+    typedef FolderStructureBase<5> FolderStructure;
-+    /** List with the folder matrix, which contains following strings:
-+	1. type (2 for root-folder, 1 for folder, 0 for mailarchiv)
-+	2. type (1 for root-folder, 3 for folder, 0 for mailarchiv)  
-+	3. "ID:flag:filename" of folder/archiv   
-+	4. "ID:name" of parent folder
-+	5. name of folder/archiv
-+    */
-+    QValueList<FolderStructure> folderMatrix;
-+    typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
-     
-     /** true, if the folderfile is parsed **/
-     bool folderParsed;
-diff -Nur kdepim-3.4.2.orig/kmailcvt/filters.hxx kdepim-3.4.2/kmailcvt/filters.hxx
---- kdepim-3.4.2.orig/kmailcvt/filters.hxx	2005-05-23 14:12:15.000000000 +0200
-+++ kdepim-3.4.2/kmailcvt/filters.hxx	2005-07-26 16:33:01.000000000 +0200
-@@ -85,6 +85,57 @@
- };
- 
- 
-+
-+/** 
-+* Glorified QString[N] for (a) understandability (b) older gcc compatibility. 
-+*/
-+template <unsigned int size> class FolderStructureBase
-+{
-+public:
-+	typedef QString NString[size];
-+	/** Constructor. Need a default constructor for QValueList. */
-+	FolderStructureBase() {} ;
-+
-+	/** Constructor. Turn N QStrings into a folder structure 
-+	*   description. 
-+	*/
-+	FolderStructureBase(const NString &s)
-+	{
-+	    for(unsigned int i=0; i<size; i++) d[i]=s[i];
-+	} ;
-+
-+	/** Copy Constructor. */
-+	FolderStructureBase(const FolderStructureBase &s)
-+	{
-+	    for(unsigned int i=0; i<size; i++) d[i]=s[i];
-+	} ;
-+
-+	/** Assignment operator. Does the same thing as 
-+	*   the copy constructor.
-+	*/
-+	FolderStructureBase &operator =(const FolderStructureBase &s)
-+	{
-+	    for(unsigned int i=0; i<size; i++) d[i]=s[i];
-+	    return *this;
-+	} ;
-+
-+	/** Access the different fields. There doesn't seem to
-+	*   be a real semantics for the fields.
-+	*/
-+	const QString operator [](unsigned int i) const
-+	{
-+	    if (i<size) return d[i]; else return QString::null;
-+	} ;
-+
-+	/** Access the different fields, for writing. */
-+	QString &operator [](unsigned int i)
-+	{
-+	    Q_ASSERT(i<size);
-+	    if (i<size) return d[i]; else return d[0];
-+	} ;
-+private:
-+	QString d[size];
-+} ;
-+
- #endif
- 
--// vim: ts=2 sw=2 et
diff --git a/kde-base/kdepim/files/kdepim-3.4.2-partnode.patch b/kde-base/kdepim/files/kdepim-3.4.2-partnode.patch
deleted file mode 100644
index 98e55197db06..000000000000
--- a/kde-base/kdepim/files/kdepim-3.4.2-partnode.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur kdepim-3.4.2.orig/kmail/partNode.cpp kdepim-3.4.2/kmail/partNode.cpp
---- kdepim-3.4.2.orig/kmail/partNode.cpp	2005-05-23 14:11:54.000000000 +0200
-+++ kdepim-3.4.2/kmail/partNode.cpp	2005-08-02 12:05:32.000000000 +0200
-@@ -36,6 +36,7 @@
- #include "kmmimeparttree.h"
- #include <mimelib/utility.h>
- #include <qregexp.h>
-+#include <kasciistricmp.h>
- 
- /*
-   ===========================================================================
-@@ -414,7 +415,7 @@
- partNode* partNode::findNodeForDwPart( DwBodyPart* part )
- {
-     partNode* found = 0;
--    if( dwPart()->partId() == part->partId() )
-+    if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 )
-         return this;
-     if( mChild )
-         found = mChild->findNodeForDwPart( part );
diff --git a/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff b/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff
deleted file mode 100644
index caae8a4e5fa5..000000000000
--- a/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmail/kmreaderwin.cpp.orig	2005-07-01 01:26:44.000000000 +0200
-+++ kmail/kmreaderwin.cpp	2005-07-01 01:28:17.000000000 +0200
-@@ -2378,6 +2378,7 @@
-     if ( me->button() == LeftButton && ( me->state() & ShiftButton ) ) {
-       // special processing for shift+click
-       mAtmCurrent = msgPartFromUrl( mUrlClicked );
-+      if ( mAtmCurrent < 0 ) return false;
-       mAtmCurrentName = mUrlClicked.path();
-       slotHandleAttachment( KMHandleAttachmentCommand::Save ); // save
-       return true; // eat event
diff --git a/kde-base/kdepim/files/kmail-3.5.6-kde-bug-140660.patch b/kde-base/kdepim/files/kmail-3.5.6-kde-bug-140660.patch
new file mode 100644
index 000000000000..323e349267b1
--- /dev/null
+++ b/kde-base/kdepim/files/kmail-3.5.6-kde-bug-140660.patch
@@ -0,0 +1,19 @@
+Index: kmfolder.cpp
+===================================================================
+--- kdepim-3.5.6/kmail/kmfolder.cpp	(revision 627528)
++++ kdepim-3.5.6/kmail/kmfolder.cpp	(working copy)
+@@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrList<KMMessage
+ 
+ int KMFolder::find( const KMMsgBase* msg ) const
+ {
+-  return mStorage->find( msg );
++  return mStorage ? mStorage->find( msg ) : 0;
+ }
+ 
+ int KMFolder::find( const KMMessage* msg ) const
+ {
+-  return mStorage->find( msg );
++  return mStorage ? mStorage->find( msg ) : 0;
+ }
+ 
+ int KMFolder::count( bool cache ) const
diff --git a/kde-base/kdepim/files/kmail-3.5.6-templates.patch b/kde-base/kdepim/files/kmail-3.5.6-templates.patch
new file mode 100644
index 000000000000..262c9821a1f9
--- /dev/null
+++ b/kde-base/kdepim/files/kmail-3.5.6-templates.patch
@@ -0,0 +1,20 @@
+--- branches/KDE/3.5/kdepim/kmail/kmfolder.cpp	2006/10/28 17:04:18	599816
++++ branches/KDE/3.5/kdepim/kmail/kmfolder.cpp	2007/01/27 00:32:53	627548
+@@ -631,11 +631,13 @@
+         mWhoField = "From";
+       if ( this == kmkernel->outboxFolder() ||
+            this == kmkernel->sentFolder() ||
+-           this == kmkernel->draftsFolder() )
++           this == kmkernel->draftsFolder() ||
++           this == kmkernel->templatesFolder() )
+         mWhoField = "To";
+-    } else if ( identity.drafts() == idString()
+-                || identity.fcc() == idString() )
+-      // drafts or sent of the identity
++    } else if ( identity.drafts() == idString() ||
++                identity.templates() == idString() ||
++                identity.fcc() == idString() )
++      // drafts, templates or sent of the identity
+       mWhoField = "To";
+     else
+       mWhoField = "From";
diff --git a/kde-base/kdepim/kdepim-3.5.6-r1.ebuild b/kde-base/kdepim/kdepim-3.5.6-r1.ebuild
new file mode 100644
index 000000000000..57401a5d17d5
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.5.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.6-r1.ebuild,v 1.1 2007/01/27 18:51:23 flameeyes Exp $
+
+inherit kde-dist
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdepim-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt gnokii"
+
+# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
+DEPEND="~kde-base/kdebase-${PV}
+	>=dev-libs/cyrus-sasl-2
+	gnokii? ( app-mobilephone/gnokii )
+	crypt? ( >=app-crypt/gpgme-1.1.2-r1
+		|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
+		x11-libs/libXScrnSaver"
+#	Requires pilot-link-0.12.0
+#	pda? ( >=app-pda/pilot-link-0.12.0 dev-libs/libmal )
+
+RDEPEND="${DEPEND}
+	crypt? ( app-crypt/pinentry )"
+
+DEPEND="${DEPEND}
+	x11-proto/scrnsaverproto"
+
+PATCHES="${FILESDIR}/kmail-3.5.6-kde-bug-140660.patch
+	${FILESDIR}/kmail-3.5.6-templates.patch"
+
+src_unpack() {
+	kde_src_unpack
+	# Call Qt 3 designer
+	sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed"
+}
+
+src_compile() {
+	local myconf="--with-sasl $(use_with gnokii)"
+	use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg"
+
+	# use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+	DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+
+	kde_src_compile
+}