Remove unneeded patches.

Package-Manager: portage-2.1.2-r7

5 files changed, 7 insertions, 219 deletions

diff --git a/kde-base/kdepim-kioslaves/ChangeLog b/kde-base/kdepim-kioslaves/ChangeLog
index 37a8645a1370..1cd81e36f11a 100644
--- a/kde-base/kdepim-kioslaves/ChangeLog
+++ b/kde-base/kdepim-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-kioslaves
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.73 2007/02/04 02:12:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.74 2007/02/05 12:13:20 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdepim-kioslaves-3.5.2-fixes.diff,
+  -files/kdepim-kioslaves-3.5.2-fixes-2.diff,
+  -files/configure-fix-kdepim-sasl.patch, -files/imap-dos.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdepim-kioslaves-3.5.2-r3.ebuild:
diff --git a/kde-base/kdepim-kioslaves/files/configure-fix-kdepim-sasl.patch b/kde-base/kdepim-kioslaves/files/configure-fix-kdepim-sasl.patch
deleted file mode 100644
index df21b0477d39..000000000000
--- a/kde-base/kdepim-kioslaves/files/configure-fix-kdepim-sasl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: kioslaves/configure.in.in
-===================================================================
---- kioslaves/configure.in.in	(revision 433553)
-+++ kioslaves/configure.in.in	(working copy)
-@@ -1,16 +1,27 @@
- KDE_CHECK_SSL
- 
-+AC_ARG_WITH(sasl,
-+  [AS_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")
-+  if test "x$SASL2_LIBS" != "x" ; then
-+    AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries])
-+  fi
-+
-+  if test "x$with_sasl" != xcheck && test -z "$SASL2_LIBS"; then
-+    AC_MSG_FAILURE([--with-sasl was given, but test for cyrus-sasl failed])
-+  fi
- fi
- 
--if test "x$SASL2_LIBS" != "x" ; then
--  AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries])
--fi
- AC_SUBST(SASL2_LIBS)
- 
- AM_CONDITIONAL(compile_kio_sieve, test -n "$SASL2_LIBS")
-Index: kioslaves/configure.in.bot
-===================================================================
---- kioslaves/configure.in.bot	(revision 433553)
-+++ kioslaves/configure.in.bot	(working copy)
-@@ -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 --git a/kde-base/kdepim-kioslaves/files/imap-dos.diff b/kde-base/kdepim-kioslaves/files/imap-dos.diff
deleted file mode 100644
index cdbca5e288b9..000000000000
--- a/kde-base/kdepim-kioslaves/files/imap-dos.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: kioslaves/imap4/imapparser.cc
-===================================================================
---- kioslaves/imap4/imapparser.cc	(revision 537000)
-+++ kioslaves/imap4/imapparser.cc	(revision 537001)
-@@ -949,7 +949,9 @@ QAsciiDict < QString > imapParser::parse
- 
-     while (!inWords.isEmpty () && inWords[0] != ')')
-     {
--      retVal.insert (parseLiteralC(inWords), new QString(parseLiteralC(inWords)));
-+      QCString l1 = parseLiteralC(inWords);
-+      QCString l2 = parseLiteralC(inWords);
-+      retVal.insert (l1, new QString(l2));
-     }
- 
-     if (inWords[0] != ')')
diff --git a/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes-2.diff b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes-2.diff
deleted file mode 100644
index 3c492756af59..000000000000
--- a/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes-2.diff
+++ /dev/null
@@ -1,98 +0,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 );
---- kdepim/kioslaves/imap4/imap4.cc	2005/09/14 19:43:34	460690
-+++ kdepim/kioslaves/imap4/imap4.cc	2006/04/24 19:41:11	533427
-@@ -1988,6 +1988,17 @@
-     if (cmd->result () == "OK")
-     {
-       QValueListIterator < imapList > it = listResponses.begin();
-+      if ( it == listResponses.end() )
-+      {
-+          // empty answer - this is a buggy imap server
-+          // as a fallback we fire a normal listing and take the first answer
-+          completeQueue.removeRef (cmd);
-+          cmd = doCommand( imapCommand::clientList("", "%") );
-+          if (cmd->result () == "OK")
-+          {
-+              it = listResponses.begin();
-+          }
-+      }
-       if ( it != listResponses.end() )
-       {
-         namespaceToDelimiter[QString::null] = (*it).hierarchyDelimiter();
-@@ -2232,6 +2243,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/28 08:08:27	534960
-@@ -729,7 +729,7 @@
-   lastStatus = imapInfo ();
- 
-   parseLiteralC(inWords);       // swallow the box
--  if (inWords[0] != '(')
-+  if (inWords.isEmpty() || inWords[0] != '(')
-     return;
- 
-   inWords.pos++;
-@@ -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/imap4/rfcdecoder.cc	2005/07/26 18:54:59	438982
-+++ kdepim/kioslaves/imap4/rfcdecoder.cc	2006/04/26 23:20:45	534373
-@@ -589,8 +589,10 @@
-       break;
-     l++;
-   }
--  if (!*l)
-+  if (!*l) {
-+    free(latin);
-     return _str.ascii ();
-+  }
-   QCString result;
-   l = latin;
-   while (*l)
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
deleted file mode 100644
index 4f755073ba20..000000000000
--- a/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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 );