Remove unneeded patches.

Package-Manager: portage-2.1.2-r7
author: Diego Elio Pettenò <flameeyes@gentoo.org> 2007-02-05 12:40:14 +0000
committer: Diego Elio Pettenò <flameeyes@gentoo.org> 2007-02-05 12:40:14 +0000
commit: 811a7154483119ea9831d8fdfe78190d5f146f40 (patch)
tree: 1769dd645f3ad12960ee724355664d952ee01460 /kde-base
parent: Stable on sparc wrt #165335 (diff)
download: historical-811a7154483119ea9831d8fdfe78190d5f146f40.tar.gz
historical-811a7154483119ea9831d8fdfe78190d5f146f40.tar.bz2
historical-811a7154483119ea9831d8fdfe78190d5f146f40.zip
221 files changed, 400 insertions, 9592 deletions
diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index d4d6b6e52bc9..51564f8a1ed7 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.71 2007/02/04 01:32:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.72 2007/02/05 12:08:24 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdepim-3.4.1-akregator-unread.patch,
+  -files/akregator-3.5-hppa.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -akregator-3.5.2.ebuild:
diff --git a/kde-base/akregator/files/akregator-3.5-hppa.patch b/kde-base/akregator/files/akregator-3.5-hppa.patch
deleted file mode 100644
index 57e3ac4b7e53..000000000000
--- a/kde-base/akregator/files/akregator-3.5-hppa.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: akregator/src/mk4storage/metakit/include/mk4.h
-===================================================================
---- akregator/src/mk4storage/metakit/include/mk4.h	(revision 547241)
-+++ akregator/src/mk4storage/metakit/include/mk4.h	(working copy)
-@@ -100,7 +100,7 @@
- 
-     // and here's the other end of the scale...
- #if !defined (_WIN32) && !defined (q4_LONG64)
--#if defined (_PA_RISC2_0) || defined (__powerpc64__) || defined(__sparcv9) || \
-+#if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
-     defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || \
-     (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
- #define q4_LONG64 1
diff --git a/kde-base/akregator/files/kdepim-3.4.1-akregator-unread.patch b/kde-base/akregator/files/kdepim-3.4.1-akregator-unread.patch
deleted file mode 100644
index 52bb1026b9a6..000000000000
--- a/kde-base/akregator/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/arts/ChangeLog b/kde-base/arts/ChangeLog
index ab0c01fdf8ba..8558b3fb4e44 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.249 2007/02/04 01:33:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.250 2007/02/05 11:44:38 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/1.3.0-jack-configure.in.in.patch, -files/arts-1.2.x.diff,
+  -files/arts-1.3.2-alsa-bigendian.patch, -files/arts-1.4-mcopidl.patch,
+  -files/arts-3.4.1-configure.patch, -files/arts-3.4.1-cpu-overload.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -arts-3.5.2-r1.ebuild:
   Remove old versions.
diff --git a/kde-base/arts/files/1.3.0-jack-configure.in.in.patch b/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
deleted file mode 100644
index a707f01f711b..000000000000
--- a/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.in.in	2004-08-05 13:53:14.000000000 -0500
-+++ configure.in.in	2004-08-26 14:15:51.901070600 -0500
-@@ -697,6 +697,12 @@
- AC_SUBST(GLIB_LIBADD)
- AC_SUBST(GLIB_LDFLAGS)
- 
-+dnl Check jack
-+AC_ARG_ENABLE(jack,
-+[  --disable-jack             disable support for Jack Audio Connection Kit],
-+[arts_with_jack="$enableval"],[arts_with_jack=yes])
-+
-+if test "x$arts_with_jack" = "xyes"; then
- AC_MSG_CHECKING(for Jack Audio Connection Kit)
- if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then
-   JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
-@@ -708,6 +714,8 @@
- else
-   AC_MSG_RESULT(not installed)
- fi
-+fi
-+
- AC_SUBST(JACK_CFLAGS)
- AC_SUBST(JACK_LIBADD)
- AC_SUBST(JACK_LDFLAGS)
diff --git a/kde-base/arts/files/arts-1.2.x.diff b/kde-base/arts/files/arts-1.2.x.diff
deleted file mode 100644
index 377fecb704c1..000000000000
--- a/kde-base/arts/files/arts-1.2.x.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: soundserver/artswrapper.c
-===================================================================
---- soundserver/artswrapper.c	(revision 546970)
-+++ soundserver/artswrapper.c	(working copy)
-@@ -95,6 +95,10 @@ int main(int argc, char **argv)
- #else
- 		setreuid(-1, getuid());
- #endif
-+		if (geteuid() != getuid()) {
-+			perror("setuid()");
-+			return 2;
-+		}
- 	}
- 
- 	if(argc == 0)
-Index: soundserver/crashhandler.cc
-===================================================================
---- soundserver/crashhandler.cc	(revision 546970)
-+++ soundserver/crashhandler.cc	(working copy)
-@@ -196,7 +196,12 @@ CrashHandler::defaultCrashHandler (int s
-           argv[i++] = NULL;
- 
-           setgid(getgid());
--          setuid(getuid());
-+          if (getuid() != geteuid())
-+            setuid(getuid());
-+          if (getuid() != geteuid()) {
-+	    perror("setuid()");
-+            exit(255);
-+          }
- 
-           execvp(crashApp, argv);
- 
diff --git a/kde-base/arts/files/arts-1.3.2-alsa-bigendian.patch b/kde-base/arts/files/arts-1.3.2-alsa-bigendian.patch
deleted file mode 100644
index c4dc0754c29f..000000000000
--- a/kde-base/arts/files/arts-1.3.2-alsa-bigendian.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN arts-1.3.1.orig/flow/audioioalsa.cc arts-1.3.1/flow/audioioalsa.cc
---- arts-1.3.1.orig/flow/audioioalsa.cc	2004-11-14 17:58:25.343403280 +0100
-+++ arts-1.3.1/flow/audioioalsa.cc	2004-11-14 17:54:27.951492336 +0100
-@@ -114,7 +114,11 @@
- 	 */
-     m_card = snd_defaults_pcm_card();  //!! need interface !!
-     m_device = snd_defaults_pcm_device(); //!!
-+#ifdef WORDS_BIGENDIAN
-+    m_format = SND_PCM_SFMT_S16_BE;
-+#else
-     m_format = SND_PCM_SFMT_S16_LE;
-+#endif
-     m_bufferMode = block;  //block/stream (stream mode doesn't work yet)
- 
- 	if(m_card >= 0) {
diff --git a/kde-base/arts/files/arts-1.4-mcopidl.patch b/kde-base/arts/files/arts-1.4-mcopidl.patch
deleted file mode 100644
index 2e51ba3bff67..000000000000
--- a/kde-base/arts/files/arts-1.4-mcopidl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -uNr arts-1.3.91.orig/mcopidl/Makefile.am arts-1.3.91/mcopidl/Makefile.am
---- arts-1.3.91.orig/mcopidl/Makefile.am	2005-01-14 23:56:06.310717856 +0100
-+++ arts-1.3.91/mcopidl/Makefile.am	2005-01-15 00:02:29.459470392 +0100
-@@ -1,4 +1,4 @@
--KDE_CXXFLAGS = $(NOOPT_CXXFLAGS) 
-+KDE_CXXFLAGS = $(NOOPT_CXXFLAGS) -fno-stack-protector -fno-stack-protector-all
- INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop $(all_includes)
- ####### Files
- 
diff --git a/kde-base/arts/files/arts-3.4.1-configure.patch b/kde-base/arts/files/arts-3.4.1-configure.patch
deleted file mode 100644
index 1b424c947055..000000000000
--- a/kde-base/arts/files/arts-3.4.1-configure.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Nur arts-1.4.1.orig/configure.in.in arts-1.4.1/configure.in.in
---- arts-1.4.1.orig/configure.in.in	2005-05-23 13:28:37.000000000 +0200
-+++ arts-1.4.1/configure.in.in	2005-06-05 21:54:05.000000000 +0200
-@@ -242,7 +242,6 @@
-       arts_audiolib_found=yes
-       ])
-   fi
--  AM_CONDITIONAL(HAVE_WAVSUPPORT,  test "x$arts_audiolib_found" = "xyes")
-   AC_SUBST(LIBAUDIOFILE)
-   AC_SUBST(LIBAUDIOFILE_LDFLAGS)
-   AC_LANG_RESTORE
-@@ -491,12 +490,85 @@
- ])
- 
- dnl call the tests
--AC_CHECK_LIBAUDIOIO
--AC_CHECK_LIBAUDIONAS
--AC_CHECK_LIBESD
--AC_CHECK_LIBAUDIOFILE
--AC_CHECK_SGILIBAUDIO
--AC_CHECK_LIBMAS
-+AC_ARG_WITH(libaudioio,
-+  [AS_HELP_STRING(--with-libaudioio,
-+    [enable support for libaudioio @<:@default=check@:>@])],
-+  [], with_libaudioio=check)
-+
-+if test "x$with_libaudioio" != xno; then
-+  AC_CHECK_LIBAUDIOIO
-+
-+  if test "x$with_libaudioio" != xcheck && test -z "$LIBAUDIOIO"; then
-+    AC_MSG_FAILURE([--with-libaudioio was given, but test for libaudioio failed])
-+  fi
-+fi
-+
-+AC_ARG_WITH(nas,
-+  [AS_HELP_STRING(--with-nas,
-+    [enable support for NAS @<:@default=check@:>@])],
-+  [], with_nas=check)
-+
-+if test "x$with_nas" != xno; then
-+  AC_CHECK_LIBAUDIONAS
-+
-+  if test "x$with_nas" != xcheck && test -z "$LIBAUDIONAS"; then
-+    AC_MSG_FAILURE([--with-nas was given, but test for NAS failed])
-+  fi
-+fi
-+
-+AC_ARG_WITH(esd,
-+  [AS_HELP_STRING(--with-esd,
-+    [enable support for EsounD @<:@default=check@:>@])],
-+  [], with_esd=check)
-+
-+if test "x$with_esd" != xno; then
-+  AC_CHECK_LIBESD
-+
-+  if test "x$with_esd" != xcheck && test -z "$LIBESD"; then
-+    AC_MSG_FAILURE([--with-esd was given, but test for EsounD failed])
-+  fi
-+fi
-+
-+AC_ARG_WITH(audiofile,
-+  [AS_HELP_STRING(--with-audiofile,
-+    [enable support for audiofile @<:@default=check@:>@])],
-+  [], with_audiofile=check)
-+
-+if test "x$with_audiofile" != xno; then
-+  AC_CHECK_LIBAUDIOFILE
-+
-+  if test "x$with_audiofile" != xcheck && test -z "$LIBAUDIOFILE"; then
-+    AC_MSG_FAILURE([--with-audiofile was given, but test for audiofile failed])
-+  fi
-+fi
-+AM_CONDITIONAL(HAVE_WAVSUPPORT, test -n "$LIBAUDIOFILE")
-+
-+AC_ARG_WITH(sgilibaudio,
-+  [AS_HELP_STRING(--with-sgilibaudio,
-+    [enable support for SGI libaudio @<:@default=check@:>@])],
-+  [], with_sgilibaudio=check)
-+
-+if test "x$with_sgilibaudio" != xno; then
-+  AC_CHECK_SGILIBAUDIO
-+
-+  if test "x$with_sgilibaudio" != xcheck && test -z "$SGILIBAUDIO"; then
-+    AC_MSG_FAILURE([--with-sgilibaudio was given, but test for SGI libaudio failed])
-+  fi
-+fi
-+
-+AC_ARG_WITH(mas,
-+  [AS_HELP_STRING(--with-mas,
-+    [enable support for MAS @<:@default=check@:>@])],
-+  [], with_mas=check)
-+
-+if test "x$with_mas" != xno; then
-+  AC_CHECK_LIBMAS
-+
-+  if test "x$with_mas" != xcheck && test -z "$LIBMAS"; then
-+    AC_MSG_FAILURE([--with-mas was given, but test for MAS failed])
-+  fi
-+fi
-+
- AC_CHECK_REALTIME_SCHED
- AC_CHECK_GETDOMAINNAME
- AC_CHECK_IOCTL_TYPE
-@@ -704,20 +776,31 @@
- AC_SUBST(GLIB_LIBADD)
- AC_SUBST(GLIB_LDFLAGS)
- 
--AC_MSG_CHECKING(for Jack Audio Connection Kit)
--if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then
--  JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
--  JACK_LIBADD="`$PKG_CONFIG --libs-only-l jack`"
--  JACK_LDFLAGS="`$PKG_CONFIG --libs-only-L jack`"
--  AC_MSG_RESULT(yes)
--  AC_DEFINE(HAVE_LIBJACK, 1,
--        [Define if you have libjack (required if you want Jack support)])
--else
--  AC_MSG_RESULT(not installed)
-+AC_ARG_WITH(jack,
-+  [AS_HELP_STRING(--with-jack,
-+    [enable support for Jack @<:@default=check@:>@])],
-+  [], with_jack=check)
-+
-+if test "x$with_jack" != xno; then
-+  AC_MSG_CHECKING(for Jack Audio Connection Kit)
-+  if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then
-+    JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
-+    JACK_LIBADD="`$PKG_CONFIG --libs-only-l jack`"
-+    JACK_LDFLAGS="`$PKG_CONFIG --libs-only-L jack`"
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(HAVE_LIBJACK, 1,
-+          [Define if you have libjack (required if you want Jack support)])
-+  else
-+    AC_MSG_RESULT(not installed)
-+  fi
-+  AC_SUBST(JACK_CFLAGS)
-+  AC_SUBST(JACK_LIBADD)
-+  AC_SUBST(JACK_LDFLAGS)
-+
-+  if test "x$with_jack" != xcheck && test -z "$JACK_LIBADD"; then
-+    AC_MSG_FAILURE([--with-jack was given, but test for Jack failed])
-+  fi
- fi
--AC_SUBST(JACK_CFLAGS)
--AC_SUBST(JACK_LIBADD)
--AC_SUBST(JACK_LDFLAGS)
- 
- dnl OpenBSD requires an -lossaudio and soundcard.h to provide OSS audio I/O
- AC_CHECK_HEADERS(soundcard.h)
diff --git a/kde-base/arts/files/arts-3.4.1-cpu-overload.patch b/kde-base/arts/files/arts-3.4.1-cpu-overload.patch
deleted file mode 100644
index 6eca5bf467d5..000000000000
--- a/kde-base/arts/files/arts-3.4.1-cpu-overload.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- arts-1.3.2.orig/flow/audioioalsa9.cc	2004-05-26 20:50:18.000000000 +0200
-+++ arts-1.3.2/flow/audioioalsa9.cc	2005-05-20 11:08:54.000000000 +0200
-@@ -263,15 +263,40 @@
- 
- int AudioIOALSA::getParam(AudioParam p)
- {
-+	snd_pcm_sframes_t avail;
- 	switch(p) {
- 
-         case canRead:
- 		if (! m_pcm_capture) return -1;
--		return snd_pcm_frames_to_bytes(m_pcm_capture, snd_pcm_avail_update(m_pcm_capture));
-+		while ((avail = snd_pcm_avail_update(m_pcm_capture)) < 0) {
-+			if (avail == -EPIPE)
-+				avail = xrun(m_pcm_capture);
-+#ifdef HAVE_SND_PCM_RESUME
-+			else if (avail == -ESTRPIPE)
-+				avail = resume(m_pcm_capture);
-+#endif
-+			if (avail < 0) {
-+				arts_info("Capture error: %s", snd_strerror(avail));
-+				return -1;
-+			}
-+		}
-+		return snd_pcm_frames_to_bytes(m_pcm_capture, avail);
- 
- 	case canWrite:
- 		if (! m_pcm_playback) return -1;
--		return snd_pcm_frames_to_bytes(m_pcm_playback, snd_pcm_avail_update(m_pcm_playback));
-+		while ((avail = snd_pcm_avail_update(m_pcm_playback)) < 0) {
-+			if (avail == -EPIPE)
-+				avail = xrun(m_pcm_playback);
-+#ifdef HAVE_SND_PCM_RESUME
-+			else if (avail == -ESTRPIPE)
-+				avail = resume(m_pcm_playback);
-+#endif
-+			if (avail < 0) {
-+				arts_info("Playback error: %s", snd_strerror(avail));
-+				return -1;
-+			}
-+		}
-+		return snd_pcm_frames_to_bytes(m_pcm_playback, avail);
- 
- 	case selectReadFD:
- 		return -1;
diff --git a/kde-base/artsplugin-akode/ChangeLog b/kde-base/artsplugin-akode/ChangeLog
index 6210cf216ea9..48eb9ad2b7dc 100644
--- a/kde-base/artsplugin-akode/ChangeLog
+++ b/kde-base/artsplugin-akode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/artsplugin-akode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-akode/ChangeLog,v 1.45 2007/02/04 01:34:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-akode/ChangeLog,v 1.46 2007/02/05 12:34:13 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/artsplugin-akode-3.5.2-memleak.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -artsplugin-akode-3.5.2-r1.ebuild:
diff --git a/kde-base/artsplugin-akode/files/artsplugin-akode-3.5.2-memleak.patch b/kde-base/artsplugin-akode/files/artsplugin-akode-3.5.2-memleak.patch
deleted file mode 100644
index 6852e3f7ad3c..000000000000
--- a/kde-base/artsplugin-akode/files/artsplugin-akode-3.5.2-memleak.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur kdemultimedia-3.5.1/akode_artsplugin/akodePlayObject_impl.cpp kdemultimedia-3.5.1-2/akode_artsplugin/akodePlayObject_impl.cpp
---- kdemultimedia-3.5.1/akode_artsplugin/akodePlayObject_impl.cpp	2005-09-10 18:20:04.000000000 +1000
-+++ kdemultimedia-3.5.1-2/akode_artsplugin/akodePlayObject_impl.cpp	2006-03-01 10:54:32.000000000 +1000
-@@ -83,6 +83,8 @@
- akodePlayObject_impl::~akodePlayObject_impl()
- {
-     unload();
-+
-+    delete m_packetQueue;
- }
- 
- bool akodePlayObject_impl::loadPlugin(const string &plugin)
-@@ -219,10 +221,9 @@
-         delete bufferedDecoder;
-         bufferedDecoder = 0;
-     }
--#else
--    delete frameDecoder
--    frameDecoder = 0;
- #endif
-+    delete frameDecoder;
-+    frameDecoder = 0;
-     decoder = 0;
-     if (buffer != inBuffer)
-         delete inBuffer;
diff --git a/kde-base/artsplugin-mpeglib/ChangeLog b/kde-base/artsplugin-mpeglib/ChangeLog
index 2c48cb510e51..bbdc1546b65d 100644
--- a/kde-base/artsplugin-mpeglib/ChangeLog
+++ b/kde-base/artsplugin-mpeglib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/artsplugin-mpeglib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/ChangeLog,v 1.62 2007/02/04 01:35:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/ChangeLog,v 1.63 2007/02/05 11:50:46 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/artsplugin-mpeglib-3.5.2-libarts.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -artsplugin-mpeglib-3.5.2.ebuild:
diff --git a/kde-base/artsplugin-mpeglib/files/artsplugin-mpeglib-3.5.2-libarts.patch b/kde-base/artsplugin-mpeglib/files/artsplugin-mpeglib-3.5.2-libarts.patch
deleted file mode 100644
index 3bcc4f439f12..000000000000
--- a/kde-base/artsplugin-mpeglib/files/artsplugin-mpeglib-3.5.2-libarts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: kdemultimedia-3.5.1/configure.in.in
-===================================================================
---- kdemultimedia-3.5.1.orig/configure.in.in
-+++ kdemultimedia-3.5.1/configure.in.in
-@@ -548,4 +548,22 @@ if test "x$with_akode" != xno; then
-   fi
- fi
- 
-+artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
-+AC_PATH_PROG(ARTSCCONFIG, artsc-config, no, $artsc_config_test_path)
-+
-+if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
-+	LIB_ARTS="-lartskde"
-+	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
-+	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
-+	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
-+else
-+	build_arts="no"
-+	LIB_ARTS=""
-+	ARTS_CFLAGS=""
-+	AC_DEFINE(HAVE_ARTS, 0, [no arts support in juk])
-+fi
-+
-+AC_SUBST(LIB_ARTS)
-+AC_SUBST(ARTS_CFLAGS)
-+
- KDE_CHECK_MPEGLIB_ARTS
diff --git a/kde-base/artsplugin-mpg123/ChangeLog b/kde-base/artsplugin-mpg123/ChangeLog
index d984e486d64e..83eeeef713a9 100644
--- a/kde-base/artsplugin-mpg123/ChangeLog
+++ b/kde-base/artsplugin-mpg123/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/artsplugin-mpg123
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/ChangeLog,v 1.39 2007/02/03 12:24:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/ChangeLog,v 1.40 2007/02/05 12:09:09 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/artsplugin-mpg123-mcpu.patch:
+  Remove unneeded patches.
 
 *artsplugin-mpg123-3.5.6 (03 Feb 2007)
 
diff --git a/kde-base/artsplugin-mpg123/files/artsplugin-mpg123-mcpu.patch b/kde-base/artsplugin-mpg123/files/artsplugin-mpg123-mcpu.patch
deleted file mode 100644
index c8262b536a39..000000000000
--- a/kde-base/artsplugin-mpg123/files/artsplugin-mpg123-mcpu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: kdemultimedia-3.4.91/mpg123_artsplugin/configure.in.in
-===================================================================
---- kdemultimedia-3.4.91/mpg123_artsplugin/configure.in.in.orig
-+++ kdemultimedia-3.4.91/mpg123_artsplugin/configure.in.in
-@@ -59,7 +59,6 @@ if test "$ARCH_TYPE" = "i686" -a "$MMX_S
- fi
- # ARCH_PPC
- if test "$ARCH_TYPE" = "ppc"; then
--	ARCH_CFLAGS="$ARCH_CFLAGS -mcpu=ppc"
- 	MPG123_PLAT_LIB=libmpppc.la
- fi
- # ARCH_ULTRA
diff --git a/kde-base/drkonqi/ChangeLog b/kde-base/drkonqi/ChangeLog
index 95236a3bd7f6..769e28d9f699 100644
--- a/kde-base/drkonqi/ChangeLog
+++ b/kde-base/drkonqi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/drkonqi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.70 2007/02/04 01:38:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.71 2007/02/05 12:02:49 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/drkonqi-3.5.2-splitdebug.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -drkonqi-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/drkonqi/files/drkonqi-3.5.2-splitdebug.patch b/kde-base/drkonqi/files/drkonqi-3.5.2-splitdebug.patch
deleted file mode 100644
index 6bffd1715715..000000000000
--- a/kde-base/drkonqi/files/drkonqi-3.5.2-splitdebug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: kdebase-3.5.2/drkonqi/debuggers/gdbrc
-===================================================================
---- kdebase-3.5.2.orig/drkonqi/debuggers/gdbrc
-+++ kdebase-3.5.2/drkonqi/debuggers/gdbrc
-@@ -140,8 +140,8 @@ Comment[xh]=Text based debugger evela kw
- Comment[zh_CN]=在控制台中运行的文本 GNU 调试器
- Comment[zh_TW]=在 Konsole 中執行的 GNU 文字型除錯器
- Comment[zu]=Umcoshi wamaphutha osekelwe umbhalo osuka kwi-GNU kwikhonsoli
--Exec=konsole -e gdb -nw %execname %pid
--ExecBatch=gdb -nw -n -batch -x %tempfile %execname %pid
-+Exec=konsole -e gdb -nw --symbols %execname %execname %pid
-+ExecBatch=gdb -nw -n -batch -x %tempfile --symbols %execname %execname %pid
- TryExec=gdb
- BacktraceCommand=bt
- RemoveFromBacktraceRegExp=\(no debugging symbols found\)\.\.\.\\n?
diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 990b5950dfb3..1bd1251a6ec3 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.77 2007/02/04 01:40:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.78 2007/02/05 11:43:08 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/juk-3.5.2-do_not_use_gstreamer-0.10.diff,
+  -files/juk-3.5.2-filerename.diff,
+  -files/configure-fix-kdemultimedia-juk.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -juk-3.5.2-r1.ebuild:
   Remove old versions.
diff --git a/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch b/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch
deleted file mode 100644
index c96da48765cf..000000000000
--- a/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Index: juk/configure.in.in
-===================================================================
---- juk/configure.in.in	(revision 433763)
-+++ juk/configure.in.in	(working copy)
-@@ -20,39 +20,60 @@
- AC_SUBST(LIB_ARTS)
- AC_SUBST(ARTS_CFLAGS)
- 
--KDE_CHECK_HEADER(tunepimp/tp_c.h,
--[
--	AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz])
--	have_musicbrainz=true
--], [
--	AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz])
--	have_musicbrainz=false
--])
-+AC_ARG_WITH(musicbrainz,
-+  [AS_HELP_STRING(--with-musicbrainz,
-+    [enable support for MusicBrainz @<:@default=check@:>@])],
-+  [], with_musicbrainz=check)
- 
--AM_CONDITIONAL(link_lib_MB, test x$have_musicbrainz = xtrue)
-+have_musicbrainz=no
-+if test "x$with_musicbrainz" != xno; then
-+  KDE_CHECK_HEADER(tunepimp/tp_c.h, have_musicbrainz=yes)
- 
--# pkg-config seems to have a bug where it masks needed -L entries when it
--# shouldn't, so disable that.
-+  if test "x$with_musicbrainz" != xcheck && test "x$have_musicbrainz" != xyes; then
-+    AC_MSG_FAILURE([--with-musicbrainz was given, but test for MusicBrainz failed])
-+  fi
-+fi
- 
--PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
--export PKG_CONFIG_ALLOW_SYSTEM_LIBS
-+if test "x$have_musicbrainz" = xyes; then
-+  AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz])
-+else
-+  AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz])
-+fi
- 
--dnl start with 0.8
--GST_MAJORMINOR=0.8
--GST_REQ=0.8.0
-+AM_CONDITIONAL(link_lib_MB, test "x$have_musicbrainz" = xyes)
- 
--PKG_CHECK_MODULES(GST, \
--	gstreamer-$GST_MAJORMINOR >= $GST_REQ \
--	gstreamer-control-$GST_MAJORMINOR >= $GST_REQ \
--	gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ,
--	have_gst=yes, have_gst=no)
-+AC_ARG_WITH(gstreamer,
-+  [AS_HELP_STRING(--with-gstreamer,
-+    [enable support for GStreamer @<:@default=check@:>@])],
-+  [], with_gstreamer=check)
- 
--dnl Give error if we don't have gstreamer
-+have_gst=no
-+if test "x$with_gstreamer" != xno; then
-+  # pkg-config seems to have a bug where it masks needed -L entries when it
-+  # shouldn't, so disable that.
-+
-+  PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-+  export PKG_CONFIG_ALLOW_SYSTEM_LIBS
-+
-+  dnl start with 0.8
-+  GST_MAJORMINOR=0.8
-+  GST_REQ=0.8.0
-+
-+  PKG_CHECK_MODULES(GST, \
-+    gstreamer-$GST_MAJORMINOR >= $GST_REQ \
-+    gstreamer-control-$GST_MAJORMINOR >= $GST_REQ \
-+    gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ,
-+    have_gst=yes, have_gst=no)
-+
-+  if test "x$with_gstreamer" != xcheck && test "x$have_gst" != xyes; then
-+    AC_MSG_FAILURE([--with-gstreamer was given, but test for GStreamer failed])
-+  fi
-+fi
-+
- if test "x$have_gst" = "xno"; then
- 	GST_CFLAGS=""
- 	LDADD_GST=""
- 	LDFLAGS_GST=""
--	AC_MSG_WARN([GStreamer version >= $GST_REQ required.])
- 	AC_DEFINE(HAVE_GSTREAMER, 0, [have GStreamer])
- else
- 	LDADD_GST=`$PKG_CONFIG --libs-only-l gstreamer-$GST_MAJORMINOR`
-@@ -63,13 +84,14 @@
- 	LIBDIRS_GST=`$PKG_CONFIG --libs-only-L gstreamer-$GST_MAJORMINOR`
- 	LDADD_GST="$LDADD_GST $LIBDIRS_GST"
- 
--	AC_SUBST(GST_CFLAGS)
--	AC_SUBST(LDADD_GST)
--	AC_SUBST(LDFLAGS_GST)
- 	AC_MSG_NOTICE([GStreamer version >= $GST_REQ found.])
- 	AC_DEFINE(HAVE_GSTREAMER, 1, [have GStreamer])
- fi
- 
--if test "x$have_taglib" = "xfalse" || ( test "x$build_arts" = "xno" && test "x$have_gst" = "xno" ) ; then
-+AC_SUBST(GST_CFLAGS)
-+AC_SUBST(LDADD_GST)
-+AC_SUBST(LDFLAGS_GST)
-+
-+if test "x$have_taglib" != xyes || ( test "x$build_arts" = "xno" && test "x$have_gst" = "xno" ) ; then
- 	DO_NOT_COMPILE="$DO_NOT_COMPILE juk"
- fi
-Index: juk/configure.in.bot
-===================================================================
---- juk/configure.in.bot	(revision 433763)
-+++ juk/configure.in.bot	(working copy)
-@@ -1,4 +1,4 @@
--if test "x$have_taglib" = "xfalse"; then
-+if test "x$with_taglib" = xcheck && test "x$have_taglib" != xyes; then
- 	echo "**************************************************"
- 	echo "*"
- 	echo "* JuK will not be built without TagLib." 
-@@ -7,7 +7,7 @@
- 	echo "**************************************************"
- fi
- 
--if test "x$have_gst" = "xno"; then
-+if test "x$with_gstreamer" = xcheck && test "x$have_gst" = xno; then
- 	echo "**************************************************"
- 	echo "*"
- 	echo "* You do not seem to have GStreamer >= 0.8 installed."
-@@ -19,7 +19,7 @@
- 	echo "**************************************************"
- fi
- 
--if test "x$have_musicbrainz" = "xfalse"; then
-+if test "x$with_musicbrainz" = xcheck && test "x$have_musicbrainz" = xno; then
- 	echo "**************************************************"
- 	echo "*"
- 	echo "* You do not seem to have libmusicbrainz and"
diff --git a/kde-base/juk/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff b/kde-base/juk/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
deleted file mode 100644
index fcc5afd0799c..000000000000
--- a/kde-base/juk/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- juk/configure.in.in.orig	2006-04-06 20:28:55.000000000 +0200
-+++ juk/configure.in.in	2006-04-06 20:29:33.000000000 +0200
-@@ -59,9 +59,9 @@
-   	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
- 	export PKG_CONFIG_ALLOW_SYSTEM_LIBS
- 
--	GST_MAJORMINOR=0.10
--	GST_REQ=0.10.0
--	GST_VERSION=10
-+	GST_MAJORMINOR=0.8
-+	GST_REQ=0.8.0
-+	GST_VERSION=8
- 
- 	PKG_CHECK_MODULES(GST, \
- 		gstreamer-$GST_MAJORMINOR >= $GST_REQ, \
diff --git a/kde-base/juk/files/juk-3.5.2-filerename.diff b/kde-base/juk/files/juk-3.5.2-filerename.diff
deleted file mode 100644
index 6a2d66d332b0..000000000000
--- a/kde-base/juk/files/juk-3.5.2-filerename.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- juk/tagrenameroptions.cpp.orig	2006-04-05 17:08:35.000000000 +0200
-+++ juk/tagrenameroptions.cpp	2006-04-05 17:08:59.000000000 +0200
-@@ -147,7 +147,7 @@
- TagType TagRenamerOptions::tagFromCategoryText(const QString &text)
- {
-     for(unsigned i = StartTag; i < NumTypes; ++i)
--        if(tagTypeText(static_cast<TagType>(i), false) == text)
-+        if(tagTypeText(static_cast<TagType>(i), true) == text)
-             return static_cast<TagType>(i);
- 
-     return Unknown;
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 50956d2bca0d..06d2e2143475 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.70 2007/02/04 01:41:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.71 2007/02/05 12:14:46 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/configure-fix-kdepim-gnokii-3.4.patch,
+  -files/kaddressbook-3.5.2-addressee-hompage-fix.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kaddressbook-3.5.2-r1.ebuild:
diff --git a/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch b/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch
deleted file mode 100644
index ecb73ecee065..000000000000
--- a/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: kaddressbook/xxport/configure.in.in
-===================================================================
---- kaddressbook/xxport/configure.in.in	(revision 433932)
-+++ kaddressbook/xxport/configure.in.in	(working copy)
-@@ -1,6 +1,2 @@
- # $Id: configure-fix-kdepim-gnokii-3.4.patch,v 1.1 2005/07/28 21:16:10 danarmak Exp $
--
--KDE_CHECK_BLUETOOTH
--KDE_CHECK_GNOKII
--
- AM_CONDITIONAL(compile_GNOKIIXXPORT, test -n "$LIB_GNOKII")
-Index: kaddressbook/xxport/configure.in.bot
-===================================================================
---- kaddressbook/xxport/configure.in.bot	(revision 433932)
-+++ kaddressbook/xxport/configure.in.bot	(working copy)
-@@ -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 ""
-Index: configure.in.in
-===================================================================
---- configure.in.in	(revision 433932)
-+++ configure.in.in	(working copy)
-@@ -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,7 +57,22 @@
-   AC_SUBST(LIB_GNOKII)
- ])
- 
-+AC_ARG_WITH(gnokii,
-+  [AS_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_FAILURE([--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 --git a/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff b/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff
deleted file mode 100644
index 47ce51e754e9..000000000000
--- a/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- kdepim/kaddressbook/addresseeeditorwidget.cpp	2005/08/22 20:40:57	452218
-+++ kdepim/kaddressbook/addresseeeditorwidget.cpp	2006/04/17 19:42:19	530843
-@@ -572,7 +572,14 @@
- 
-   mAddressee.setRole( mRoleEdit->text() );
-   mAddressee.setOrganization( mOrgEdit->text() );
--  mAddressee.setUrl( KURL( mURLEdit->text().stripWhiteSpace() ) );
-+  QString homepage = mURLEdit->text().stripWhiteSpace();
-+  if ( homepage.isEmpty() )
-+     mAddressee.setUrl( KURL() );
-+  else {
-+     if( !homepage.startsWith("http") )
-+       homepage = "http://" + homepage;
-+     mAddressee.setUrl( KURL( homepage ) );
-+  }
-   if ( !mBlogEdit->text().isEmpty() )
-     mAddressee.insertCustom( "KADDRESSBOOK", "BlogFeed", mBlogEdit->text() );
-   else
diff --git a/kde-base/kbabel/ChangeLog b/kde-base/kbabel/ChangeLog
index ce6132b41073..696ef95ccc19 100644
--- a/kde-base/kbabel/ChangeLog
+++ b/kde-base/kbabel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kbabel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/ChangeLog,v 1.54 2007/02/04 01:46:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/ChangeLog,v 1.55 2007/02/05 12:18:22 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/configure-fix-kdesdk-db-3.4.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kbabel-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kbabel/files/configure-fix-kdesdk-db-3.4.patch b/kde-base/kbabel/files/configure-fix-kdesdk-db-3.4.patch
deleted file mode 100644
index 1b60cff7ab08..000000000000
--- a/kde-base/kbabel/files/configure-fix-kdesdk-db-3.4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in
---- kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in	2005-05-23 14:08:28.000000000 +0200
-+++ kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in	2005-07-29 13:41:27.000000000 +0200
-@@ -1,3 +1,10 @@
-+AC_ARG_WITH(berkeley-db,
-+  [AC_HELP_STRING(--with-berkeley-db,
-+    [enable the dictionary plugin based on Berkeley DB IV @<:@default=check@:>@])],
-+  [], with_berkeley_db=check)
-+
-+LIB_DBIV=""
-+if test "x$with_berkeley_db" != xno; then
- 
- AC_MSG_CHECKING([for Berkeley Database IV])
- 
-@@ -122,6 +129,11 @@
- DBIV_INCLUDES="$ac_db_includes"
- DBIV_NAME="$ac_db_name"
- 
-+if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
-+  AC_MSG_ERROR([--with-berkeley-db was given, but test for Berkeley DB IV failed])
-+fi
-+fi
-+
- AC_SUBST(DBIV_INCLUDES)
- AC_SUBST(DBIV_LDFLAGS)
- AC_SUBST(DBIV_NAME)
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 70106c7df92e..f98d8493dbeb 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.82 2007/02/04 01:51:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.83 2007/02/05 12:16:34 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.4.1-configure.patch,
+  -files/kdebase-3.4.2-kinfocenter-opengl-fix.patch,
+  -files/configure.in.in-kdm-settings.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kcontrol-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kcontrol/files/configure.in.in-kdm-settings.diff b/kde-base/kcontrol/files/configure.in.in-kdm-settings.diff
deleted file mode 100644
index 312a4f28db82..000000000000
--- a/kde-base/kcontrol/files/configure.in.in-kdm-settings.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- /dev/null	2004-10-20 22:28:31.361557664 +0200
-+++ kcontrol/configure.in.in	2004-10-10 16:37:14.000000000 +0200
-@@ -0,0 +1,11 @@
-+dnl Taken from kdebase/kdm/configure.in.in to create kdebase/kcontrol/configure.in.in
-+dnl when kcontrol is compiled without kdm being in the source tree
-+
-+KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
-+AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
-+KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
-+AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory])
-+KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
-+AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
-+AC_SUBST(KDE_BINDIR)
-+
diff --git a/kde-base/kcontrol/files/kdebase-3.4.1-configure.patch b/kde-base/kcontrol/files/kdebase-3.4.1-configure.patch
deleted file mode 100644
index 319a96702b3d..000000000000
--- a/kde-base/kcontrol/files/kdebase-3.4.1-configure.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: kcontrol/input/configure.in.bot
-===================================================================
---- kcontrol/input/configure.in.bot	(revision 420060)
-+++ kcontrol/input/configure.in.bot	(working copy)
-@@ -1,10 +1,4 @@
--if test "$LUSBLIB" = "no"; then
--  echo
--  echo "   Problem!  libusb library not found, get it from"
--  echo "   http://libusb.sourceforge.net"
--fi
--
--if (test x"$USB_LIBS" = x""); then
-+if test "x$with_libusb" = xcheck && test "x$have_libusb" = xno; then
-   echo ""
-   echo "Logitech mouse support is disabled. Provide libusb to enable it."
-   echo ""
-Index: kcontrol/input/configure.in.in
-===================================================================
---- kcontrol/input/configure.in.in	(revision 420060)
-+++ kcontrol/input/configure.in.in	(working copy)
-@@ -1,19 +1,26 @@
--LIBUSBCONFIG=""
--AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
--if test $LIBUSBCONFIG = "no"  ; then
--    AC_MSG_WARN(Can't find libusb-config)
--    AC_MSG_WARN(Check your libusb installation)
--    USB_LIBS=""
--    USB_CFLAGS=""
--else  
--    USB_LIBS="$($LIBUSBCONFIG --libs)"
--    USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
--AC_CHECK_LIB(usb,main,
--    AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb]),
--    [],
--    $USB_LIBS
--)
-+AC_ARG_WITH(libusb,
-+    [AS_HELP_STRING(--with-libusb,
-+        [enable control of some mouse models through libusb @<:@default=check@:>@])],
-+    [], with_libusb=check)
-+
-+USB_LIBS=
-+USB_CFLAGS=
-+have_libusb=no
-+if test "x$with_libusb" != xno; then
-+    AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
-+    if test $LIBUSBCONFIG != "no"; then
-+        USB_LIBS="$($LIBUSBCONFIG --libs)"
-+        USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
-+    
-+        AC_CHECK_LIB(usb,main,
-+            [have_libusb=yes
-+             AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])],
-+            [], [$USB_LIBS]
-+        )
-+    fi
-+    if test "x$with_libusb" != xcheck && test "x$have_libusb" = xno; then
-+        AC_MSG_FAILURE([--with-libusb was given, but test for libusb failed])
-+    fi
- fi
- AC_SUBST(USB_LIBS)
- AC_SUBST(USB_CFLAGS)
--
-Index: kcontrol/view1394/configure.in.in
-===================================================================
---- kcontrol/view1394/configure.in.in	(revision 420060)
-+++ kcontrol/view1394/configure.in.in	(working copy)
-@@ -1,3 +1,15 @@
-+AC_ARG_WITH(libraw1394,
-+  [AS_HELP_STRING(--with-libraw1394,
-+    [enable visualization of ieee1394 devices through libraw1394 @<:@default=check@:>@])],
-+  [], with_libraw1394=check)
-+
- VIEW1394_SUBDIR=
--KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
-+if test "x$with_libraw1394" != xno; then
-+  KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
-+
-+  if test "x$with_libraw1394" != xcheck && test -z "$VIEW1394_SUBDIR"; then
-+    AC_MSG_FAILURE([--with-libraw1394 was given, but test for libraw1394 failed])
-+  fi
-+fi
-+
- AM_CONDITIONAL(include_kcontrol_view1394, test -n "$VIEW1394_SUBDIR")
diff --git a/kde-base/kcontrol/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch b/kde-base/kcontrol/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch
deleted file mode 100644
index f18c216257ff..000000000000
--- a/kde-base/kcontrol/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kcontrol/info/opengl.cpp.bak	2005-05-23 07:13:35.000000000 -0500
-+++ kcontrol/info/opengl.cpp	2005-08-27 10:45:08.000000000 -0500
-@@ -235,6 +235,9 @@
-       GL_COMPRESSED_TEXTURE_FORMATS
- */
- 
-+  if (!glExtensions)
-+	return;
-+
-   struct token_name {
-       GLuint type;  // count and flags, !!! count must be <=2 for now
-       GLenum token;
diff --git a/kde-base/kdeaccessibility/ChangeLog b/kde-base/kdeaccessibility/ChangeLog
index e2f133ebd926..2b6c8a0903a0 100644
--- a/kde-base/kdeaccessibility/ChangeLog
+++ b/kde-base/kdeaccessibility/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeaccessibility
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.130 2007/02/04 17:26:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.131 2007/02/05 12:16:03 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeaccessibility-3.4.0-noarts.patch,
+  -files/kdeaccessibility-3.4.3-pointer.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org>
   kdeaccessibility-3.5.6.ebuild:
diff --git a/kde-base/kdeaccessibility/files/kdeaccessibility-3.4.0-noarts.patch b/kde-base/kdeaccessibility/files/kdeaccessibility-3.4.0-noarts.patch
deleted file mode 100644
index f5fbabeb26f5..000000000000
--- a/kde-base/kdeaccessibility/files/kdeaccessibility-3.4.0-noarts.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- kttsd/configure.in.in.org	2005-03-17 22:25:56.000000000 +0100
-+++ kttsd/configure.in.in	2005-03-17 22:26:25.000000000 +0100
-@@ -2,10 +2,6 @@
- 
- ### AM_INIT_AUTOMAKE(kttsd,0.2.0)
- 
--if test "x$build_arts" = "xno"; then
--	DO_NOT_COMPILE="$DO_NOT_COMPILE kttsd"
--fi
--
- AC_ARG_ENABLE(kttsd-gstreamer,
-               AC_HELP_STRING([--enable-kttsd-gstreamer],
-                              [build KTTSD GStreamer audio plugin [default=no]]),
---- kttsd/plugins/freetts/configure.in.in.org	2005-03-17 22:29:06.000000000 +0100
-+++ kttsd/plugins/freetts/configure.in.in	2005-03-17 22:29:13.000000000 +0100
-@@ -13,6 +13,10 @@
- if test "x$freetts_plugin" = "xno"; then
-   compile_freetts_plugin="no"
- fi
-+if test "x$build_arts" = "xno"; then
-+  compile_freetts_plugin="no"
-+fi
-+
- 
- dnl Check for festival executable.
- dnl Note that Festival Interactive plugin is always built
---- kttsd/configure.in.in.org	2005-03-17 22:25:56.000000000 +0100
-+++ kttsd/configure.in.in	2005-03-17 22:49:26.000000000 +0100
-@@ -126,6 +126,7 @@
- fi
- 
- AM_CONDITIONAL(include_kttsd_gstplayer, [test "x$have_gst" = "xyes" && test "x$gstreamer_plugin" = "xyes"])
-+AM_CONDITIONAL(include_kttsd_arts, [test "x$build_arts" = "xyes"])
- 
- dnl ================================================================================
- 
---- kttsd/players/Makefile.am.orig	2005-03-17 22:55:21.000000000 +0100
-+++ kttsd/players/Makefile.am	2005-03-17 22:54:34.000000000 +0100
-@@ -3,8 +3,10 @@
-     gstplayer_DIR = gstplayer
- endif
- 
--SUBDIRS = \
--    artsplayer \
--    $(gstplayer_DIR)
-+if include_kttsd_arts
-+   artsplayer_DIR = artsplayer
-+endif
-+
-+SUBDIRS = $(artsplayer_DIR) $(gstplayer_DIR)
- 
- kde_servicetypes_DATA = kttsd_audioplugin.desktop
---- kttsd/plugins/command/Makefile.am.org	2005-03-17 22:59:24.000000000 +0100
-+++ kttsd/plugins/command/Makefile.am	2005-03-17 22:59:58.000000000 +0100
-@@ -16,7 +16,7 @@
-         commandproc.cpp \
-         commandplugin.cpp
- libkttsd_commandplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libkttsd_commandplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
-+libkttsd_commandplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
- 
- services_DATA = kttsd_commandplugin.desktop
- servicesdir = $(kde_servicesdir)
---- kttsd/plugins/epos/Makefile.am.org	2005-03-17 22:59:35.000000000 +0100
-+++ kttsd/plugins/epos/Makefile.am	2005-03-17 23:00:05.000000000 +0100
-@@ -16,7 +16,7 @@
-         eposproc.cpp \
-         eposplugin.cpp 
- libkttsd_eposplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libkttsd_eposplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
-+libkttsd_eposplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
- 
- services_DATA = kttsd_eposplugin.desktop
- servicesdir = $(kde_servicesdir)
---- kttsd/plugins/flite/Makefile.am.org	2005-03-17 22:59:42.000000000 +0100
-+++ kttsd/plugins/flite/Makefile.am	2005-03-17 23:00:11.000000000 +0100
-@@ -16,7 +16,7 @@
-         fliteproc.cpp \
-         fliteplugin.cpp 
- libkttsd_fliteplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libkttsd_fliteplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
-+libkttsd_fliteplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
- 
- services_DATA = kttsd_fliteplugin.desktop
- servicesdir = $(kde_servicesdir)
---- kttsd/plugins/hadifix/Makefile.am.org	2005-03-17 22:59:50.000000000 +0100
-+++ kttsd/plugins/hadifix/Makefile.am	2005-03-17 23:00:20.000000000 +0100
-@@ -17,7 +17,7 @@
- 	hadifixconfigui.ui \
- 	voicefileui.ui
- libkttsd_hadifixplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libkttsd_hadifixplugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) -lartskde $(top_builddir)/kttsd/libkttsd/libkttsd.la
-+libkttsd_hadifixplugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/kttsd/libkttsd/libkttsd.la
- 
- EXTRA_DIST = male.png female.png 
- 
diff --git a/kde-base/kdeaccessibility/files/kdeaccessibility-3.4.3-pointer.patch b/kde-base/kdeaccessibility/files/kdeaccessibility-3.4.3-pointer.patch
deleted file mode 100644
index 29fec54ab0bb..000000000000
--- a/kde-base/kdeaccessibility/files/kdeaccessibility-3.4.3-pointer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ksayit/src/fxpluginhandler.cpp.old	2005-11-27 05:19:14.000000000 +0900
-+++ ksayit/src/fxpluginhandler.cpp	2005-11-27 05:19:30.000000000 +0900
-@@ -97,7 +97,8 @@
-         plugin.description = p->getDescription_KS();
-         plugin.EffectID    = 0;
-         kdDebug(100200) << "FX-Plugin " << plugin.name << " Handle: " << plugin.handle << " registered." << endl;
--        destroyPlugin(p);
-+	// destroyPlugin(p);
-+	p = NULL;
-         plugin.p = NULL;
-         // add to list of available plugins
-         pmap[plugin.name] = plugin;
diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 9afe4cbef0dc..5f86bdfe5840 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.200 2007/02/04 18:11:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.201 2007/02/05 12:30:08 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeaddons-3.2.0-kvim.diff,
+  -files/noatun-oblique-db-location-3.4.0.diff,
+  -files/kdeaddons-3.4-configure.patch,
+  -files/konq-plugins-3.5.2-arkplugin-crash-fix.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdeaddons-3.5.6-r1.ebuild:
   Marked ~hppa.
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.2.0-kvim.diff b/kde-base/kdeaddons/files/kdeaddons-3.2.0-kvim.diff
deleted file mode 100644
index 6b1aaa827def..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.2.0-kvim.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- vimpart/kcmvim/kcmvim.cpp.agriffis	2003-12-07 23:27:22.000000000 -0500
-+++ vimpart/kcmvim/kcmvim.cpp	2003-12-07 23:27:29.000000000 -0500
-@@ -224,7 +224,7 @@
- 
- void KCMVim::defaults()
- {
--	base->executable->setURL("/usr/bin/vim");
-+	base->executable->setURL("/usr/bin/kvim");
- 	base->menubar->setChecked(false);
- 	base->toolbar->setChecked(false);
- 	reset();
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch b/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch
deleted file mode 100644
index 948cd77631bb..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nur kdeaddons-3.4.2.orig/kicker-applets/mediacontrol/configure.in.in kdeaddons-3.4.2/kicker-applets/mediacontrol/configure.in.in
---- kdeaddons-3.4.2.orig/kicker-applets/mediacontrol/configure.in.in	2005-07-20 18:42:57.000000000 +0200
-+++ kdeaddons-3.4.2/kicker-applets/mediacontrol/configure.in.in	2005-07-26 12:54:48.000000000 +0200
-@@ -32,6 +32,18 @@
-   fi
- ])
- 
--AC_CHECK_XMMS
-+AC_ARG_WITH(xmms,
-+  [AC_HELP_STRING(--with-xmms,
-+    [enable XMMS control applet @<:@default=check@:>@])],
-+  [], with_xmms=check)
-+
-+if test "x$with_xmms" != xno; then
-+  AC_CHECK_XMMS
-+
-+  if test "x$with_xmms" != xcheck && test "x$ac_cv_have_xmms" != xyes; then
-+    AC_MSG_ERROR([--with-xmms was given, but test for XMMS failed])
-+  fi
-+fi
-+
- AC_SUBST(XMMS_LIBS)
- AC_SUBST(XMMS_INCLUDES)
-diff -Nur kdeaddons-3.4.2.orig/noatun-plugins/configure.in.in kdeaddons-3.4.2/noatun-plugins/configure.in.in
---- kdeaddons-3.4.2.orig/noatun-plugins/configure.in.in	2005-07-20 18:42:41.000000000 +0200
-+++ kdeaddons-3.4.2/noatun-plugins/configure.in.in	2005-07-26 12:54:18.000000000 +0200
-@@ -173,14 +173,20 @@
- noatun_sdl=no
- dnl Check for SDL
- dnl require SDL 1.2 just because it's the new stable version, and it's what I have
--NOATUN_PATH_SDL(
--[1.2.0],
--[
--noatun_sdl=yes
--],
--[
--]
--)
-+
-+AC_ARG_WITH(sdl,
-+  [AC_HELP_STRING(--with-sdl,
-+    [enable SDL Noatun plugins @<:@default=check@:>@])],
-+  [], with_sdl=check)
-+
-+if test "x$with_sdl" != xno; then
-+  NOATUN_PATH_SDL([1.2.0], [noatun_sdl=yes], [])
-+
-+  if test "x$with_sdl" != xcheck && test "x$noatun_sdl" != xyes; then
-+    AC_MSG_ERROR([--with-sdl was given, but test for SDL failed])
-+  fi
-+fi
-+
- AM_CONDITIONAL(include_SDL, test "$noatun_sdl" = yes)
- 
- AC_CHECK_HEADERS(endian.h)
-diff -Nur kdeaddons-3.4.2.orig/noatun-plugins/oblique/configure.in.in kdeaddons-3.4.2/noatun-plugins/oblique/configure.in.in
---- kdeaddons-3.4.2.orig/noatun-plugins/oblique/configure.in.in	2005-07-20 18:42:35.000000000 +0200
-+++ kdeaddons-3.4.2/noatun-plugins/oblique/configure.in.in	2005-07-26 12:53:34.000000000 +0200
-@@ -1,19 +1,31 @@
-+AC_ARG_WITH(berkeley-db,
-+  [AC_HELP_STRING(--with-berkeley-db,
-+    [enable support for Berkeley DB++ @<:@default=check@:>@])],
-+  [], with_berkeley_db=check)
-+
-+AC_ARG_WITH(db-lib,
-+  [AC_HELP_STRING([--with-db-lib=NAME],[name of the Berkeley DB++ library @<:@default=db_cxx@:>@])],
-+    [ac_db_name="$withval"], [ac_db_name="db_cxx"])
- 
--AC_MSG_CHECKING(for Berkeley DB++)
- berkeley_db=no
--AC_LANG_PUSH(C++)
--AC_TRY_COMPILE([
--		#include <db_cxx.h>
--	],[
--	],[
--		berkeley_db=yes
--	])
--AC_MSG_RESULT($berkeley_db)
--AC_DEFINE(BERKELEY_DB,1,[Define if you have Berkeley DB++ installed])
--BERKELEY_DB_LIBS="-ldb_cxx"
--AC_SUBST(BERKELEY_DB_LIBS)
--AC_LANG_POP(C++)
-+if test "x$with_berkeley_db" != xno; then
-+  berkeley_db=yes
- 
--AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
-+  KDE_CHECK_HEADER([db_cxx.h],
-+    [:], [berkeley_db=no])
-+
-+  AC_CHECK_LIB([$ac_db_name], [main],
-+    [:], [berkeley_db=no])
- 
-+  if test "x$berkeley_db" = xyes; then
-+    AC_DEFINE(BERKELEY_DB, 1, [Define if you have Berkeley DB++ installed])
-+    BERKELEY_DB_LIBS="-l$ac_db_name"
-+    AC_SUBST(BERKELEY_DB_LIBS)
-+  fi
- 
-+  if test "x$with_berkeley_db" != xcheck && test "x$berkeley_db" != xyes; then
-+    AC_MSG_ERROR([--with-berkeley-db was given, but test for Berkeley DB++ failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
diff --git a/kde-base/kdeaddons/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff b/kde-base/kdeaddons/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
deleted file mode 100644
index ed846c8ee850..000000000000
--- a/kde-base/kdeaddons/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
+++ /dev/null
@@ -1,253 +0,0 @@
---- kdeaddons/konq-plugins/arkplugin/arkplugin.cpp	2006/03/12 01:18:18	517743
-+++ kdeaddons/konq-plugins/arkplugin/arkplugin.cpp	2006/04/01 23:42:40	525413
-@@ -58,10 +58,15 @@
-     KGlobal::locale()->insertCatalogue("ark_plugin");
- 
-     extMimeTypes();
--    m_list = popupmenu->fileItemList();
-+    KFileItemList itemList = popupmenu->fileItemList();
-+    for ( KFileItem *item = itemList.first(); item; item = itemList.next() )
-+    {
-+        m_urlList.append( item->url() );
-+        m_urlStringList.append( item->url().url() );
-+    }
-     m_dir = popupmenu->url().url() + "/";
--    unsigned int itemCount = m_list.count();
--    KFileItemListIterator it( m_list );
-+    unsigned int itemCount = m_urlList.count();
-+    KFileItemListIterator it( itemList );
-     KFileItem * item;
-     bool hasArchives = false;
-     bool hasOther = false;
-@@ -84,15 +89,15 @@
-     QString ext;
-     KActionMenu * actionMenu;
-     KAction * action;
--    if ( hasOther &&  m_list.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
-+    if ( hasOther &&  itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
-     {
-         compMimeTypes();
-         actionMenu = new KActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu"  );
-         m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" );
-         if ( itemCount == 1 )
-         {
--            item = m_list.first();
--            m_name = m_list.first()->name();
-+            item = itemList.first();
-+            m_name = itemList.first()->name();
-             action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
-                                     SLOT( slotCompressAsDefault() ), actionCollection() );
-         }
-@@ -109,7 +114,7 @@
- 
- 
-         m_addToMenu = new KActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
--        if ( m_list.first()->url().isLocalFile() )
-+        if ( itemList.first()->url().isLocalFile() )
-             actionMenu->insert( m_addToMenu );
- 
-         connect( m_compAsMenu->popupMenu(), SIGNAL( aboutToShow() ),
-@@ -136,7 +141,7 @@
-             // stolen from arkwidget.cpp
-             if ( itemCount == 1 )
-             {
--                QString targetName = m_list.first()->name();
-+                QString targetName = itemList.first()->name();
-                 stripExtension( targetName );
-                 action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
-                                         SLOT( slotExtractToSubfolders() ), actionCollection() );
-@@ -187,7 +192,7 @@
-         (*eit).remove( '*' );
-         if ( *eit == ".tar.bz" )                   // tbz mimetype, has tar.bz as first entry :}
-             *eit = ".tar.bz2";
--        if ( m_list.count() == 1 )
-+        if ( m_urlList.count() == 1 )
-         {
-             action = new KAction( m_name + (*eit), 0, m_compAsMapper,
-                     SLOT( map() ), actionCollection() );
-@@ -231,7 +236,7 @@
-     QCString actionName;
-     QStringList::Iterator mit;
-     KURL archive;
--    QDir dir( m_list.first()->url().directory() );
-+    QDir dir( m_urlList.first().directory() );
-     QStringList entries = dir.entryList();
-     QStringList::Iterator uit = entries.begin();
-     for ( ; uit != entries.end(); ++uit )
-@@ -254,7 +259,7 @@
- 
- void ArkMenu::compMimeTypes()
- {
--    unsigned int itemCount = m_list.count();
-+    unsigned int itemCount = m_urlList.count();
- 
-     bool havegz = false;
-     if ( !KStandardDirs::findExe( "gzip" ).isNull() && m_conf->readBoolEntry( "UseGz", true ) )
-@@ -401,14 +406,8 @@
-     QCString name;
-     QString extension, mimeType;
-     KURL target;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    QStringList filelist;
--    while (  ( item = it.current() ) != 0 )
--    {
--         ++it;
--         filelist.append( item->url().url() );
--    }
-+    QStringList filelist( m_urlStringList );
-+
-     //if KMimeType returns .ZIP or .RAR. convert them to lowercase
-     if ( m_extensionList[ pos ].contains ( ".ZIP" ) )
-          m_extensionList[ pos ] = ".zip";
-@@ -458,17 +457,10 @@
- 
- void ArkMenu::slotCompressAsDefault()
- {
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
-     KURL name;
--    QStringList filelist;
--    while (  ( item = it.current() ) != 0 )
--    {
--         ++it;
--         filelist.append( item->url().url() );
--    }
--    if ( filelist.count() == 1)
--         name = filelist.first() + m_ext;
-+
-+    if ( m_urlStringList.count() == 1)
-+         name = m_urlStringList.first() + m_ext;
-     else
-     {
-         name = m_dir + i18n("Archive") + m_ext;
-@@ -479,7 +471,7 @@
-             i++;
-         }
-     }
--    compressAs( filelist, name );
-+    compressAs( m_urlStringList, name );
- }
- 
- // make work for URLs
-@@ -494,16 +486,10 @@
- 
- void ArkMenu::slotAddTo( int pos )
- {
--    QStringList args;
--    args << "--add-to";
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        ++it;
--        args << item->url().url();
--    }
--    KURL archive( m_list.first()->url() );
-+    QStringList args( m_urlStringList );
-+    args.prepend( "--add-to" );
-+
-+    KURL archive( m_urlStringList.first() );
-     archive.setPath( archive.directory( false ) );
-     archive.setFileName( m_archiveList[ pos ].fileName() );
- 
-@@ -513,63 +499,53 @@
- 
- void ArkMenu::slotAdd()
- {
--    QStringList args;
--    args << "--add";
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        ++it;
--        args << item->url().url();
--    }
-+    QStringList args( m_urlStringList );
-+    args.prepend( "--add" );
-+
-     kapp->kdeinitExec( "ark", args );
- }
- 
- void ArkMenu::slotExtractHere()
- {
--    QStringList args;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
-+    for ( QValueList<KURL>::ConstIterator it = m_urlList.constBegin();
-+          it != m_urlList.constEnd();
-+          ++it )
-     {
--        args.clear();
--        ++it;
--        KURL targetDirectory = item->url();
-+        QStringList args;
-+        KURL targetDirectory = ( *it ).url();
-         targetDirectory.setPath( targetDirectory.directory() );
--        args << "--extract-to"  << targetDirectory.url() << item->url().url();
-+        args << "--extract-to"  << targetDirectory.url() << ( *it ).url();
-         kapp->kdeinitExec( "ark", args );
-     }
- }
- 
- void ArkMenu::slotExtractToSubfolders()
- {
--    QStringList args;
--    QString dirName;
--    KURL targetDir;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        args.clear();
--        ++it;
--        targetDir = item->url();
-+    for ( QStringList::ConstIterator it = m_urlStringList.constBegin();
-+          it != m_urlStringList.constEnd();
-+          ++it )
-+    {
-+        KURL targetDir;
-+        QString dirName;
-+        QStringList args;
-+
-+        targetDir = *it;
-         dirName = targetDir.path();
-         stripExtension( dirName );
-         targetDir.setPath( dirName );
--        args << "--extract-to"  << targetDir.url() << item->url().url();
-+        args << "--extract-to"  << targetDir.url() << *it;
-         kapp->kdeinitExec( "ark", args );
-     }
- }
- 
- void ArkMenu::slotExtractTo()
- {
--    QStringList args;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
-+    for ( QStringList::ConstIterator it = m_urlStringList.constBegin();
-+          it != m_urlStringList.constEnd();
-+          ++it )
-     {
--        ++it;
--        args << "--extract"  << item->url().url();
-+        QStringList args;
-+        args << "--extract" << *it;
-         kapp->kdeinitExec( "ark", args );
-     }
- }
---- kdeaddons/konq-plugins/arkplugin/arkplugin.h	2005/09/29 14:33:08	465369
-+++ kdeaddons/konq-plugins/arkplugin/arkplugin.h	2006/04/01 23:42:40	525413
-@@ -54,7 +54,8 @@
- 
- private:
-     QString m_name, m_ext;
--    KFileItemList m_list;
-+    QValueList<KURL> m_urlList;
-+    QStringList m_urlStringList;
-     KURL::List m_archiveList;
-     QStringList m_archiveMimeTypes;
-     QStringList m_extractMimeTypes;
diff --git a/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff b/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff
deleted file mode 100644
index bf3f954f57af..000000000000
--- a/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- noatun-plugins/oblique/configure.in.in.orig	2004-10-09 11:41:38.000000000 +0200
-+++ noatun-plugins/oblique/configure.in.in	2005-02-11 20:29:38.760533256 +0200
-@@ -1,19 +1,4 @@
--
--AC_MSG_CHECKING(for Berkeley DB++)
--berkeley_db=no
--AC_LANG_PUSH(C++)
--AC_TRY_COMPILE([
--		#include <db_cxx.h>
--	],[
--	],[
--		berkeley_db=yes
--	])
--AC_MSG_RESULT($berkeley_db)
--AC_DEFINE(BERKELEY_DB,1,[Define if you have Berkeley DB++ installed])
--BERKELEY_DB_LIBS="-ldb_cxx"
-+berkeley_db=yes
-+BERKELEY_DB_LIBS="-ldb_cxx-4.2"
- AC_SUBST(BERKELEY_DB_LIBS)
--AC_LANG_POP(C++)
--
- AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
--
--
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index 03bc5c98d083..d31ad14cf14b 100644
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-base/kdeartwork-kscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork-kscreensaver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.67 2007/02/04 01:57:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.68 2007/02/05 12:31:39 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeartwork-3.4.1-configure.patch,
+  -files/kdeartwork-3.4.3-configure.patch,
+  -files/kdeartwork-3.4.3-kfiresaver.patch,
+  -files/kdeartwork-3.4-configure.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdeartwork-kscreensaver-3.5.2.ebuild:
diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4-configure.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4-configure.patch
deleted file mode 100644
index 2412cdcd77f5..000000000000
--- a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4-configure.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -Nur kdeartwork-3.4.2.orig/kscreensaver/configure.in.in kdeartwork-3.4.2/kscreensaver/configure.in.in
---- kdeartwork-3.4.2.orig/kscreensaver/configure.in.in	2005-07-20 18:40:58.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/configure.in.in	2005-08-11 18:27:34.000000000 +0200
-@@ -36,32 +36,41 @@
- AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
- AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
- 
--LIBART=
-+AC_ARG_WITH(libart,
-+  [AC_HELP_STRING(--with-libart,
-+    [enable support for libart @<:@default=check@:>@])],
-+  [], with_libart=check)
- 
--KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
--])
--
--if test -n "$LIBART_CONFIG"; then
--  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 2003008
--  then
--     LIBART_LIBS="`$LIBART_CONFIG --libs`"
--     LIBART_RPATH=
--     for args in $LIBART_LIBS; do
-+LIBART=
-+if test "x$with_libart" != xno; then
-+  KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
-+  ])
-+
-+  if test -n "$LIBART_CONFIG"; then
-+    vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+    if test -n "$vers" && test "$vers" -ge 2003008; then
-+      LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+      LIBART_RPATH=
-+      for args in $LIBART_LIBS; do
- 	  case $args in
- 	    -L*)
- 	       LIBART_RPATH="$LIBART_RPATH $args"
- 	       ;;
-           esac
--     done
--     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
--     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
--     LIBART=yes
--
--     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
--  else
--     AC_MSG_WARN([You need at least libart 2.3.8])
-+      done
-+      LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
-+      LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+      LIBART=yes
-+
-+      AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
-+    else
-+      AC_MSG_WARN([You need at least libart 2.3.8])
-+    fi
-+  fi
-+
-+  if test "x$with_libart" != xcheck && test -z "$LIBART"; then
-+      AC_MSG_ERROR([--with-libart was given, but test for libart failed])
-   fi
- fi
- 
-diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot
---- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot	2005-07-20 18:40:57.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot	2005-08-11 18:22:05.000000000 +0200
-@@ -1,4 +1,4 @@
--if test "$XSCREENSAVER" = "NO"; then
-+if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
-   echo ""
-   echo "xscreensaver could not be detected on your system."
-   echo "Check www.jwz.org/xscreensaver if you're loving to"
-diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in
---- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in	2005-07-20 18:40:57.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in	2005-08-11 18:39:20.000000000 +0200
-@@ -1,4 +1,13 @@
--AC_DEFUN([KDE_CHECK_XSREENSAVER],
-+AC_DEFUN([KDE_CHECK_XSCREENSAVER_HACKS],
-+[
-+     XSCREENSAVER_HACKS_DIR=NO
-+     AC_FIND_FILE($1/flame, [ $xscreensaver_prefixes ], XSCREENSAVER_HACKS_DIR)
-+     if test "$XSCREENSAVER_HACKS_DIR" != NO; then
-+	XSCREENSAVER_HACKS_DIR="$XSCREENSAVER_HACKS_DIR/$1"
-+     fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_XSCREENSAVER_CONFIG],
- [
-      XSCREENSAVER_CONFIG=NO
-      AC_FIND_FILE($1/flame.xml, [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
-@@ -22,46 +31,80 @@
- done
- IFS=$old_IFS
- 
--KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
--   [
--        KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
--        [
--    	    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, 
--  	      [ $xscreensaver_prefixes ],
--	      [
--    	          KDE_FIND_PATH(hacks/flame, XSCREENSAVER, 
--  	          [ $xscreensaver_prefixes ],
--	          [
--		    XSCREENSAVER=NO
--	          ])
--	      ])
--        ])
--   ])
-+AC_ARG_WITH(xscreensaver,
-+  [AC_HELP_STRING(--with-xscreensaver,
-+    [enable support for xscreensaver @<:@default=check@:>@])],
-+  [], with_xscreensaver=check)
-+
-+AC_ARG_WITH(xscreensaver-dir,
-+  [AC_HELP_STRING(--with-xscreensaver-dir=DIR,
-+    [where xscreensaver is installed])], [])
-+
-+AC_ARG_WITH(xscreensaver-config,
-+  [AC_HELP_STRING(--with-xscreensaver-config=DIR,
-+    [where the xscreensaver config files are])], [])
-+
-+XSCREENSAVER=NO
-+if test "x$with_xscreensaver" != xno; then
-+  XSCREENSAVER_HACKS_DIR=NO
-+  XSCREENSAVER_CONFIG=NO
-+
-+  AC_MSG_CHECKING([for xscreensaver])
-+
-+  if test -n "$with_xscreensaver_dir" && test -f "$with_xscreensaver_dir/flame"; then
-+    XSCREENSAVER_HACKS_DIR="$with_xscreensaver_dir"
-+  fi
-+
-+  if test "x$XSCREENSAVER_HACKS_DIR" = xNO; then
-+     for subdir in lib$kdelibsuff/xscreensaver \
-+		   lib/xscreensaver \
-+		   libexec/xscreensaver \
-+		   bin/xscreensaver-hacks \
-+		   hacks; do
-+         KDE_CHECK_XSCREENSAVER_HACKS($subdir)
-+         if test "$XSCREENSAVER_HACKS_DIR" != NO; then
-+		break
-+         fi
-+     done
-+  fi
-+
-+  AC_MSG_RESULT([$XSCREENSAVER_HACKS_DIR])
- 
--XSCREENSAVER_HACKS_DIR=
-+  AC_MSG_CHECKING([for xscreensaver config files])
- 
--if test "$XSCREENSAVER" != "NO"; then
--     XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
--     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
-+  if test -n "$with_xscreensaver_config" && test -f "$with_xscreensaver_config/flame.xml"; then
-+    XSCREENSAVER_CONFIG="$with_xscreensaver_config"
-+  fi
- 
--     AC_MSG_CHECKING([for flame.xml])
-+  if test "x$XSCREENSAVER_CONFIG" = xNO; then
-      for subdir in lib/xscreensaver/config \
- 		   lib/X11/xscreensaver/config \
- 		   share/control-center/screensavers \
--		   share/control-center/screensavers \
- 		   share/xscreensaver/config \
-                    xscreensaver \
- 		   config/control-center-2.0; do
--         KDE_CHECK_XSREENSAVER($subdir)
-+         KDE_CHECK_XSCREENSAVER_CONFIG($subdir)
-          if test "$XSCREENSAVER_CONFIG" != NO; then
- 		break
-          fi
-      done
--     AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
--     AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", 
--	[Defines where xscreensaver stores it's config files])
-+  fi
-+
-+  AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
-+
-+  if test "x$XSCREENSAVER_HACKS_DIR" != xNO && test "x$XSCREENSAVER_CONFIG" != xNO; then
-+    XSCREENSAVER=YES
-+  fi
-+
-+  if test "x$with_xscreensaver" != xcheck && test "$XSCREENSAVER" != YES; then
-+    AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed])
-+  fi
-+fi
-+
-+if test "$XSCREENSAVER" != "NO"; then
-+     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
-+     AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", [Defines where xscreensaver stores it's config files])
- fi
- 
- AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO")
- AC_SUBST(XSCREENSAVER_HACKS_DIR)
--
diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.1-configure.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.1-configure.patch
deleted file mode 100644
index 6b86d10bbb66..000000000000
--- a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.1-configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur kdeartwork-3.4.1.orig/kscreensaver/configure.in.in kdeartwork-3.4.1/kscreensaver/configure.in.in
---- kdeartwork-3.4.1.orig/kscreensaver/configure.in.in	2005-05-23 14:01:05.000000000 +0200
-+++ kdeartwork-3.4.1/kscreensaver/configure.in.in	2005-05-25 14:58:51.000000000 +0200
-@@ -32,9 +32,9 @@
- AC_HAVE_GL( have_gl=yes, have_gl=no )
- 
- AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
--AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes)
-+AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes)
- AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
--AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$have_arts = xyes)
-+AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
- 
- LIBART=
- 
diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-configure.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-configure.patch
deleted file mode 100644
index 567431d69d75..000000000000
--- a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-configure.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -Nur kdeartwork-3.4.3.orig/kscreensaver/configure.in.in kdeartwork-3.4.3/kscreensaver/configure.in.in
---- kdeartwork-3.4.3.orig/kscreensaver/configure.in.in	2005-10-06 08:12:25.000000000 +0200
-+++ kdeartwork-3.4.3/kscreensaver/configure.in.in	2005-10-08 10:02:25.000000000 +0200
-@@ -37,32 +37,41 @@
- AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
- AM_CONDITIONAL(COMPILE_ARTS_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes && test x$build_arts = xyes)
- 
--LIBART=
-+AC_ARG_WITH(libart,
-+  [AC_HELP_STRING(--with-libart,
-+    [enable support for libart @<:@default=check@:>@])],
-+  [], with_libart=check)
- 
--KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
--])
--
--if test -n "$LIBART_CONFIG"; then
--  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 2003008
--  then
--     LIBART_LIBS="`$LIBART_CONFIG --libs`"
--     LIBART_RPATH=
--     for args in $LIBART_LIBS; do
-+LIBART=
-+if test "x$with_libart" != xno; then
-+  KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
-+  ])
-+
-+  if test -n "$LIBART_CONFIG"; then
-+    vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+    if test -n "$vers" && test "$vers" -ge 2003008; then
-+      LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+      LIBART_RPATH=
-+      for args in $LIBART_LIBS; do
- 	  case $args in
- 	    -L*)
- 	       LIBART_RPATH="$LIBART_RPATH $args"
- 	       ;;
-           esac
--     done
--     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
--     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
--     LIBART=yes
--
--     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
--  else
--     AC_MSG_WARN([You need at least libart 2.3.8])
-+      done
-+      LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
-+      LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+      LIBART=yes
-+
-+      AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
-+    else
-+      AC_MSG_WARN([You need at least libart 2.3.8])
-+    fi
-+  fi
-+
-+  if test "x$with_libart" != xcheck && test -z "$LIBART"; then
-+      AC_MSG_ERROR([--with-libart was given, but test for libart failed])
-   fi
- fi
- 
-diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.bot
---- kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.bot	2005-10-05 15:11:48.000000000 +0200
-+++ kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.bot	2005-10-08 10:02:25.000000000 +0200
-@@ -1,4 +1,4 @@
--if test "$XSCREENSAVER" = "NO"; then
-+if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
-   echo ""
-   echo "xscreensaver could not be detected on your system."
-   echo "Check www.jwz.org/xscreensaver if you're loving to"
-diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.in
---- kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.in	2005-10-05 15:11:48.000000000 +0200
-+++ kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.in	2005-10-08 10:03:21.000000000 +0200
-@@ -22,25 +22,30 @@
- done
- IFS=$old_IFS
- 
--KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
--   [
--        KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
--        [
--    	    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, 
--  	      [ $xscreensaver_prefixes ],
--	      [
--    	          KDE_FIND_PATH(hacks/flame, XSCREENSAVER, 
--  	          [ $xscreensaver_prefixes ],
--	          [
--		    XSCREENSAVER=NO
--	          ])
--	      ])
--        ])
--   ])
-+AC_ARG_WITH(xscreensaver,
-+  [AC_HELP_STRING(--with-xscreensaver,
-+    [enable support for xscreensaver @<:@default=check@:>@])],
-+  [], with_xscreensaver=check)
-+
-+XSCREENSAVER=''
-+echo "Searching in $xscreensaver_prefixes"
-+if test "x$with_xscreensaver" != xno; then
-+  for xsdir in lib$kdelibsuff/xscreensaver lib/xscreensaver \
-+               lib$kdelibsuff/misc/xscreensaver lib/misc/xscreensaver \
-+               libexec$kdelibsuff/xscreensaver libexec/xscreensaver \
-+               bin/xscreensaver-hacks hacks; do
-+    test -n "$XSCREENSAVER" && break
-+    KDE_FIND_PATH("$xsdir/flame", XSCREENSAVER, [ $xscreensaver_prefixes ])
-+  done
-+
-+  if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = x; then
-+    AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed])
-+  fi
-+fi
- 
- XSCREENSAVER_HACKS_DIR=
- 
--if test "$XSCREENSAVER" != "NO"; then
-+if test -n "$XSCREENSAVER"; then
-      XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
-      AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
- 
-@@ -48,7 +53,6 @@
-      for subdir in lib/xscreensaver/config \
- 		   lib/X11/xscreensaver/config \
- 		   share/control-center/screensavers \
--		   share/control-center/screensavers \
- 		   share/xscreensaver/config \
-                    xscreensaver \
- 		   config/control-center-2.0; do
-@@ -62,6 +66,5 @@
- 	[Defines where xscreensaver stores it's config files])
- fi
- 
--AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO")
-+AM_CONDITIONAL(include_XSCREENSAVER, test -n "$XSCREENSAVER")
- AC_SUBST(XSCREENSAVER_HACKS_DIR)
--
diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-kfiresaver.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-kfiresaver.patch
deleted file mode 100644
index 53e69720b1bd..000000000000
--- a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-kfiresaver.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kdesavers/Makefile.am kdeartwork-3.4.3/kscreensaver/kdesavers/Makefile.am
---- kdeartwork-3.4.3.orig/kscreensaver/kdesavers/Makefile.am	2005-10-05 15:11:45.000000000 +0200
-+++ kdeartwork-3.4.3/kscreensaver/kdesavers/Makefile.am	2005-10-10 16:19:25.000000000 +0200
-@@ -95,7 +95,7 @@
- desktop_DATA = KBanner.desktop KPolygon.desktop \
-                KSlideshow.desktop KLines-saver.desktop KLorenz.desktop \
-                KBlob.desktop KVm.desktop \
--               KClock.desktop $(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES)
-+               KClock.desktop $(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES) $(ARTS_GL_DESKTOP_FILES)
- 
- desktopdir = $(kde_appsdir)/System/ScreenSavers
- 
diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 814a001375f0..9bcf8e71b1eb 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.185 2007/02/04 18:18:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.186 2007/02/05 11:59:09 flameeyes Exp $
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdeartwork-3.5.6.ebuild:
   Marked ~hppa.
 
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeartwork-3.4.1-configure.patch,
+  -files/kdeartwork-3.4.3-configure.patch,
+  -files/kdeartwork-3.4.3-kfiresaver.patch,
+  -files/kdeartwork-3.4-configure.patch:
+  Remove unneeded patches.
+
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdeartwork-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch b/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch
deleted file mode 100644
index 2412cdcd77f5..000000000000
--- a/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -Nur kdeartwork-3.4.2.orig/kscreensaver/configure.in.in kdeartwork-3.4.2/kscreensaver/configure.in.in
---- kdeartwork-3.4.2.orig/kscreensaver/configure.in.in	2005-07-20 18:40:58.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/configure.in.in	2005-08-11 18:27:34.000000000 +0200
-@@ -36,32 +36,41 @@
- AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
- AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
- 
--LIBART=
-+AC_ARG_WITH(libart,
-+  [AC_HELP_STRING(--with-libart,
-+    [enable support for libart @<:@default=check@:>@])],
-+  [], with_libart=check)
- 
--KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
--])
--
--if test -n "$LIBART_CONFIG"; then
--  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 2003008
--  then
--     LIBART_LIBS="`$LIBART_CONFIG --libs`"
--     LIBART_RPATH=
--     for args in $LIBART_LIBS; do
-+LIBART=
-+if test "x$with_libart" != xno; then
-+  KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
-+  ])
-+
-+  if test -n "$LIBART_CONFIG"; then
-+    vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+    if test -n "$vers" && test "$vers" -ge 2003008; then
-+      LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+      LIBART_RPATH=
-+      for args in $LIBART_LIBS; do
- 	  case $args in
- 	    -L*)
- 	       LIBART_RPATH="$LIBART_RPATH $args"
- 	       ;;
-           esac
--     done
--     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
--     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
--     LIBART=yes
--
--     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
--  else
--     AC_MSG_WARN([You need at least libart 2.3.8])
-+      done
-+      LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
-+      LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+      LIBART=yes
-+
-+      AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
-+    else
-+      AC_MSG_WARN([You need at least libart 2.3.8])
-+    fi
-+  fi
-+
-+  if test "x$with_libart" != xcheck && test -z "$LIBART"; then
-+      AC_MSG_ERROR([--with-libart was given, but test for libart failed])
-   fi
- fi
- 
-diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot
---- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot	2005-07-20 18:40:57.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot	2005-08-11 18:22:05.000000000 +0200
-@@ -1,4 +1,4 @@
--if test "$XSCREENSAVER" = "NO"; then
-+if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
-   echo ""
-   echo "xscreensaver could not be detected on your system."
-   echo "Check www.jwz.org/xscreensaver if you're loving to"
-diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in
---- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in	2005-07-20 18:40:57.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in	2005-08-11 18:39:20.000000000 +0200
-@@ -1,4 +1,13 @@
--AC_DEFUN([KDE_CHECK_XSREENSAVER],
-+AC_DEFUN([KDE_CHECK_XSCREENSAVER_HACKS],
-+[
-+     XSCREENSAVER_HACKS_DIR=NO
-+     AC_FIND_FILE($1/flame, [ $xscreensaver_prefixes ], XSCREENSAVER_HACKS_DIR)
-+     if test "$XSCREENSAVER_HACKS_DIR" != NO; then
-+	XSCREENSAVER_HACKS_DIR="$XSCREENSAVER_HACKS_DIR/$1"
-+     fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_XSCREENSAVER_CONFIG],
- [
-      XSCREENSAVER_CONFIG=NO
-      AC_FIND_FILE($1/flame.xml, [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
-@@ -22,46 +31,80 @@
- done
- IFS=$old_IFS
- 
--KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
--   [
--        KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
--        [
--    	    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, 
--  	      [ $xscreensaver_prefixes ],
--	      [
--    	          KDE_FIND_PATH(hacks/flame, XSCREENSAVER, 
--  	          [ $xscreensaver_prefixes ],
--	          [
--		    XSCREENSAVER=NO
--	          ])
--	      ])
--        ])
--   ])
-+AC_ARG_WITH(xscreensaver,
-+  [AC_HELP_STRING(--with-xscreensaver,
-+    [enable support for xscreensaver @<:@default=check@:>@])],
-+  [], with_xscreensaver=check)
-+
-+AC_ARG_WITH(xscreensaver-dir,
-+  [AC_HELP_STRING(--with-xscreensaver-dir=DIR,
-+    [where xscreensaver is installed])], [])
-+
-+AC_ARG_WITH(xscreensaver-config,
-+  [AC_HELP_STRING(--with-xscreensaver-config=DIR,
-+    [where the xscreensaver config files are])], [])
-+
-+XSCREENSAVER=NO
-+if test "x$with_xscreensaver" != xno; then
-+  XSCREENSAVER_HACKS_DIR=NO
-+  XSCREENSAVER_CONFIG=NO
-+
-+  AC_MSG_CHECKING([for xscreensaver])
-+
-+  if test -n "$with_xscreensaver_dir" && test -f "$with_xscreensaver_dir/flame"; then
-+    XSCREENSAVER_HACKS_DIR="$with_xscreensaver_dir"
-+  fi
-+
-+  if test "x$XSCREENSAVER_HACKS_DIR" = xNO; then
-+     for subdir in lib$kdelibsuff/xscreensaver \
-+		   lib/xscreensaver \
-+		   libexec/xscreensaver \
-+		   bin/xscreensaver-hacks \
-+		   hacks; do
-+         KDE_CHECK_XSCREENSAVER_HACKS($subdir)
-+         if test "$XSCREENSAVER_HACKS_DIR" != NO; then
-+		break
-+         fi
-+     done
-+  fi
-+
-+  AC_MSG_RESULT([$XSCREENSAVER_HACKS_DIR])
- 
--XSCREENSAVER_HACKS_DIR=
-+  AC_MSG_CHECKING([for xscreensaver config files])
- 
--if test "$XSCREENSAVER" != "NO"; then
--     XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
--     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
-+  if test -n "$with_xscreensaver_config" && test -f "$with_xscreensaver_config/flame.xml"; then
-+    XSCREENSAVER_CONFIG="$with_xscreensaver_config"
-+  fi
- 
--     AC_MSG_CHECKING([for flame.xml])
-+  if test "x$XSCREENSAVER_CONFIG" = xNO; then
-      for subdir in lib/xscreensaver/config \
- 		   lib/X11/xscreensaver/config \
- 		   share/control-center/screensavers \
--		   share/control-center/screensavers \
- 		   share/xscreensaver/config \
-                    xscreensaver \
- 		   config/control-center-2.0; do
--         KDE_CHECK_XSREENSAVER($subdir)
-+         KDE_CHECK_XSCREENSAVER_CONFIG($subdir)
-          if test "$XSCREENSAVER_CONFIG" != NO; then
- 		break
-          fi
-      done
--     AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
--     AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", 
--	[Defines where xscreensaver stores it's config files])
-+  fi
-+
-+  AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
-+
-+  if test "x$XSCREENSAVER_HACKS_DIR" != xNO && test "x$XSCREENSAVER_CONFIG" != xNO; then
-+    XSCREENSAVER=YES
-+  fi
-+
-+  if test "x$with_xscreensaver" != xcheck && test "$XSCREENSAVER" != YES; then
-+    AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed])
-+  fi
-+fi
-+
-+if test "$XSCREENSAVER" != "NO"; then
-+     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
-+     AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", [Defines where xscreensaver stores it's config files])
- fi
- 
- AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO")
- AC_SUBST(XSCREENSAVER_HACKS_DIR)
--
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.4.1-configure.patch b/kde-base/kdeartwork/files/kdeartwork-3.4.1-configure.patch
deleted file mode 100644
index 6b86d10bbb66..000000000000
--- a/kde-base/kdeartwork/files/kdeartwork-3.4.1-configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur kdeartwork-3.4.1.orig/kscreensaver/configure.in.in kdeartwork-3.4.1/kscreensaver/configure.in.in
---- kdeartwork-3.4.1.orig/kscreensaver/configure.in.in	2005-05-23 14:01:05.000000000 +0200
-+++ kdeartwork-3.4.1/kscreensaver/configure.in.in	2005-05-25 14:58:51.000000000 +0200
-@@ -32,9 +32,9 @@
- AC_HAVE_GL( have_gl=yes, have_gl=no )
- 
- AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
--AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes)
-+AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes)
- AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
--AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$have_arts = xyes)
-+AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
- 
- LIBART=
- 
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.4.3-configure.patch b/kde-base/kdeartwork/files/kdeartwork-3.4.3-configure.patch
deleted file mode 100644
index 567431d69d75..000000000000
--- a/kde-base/kdeartwork/files/kdeartwork-3.4.3-configure.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -Nur kdeartwork-3.4.3.orig/kscreensaver/configure.in.in kdeartwork-3.4.3/kscreensaver/configure.in.in
---- kdeartwork-3.4.3.orig/kscreensaver/configure.in.in	2005-10-06 08:12:25.000000000 +0200
-+++ kdeartwork-3.4.3/kscreensaver/configure.in.in	2005-10-08 10:02:25.000000000 +0200
-@@ -37,32 +37,41 @@
- AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
- AM_CONDITIONAL(COMPILE_ARTS_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes && test x$build_arts = xyes)
- 
--LIBART=
-+AC_ARG_WITH(libart,
-+  [AC_HELP_STRING(--with-libart,
-+    [enable support for libart @<:@default=check@:>@])],
-+  [], with_libart=check)
- 
--KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
--])
--
--if test -n "$LIBART_CONFIG"; then
--  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 2003008
--  then
--     LIBART_LIBS="`$LIBART_CONFIG --libs`"
--     LIBART_RPATH=
--     for args in $LIBART_LIBS; do
-+LIBART=
-+if test "x$with_libart" != xno; then
-+  KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
-+  ])
-+
-+  if test -n "$LIBART_CONFIG"; then
-+    vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+    if test -n "$vers" && test "$vers" -ge 2003008; then
-+      LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+      LIBART_RPATH=
-+      for args in $LIBART_LIBS; do
- 	  case $args in
- 	    -L*)
- 	       LIBART_RPATH="$LIBART_RPATH $args"
- 	       ;;
-           esac
--     done
--     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
--     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
--     LIBART=yes
--
--     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
--  else
--     AC_MSG_WARN([You need at least libart 2.3.8])
-+      done
-+      LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
-+      LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+      LIBART=yes
-+
-+      AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
-+    else
-+      AC_MSG_WARN([You need at least libart 2.3.8])
-+    fi
-+  fi
-+
-+  if test "x$with_libart" != xcheck && test -z "$LIBART"; then
-+      AC_MSG_ERROR([--with-libart was given, but test for libart failed])
-   fi
- fi
- 
-diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.bot
---- kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.bot	2005-10-05 15:11:48.000000000 +0200
-+++ kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.bot	2005-10-08 10:02:25.000000000 +0200
-@@ -1,4 +1,4 @@
--if test "$XSCREENSAVER" = "NO"; then
-+if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
-   echo ""
-   echo "xscreensaver could not be detected on your system."
-   echo "Check www.jwz.org/xscreensaver if you're loving to"
-diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.in
---- kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.in	2005-10-05 15:11:48.000000000 +0200
-+++ kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.in	2005-10-08 10:03:21.000000000 +0200
-@@ -22,25 +22,30 @@
- done
- IFS=$old_IFS
- 
--KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
--   [
--        KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
--        [
--    	    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, 
--  	      [ $xscreensaver_prefixes ],
--	      [
--    	          KDE_FIND_PATH(hacks/flame, XSCREENSAVER, 
--  	          [ $xscreensaver_prefixes ],
--	          [
--		    XSCREENSAVER=NO
--	          ])
--	      ])
--        ])
--   ])
-+AC_ARG_WITH(xscreensaver,
-+  [AC_HELP_STRING(--with-xscreensaver,
-+    [enable support for xscreensaver @<:@default=check@:>@])],
-+  [], with_xscreensaver=check)
-+
-+XSCREENSAVER=''
-+echo "Searching in $xscreensaver_prefixes"
-+if test "x$with_xscreensaver" != xno; then
-+  for xsdir in lib$kdelibsuff/xscreensaver lib/xscreensaver \
-+               lib$kdelibsuff/misc/xscreensaver lib/misc/xscreensaver \
-+               libexec$kdelibsuff/xscreensaver libexec/xscreensaver \
-+               bin/xscreensaver-hacks hacks; do
-+    test -n "$XSCREENSAVER" && break
-+    KDE_FIND_PATH("$xsdir/flame", XSCREENSAVER, [ $xscreensaver_prefixes ])
-+  done
-+
-+  if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = x; then
-+    AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed])
-+  fi
-+fi
- 
- XSCREENSAVER_HACKS_DIR=
- 
--if test "$XSCREENSAVER" != "NO"; then
-+if test -n "$XSCREENSAVER"; then
-      XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
-      AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
- 
-@@ -48,7 +53,6 @@
-      for subdir in lib/xscreensaver/config \
- 		   lib/X11/xscreensaver/config \
- 		   share/control-center/screensavers \
--		   share/control-center/screensavers \
- 		   share/xscreensaver/config \
-                    xscreensaver \
- 		   config/control-center-2.0; do
-@@ -62,6 +66,5 @@
- 	[Defines where xscreensaver stores it's config files])
- fi
- 
--AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO")
-+AM_CONDITIONAL(include_XSCREENSAVER, test -n "$XSCREENSAVER")
- AC_SUBST(XSCREENSAVER_HACKS_DIR)
--
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.4.3-kfiresaver.patch b/kde-base/kdeartwork/files/kdeartwork-3.4.3-kfiresaver.patch
deleted file mode 100644
index 53e69720b1bd..000000000000
--- a/kde-base/kdeartwork/files/kdeartwork-3.4.3-kfiresaver.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kdesavers/Makefile.am kdeartwork-3.4.3/kscreensaver/kdesavers/Makefile.am
---- kdeartwork-3.4.3.orig/kscreensaver/kdesavers/Makefile.am	2005-10-05 15:11:45.000000000 +0200
-+++ kdeartwork-3.4.3/kscreensaver/kdesavers/Makefile.am	2005-10-10 16:19:25.000000000 +0200
-@@ -95,7 +95,7 @@
- desktop_DATA = KBanner.desktop KPolygon.desktop \
-                KSlideshow.desktop KLines-saver.desktop KLorenz.desktop \
-                KBlob.desktop KVm.desktop \
--               KClock.desktop $(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES)
-+               KClock.desktop $(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES) $(ARTS_GL_DESKTOP_FILES)
- 
- desktopdir = $(kde_appsdir)/System/ScreenSavers
- 
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 25a2dcfdcf18..2650b2c0dae5 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.85 2007/02/04 02:00:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.86 2007/02/05 12:35:30 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.4.1-configure.patch,
+  -files/kdebase-kioslaves-3.5.4-dbuscrash.patch,
+  -files/configure-fix-kdebase-openexr.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdebase-kioslaves-3.5.2.ebuild:
diff --git a/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch b/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch
deleted file mode 100644
index 064bc9dd3a8e..000000000000
--- a/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: kioslave/thumbnail/configure.in.in
-===================================================================
---- kioslave/thumbnail/configure.in.in	(revision 434549)
-+++ kioslave/thumbnail/configure.in.in	(working copy)
-@@ -95,6 +95,18 @@
-   AC_SUBST(EXR_FLAGS)
- ])
- 
--AC_FIND_LIBEXR
-+AC_ARG_WITH(openexr,
-+  [AS_HELP_STRING(--with-openexr,
-+    [enable support for OpenEXR @<:@default=check@:>@])],
-+  [], with_openexr=check)
-+
-+if test "x$with_openexr" != xno; then
-+  AC_FIND_LIBEXR
-+
-+  if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
-+    AC_MSG_FAILURE([--with-openexr was given, but test for OpenEXR failed])
-+  fi
-+fi
-+
- AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
- 
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch b/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch
deleted file mode 100644
index 80cf050b7a45..000000000000
--- a/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: kioslave/smb/configure.in.bot
-===================================================================
---- kioslave/smb/configure.in.bot	(revision 420060)
-+++ kioslave/smb/configure.in.bot	(working copy)
-@@ -1,4 +1,4 @@
--if test "$have_libsmbclient" = no; then
-+if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
-   echo ""
-   echo "You're missing libsmbclient from samba 3.0"
-   echo "KDE will not be able to browse windows shares without it,"
-Index: kioslave/smb/configure.in.in
-===================================================================
---- kioslave/smb/configure.in.in	(revision 420060)
-+++ kioslave/smb/configure.in.in	(working copy)
-@@ -1,20 +1,34 @@
- AC_DEFUN([SMB_CHECK],
- [
- AC_REQUIRE([KDE_CHECK_LARGEFILE])
--have_libsmbclient=yes
--KDE_CHECK_HEADER(libsmbclient.h, ,[have_libsmbclient=no] )
--KDE_CHECK_LIB(smbclient, smbc_new_context, [] ,[have_libsmbclient=no])
- 
--AM_CONDITIONAL(include_kioslave_smb, test "$have_libsmbclient" = yes)
-+AC_ARG_WITH(samba,
-+  [AS_HELP_STRING(--with-samba,
-+    [enable the samba ioslave @<:@default=check@:>@])],
-+  [], with_samba=check)
- 
--SMBCLIENT_EXTRA_LIBS=""
--AC_CHECK_FUNC(yp_get_default_domain, [],
-+have_libsmbclient=no
-+if test "x$with_samba" != xno; then
-+  have_libsmbclient=yes
-+  KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no])
-+  KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no])
-+
-+  SMBCLIENT_EXTRA_LIBS=""
-+  AC_CHECK_FUNC(yp_get_default_domain, [],
-   [
-      KDE_CHECK_LIB(nsl, yp_get_default_domain, 
-            [SMBCLIENT_EXTRA_LIBS="-lnsl"] )
-   ])
- 
--AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+  AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+
-+  if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
-+    AC_MSG_FAILURE([--with-samba was given, but test for libsmbclient failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
-+
- ])
- 
- SMB_CHECK
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.4-dbuscrash.patch b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.4-dbuscrash.patch
deleted file mode 100644
index bb0746cd58f0..000000000000
--- a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.4-dbuscrash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp	2006/06/21 08:56:19	553501
-+++ branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp	2006/07/26 08:18:37	566466
-@@ -112,6 +112,14 @@
-     DBusError error;
-     dbus_error_init(&error);
-     dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
-+
-+    if (!dbus_connection || dbus_error_is_set(&error)) {
-+        dbus_error_free(&error);
-+        libhal_ctx_free(m_halContext);
-+        m_halContext = NULL;
-+        return false;
-+    }
-+
-     dbus_bus_register(dbus_connection, &error);
- 
-     if (dbus_error_is_set(&error)) {
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 7d93907aeb0e..c84dde869a13 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.83 2007/02/04 02:01:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.84 2007/02/05 12:23:11 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-startkde-3.4.1-gentoo.patch,
+  -files/kdebase-startkde-3.4.2-gentoo.patch,
+  -files/kdebase-startkde-3.5.3-xinitrcd.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdebase-startkde-3.5.2.ebuild, -kdebase-startkde-3.5.6.ebuild:
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch
deleted file mode 100644
index 08f781212465..000000000000
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde
---- kdebase-3.4.0.orig/startkde	2005-03-04 12:20:04.000000000 +0100
-+++ kdebase-3.4.0/startkde	2005-05-26 02:04:35.000000000 +0200
-@@ -14,6 +14,40 @@
- 	exit 1
- fi
- 
-+# Gentoo part:
-+export PATH="/usr/kde/3.4/bin:${PATH}"
-+
-+cd ${HOME}
-+if [ -L .kde -o ! -d .kde ]; then
-+	# handle ~/.kde* dirs - separate ones for separate KDEs
-+	rm -f .kde
-+	if [ ! -e .kde3.4 ]; then
-+		# migrate old config files
-+		if [ -e .kde3.3 ]; then
-+			cp -r .kde3.3 .kde3.4
-+		elif [ -e .kde3.2 ]; then
-+			cp -r .kde3.2 .kde3.4
-+		else
-+			mkdir .kde3.4
-+		fi
-+		cd .kde3.4
-+		for file in share/apps/kdevdocumentation/search/htdig.conf \
-+			    share/apps/kalarmd/clients \
-+			    share/config/kresources/calendar/stdrc \
-+			    share/config/*rc; do
-+			if [ -e "${file}" ]; then
-+				sed -i -e "s:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g" \
-+				       -e 's:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g' \
-+				       -e 's:/usr/kde/3\.[23]/:/usr/kde/3\.4/:g' \
-+					"${file}"
-+			fi
-+		done
-+		cd ${HOME}
-+	fi
-+	ln -sf .kde3.4 .kde
-+fi
-+# Gentoo part ends
-+
- # Set the background to plain grey.
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard KDE palette for those with
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.2-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.2-gentoo.patch
deleted file mode 100644
index 08f781212465..000000000000
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.2-gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde
---- kdebase-3.4.0.orig/startkde	2005-03-04 12:20:04.000000000 +0100
-+++ kdebase-3.4.0/startkde	2005-05-26 02:04:35.000000000 +0200
-@@ -14,6 +14,40 @@
- 	exit 1
- fi
- 
-+# Gentoo part:
-+export PATH="/usr/kde/3.4/bin:${PATH}"
-+
-+cd ${HOME}
-+if [ -L .kde -o ! -d .kde ]; then
-+	# handle ~/.kde* dirs - separate ones for separate KDEs
-+	rm -f .kde
-+	if [ ! -e .kde3.4 ]; then
-+		# migrate old config files
-+		if [ -e .kde3.3 ]; then
-+			cp -r .kde3.3 .kde3.4
-+		elif [ -e .kde3.2 ]; then
-+			cp -r .kde3.2 .kde3.4
-+		else
-+			mkdir .kde3.4
-+		fi
-+		cd .kde3.4
-+		for file in share/apps/kdevdocumentation/search/htdig.conf \
-+			    share/apps/kalarmd/clients \
-+			    share/config/kresources/calendar/stdrc \
-+			    share/config/*rc; do
-+			if [ -e "${file}" ]; then
-+				sed -i -e "s:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g" \
-+				       -e 's:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g' \
-+				       -e 's:/usr/kde/3\.[23]/:/usr/kde/3\.4/:g' \
-+					"${file}"
-+			fi
-+		done
-+		cd ${HOME}
-+	fi
-+	ln -sf .kde3.4 .kde
-+fi
-+# Gentoo part ends
-+
- # Set the background to plain grey.
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard KDE palette for those with
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch
deleted file mode 100644
index 88a7e1baf467..000000000000
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: kdebase-startkde-3.5.3/startkde
-===================================================================
---- kdebase-startkde-3.5.3.orig/startkde
-+++ kdebase-startkde-3.5.3/startkde
-@@ -188,6 +188,13 @@ for prefix in `echo "$exepath" | sed -n 
-   done
- done
- 
-+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
-+if test -d "/etc/X11/xinit/xinitrc.d/"; then
-+  for file in "/etc/X11/xinit/xinitrc.d/"*; do
-+    test -x "$file" && . "$file"
-+  done
-+fi
-+
- # Activate the kde font directories.
- #
- # There are 4 directories that may be used for supplying fonts for KDE.
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 18585a626dc7..639d7a81c1bb 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.346 2007/02/04 17:41:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.347 2007/02/05 12:39:07 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/post-3.5.0-kdebase-kdm.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdebase-3.5.6-r1.ebuild:
   Marked ~hppa.
diff --git a/kde-base/kdebase/files/post-3.5.0-kdebase-kdm.diff b/kde-base/kdebase/files/post-3.5.0-kdebase-kdm.diff
deleted file mode 100644
index 129a10594be4..000000000000
--- a/kde-base/kdebase/files/post-3.5.0-kdebase-kdm.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: kdm/backend/client.c
-===================================================================
---- kdm/backend/client.c	(revision 547560)
-+++ kdm/backend/client.c	(working copy)
-@@ -1537,16 +1542,6 @@ ReadDmrc()
- 
- 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
- 		return GE_Error;
--	if ((curdmrc = iniLoad( fname ))) {
--		free( fname );
--		return GE_Ok;
--	}
--
--	if (errno != EACCES) {
--		free( fname );
--		return GE_NoFile;
--	}
--
- 	if (pipe( pfd ))
- 		return GE_Error;
- 	if ((pid = Fork()) < 0) {
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 6c747ccee15d..6eeb756ea1c5 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.207 2007/02/04 17:13:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.208 2007/02/05 12:18:52 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/post-3.4.2-kdeedu.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdeedu-3.5.6.ebuild:
   Marked ~hppa (bug #foo).
diff --git a/kde-base/kdeedu/files/post-3.4.2-kdeedu.diff b/kde-base/kdeedu/files/post-3.4.2-kdeedu.diff
deleted file mode 100644
index 1d75c63bac18..000000000000
--- a/kde-base/kdeedu/files/post-3.4.2-kdeedu.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: kvoctrain/kvoctrain/langen2kvtml
-===================================================================
---- kvoctrain/kvoctrain/langen2kvtml	(revision 443975)
-+++ kvoctrain/kvoctrain/langen2kvtml	(working copy)
-@@ -89,6 +89,9 @@
- 
- require "flush.pl";
- use Getopt::Long;
-+use File::Temp qw(tempdir);
-+my $tmpdir = tempdir(TEMPDIR => 1, CLEANUP => 1 );
-+
- $/="\r\n";	# we work with dos files
- 
- #
-@@ -165,10 +168,6 @@
-     $country="GB";
- }
- 
--# All logging information goes into this file
--$logfile = "/tmp/langen2kvtml.log";
--open(LOG, ">$logfile") || die "Cannot create $logfile: $!";
--
- &printflush(STDOUT,"Waiting for generating files ...\n");
- $tmp1=$#ARGV+1;
- &printflush(STDOUT,"... $tmp1 files given via command line ...\n");
-@@ -178,13 +177,11 @@
-     if ($proxy) {
-         &printflush(STDOUT,"... using proxy service $proxy ...\n");
-     }
--    `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip >/tmp/Voc-$country.zip`;
--    # unzip -u update only!
--    # unzip -o overwrite!
--    `unzip -u /tmp/Voc-$country.zip >/tmp/unzip.log`;
-+    `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip >$tmpdir/Voc-$country.zip`;
-     &printflush(STDOUT,"... updating Voc-$country.zip ...\n");
-     $/="\n";	# we work with a unix file
--    open(ZIP,"</tmp/unzip.log");
-+    # unzip -u update only!
-+    open(ZIP,"unzip -u $tmpdir/Voc-$country.zip |");
-     while(<ZIP>) {
- 	chomp;
- 	if( /voc/ ) {
-@@ -194,20 +191,16 @@
- 	}
-     }
-     close(ZIP);
--    unlink("/tmp/unzip.log");
-     $/="\r\n";	# we work with a dos file
- }
- 
- for my $file (@res, @ARGV) {
-     $vocfile = $file;
--    &printflush(LOG,"... generating \"$kvtfile\"...\n");
-     $lang		= "";		# initially unset
-     $filestage	= 0;		# file stage
-     &process_vocfile($vocfile);
- }
- print STDERR "...\tAll Complete.\n";
--&printflush(LOG,"\nAll Complete.\n");
--close(LOG);
- 
- exit;
- 
diff --git a/kde-base/kdegraphics-kfile-plugins/ChangeLog b/kde-base/kdegraphics-kfile-plugins/ChangeLog
index 9d1d05a6878e..f8975e2650f9 100644
--- a/kde-base/kdegraphics-kfile-plugins/ChangeLog
+++ b/kde-base/kdegraphics-kfile-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegraphics-kfile-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/ChangeLog,v 1.75 2007/02/04 02:04:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/ChangeLog,v 1.76 2007/02/05 12:36:50 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/configure-fix-kdegraphics-openexr.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdegraphics-kfile-plugins-3.5.2.ebuild,
diff --git a/kde-base/kdegraphics-kfile-plugins/files/configure-fix-kdegraphics-openexr.patch b/kde-base/kdegraphics-kfile-plugins/files/configure-fix-kdegraphics-openexr.patch
deleted file mode 100644
index 674a6d5ab220..000000000000
--- a/kde-base/kdegraphics-kfile-plugins/files/configure-fix-kdegraphics-openexr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: kfile-plugins/exr/configure.in.in
-===================================================================
---- kfile-plugins/exr/configure.in.in	(revision 428265)
-+++ kfile-plugins/exr/configure.in.in	(working copy)
-@@ -64,6 +64,17 @@
-   AC_SUBST(EXR_FLAGS)
- ])
- 
--AC_FIND_LIBEXR
-+AC_ARG_WITH([openexr],
-+  [AS_HELP_STRING([--with-openexr],
-+    [Enable support for OpenEXR @<:@default=check@:>@])],
-+  [], with_openexr=check)
-+
-+if test "x$with_openexr" != xno; then
-+  AC_FIND_LIBEXR
-+
-+  if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
-+    AC_MSG_FAILURE([--with-openexr was given, but test for OpenEXR failed])
-+  fi
-+fi
-+
- AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
--
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index a1f2dad5c34c..fe7cbced5db8 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.420 2007/02/04 06:43:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.421 2007/02/05 12:40:14 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdelibs-3.5.0-bindnow.patch,
+  -files/kdelibs-3.5.0-kicker-crash.patch,
+  -files/kdelibs-3.5.2-kssl-3des.patch,
+  -files/kdelibs-3.5.2-xorg7-rgbtxt.patch,
+  -files/kdelibs-3.5.3-konqcrash.patch, -files/kdelibs-3.5-lua.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdelibs-3.5.6-r2.ebuild:
   Marked ~hppa (bug #foo).
diff --git a/kde-base/kdelibs/files/kdelibs-3.5-lua.patch b/kde-base/kdelibs/files/kdelibs-3.5-lua.patch
deleted file mode 100644
index 72e25434ce08..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5-lua.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: kate/part/configure.in.in
-===================================================================
---- kate/part/configure.in.in	(revision 586622)
-+++ kate/part/configure.in.in	(working copy)
-@@ -4,6 +4,9 @@
- 
- 	HAVE_LUA=""
- 
-+	AC_ARG_WITH([lua],
-+		AC_HELP_STRING([--without-lua], [Build without Lua libraries (default: check)]))
-+
-         AC_ARG_WITH(lua-dir,
-                 AC_HELP_STRING([--with-lua-dir=DIR],[where the root of Lua 5.x is installed]),
-                 [
-@@ -21,6 +24,9 @@
-                 LUA_LIBS="-L$withval" ])
- 
- 
-+    if test "x$with_lua" = "xno"; then
-+	AC_MSG_RESULT([Not using Lua])
-+    else
-         if ! test "x$LUA" = "x"; then
-                 AC_MSG_RESULT(using Lua from $LUA)
-         fi
-@@ -76,6 +82,7 @@
-         AC_SUBST(LUA)
-         AC_SUBST(LUA_INCLUDES)
-         AC_SUBST(LUA_LIBS)
-+    fi
- 
- ])
- 
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.0-bindnow.patch b/kde-base/kdelibs/files/kdelibs-3.5.0-bindnow.patch
deleted file mode 100644
index 3a7e1133a5d7..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.0-bindnow.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Add support for BINDNOW_FLAGS to build kgrantpty and kpac_dhcp_helper with
-non-lazy bindings, to improve security and fix installation on
-FEATURES=stricter.
-See bug #113937.
-
-Requires the ebuild to export BINDNOW_FLAGS="$(bindnow-flags)".
-
-Index: kdelibs-3.5.0/kdecore/Makefile.am
-===================================================================
---- kdelibs-3.5.0.orig/kdecore/Makefile.am
-+++ kdelibs-3.5.0/kdecore/Makefile.am
-@@ -169,7 +169,7 @@ kde_config_LDFLAGS = $(KDE_RPATH) $(KDE_
- 
- kgrantpty_SOURCES = kgrantpty.c
- kgrantpty_CFLAGS= $(KDE_USE_FPIE)
--kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries)
-+kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries) $(BINDNOW_FLAGS)
- kgrantpty_LDADD = ./libkdefakes.la
- 
- # kgrantpty needs to be installed setuid root
-Index: kdelibs-3.5.0/kio/misc/kpac/Makefile.am
-===================================================================
---- kdelibs-3.5.0.orig/kio/misc/kpac/Makefile.am
-+++ kdelibs-3.5.0/kio/misc/kpac/Makefile.am
-@@ -14,7 +14,7 @@ kded_proxyscout_la_LIBADD = $(LIB_KIO) $
- 
- kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
- kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
--kpac_dhcp_helper_LDFLAGS = $(KDE_USE_PIE)
-+kpac_dhcp_helper_LDFLAGS = $(KDE_USE_PIE) $(BINDNOW_FLAGS)
- kpac_dhcp_helper_LDADD = $(LIBSOCKET)
- 
- noinst_HEADERS = proxyscout.h script.h downloader.h discovery.h
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.0-kicker-crash.patch b/kde-base/kdelibs/files/kdelibs-3.5.0-kicker-crash.patch
deleted file mode 100644
index 8f97cb41b979..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.0-kicker-crash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kio/kio/kdirlister.cpp
-===================================================================
---- kio/kio/kdirlister.cpp	(revision 479279)
-+++ kio/kio/kdirlister.cpp	(revision 479280)
-@@ -415,8 +415,11 @@
-   url.adjustPath( -1 );
-   QString urlStr = url.url();
-   QPtrList<KDirLister> *holders = urlsCurrentlyHeld[urlStr];
--  Q_ASSERT( holders );
--  holders->removeRef( lister );
-+  //Q_ASSERT( holders );
-+  if ( holders )
-+  {
-+    holders->removeRef( lister );
-+  }
- 
-   // remove the dir from lister->d->lstDirs so that it doesn't contain things
-   // that itemsInUse doesn't. When emitting the canceled signals lstDirs must
-@@ -425,9 +428,8 @@
-   lister->d->lstDirs.remove( lister->d->lstDirs.find( url ) );
- 
-   DirItem *item = itemsInUse[urlStr];
--  Q_ASSERT( item );
- 
--  if ( holders->isEmpty() )
-+  if ( holders && holders->isEmpty() )
-   {
-     urlsCurrentlyHeld.remove( urlStr ); // this deletes the (empty) holders list
-     if ( !urlsCurrentlyListed[urlStr] )
-@@ -454,7 +456,7 @@
-       if ( notify )
-         emit lister->clear( url );
- 
--      if ( item->complete )
-+      if ( item && item->complete )
-       {
-         kdDebug(7004) << k_funcinfo << lister << " item moved into cache: " << url << endl;
-         itemsCached.insert( urlStr, item ); // TODO: may return false!!
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-kssl-3des.patch b/kde-base/kdelibs/files/kdelibs-3.5.2-kssl-3des.patch
deleted file mode 100644
index 56347b685539..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.2-kssl-3des.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- kdelibs-3.5.2/kio/kssl/ksslsettings.cc.old	2006-04-05 23:20:42.000000000 +0930
-+++ kdelibs-3.5.2/kio/kssl/ksslsettings.cc	2006-04-05 23:21:27.000000000 +0930
-@@ -179,11 +179,10 @@
-   }
- 
-   // Remove any ADH ciphers as per RFC2246
--  // Also remove NULL ciphers and 168bit ciphers
-   for (unsigned int i = 0; i < cipherSort.count(); i++) {
-     CipherNode *j = 0L;
-     while ((j = cipherSort.at(i)) != 0L) {
--      if (j->name.contains("ADH-") || j->name.contains("NULL-") || j->name.contains("DES-CBC3-SHA") || j->name.contains("FZA")) {
-+      if (j->name.contains("ADH-")) {
-         cipherSort.remove(j);
-       } else {
-         break;
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-xorg7-rgbtxt.patch b/kde-base/kdelibs/files/kdelibs-3.5.2-xorg7-rgbtxt.patch
deleted file mode 100644
index 13b270e9f433..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.2-xorg7-rgbtxt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: kdelibs-3.5.2/configure.in.in
-===================================================================
---- kdelibs-3.5.2.orig/configure.in.in
-+++ kdelibs-3.5.2/configure.in.in
-@@ -306,7 +306,10 @@ if test "x$kde_use_qt_emb" != "xyes"; th
-    CXXFLAGS="$CXXFLAGS $USE_RTTI"
- fi
- 
--rgb_file="$x_libraries/X11/rgb.txt"
-+AC_ARG_WITH([rgbfile],
-+  AC_HELP_STRING([--with-rgbfile=path], [Define custom path for rgb.txt. (default: \$(x11libdir)/X11/rgb.txt)]),
-+  [rgb_file=$withval], [rgb_file="$x_libraries/X11/rgb.txt"])
-+
- AC_DEFINE_UNQUOTED(X11_RGBFILE, "$rgb_file", [where rgb.txt is in])
- 
- AC_MSG_CHECKING([for Compiler version])
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.3-konqcrash.patch b/kde-base/kdelibs/files/kdelibs-3.5.3-konqcrash.patch
deleted file mode 100644
index 13ec8de97f8d..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.3-konqcrash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: khtml/dom/dom_node.cpp
-===================================================================
---- khtml/dom/dom_node.cpp	(revision 562181)
-+++ khtml/dom/dom_node.cpp	(revision 562182)
-@@ -273,7 +273,7 @@
-     NodeImpl *r = impl->replaceChild( newChild.impl, oldChild.impl, exceptioncode );
-     if (exceptioncode)
- 	throw DOMException(exceptioncode);
--    if (!newChild.impl->closed()) newChild.impl->close();
-+    if (newChild.impl && !newChild.impl->closed()) newChild.impl->close();
-     return r;
- }
- 
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 2502e7c7717b..475445263b47 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.240 2007/02/04 18:04:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.241 2007/02/05 12:37:58 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/juk-3.5.2-do_not_use_gstreamer-0.10.diff,
+  -files/juk-3.5.2-filerename.diff,
+  -files/artsplugin-akode-3.5.2-memleak.patch,
+  -files/kdemultimedia-64bit.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdemultimedia-3.5.6.ebuild:
   Marked ~hppa.
diff --git a/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch b/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch
deleted file mode 100644
index 6852e3f7ad3c..000000000000
--- a/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur kdemultimedia-3.5.1/akode_artsplugin/akodePlayObject_impl.cpp kdemultimedia-3.5.1-2/akode_artsplugin/akodePlayObject_impl.cpp
---- kdemultimedia-3.5.1/akode_artsplugin/akodePlayObject_impl.cpp	2005-09-10 18:20:04.000000000 +1000
-+++ kdemultimedia-3.5.1-2/akode_artsplugin/akodePlayObject_impl.cpp	2006-03-01 10:54:32.000000000 +1000
-@@ -83,6 +83,8 @@
- akodePlayObject_impl::~akodePlayObject_impl()
- {
-     unload();
-+
-+    delete m_packetQueue;
- }
- 
- bool akodePlayObject_impl::loadPlugin(const string &plugin)
-@@ -219,10 +221,9 @@
-         delete bufferedDecoder;
-         bufferedDecoder = 0;
-     }
--#else
--    delete frameDecoder
--    frameDecoder = 0;
- #endif
-+    delete frameDecoder;
-+    frameDecoder = 0;
-     decoder = 0;
-     if (buffer != inBuffer)
-         delete inBuffer;
diff --git a/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff b/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
deleted file mode 100644
index fcc5afd0799c..000000000000
--- a/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- juk/configure.in.in.orig	2006-04-06 20:28:55.000000000 +0200
-+++ juk/configure.in.in	2006-04-06 20:29:33.000000000 +0200
-@@ -59,9 +59,9 @@
-   	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
- 	export PKG_CONFIG_ALLOW_SYSTEM_LIBS
- 
--	GST_MAJORMINOR=0.10
--	GST_REQ=0.10.0
--	GST_VERSION=10
-+	GST_MAJORMINOR=0.8
-+	GST_REQ=0.8.0
-+	GST_VERSION=8
- 
- 	PKG_CHECK_MODULES(GST, \
- 		gstreamer-$GST_MAJORMINOR >= $GST_REQ, \
diff --git a/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff b/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff
deleted file mode 100644
index 6a2d66d332b0..000000000000
--- a/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- juk/tagrenameroptions.cpp.orig	2006-04-05 17:08:35.000000000 +0200
-+++ juk/tagrenameroptions.cpp	2006-04-05 17:08:59.000000000 +0200
-@@ -147,7 +147,7 @@
- TagType TagRenamerOptions::tagFromCategoryText(const QString &text)
- {
-     for(unsigned i = StartTag; i < NumTypes; ++i)
--        if(tagTypeText(static_cast<TagType>(i), false) == text)
-+        if(tagTypeText(static_cast<TagType>(i), true) == text)
-             return static_cast<TagType>(i);
- 
-     return Unknown;
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-64bit.patch b/kde-base/kdemultimedia/files/kdemultimedia-64bit.patch
deleted file mode 100644
index a2eb8cc89e28..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-64bit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mpeglib/lib/input/cdromAccess.cpp.orig	2004-12-17 19:48:52.348984280 +0000
-+++ mpeglib/lib/input/cdromAccess.cpp	2004-12-17 19:49:01.656900680 +0000
-@@ -26,9 +26,14 @@
-   #include <linux/version.h>
-   #include <sys/types.h>
-   #ifndef __u64
--  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
--  typedef unsigned long long __u64;
--  #endif
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
-+      #include <bits/wordsize.h>
-+      #if __WORDSIZE == 64
-+        typedef unsigned long __u64;
-+      #else
-+        typedef unsigned long long __u64;
-+      #endif
-+    #endif
-   #endif
-   #include "cdromAccess_Linux.cpp"
- #endif
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 0d3234769204..ddf348069bf6 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.248 2007/02/04 18:14:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.249 2007/02/05 12:33:18 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kopete-0.12.1-icqfix3.patch, -files/kdenetwork-3.4-configure.patch,
+  -files/kppp-3.5.0-bindnow.patch, -files/lisa-3.5.0-bindnow.patch,
+  -files/kopete-3.5.3-icqfix.patch, -files/post-3.5.5-kdenetwork-ksirc.diff,
+  -files/kopete-3.5.x-oscarcontacts.patch, -files/disable-meanwhile.diff,
+  -files/lisa, -files/lisa.conf, -files/reslisa, -files/reslisa.conf,
+  -files/wireless-extensions-api.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdenetwork-3.5.6.ebuild:
   Marked ~hppa.
diff --git a/kde-base/kdenetwork/files/disable-meanwhile.diff b/kde-base/kdenetwork/files/disable-meanwhile.diff
deleted file mode 100644
index 7ecb0e6dfff5..000000000000
--- a/kde-base/kdenetwork/files/disable-meanwhile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kopete/protocols/configure.in.in	2005-05-23 15:07:47.000000000 +0300
-+++ kopete/protocols/configure.in.in	2005-06-30 21:51:09.000000000 +0300
-@@ -196,7 +196,7 @@
- 	AC_MSG_RESULT([yes])
- 	AC_SUBST(MEANWHILE_INCLUDES)
- 	AC_SUBST(MEANWHILE_LIBS)
--	COMPILE_MEANWHILE=true
-+	COMPILE_MEANWHILE=
- 	AC_SUBST(COMPILE_MEANWHILE)
- ], [
- 	AC_MSG_RESULT([no])
diff --git a/kde-base/kdenetwork/files/kdenetwork-3.4-configure.patch b/kde-base/kdenetwork/files/kdenetwork-3.4-configure.patch
deleted file mode 100644
index 13ce9cd5f246..000000000000
--- a/kde-base/kdenetwork/files/kdenetwork-3.4-configure.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-diff -Nur kdenetwork-3.4.2.orig/configure.in.bot kdenetwork-3.4.2/configure.in.bot
---- kdenetwork-3.4.2.orig/configure.in.bot	2005-05-23 14:08:19.000000000 +0200
-+++ kdenetwork-3.4.2/configure.in.bot	2005-07-26 13:55:52.000000000 +0200
-@@ -63,7 +63,7 @@
-   all_tests=bad
- fi
- 
--if test -z "$XMMS_LIBS"; then
-+if test "x$with_xmms" = xcheck && test -z "$XMMS_LIBS"; then
-   echo ""
-   echo "You're missing the XMMS libraries, or the libxmms development package."
-   echo "Without libxmms Kopete's NowListening plugin won't be able to talk to"
-@@ -74,7 +74,7 @@
-   all_tests=bad
- fi
- 
--if test "$kde_libiw_installed" = "no"; then
-+if test "x$with_wifi" = xcheck && test "$kde_libiw_installed" = "no"; then
-   echo ""
-   echo "You're missing the wireless tools libraries, or the wireless tools"
-   echo "header files. Without these, KWiFiManager and the kwireless applet"
-diff -Nur kdenetwork-3.4.2.orig/kopete/plugins/nowlistening/configure.in.in kdenetwork-3.4.2/kopete/plugins/nowlistening/configure.in.in
---- kdenetwork-3.4.2.orig/kopete/plugins/nowlistening/configure.in.in	2005-05-23 14:07:30.000000000 +0200
-+++ kdenetwork-3.4.2/kopete/plugins/nowlistening/configure.in.in	2005-07-26 13:56:43.000000000 +0200
-@@ -41,7 +41,19 @@
-   fi
- ])
- 
--AC_CHECK_XMMS
-+AC_ARG_WITH(xmms,
-+  [AC_HELP_STRING(--with-xmms,
-+    [enable support for XMMS @<:@default=check@:>@])],
-+  [], with_xmms=check)
-+
-+if test "x$with_xmms" != xno; then
-+  AC_CHECK_XMMS
-+
-+  if test "x$with_xmms" != xcheck && test "x$ac_cv_have_xmms" = xno; then
-+    AC_MSG_ERROR([--with-xmms was given, but test for XMMS failed])
-+  fi
-+fi
-+
- AC_SUBST(XMMS_LIBS)
- AC_SUBST(XMMS_LDFLAGS)
- AC_SUBST(XMMS_INCLUDES)
-diff -Nur kdenetwork-3.4.2.orig/kopete/protocols/configure.in.in kdenetwork-3.4.2/kopete/protocols/configure.in.in
---- kdenetwork-3.4.2.orig/kopete/protocols/configure.in.in	2005-05-23 14:07:47.000000000 +0200
-+++ kdenetwork-3.4.2/kopete/protocols/configure.in.in	2005-07-26 13:56:19.000000000 +0200
-@@ -10,6 +10,11 @@
- ac_libgadu_includes=""
- ac_libgadu_libs=""
- 
-+AC_ARG_WITH(external-libgadu,
-+  [AC_HELP_STRING(--with-external-libgadu,
-+    [use external libgadu library @<:@default=check@:>@])],
-+  [], with_external_libgadu=check)
-+
- AC_ARG_WITH(libgadu-includes,
- 	AC_HELP_STRING([--with-libgadu-includes=DIR], [where the libgadu includes are.]),
- 	[  ac_libgadu_includes="$withval" ])
-@@ -26,12 +31,12 @@
- 	LIBGG_LIBS="-L$ac_libgadu_libs"
- fi
- 
--
--ac_save_LIBS="$LIBS"
--ac_save_CFLAGS="$CFLAGS"
--LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
--CFLAGS="$CFLAGS $LIBGG_INCLUDES"
--AC_MSG_CHECKING([libgadu version 1.5(rcX) with pthread support])
-+if test "x$with_external_libgadu" != xno; then
-+	ac_save_LIBS="$LIBS"
-+	ac_save_CFLAGS="$CFLAGS"
-+	LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
-+	CFLAGS="$CFLAGS $LIBGG_INCLUDES"
-+	AC_MSG_CHECKING([libgadu version 1.5(rcX) with pthread support])
- 	AC_TRY_RUN(
- 	[
- 	
-@@ -61,28 +66,37 @@
- 	], [
- 	LIBGG_LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
- 	AC_MSG_RESULT([yes])
--	AC_SUBST(LIBGG_INCLUDES)
--	AC_SUBST(LIBGG_LIBS)
- 	COMPILE_GADU=true
--	AC_SUBST(COMPILE_GADU)
- 	use_libgadu_copy=
- 	], [
--	if test "$kde_use_threading" = "yes" ; then
--	AC_MSG_RESULT([no, falling back on supplied libgadu-copy])
--	use_libgadu_copy=yes
--	COMPILE_GADU=true
-+	AC_MSG_RESULT([no])
-+	])
-+	LIBS="$ac_save_LIBS"
-+	CFLAGS="$ac_save_CFLAGS"
-+
-+	if test "x$with_external_libgadu" != xcheck && test -z "$COMPILE_GADU"; then
-+		AC_MSG_ERROR([--with-external-libgadu was given, but test for libgadu failed])
-+	fi
-+fi
-+
-+if test -z "$COMPILE_GADU"; then
-+	AC_MSG_CHECKING([if supplied libgadu-copy can be used])
-+	if test "$kde_use_threading" = "yes"; then
-+		AC_MSG_RESULT([yes])
-+		use_libgadu_copy=yes
-+		COMPILE_GADU=true
- 	else
--	use_libgadu_copy=
--	AC_MSG_RESULT([no, cannot fall back on libgadu-copy (no pthread)])
--	COMPILE_GADU=	
-+		AC_MSG_RESULT([no (no pthread), support for Gadu-Gadu will be disabled])
-+		use_libgadu_copy=
-+		COMPILE_GADU=
- 	fi
--	AC_SUBST(COMPILE_GADU)	
--	])
-+fi
-+
-+AC_SUBST(LIBGG_INCLUDES)
-+AC_SUBST(LIBGG_LIBS)
-+AC_SUBST(COMPILE_GADU)
- AM_CONDITIONAL(include_gadu, test -n "$COMPILE_GADU")
- AM_CONDITIONAL(include_libggcopy, test -n "$use_libgadu_copy")
--LIBS="$ac_save_LIBS"
--CFLAGS="$ac_save_CFLAGS"
--
- 
- if test "$use_libgadu_copy" = "yes"; then
- 	cp ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.in \
-diff -Nur kdenetwork-3.4.2.orig/wifi/configure.in.in kdenetwork-3.4.2/wifi/configure.in.in
---- kdenetwork-3.4.2.orig/wifi/configure.in.in	2005-05-23 14:08:02.000000000 +0200
-+++ kdenetwork-3.4.2/wifi/configure.in.in	2005-07-26 13:57:27.000000000 +0200
-@@ -1,7 +1,14 @@
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_MSG_CHECKING([if wireless tools >= 25 are installed])
--AC_TRY_COMPILE(
-+AC_ARG_WITH(wifi,
-+  [AC_HELP_STRING(--with-wifi,
-+    [enable support for wireless tools @<:@default=check@:>@])],
-+  [], with_wifi=check)
-+
-+kde_libiw_installed=no
-+if test "x$with_wifi" != xno; then
-+	AC_LANG_SAVE
-+	AC_LANG_CPLUSPLUS
-+	AC_MSG_CHECKING([if wireless tools >= 25 are installed])
-+	AC_TRY_COMPILE(
- 	[
- 		#include <iwlib.h>
- 	],
-@@ -14,14 +21,10 @@
- 	,
- 		kde_libiw_installed=no
- 		AC_MSG_RESULT(no)
--)
--
--if test "$kde_libiw_installed" = "no"; then
--	DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
--fi
-+	)
- 
--AC_MSG_CHECKING([if wireless tools >= 27 are installed])
--AC_TRY_COMPILE(
-+	AC_MSG_CHECKING([if wireless tools >= 27 are installed])
-+	AC_TRY_COMPILE(
- 	[
- 		#include <iwlib.h>
- 	],
-@@ -54,6 +57,15 @@
-                AC_MSG_RESULT(no)
-         )
- 	
--)
-+	)
-+
-+	AC_LANG_RESTORE
- 
--AC_LANG_RESTORE
-+	if test "x$with_wifi" != xcheck && test "x$kde_libiw_installed" = xno; then
-+		AC_MSG_ERROR([--with-wifi was given, but test for wireless-tools failed])
-+	fi
-+fi
-+
-+if test "$kde_libiw_installed" = "no"; then
-+	DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
-+fi
diff --git a/kde-base/kdenetwork/files/kopete-0.12.1-icqfix3.patch b/kde-base/kdenetwork/files/kopete-0.12.1-icqfix3.patch
deleted file mode 100644
index ac786297eb5e..000000000000
--- a/kde-base/kdenetwork/files/kopete-0.12.1-icqfix3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kopete/protocols/oscar/liboscar/oscartypes.h
-===================================================================
---- kopete/protocols/oscar/liboscar/oscartypes.h	(revision 568242)
-+++ kopete/protocols/oscar/liboscar/oscartypes.h	(revision 568243)
-@@ -239,7 +239,7 @@
- 	const WORD ICQ_MAJOR 			= 0x0014;
- 	const WORD ICQ_MINOR 			= 0x0034;
- 	const WORD ICQ_POINT 			= 0x0000;
--	const WORD ICQ_BUILD 			= 0x0A0F;
-+	const WORD ICQ_BUILD 			= 0x0BB8;
- 	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
- 	const char ICQ_COUNTRY[] 		= "us";
- 	const char ICQ_LANG[] 			= "en";
diff --git a/kde-base/kdenetwork/files/kopete-3.5.3-icqfix.patch b/kde-base/kdenetwork/files/kopete-3.5.3-icqfix.patch
deleted file mode 100644
index 6370565cf64a..000000000000
--- a/kde-base/kdenetwork/files/kopete-3.5.3-icqfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: kopete/protocols/oscar/liboscar/oscartypes.h
-===================================================================
---- kopete/protocols/oscar/liboscar/oscartypes.h	(revision 561015)
-+++ kopete/protocols/oscar/liboscar/oscartypes.h	(revision 561016)
-@@ -232,13 +232,13 @@
- 
- 	/* ICQ Version Characteristics */
- 	const unsigned char ICQ_TCP_VERSION 	= 0x0008;
--	const char ICQ_CLIENTSTRING[] 		= "ICQ Inc. - Product of ICQ (TM).2003a.5.45.1.3777.85";
-+	const char ICQ_CLIENTSTRING[] 		= "ICQBasic";
- 	const WORD ICQ_CLIENTID 		= 0x010A;
--	const WORD ICQ_MAJOR 			= 0x0005;
--	const WORD ICQ_MINOR 			= 0x002D;
--	const WORD ICQ_POINT 			= 0x0001;
--	const WORD ICQ_BUILD 			= 0x0EC1;
--	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x00, 0x55 };
-+	const WORD ICQ_MAJOR 			= 0x0014;
-+	const WORD ICQ_MINOR 			= 0x0034;
-+	const WORD ICQ_POINT 			= 0x0000;
-+	const WORD ICQ_BUILD 			= 0x0A0F;
-+	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
- 	const char ICQ_COUNTRY[] 		= "us";
- 	const char ICQ_LANG[] 			= "en";
- 
diff --git a/kde-base/kdenetwork/files/kopete-3.5.x-oscarcontacts.patch b/kde-base/kdenetwork/files/kopete-3.5.x-oscarcontacts.patch
deleted file mode 100644
index 7ea35079f58e..000000000000
--- a/kde-base/kdenetwork/files/kopete-3.5.x-oscarcontacts.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=141675
-http://bugs.kde.org/show_bug.cgi?id=104243
-
-Index: kopete/protocols/oscar/liboscar/ssimanager.cpp
-===================================================================
---- kopete/protocols/oscar/liboscar/ssimanager.cpp	(revision 565951)
-+++ kopete/protocols/oscar/liboscar/ssimanager.cpp	(working copy)
-@@ -71,18 +71,65 @@
- 		while ( it != d->SSIList.end() && d->SSIList.count() > 0 )
- 			it = d->SSIList.remove( it );
- 	};
-+	
-+	d->nextContactId = 0;
-+	d->nextGroupId = 0;
- }
- 
- WORD SSIManager::nextContactId()
- {
--	d->nextContactId++;
--	return d->nextContactId;
-+	if ( d->nextContactId == 0 )
-+		d->nextContactId++;
-+	
-+	QValueList<Oscar::SSI>::const_iterator it, listEnd;
-+	
-+	for ( ; d->nextContactId < 0x8000; d->nextContactId++ )
-+	{
-+		bool freeId = true;
-+		listEnd = d->SSIList.end();
-+		for ( it = d->SSIList.begin(); it != listEnd; ++it )
-+		{
-+			if ( ( *it ).bid() == d->nextContactId )
-+			{
-+				freeId = false;
-+				break;
-+			}
-+		}
-+	
-+		if ( freeId )
-+			return d->nextContactId;
-+	}
-+	
-+	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No free id!" << endl;
-+	return 0xFFFF;
- }
- 
- WORD SSIManager::nextGroupId()
- {
--	d->nextGroupId++;
--	return d->nextGroupId;
-+	if ( d->nextGroupId == 0 )
-+		d->nextGroupId++;
-+	
-+	QValueList<Oscar::SSI>::const_iterator it, listEnd;
-+	
-+	for ( ; d->nextGroupId < 0x8000; d->nextGroupId++ )
-+	{
-+		bool freeId = true;
-+		listEnd = d->SSIList.end();
-+		for ( it = d->SSIList.begin(); it != listEnd; ++it )
-+		{
-+			if ( ( *it ).type() == ROSTER_GROUP && ( *it ).gid() == d->nextGroupId )
-+			{
-+				freeId = false;
-+				break;
-+			}
-+		}
-+		
-+		if ( freeId )
-+			return d->nextGroupId;
-+	}
-+	
-+	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No free group id!" << endl;
-+	return 0xFFFF;
- }
- 
- WORD SSIManager::numberOfItems() const
-@@ -379,8 +426,6 @@
- 	if ( !group.name().isEmpty() ) //avoid the group with gid 0 and bid 0
- 	{	// the group is really new
- 		kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding group '" << group.name() << "' to SSI list" << endl;
--		if ( group.gid() > d->nextGroupId )
--			d->nextGroupId = group.gid();
- 		
- 		d->SSIList.append( group );
- 		emit groupAdded( group );
-@@ -394,6 +439,10 @@
- 	QString groupName = group.name();
- 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Removing group " << group.name() << endl;
- 	int remcount = d->SSIList.remove( group );
-+	
-+	if ( d->nextGroupId > group.gid() )
-+		d->nextGroupId = group.gid();
-+	
- 	if ( remcount == 0 )
- 	{
- 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No groups removed" << endl;
-@@ -420,13 +469,6 @@
- 
- bool SSIManager::newContact( const Oscar::SSI& contact )
- {
--	//what to validate?
--	if ( contact.bid() > d->nextContactId )
--	{
--		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Setting next contact ID to " << contact.bid() << endl;
--		d->nextContactId = contact.bid();
--	}
--	
- 	if ( d->SSIList.findIndex( contact ) == -1 )
- 	{
- 		kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding contact '" << contact.name() << "' to SSI list" << endl;
-@@ -443,6 +485,9 @@
- 	QString contactName = contact.name();
- 	int remcount = d->SSIList.remove( contact );
- 	
-+	if ( d->nextContactId > contact.bid() )
-+		d->nextContactId = contact.bid();
-+	
- 	if ( remcount == 0 )
- 	{
- 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No contacts were removed." << endl;
-@@ -476,6 +521,10 @@
- bool SSIManager::removeItem( const Oscar::SSI& item )
- {
- 	d->SSIList.remove( item );
-+	
-+	if ( d->nextContactId > item.bid() )
-+		d->nextContactId = item.bid();
-+	
- 	return true;
- }
- 
diff --git a/kde-base/kdenetwork/files/kppp-3.5.0-bindnow.patch b/kde-base/kdenetwork/files/kppp-3.5.0-bindnow.patch
deleted file mode 100644
index c52d94b16042..000000000000
--- a/kde-base/kdenetwork/files/kppp-3.5.0-bindnow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdenetwork-3.5.0/kppp/Makefile.am
-===================================================================
---- kdenetwork-3.5.0.orig/kppp/Makefile.am
-+++ kdenetwork-3.5.0/kppp/Makefile.am
-@@ -51,7 +51,7 @@ kppp_SOURCES	= kpppwidget.cpp \
- 		KPPPIface.skel
- 
- # the library search path
--kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(BINDNOW_FLAGS)
- 
- # the libraries to link against. Be aware of the order. First the libraries,
- # that depend on the following ones.
diff --git a/kde-base/kdenetwork/files/lisa b/kde-base/kdenetwork/files/lisa
deleted file mode 100644
index 81ae60b40d44..000000000000
--- a/kde-base/kdenetwork/files/lisa
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/lisa,v 1.4 2004/07/14 22:26:56 agriffis Exp $
-
-depend() {
-    use net
-}
-
-start() {
-    ebegin "Starting lisa"
-    start-stop-daemon --start -x _KDEDIR_/bin/lisa -q -- $LISACONF 1>/dev/null
-    eend $? "Failed to start lisa"
-}
-
-stop() {
-    ebegin "Stopping lisa"
-    start-stop-daemon --stop -x _KDEDIR_/bin/lisa -q
-    eend $? "Failed to stop lisa"
-}
diff --git a/kde-base/kdenetwork/files/lisa-3.5.0-bindnow.patch b/kde-base/kdenetwork/files/lisa-3.5.0-bindnow.patch
deleted file mode 100644
index f55c5c6892d1..000000000000
--- a/kde-base/kdenetwork/files/lisa-3.5.0-bindnow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdenetwork-3.5.0/lanbrowsing/lisa/Makefile.am
-===================================================================
---- kdenetwork-3.5.0.orig/lanbrowsing/lisa/Makefile.am
-+++ kdenetwork-3.5.0/lanbrowsing/lisa/Makefile.am
-@@ -33,7 +33,7 @@ lisa_LDADD = $(LIBSOCKET)
- lisa_LDFLAGS = $(KDE_EXTRA_RPATH)
- 
- reslisa_LDADD = $(LIBSOCKET)
--reslisa_LDFLAGS = $(KDE_EXTRA_RPATH)
-+reslisa_LDFLAGS = $(KDE_EXTRA_RPATH) $(BINDNOW_FLAGS)
- 
- misc_DATA = README
- miscdir = $(kde_datadir)/lisa
diff --git a/kde-base/kdenetwork/files/lisa.conf b/kde-base/kdenetwork/files/lisa.conf
deleted file mode 100644
index bad3fa8261fc..000000000000
--- a/kde-base/kdenetwork/files/lisa.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Note: this is NOT the main lisa configuratio file. That is in /etc/lisarc.
-# This merely sets startup options for the gentoo lisa initscript.
-# Add anything you want to $LISACONF.
-
-# config file to use; overrides default
-# note that default checks /etc/lisarc and ~/.lisarc
-# LISACONF="$LISACONF --config=myfile"
-
-# port to use; overrides default of 7741
-# I think all lisas on the network have to use the same port
-# LISACONF="$LISACONF --port 7741"
-\ No newline at end of file
diff --git a/kde-base/kdenetwork/files/post-3.5.5-kdenetwork-ksirc.diff b/kde-base/kdenetwork/files/post-3.5.5-kdenetwork-ksirc.diff
deleted file mode 100644
index cd0b5699c94f..000000000000
--- a/kde-base/kdenetwork/files/post-3.5.5-kdenetwork-ksirc.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- ksirc/iocontroller.cpp
-+++ ksirc/iocontroller.cpp
-@@ -237,7 +237,7 @@
- 
-     if((line.length() > 0) && (line[0] == '~')){
-       pos3 = line.find('~', 1);
--      if(pos3 > 0){
-+      if(pos3 > 1){
- 	name = line.mid(1,pos3-1).lower();
- 	name = name.lower();
- 	line.remove(0, pos3+1);
-@@ -266,13 +266,13 @@
-         if(ksopts->autoCreateWin == TRUE && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) {
- 	    //kdDebug(5008) << "Creating window for: " << qsname << " because of: " << line.data() << endl;
- 	    ksircproc->new_toplevel(KSircChannel(ksircproc->serverName(), qsname));
--	    assert(ksircproc->TopList[qsname] != 0x0);
-         }
--        else{
-+        if (!ksircproc->TopList[qsname]) {
-             qsname = "!default";
-             if(line[0] == '`')
-                 qsname = "!discard";
-         }
-+        assert(ksircproc->TopList[qsname]);
-     }
- 
-     ksircproc->TopList[qsname]->sirc_receive(line);
diff --git a/kde-base/kdenetwork/files/reslisa b/kde-base/kdenetwork/files/reslisa
deleted file mode 100644
index 26983b3ce79c..000000000000
--- a/kde-base/kdenetwork/files/reslisa
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/reslisa,v 1.4 2004/07/14 22:26:56 agriffis Exp $
-
-depend() {
-    use net
-}
-
-start() {
-    ebegin "Starting reslisa"
-    start-stop-daemon --start -x _KDEDIR_/bin/reslisa -q -- 1>/dev/null
-    eend $? "Failed to start reslisa"
-}
-
-stop() {
-    ebegin "Stopping reslisa"
-    start-stop-daemon --stop -x _KDEDIR_/bin/reslisa -q
-    eend $? "Failed to stop reslisa"
-}
diff --git a/kde-base/kdenetwork/files/reslisa.conf b/kde-base/kdenetwork/files/reslisa.conf
deleted file mode 100644
index 0a74c6caec58..000000000000
--- a/kde-base/kdenetwork/files/reslisa.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Note: this is NOT the main reslisa configuratio file. That is in /etc/reslisarc.
-# This merely sets startup options for the gentoo reslisa initscript.
-# Add anything you want to $RESLISACONF.
-
-# config file to use; overrides default
-# note that default checks /etc/reslisarc and ~/.reslisarc
-# RESLISACONF="$RESLISACONF --config=myfile"
-
diff --git a/kde-base/kdenetwork/files/wireless-extensions-api.diff b/kde-base/kdenetwork/files/wireless-extensions-api.diff
deleted file mode 100644
index e6ca15c3112c..000000000000
--- a/kde-base/kdenetwork/files/wireless-extensions-api.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- wifi/interface_wireless_wirelessextensions.cpp	2005/05/04 06:07:06	409205
-+++ wifi/interface_wireless_wirelessextensions.cpp	2005/06/23 11:03:38	428163
-@@ -418,7 +418,7 @@
-   essid = (WIFI_CONFIG(info,essid_on) ? WIFI_CONFIG(info,essid) : "any");
-   char
-     ap_addr[256];
--  iw_pr_ether (ap_addr, (const unsigned char *) info.ap_addr.sa_data);
-+  iw_ether_ntop ( (const ether_addr *) info.ap_addr.sa_data, ap_addr);
-   if (access_point_address != ap_addr)
-     emitStatusChanged = true;
-   access_point_address = ap_addr;
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 );
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 9f79206e86eb..072a86570944 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.249 2007/02/04 17:56:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.250 2007/02/05 12:20:12 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libkdepim-3.5.2-call_qt3_designer.diff,
+  -files/libkdepim-3.5.2-fixes.diff, -files/kmail-3.5.2-imap-fixes-2.diff,
+  -files/kmail-3.5.2-misc-fixes-2.diff, -files/akregator-3.5-hppa.patch,
+  -files/imap-dos.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdepim-3.5.6-r1.ebuild:
   Marked ~hppa.
diff --git a/kde-base/kdepim/files/akregator-3.5-hppa.patch b/kde-base/kdepim/files/akregator-3.5-hppa.patch
deleted file mode 100644
index 57e3ac4b7e53..000000000000
--- a/kde-base/kdepim/files/akregator-3.5-hppa.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: akregator/src/mk4storage/metakit/include/mk4.h
-===================================================================
---- akregator/src/mk4storage/metakit/include/mk4.h	(revision 547241)
-+++ akregator/src/mk4storage/metakit/include/mk4.h	(working copy)
-@@ -100,7 +100,7 @@
- 
-     // and here's the other end of the scale...
- #if !defined (_WIN32) && !defined (q4_LONG64)
--#if defined (_PA_RISC2_0) || defined (__powerpc64__) || defined(__sparcv9) || \
-+#if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
-     defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || \
-     (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
- #define q4_LONG64 1
diff --git a/kde-base/kdepim/files/imap-dos.diff b/kde-base/kdepim/files/imap-dos.diff
deleted file mode 100644
index cdbca5e288b9..000000000000
--- a/kde-base/kdepim/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/files/kmail-3.5.2-imap-fixes-2.diff b/kde-base/kdepim/files/kmail-3.5.2-imap-fixes-2.diff
deleted file mode 100644
index f8d7326327f9..000000000000
--- a/kde-base/kdepim/files/kmail-3.5.2-imap-fixes-2.diff
+++ /dev/null
@@ -1,434 +0,0 @@
---- kdepim/kmail/kmheaders.cpp	2006/03/02 12:26:51	515022
-+++ kdepim/kmail/kmheaders.cpp	2006/04/22 08:13:05	532593
-@@ -1841,7 +1841,7 @@
-   bool foundUnreadMessage = false;
- 
-   if (!mFolder) return -1;
--  if (!(mFolder->count()) > 0) return -1;
-+  if (mFolder->count() <= 0) return -1;
- 
-   if ((aStartAt >= 0) && (aStartAt < (int)mItems.size()))
-     item = mItems[aStartAt];
-@@ -2041,7 +2041,7 @@
- 
-   int idx = item->msgId();
-   KMMessage *msg = mFolder->getMsg(idx);
--  if (!msg->transferInProgress())
-+  if (msg && !msg->transferInProgress())
-   {
-     emit activated(mFolder->getMsg(idx));
-   }
-@@ -3280,7 +3280,8 @@
-         unlink(QFile::encodeName(sortFile));
-         kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
-         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
--        //kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile ));
-+
-+        return true;
-     }
-     if(sortStream)
-         fclose(sortStream);
---- kdepim/kmail/imapaccountbase.cpp	2006/02/23 14:32:38	512746
-+++ kdepim/kmail/imapaccountbase.cpp	2006/04/15 13:05:11	530119
-@@ -1098,10 +1098,10 @@
-       {
-         DwBodyPart* newparent = dwpart;
-         const DwMessage* newmsg = dwmsg;
--        if ( part->originalContentTypeStr() == "MESSAGE/RFC822" &&
-+        if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart &&
-              dwpart->Body().Message() )
-         {
--          // set the encapsulated message as new parent message
-+          // set the encapsulated message as the new message
-           newparent = 0;
-           newmsg = dwpart->Body().Message();
-         }
-@@ -1281,7 +1281,8 @@
-     if ( delim.isEmpty() ) {
-       delim = "/";
-     }
--    if ( !newName.endsWith( delim ) && !folderName.startsWith( delim ) ) {
-+    if ( !newName.isEmpty() && 
-+         !newName.endsWith( delim ) && !folderName.startsWith( delim ) ) {
-       newName = newName + delim;
-     }
-     newName = newName + folderName;
---- kdepim/kmail/kmfolderimap.cpp	2006/03/15 14:19:26	518857
-+++ kdepim/kmail/kmfolderimap.cpp	2006/04/15 13:05:11	530119
-@@ -110,6 +110,11 @@
-   if (mOpenCount <= 0 ) return;
-   if (mOpenCount > 0) mOpenCount--;
-   if (mOpenCount > 0 && !aForced) return;
-+  if (isSelected() && !aForced) {
-+      kdWarning(5006) << "Trying to close the selected folder " << label() << 
-+          " - ignoring!" << endl;
-+      return;
-+  }
-   // FIXME is this still needed?
-   if (mAccount)
-     mAccount->ignoreJobsForFolder( folder() );
-@@ -873,8 +878,10 @@
-     }
-     kmkernel->imapFolderMgr()->contentsChanged();
-   }
--  f->initializeFrom( this, "/INBOX/", "message/directory" );
--  f->setChildrenState( QString::null );
-+  if ( f ) {
-+    f->initializeFrom( this, "/INBOX/", "message/directory" );
-+    f->setChildrenState( QString::null );
-+  }
-   // so we have an INBOX
-   mAccount->setHasInbox( true );
- }
-@@ -1086,17 +1093,20 @@
-     int a = cstr.find("X-uidValidity: ");
-     int b = cstr.find("\r\n", a);
-     QString uidv;
--    if ( (b - a - 15) >= 0 ) uidv = cstr.mid(a + 15, b - a - 15);
-+    if ( (b - a - 15) >= 0 ) 
-+        uidv = cstr.mid(a + 15, b - a - 15);
-     a = cstr.find("X-Access: ");
-     b = cstr.find("\r\n", a);
-     QString access;
--    if ( (b - a - 10) >= 0 ) access = cstr.mid(a + 10, b - a - 10);
-+    if ( (b - a - 10) >= 0 ) 
-+        access = cstr.mid(a + 10, b - a - 10);
-     mReadOnly = access == "Read only";
-     a = cstr.find("X-Count: ");
-     b = cstr.find("\r\n", a);
-     int exists = -1;
--    bool ok;
--    if ( (b - a - 9) >= 0 ) exists = cstr.mid(a + 9, b - a - 9).toInt(&ok);
-+    bool ok = false;
-+    if ( (b - a - 9) >= 0 ) 
-+        exists = cstr.mid(a + 9, b - a - 9).toInt(&ok);
-     if ( !ok ) exists = -1;
-     QString startUid;
-     if (uidValidity() != uidv)
---- kdepim/kmail/kmfoldercachedimap.cpp	2006/02/11 22:39:04	508499
-+++ kdepim/kmail/kmfoldercachedimap.cpp	2006/05/01 18:24:21	536266
-@@ -539,8 +539,11 @@
-   mRecurse = recurse;
-   assert( account() );
- 
--  mAccount->mailCheckProgressItem()->reset();
--  mAccount->mailCheckProgressItem()->setTotalItems( 100 );
-+  ProgressItem *progressItem = mAccount->mailCheckProgressItem();
-+  if ( progressItem ) {
-+    progressItem->reset();
-+    progressItem->setTotalItems( 100 );
-+  }
-   mProgress = 0;
- 
- #if 0
-@@ -1115,12 +1118,12 @@
-       job->start();
-       return;
-     } else {
--      const QString msg ( i18n( "<p>There are new messages in this folder, which "
-+      const QString msg ( i18n( "<p>There are new messages in this folder (%1), which "
-             "have not been uploaded to the server yet, but you do not seem to "
-             "have sufficient access rights on the folder now to upload them. "
-             "Please contact your administrator to allow upload of new messages "
-             "to you, or move them out of this folder.</p> "
--            "<p>Do you want to move these messages to another folder now?</p>") );
-+            "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) );
-       if ( KMessageBox::warningYesNo( 0, msg, QString::null, i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) {
-         KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(),
-             i18n("Move Messages to Folder"), true );
-@@ -1746,11 +1749,14 @@
-         f = static_cast<KMFolderCachedImap*>(newFolder->storage());
-       }
-     }
--    f->setAccount( mAccount );
--    f->setImapPath( "/INBOX/" );
--    f->folder()->setLabel( i18n("inbox") );
-+    if ( f ) {
-+      f->setAccount( mAccount );
-+      f->setImapPath( "/INBOX/" );
-+      f->folder()->setLabel( i18n("inbox") );
-+    }
-     if (!node) {
--      f->close();
-+      if ( f )
-+        f->close();
-       kmkernel->dimapFolderMgr()->contentsChanged();
-     }
-     // so we have an INBOX
---- kdepim/kmail/kmfoldertree.cpp	2006/02/13 20:29:00	509156
-+++ kdepim/kmail/kmfoldertree.cpp	2006/04/28 09:54:26	534978
-@@ -139,7 +139,7 @@
-   KIconLoader * il = KGlobal::instance()->iconLoader();
-   QPixmap pm = il->loadIcon( icon, KIcon::Small, size,
-                              KIcon::DefaultState, 0, true );
--  if ( pm.isNull() ) {
-+  if ( mFolder && pm.isNull() ) {
-       pm = il->loadIcon( mFolder->normalIconPath(), KIcon::Small, size,
-                          KIcon::DefaultState, 0, true );
-   }
-@@ -157,7 +157,7 @@
-     pm = normalIcon( size );
- 
-   KIconLoader * il = KGlobal::instance()->iconLoader();
--  if ( mFolder->useCustomIcons() ) {
-+  if ( mFolder && mFolder->useCustomIcons() ) {
-     pm = il->loadIcon( mFolder->unreadIconPath(), KIcon::Small, size,
-                        KIcon::DefaultState, 0, true );
-     if ( pm.isNull() )
-@@ -1020,10 +1020,10 @@
-       mMainWidget->action("compact")->plug(folderMenu);
- 
-       folderMenu->insertSeparator();
--      if ( !fti->folder()->isSystemFolder() )
-+      if ( !fti->folder()->isSystemFolder() ) {
-         mMainWidget->action("delete_folder")->plug(folderMenu);
--
--      folderMenu->insertSeparator();
-+        folderMenu->insertSeparator();
-+      }
-       mMainWidget->action("empty")->plug(folderMenu);
-       folderMenu->insertSeparator();
-     }
-@@ -1472,7 +1472,7 @@
- 
-   KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>(item);
- 
--  if (fti && fti->folder() && col != 0 && !currentFolder()->child())
-+  if ((!fti) || (fti && fti->folder() && col != 0 && !currentFolder()->child()))
-           return;
- 
-   QString fldName, oldFldName;
-@@ -1546,10 +1546,12 @@
- 
-   // get the unread count
-   int count = 0;
--  if (folder->noContent()) // always empty
-+  if (folder && folder->noContent()) // always empty
-     count = -1;
--  else
--    count = fti->folder()->countUnread();
-+  else {
-+    if ( fti->folder() ) 
-+      count = fti->folder()->countUnread();
-+  }
- 
-   // set it
-   bool repaint = false;
-@@ -1848,6 +1850,9 @@
- void KMFolderTree::moveFolder( KMFolder* destination )
- {
-   KMFolder* folder = currentFolder();
-+  if (!folder)
-+	return;
-+
-   KMFolderDir* parent = &(kmkernel->folderMgr()->dir());
-   if ( destination )
-     parent = destination->createChildFolder();
-@@ -1857,7 +1862,7 @@
- 
-   KMFolderDir* folderDir = parent;
-   // check that the folder can be moved
--  if ( folder && folder->child() )
-+  if ( folder->child() )
-   {
-     while ( folderDir && ( folderDir != &kmkernel->folderMgr()->dir() ) &&
-         ( folderDir != folder->parent() ) )
-@@ -1871,13 +1876,13 @@
-     }
-   }
- 
--  if( folder && folder->child() && parent &&
-+  if( folder->child() && parent &&
-       ( parent->path().find( folder->child()->path() + "/" ) == 0 ) ) {
-     KMessageBox::error( this, message );
-     return;
-   }
- 
--  if( folder && folder->child()
-+  if( folder->child()
-       && ( parent == folder->child() ) ) {
-     KMessageBox::error( this, message );
-     return;
---- kdepim/kmail/imapjob.cpp	2005/08/12 17:17:32	446148
-+++ kdepim/kmail/imapjob.cpp	2006/05/04 21:30:58	537478
-@@ -97,11 +97,12 @@
-   // imap folder, use its account for keeping track of the job. Otherwise,
-   // this is a get job and the src folder is an imap one. Use its account
-   // then.
--  KMAcctImap *account;
-+  KMAcctImap *account = 0;
-   if (folder) {
-     account = folder->account();
-   } else {
--    account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
-+    if ( msg_parent && msg_parent->storage() )
-+      account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
-   }
-   if ( !account ||
-        account->makeConnection() == ImapAccountBase::Error ) {
-@@ -127,7 +128,7 @@
-       url.setPath( folder->imapPath() + ";SECTION=" + flags );
-       ImapAccountBase::jobData jd;
-       jd.parent = 0; jd.offset = 0; jd.done = 0;
--      jd.total = ( curMsg->msgSizeServer() > 0 ) ? 
-+      jd.total = ( curMsg->msgSizeServer() > 0 ) ?
-         curMsg->msgSizeServer() : curMsg->msgSize();
-       jd.msgList.append( curMsg );
-       QCString cstr( curMsg->asString() );
-@@ -192,7 +193,7 @@
-                           "ImapJobCopyMove"+ProgressManager::getUniqueID(),
-                           i18n("Server operation"),
-                           i18n("Source folder: %1 - Destination folder: %2")
--                            .arg( msg_parent->prettyURL(), 
-+                            .arg( msg_parent->prettyURL(),
-                                   mDestFolder->prettyURL() ),
-                           true,
-                           account->useSSL() || account->useTLS() );
-@@ -223,21 +224,23 @@
-   if ( mDestFolder )
-   {
-     KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
--    if ( account &&  mJob ) {
--      ImapAccountBase::JobIterator it = account->findJob( mJob );
--      if ( it != account->jobsEnd() ) {
--        if( (*it).progressItem ) {
--          (*it).progressItem->setComplete();
--          (*it).progressItem = 0;
--        }
--        if ( !(*it).msgList.isEmpty() ) {
--          for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
--            mit.current()->setTransferInProgress( false );
-+    if ( account ) {
-+      if ( mJob ) {
-+        ImapAccountBase::JobIterator it = account->findJob( mJob );
-+        if ( it != account->jobsEnd() ) {
-+          if( (*it).progressItem ) {
-+            (*it).progressItem->setComplete();
-+            (*it).progressItem = 0;
-+          }
-+          if ( !(*it).msgList.isEmpty() ) {
-+            for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
-+              mit.current()->setTransferInProgress( false );
-+          }
-         }
-+        account->removeJob( mJob );
-       }
--      account->removeJob( mJob );
-+      account->mJobList.remove( this );
-     }
--    account->mJobList.remove( this );
-     mDestFolder->close();
-   }
- 
-@@ -245,21 +248,23 @@
-     if (!mDestFolder || mDestFolder != mSrcFolder) {
-       if (! (mSrcFolder->folderType() == KMFolderTypeImap) ) return;
-       KMAcctImap *account = static_cast<KMFolderImap*>(mSrcFolder->storage())->account();
--      if ( account && mJob ) {
--        ImapAccountBase::JobIterator it = account->findJob( mJob );
--        if ( it != account->jobsEnd() ) {
--          if( (*it).progressItem ) {
--            (*it).progressItem->setComplete();
--            (*it).progressItem = 0;
--          }
--          if ( !(*it).msgList.isEmpty() ) {
--            for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
--              mit.current()->setTransferInProgress( false );
-+      if ( account ) {
-+        if ( mJob ) {
-+          ImapAccountBase::JobIterator it = account->findJob( mJob );
-+          if ( it != account->jobsEnd() ) {
-+            if( (*it).progressItem ) {
-+              (*it).progressItem->setComplete();
-+              (*it).progressItem = 0;
-+            }
-+            if ( !(*it).msgList.isEmpty() ) {
-+              for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
-+                mit.current()->setTransferInProgress( false );
-+            }
-           }
-+          account->removeJob( mJob ); // remove the associated kio job
-         }
--        account->removeJob( mJob ); // remove the associated kio job
-+        account->mJobList.remove( this ); // remove the folderjob
-       }
--      account->mJobList.remove( this ); // remove the folderjob
-     }
-     mSrcFolder->close();
-   }
-@@ -270,15 +275,15 @@
- void ImapJob::slotGetNextMessage()
- {
-   KMMessage *msg = mMsgList.first();
--  KMFolderImap *msgParent = static_cast<KMFolderImap*>(msg->storage());
--  KMAcctImap *account = msgParent->account();
--  if ( msg->UID() == 0 )
-+  KMFolderImap *msgParent = msg ? static_cast<KMFolderImap*>(msg->storage()) : 0;
-+  if ( !msgParent || msg->UID() == 0 )
-   {
-     // broken message
-     emit messageRetrieved( 0 );
-     deleteLater();
-     return;
-   }
-+  KMAcctImap *account = msgParent->account();
-   KURL url = account->getUrl();
-   QString path = msgParent->imapPath() + ";UID=" + QString::number(msg->UID());
-   ImapAccountBase::jobData jd;
-@@ -391,7 +396,7 @@
-         dataSize = Util::crlf2lf( (*it).data.data(), dataSize ); // always <=
-         (*it).data.resize( dataSize );
- 
--        // During the construction of the message from the byteArray it does 
-+        // During the construction of the message from the byteArray it does
-         // not have a uid. Therefore we have to make sure that no connected
-         // slots are called, since they would operate on uid == 0.
-         msg->parent()->storage()->blockSignals( true );
-@@ -445,7 +450,7 @@
-       parent->ignoreJobsForMessage( msg );
-       int idx = parent->find( msg );
-       if (idx != -1) parent->removeMsg( idx, true );
--      // the removeMsg will unGet the message, which will delete all 
-+      // the removeMsg will unGet the message, which will delete all
-       // jobs, including this one
-       return;
-     }
---- kdepim/kmail/kmacctcachedimap.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/kmail/kmacctcachedimap.cpp	2006/05/06 09:14:35	537923
-@@ -381,14 +381,14 @@
- //-----------------------------------------------------------------------------
- void KMAcctCachedImap::addDeletedFolder( KMFolder* folder )
- {
--  if ( folder->folderType() != KMFolderTypeCachedImap )
-+  if ( !folder || folder->folderType() != KMFolderTypeCachedImap )
-     return;
-   KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>(folder->storage());
-   addDeletedFolder( storage->imapPath() );
-   kdDebug(5006) << k_funcinfo << storage->imapPath() << endl;
- 
-   // Add all child folders too
--  if( folder && folder->child() ) {
-+  if( folder->child() ) {
-     KMFolderNode *node = folder->child()->first();
-     while( node ) {
-       if( !node->isDir() ) {
---- kdepim/kmail/kmcommands.cpp	2006/03/14 20:17:40	518656
-+++ kdepim/kmail/kmcommands.cpp	2006/05/06 09:14:35	537923
-@@ -1724,7 +1724,7 @@
-       msg = srcFolder->getMsg(idx);
-     }
- 
--    if (srcFolder &&
-+    if (srcFolder && mDestFolder &&
-         (srcFolder->folderType()== KMFolderTypeImap) &&
-         (mDestFolder->folderType() == KMFolderTypeImap) &&
-         (static_cast<KMFolderImap*>(srcFolder->storage())->account() ==
-@@ -1761,7 +1761,7 @@
-       }
-     }
- 
--    if (!isMessage && list.isEmpty())
-+    if (srcFolder && !isMessage && list.isEmpty())
-     {
-       assert(idx != -1);
-       srcFolder->unGetMsg( idx );
diff --git a/kde-base/kdepim/files/kmail-3.5.2-misc-fixes-2.diff b/kde-base/kdepim/files/kmail-3.5.2-misc-fixes-2.diff
deleted file mode 100644
index f05626b998f5..000000000000
--- a/kde-base/kdepim/files/kmail-3.5.2-misc-fixes-2.diff
+++ /dev/null
@@ -1,329 +0,0 @@
---- kdepim/kmail/attachmentlistview.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/kmail/attachmentlistview.cpp	2006/04/15 06:51:13	530022
-@@ -92,7 +92,7 @@
-     QBuffer serNumBuffer( serNums );
-     serNumBuffer.open( IO_ReadOnly );
-     QDataStream serNumStream( &serNumBuffer );
--    unsigned long serNum;
-+    Q_UINT32 serNum;
-     KMFolder *folder = 0;
-     int idx;
-     QPtrList<KMMsgBase> messageList;
---- kdepim/kmail/kmedit.cpp	2006/02/20 11:40:20	511574
-+++ kdepim/kmail/kmedit.cpp	2006/04/15 06:51:13	530022
-@@ -144,7 +144,7 @@
-         QBuffer serNumBuffer(serNums);
-         serNumBuffer.open(IO_ReadOnly);
-         QDataStream serNumStream(&serNumBuffer);
--        unsigned long serNum;
-+        Q_UINT32 serNum;
-         KMFolder *folder = 0;
-         int idx;
-         QPtrList<KMMsgBase> messageList;
---- kdepim/kmail/kmkernel.cpp	2006/04/09 09:53:18	527760
-+++ kdepim/kmail/kmkernel.cpp	2006/04/09 09:53:52	527761
-@@ -1463,6 +1463,9 @@
- 
- void KMKernel::readConfig()
- {
-+  //Needed here, since this function is also called when the configuration
-+  //changes, and the static variables should be updated then - IOF
-+  KMMessage::readConfig();
- }
- 
- void KMKernel::cleanupImapFolders()
---- kdepim/kmail/kmmsgbase.cpp	2006/01/11 14:34:42	496941
-+++ kdepim/kmail/kmmsgbase.cpp	2006/04/15 13:05:11	530119
-@@ -870,7 +870,7 @@
- 
-   char *l;
-   for ( l = latin.data(); *l; ++l ) {
--    if ( ( *l & 0xE0 == 0 ) || ( *l & 0x80 ) )
-+    if ( ( ( *l & 0xE0 ) == 0 ) || ( *l & 0x80 ) )
-       // *l is control character or 8-bit char
-       break;
-   }
---- kdepim/kmail/kmmsgdict.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/kmail/kmmsgdict.cpp	2006/04/15 13:05:11	530119
-@@ -205,7 +205,16 @@
-   }
- 
-   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
--  if (folder && index == -1)
-+  if ( !folder ) {
-+    kdDebug(5006) << "KMMsgDict::insert: Cannot insert the message, "
-+      << "null pointer to storage. Requested serial: " << msgSerNum
-+      << endl;
-+    kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
-+      << msg->toStrip() << ", Date: " << msg->dateStr() << endl; 
-+    return 0;
-+  }
-+
-+  if (index == -1)
-     index = folder->find(msg);
- 
-   // Should not happen, indicates id file corruption
-@@ -241,7 +250,16 @@
- 		       const KMMsgBase *msg, int index)
- {
-   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
--  if ( folder && index == -1 )
-+  if ( !folder ) {
-+    kdDebug(5006) << "KMMsgDict::replace: Cannot replace the message serial "
-+      << "number, null pointer to storage. Requested serial: " << msgSerNum
-+      << endl;
-+    kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
-+      << msg->toStrip() << ", Date: " << msg->dateStr() << endl; 
-+    return;
-+  }
-+
-+  if ( index == -1 )
-     index = folder->find( msg );
- 
-   remove( msgSerNum );
---- kdepim/kmail/renamejob.cpp	2005/12/10 04:41:02	487311
-+++ kdepim/kmail/renamejob.cpp	2006/04/15 13:05:11	530119
-@@ -59,11 +59,13 @@
-    mNewName( newName ), mNewFolder( 0 )
- {
-   mStorageTempOpened = 0;
--  mOldName = storage->name();
--  if ( storage->folderType() == KMFolderTypeImap ) {
--    mOldImapPath = static_cast<KMFolderImap*>(storage)->imapPath();
--  } else if ( storage->folderType() == KMFolderTypeCachedImap ) {
--    mOldImapPath = static_cast<KMFolderCachedImap*>(storage)->imapPath();
-+  if ( storage ) {
-+    mOldName = storage->name();
-+    if ( storage->folderType() == KMFolderTypeImap ) {
-+      mOldImapPath = static_cast<KMFolderImap*>(storage)->imapPath();
-+    } else if ( storage->folderType() == KMFolderTypeCachedImap ) {
-+      mOldImapPath = static_cast<KMFolderCachedImap*>(storage)->imapPath();
-+    }
-   }
- }
- 
---- kdepim/kmail/configuredialog_p.h	2005/08/19 15:04:44	450950
-+++ kdepim/kmail/configuredialog_p.h	2006/04/01 23:19:36	525407
-@@ -715,8 +715,7 @@
-   void slotOutlookCompatibleClicked();
- 
- private:
--  //virtual void doLoadFromGlobalSettings();
--  virtual void doLoadOther();
-+  virtual void doLoadFromGlobalSettings();
-   //FIXME virtual void doResetToDefaultsOther();
- 
- private:
---- kdepim/kmail/replyphrases.kcfg	2006/04/09 09:53:18	527760
-+++ kdepim/kmail/replyphrases.kcfg	2006/04/09 09:53:52	527761
-@@ -20,17 +20,14 @@
-     <entry name="PhraseForward" type="String" key="phrase-forward">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>Forwarded Message</default>
-     </entry>
-     <entry name="PhraseReplySender" type="String" key="phrase-reply">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>On %D, you wrote:</default>
-     </entry>
-     <entry name="PhraseReplyAll" type="String" key="phrase-reply-all">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>On %D, %F wrote:</default>
-     </entry>
- 
-   </group>
---- kdepim/kmail/kmfolder.cpp	2005/12/06 21:29:44	486141
-+++ kdepim/kmail/kmfolder.cpp	2006/04/18 20:41:15	531267
-@@ -84,12 +84,6 @@
-     }
-   }
- 
--   // trigger from here, since it needs a fully constructed FolderStorage
--  if ( mExportsSernums )
--    mStorage->registerWithMessageDict();
--  if ( !mHasIndex )
--    mStorage->setAutoCreateIndex( false );
--
-   if ( aParent ) {
-     connect( mStorage, SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-              aParent->manager(), SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-@@ -133,8 +127,16 @@
-                 this, SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) );
- 
-   //FIXME: Centralize all the readConfig calls somehow - Zack
-+  // Meanwhile, readConfig must be done before registerWithMessageDict, since
-+  // that one can call writeConfig in some circumstances - David
-   mStorage->readConfig();
- 
-+   // trigger from here, since it needs a fully constructed FolderStorage
-+  if ( mExportsSernums )
-+    mStorage->registerWithMessageDict();
-+  if ( !mHasIndex )
-+    mStorage->setAutoCreateIndex( false );
-+
-   if ( mId == 0 && aParent )
-     mId = aParent->manager()->createId();
- }
---- kdepim/kmail/configuredialog.cpp	2006/01/21 12:34:03	500799
-+++ kdepim/kmail/configuredialog.cpp	2006/05/03 08:46:45	536841
-@@ -2276,7 +2276,7 @@
-     const QString encoding = KGlobal::charsets()->encodingForName(*it);
-     if ( encoding == "iso-8859-15" )
-         indexOfLatin9 = i;
--    if( false && encoding == currentEncoding )
-+    if( encoding == currentEncoding )
-     {
-       mCharsetCombo->setCurrentItem( i );
-       found = true;
-@@ -3348,15 +3348,12 @@
-            mAttachWordsListEditor, SLOT(setEnabled(bool)) );
- }
- 
--void ComposerPage::AttachmentsTab::doLoadOther() {
--  KConfigGroup composer( KMKernel::config(), "Composer" );
--
-+void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() {
-   mOutlookCompatibleCheck->setChecked(
--    composer.readBoolEntry( "outlook-compatible-attachments", false ) );
-+    GlobalSettings::self()->outlookCompatibleAttachments() );
-   mMissingAttachmentDetectionCheck->setChecked(
--    composer.readBoolEntry( "showForgottenAttachmentWarning", true ) );
--  QStringList attachWordsList =
--    composer.readListEntry( "attachment-keywords" );
-+    GlobalSettings::self()->showForgottenAttachmentWarning() );
-+  QStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
-   if ( attachWordsList.isEmpty() ) {
-     // default value
-     attachWordsList << QString::fromLatin1("attachment")
-@@ -3371,13 +3368,12 @@
- }
- 
- void ComposerPage::AttachmentsTab::save() {
--  KConfigGroup composer( KMKernel::config(), "Composer" );
--  composer.writeEntry( "outlook-compatible-attachments",
--                       mOutlookCompatibleCheck->isChecked() );
--  composer.writeEntry( "showForgottenAttachmentWarning",
--                       mMissingAttachmentDetectionCheck->isChecked() );
--  composer.writeEntry( "attachment-keywords",
--                       mAttachWordsListEditor->stringList() );
-+  GlobalSettings::self()->setOutlookCompatibleAttachments(
-+    mOutlookCompatibleCheck->isChecked() );
-+  GlobalSettings::self()->setShowForgottenAttachmentWarning(
-+    mMissingAttachmentDetectionCheck->isChecked() );
-+  GlobalSettings::self()->setAttachmentKeywords(
-+    mAttachWordsListEditor->stringList() );
- }
- 
- void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked()
---- kdepim/kmail/antispamwizard.cpp	2005/12/30 00:15:02	492457
-+++ kdepim/kmail/antispamwizard.cpp	2006/05/06 09:14:35	537923
-@@ -502,7 +502,7 @@
-       while ( account ) {
-         if ( account->type() == "pop" || account->type().contains( "imap" ) ) {
-           const NetworkAccount * n = dynamic_cast<const NetworkAccount*>( account );
--          if ( n->host().lower().contains( pattern.lower() ) ) {
-+          if ( n && n->host().lower().contains( pattern.lower() ) ) {
-             mInfoPage->addAvailableTool( (*it).getVisibleName() );
-             found = true;
-           }
---- kdepim/kmail/kmmessage.cpp	2006/03/16 12:47:35	519171
-+++ kdepim/kmail/kmmessage.cpp	2006/05/06 09:14:35	537923
-@@ -2667,7 +2667,7 @@
-       parts.removeLast();
-     }
- 
--    if (part->Body().Message() &&
-+    if (part && part->Body().Message() &&
-         part->Body().Message()->Body().FirstBodyPart())
-     {
-       part = part->Body().Message()->Body().FirstBodyPart();
---- kdepim/kmail/kmreaderwin.cpp	2006/02/20 20:15:05	511744
-+++ kdepim/kmail/kmreaderwin.cpp	2006/05/06 09:14:35	537923
-@@ -371,7 +371,7 @@
-         if( dataNode->parentNode() && !weAreReplacingTheRootNode ) {
- kdDebug(5006) << "dataNode is NOT replacing the root node:  Store the headers." << endl;
-           resultingData += headers->AsString().c_str();
--        } else if( weAreReplacingTheRootNode && part->hasHeaders() ){
-+        } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){
- kdDebug(5006) << "dataNode replace the root node:  Do NOT store the headers but change" << endl;
- kdDebug(5006) << "                                 the Message's headers accordingly." << endl;
- kdDebug(5006) << "              old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl;
---- kdepim/kmail/kmsender.cpp	2006/03/20 17:51:08	520754
-+++ kdepim/kmail/kmsender.cpp	2006/05/06 09:14:35	537923
-@@ -373,12 +373,14 @@
-       KMessageBox::information(0, i18n("Critical error: "
-                    "Unable to process sent mail (out of space?)"
-                    "Moving failing message to \"sent-mail\" folder."));
--      sentFolder->moveMsg(mCurrentMsg);
--      sentFolder->close();
-+      if ( sentFolder ) {
-+        sentFolder->moveMsg(mCurrentMsg);
-+        sentFolder->close();
-+      }
-       cleanup();
-       return;
-     case 1:
--      if (sentFolder->moveMsg(mCurrentMsg) != 0)
-+      if ( sentFolder && sentFolder->moveMsg(mCurrentMsg) != 0 )
-       {
-         KMessageBox::error(0, i18n("Moving the sent message \"%1\" from the "
-           "\"outbox\" to the \"sent-mail\" folder failed.\n"
---- kdepim/kmail/objecttreeparser.cpp	2005/12/16 16:18:58	488973
-+++ kdepim/kmail/objecttreeparser.cpp	2006/05/06 09:14:35	537923
-@@ -92,6 +92,7 @@
- #include <qbuffer.h>
- #include <qpixmap.h>
- #include <qpainter.h>
-+#include <qregexp.h>
- 
- // other headers
- #include <memory>
-@@ -277,7 +278,7 @@
-                               << node->typeString() << '/' << node->subTypeString()
-                               << ')' << endl;
- 
--        if ( !bpf->process( this, node, processResult ) )
-+        if ( bpf && !bpf->process( this, node, processResult ) )
-           defaultHandling( node, processResult );
-       }
-       node->setProcessed( true, false );
-@@ -765,30 +766,21 @@
-   //static
-   bool ObjectTreeParser::containsExternalReferences( const QCString & str )
-   {
--    int httpPos = str.find( "\"http:", 0, true );
--    int httpsPos = str.find( "\"https:", 0, true );
-+    QRegExp httpRegExp("(\\\"|\\\'|url\\s*\\(\\s*)http[s]?:");
-+    int httpPos = str.find( httpRegExp, 0 );
- 
--    while ( httpPos >= 0 || httpsPos >= 0 ) {
--      // pos = index of next occurrence of "http: or "https: whichever comes first
--      int pos = ( httpPos < httpsPos )
--                ? ( ( httpPos >= 0 ) ? httpPos : httpsPos )
--                : ( ( httpsPos >= 0 ) ? httpsPos : httpPos );
-+    while ( httpPos >= 0 ) {
-       // look backwards for "href"
--      if ( pos > 5 ) {
--        int hrefPos = str.findRev( "href", pos - 5, true );
-+      if ( httpPos > 5 ) {
-+        int hrefPos = str.findRev( "href", httpPos - 5, true );
-         // if no 'href' is found or the distance between 'href' and '"http[s]:'
-         // is larger than 7 (7 is the distance in 'href = "http[s]:') then
-         // we assume that we have found an external reference
--        if ( ( hrefPos == -1 ) || ( pos - hrefPos > 7 ) )
-+        if ( ( hrefPos == -1 ) || ( httpPos - hrefPos > 7 ) )
-           return true;
-       }
-       // find next occurrence of "http: or "https:
--      if ( pos == httpPos ) {
--        httpPos = str.find( "\"http:", httpPos + 6, true );
--      }
--      else {
--        httpsPos = str.find( "\"https:", httpsPos + 7, true );
--      }
-+      httpPos = str.find( httpRegExp, httpPos + 6 );
-     }
-     return false;
-   }
diff --git a/kde-base/kdepim/files/libkdepim-3.5.2-call_qt3_designer.diff b/kde-base/kdepim/files/libkdepim-3.5.2-call_qt3_designer.diff
deleted file mode 100644
index f32ebe9c124b..000000000000
--- a/kde-base/kdepim/files/libkdepim-3.5.2-call_qt3_designer.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdepim/libkdepim/kcmdesignerfields.cpp.orig	2006-05-07 04:05:20.000000000 +0200
-+++ kdepim/libkdepim/kcmdesignerfields.cpp	2006-05-07 04:06:33.000000000 +0200
-@@ -264,7 +264,7 @@
-   QVBoxLayout *layout = new QVBoxLayout( this, KDialog::marginHint(),
-                                          KDialog::spacingHint() );
- 
--  bool noDesigner = KStandardDirs::findExe("designer").isEmpty();
-+  bool noDesigner = KStandardDirs::findExe("/usr/qt/3/bin/designer").isEmpty();
- 
-   if ( noDesigner )
-   {
-@@ -407,7 +407,7 @@
- 
- void KCMDesignerFields::startDesigner()
- {
--  QString cmdLine = "designer";
-+  QString cmdLine = "/usr/qt/3/bin/designer";
- 
-   // check if path exists and create one if not.
-   QString cepPath = localUiDir();
diff --git a/kde-base/kdepim/files/libkdepim-3.5.2-fixes.diff b/kde-base/kdepim/files/libkdepim-3.5.2-fixes.diff
deleted file mode 100644
index 04fce865d08b..000000000000
--- a/kde-base/kdepim/files/libkdepim-3.5.2-fixes.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- kdepim/libkdepim/kcmdesignerfields.cpp	2005/09/08 15:37:56	458580
-+++ kdepim/libkdepim/kcmdesignerfields.cpp	2006/04/15 12:39:26	530112
-@@ -99,8 +99,7 @@
-         }
- 
-         delete list;
--      } else
--        delete wdg;
-+      } 
-     }
- 
-     QString name() const { return mName; }
---- kdepim/libkdepim/kfoldertree.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/libkdepim/kfoldertree.cpp	2006/04/15 12:39:26	530112
-@@ -225,9 +225,9 @@
- 
-     KListViewItem::paintCell( p, cg, column, width, align );
- 
--    int r = lv ? lv->itemMargin() : 1;
-     const QPixmap *icon = pixmap( column );
-     int marg = lv ? lv->itemMargin() : 1;
-+    int r = marg;
- 
-     QString t;
-     QRect br;
-@@ -238,7 +238,7 @@
-       p->setPen( ft->paintInfo().colFore );
- 
-     if ( icon ) {
--      r += icon->width() + lv->itemMargin();
-+      r += icon->width() + marg;
-     }
-     t = text( column );
-     if ( !t.isEmpty() )
---- kdepim/libkdepim/kscoringeditor.cpp	2006/03/24 15:55:54	522155
-+++ kdepim/libkdepim/kscoringeditor.cpp	2006/05/06 09:14:35	537923
-@@ -127,8 +127,8 @@
- 
- void SingleConditionWidget::toggleRegExpButton( int selected )
- {
--  bool isRegExp = KScoringExpression::MATCH == selected &&
--      KScoringExpression::MATCHCS == selected &&
-+  bool isRegExp = (KScoringExpression::MATCH == selected ||
-+      KScoringExpression::MATCHCS == selected) &&
-       !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
-   regExpButton->setEnabled( isRegExp );
- }
-@@ -248,7 +248,8 @@
-           w = new QLabel( stack ); // empty dummy
-           break;
-       }
--      stack->addWidget(w,index++);
-+      if ( w )
-+        stack->addWidget(w,index++);
-     }
-   }
- 
diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index d6b6915307db..686f037d835d 100644
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.140 2007/02/04 02:14:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.141 2007/02/05 12:20:45 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdesdk-3.4-configure.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kdesdk-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
deleted file mode 100644
index 0f33340d4b6d..000000000000
--- a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Nur kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in
---- kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in	2005-05-23 14:08:28.000000000 +0200
-+++ kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in	2005-07-28 16:28:56.000000000 +0200
-@@ -1,3 +1,10 @@
-+AC_ARG_WITH(berkeley-db,
-+  [AC_HELP_STRING(--with-berkeley-db,
-+    [enable the dictionary plugin based on Berkeley DB IV @<:@default=check@:>@])],
-+  [], with_berkeley_db=check)
-+
-+LIB_DBIV=""
-+if test "x$with_berkeley_db" != xno; then
- 
- AC_MSG_CHECKING([for Berkeley Database IV])
- 
-@@ -122,6 +129,11 @@
- DBIV_INCLUDES="$ac_db_includes"
- DBIV_NAME="$ac_db_name"
- 
-+if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
-+  AC_MSG_ERROR([--with-berkeley-db was given, but test for Berkeley DB IV failed])
-+fi
-+fi
-+
- AC_SUBST(DBIV_INCLUDES)
- AC_SUBST(DBIV_LDFLAGS)
- AC_SUBST(DBIV_NAME)
-diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot kdesdk-3.4.2/kioslave/svn/configure.in.bot
---- kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot	2005-05-23 14:08:56.000000000 +0200
-+++ kdesdk-3.4.2/kioslave/svn/configure.in.bot	2005-07-28 16:28:38.000000000 +0200
-@@ -1,4 +1,4 @@
--if test -z "$SVN_SUBDIR"; then
-+if test "x$with_subversion" = xcheck && test -z "$SVN_SUBDIR"; then
-   echo ""
-   echo "You're missing Subversion libraries (1.x)"
-   echo "KDE will not be able to browse Subversion repositories without it,"
-@@ -7,4 +7,3 @@
-   echo ""
-   all_tests=bad
- fi
--
-diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.in kdesdk-3.4.2/kioslave/svn/configure.in.in
---- kdesdk-3.4.2.orig/kioslave/svn/configure.in.in	2005-05-23 14:08:56.000000000 +0200
-+++ kdesdk-3.4.2/kioslave/svn/configure.in.in	2005-07-28 16:28:38.000000000 +0200
-@@ -1,3 +1,11 @@
-+AC_ARG_WITH(subversion,
-+  [AC_HELP_STRING(--with-subversion,
-+    [enable support for subversion @<:@default=check@:>@])],
-+  [], with_subversion=check)
-+
-+SVN_SUBDIR=""
-+if test "x$with_subversion" != xno; then
-+
- APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
- SVN_SUBDIR="svn"
- AC_ARG_WITH(apr-config,
-@@ -137,6 +145,11 @@
- SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
- SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
- 
-+if test "x$with_subversion" != xcheck && test -z "$SVN_SUBDIR"; then
-+  AC_MSG_ERROR([--with-subversion was given, but test for subversion failed])
-+fi
-+fi
-+
- AC_SUBST(SVN_INCLUDE)
- AC_SUBST(SVN_LIB)
- AC_SUBST(SVN_CPPFLAGS)
diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index 7e136627c39f..c921b08f7426 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.84 2007/02/04 02:16:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.85 2007/02/05 12:21:39 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdesktop-3.5.3-screensaver.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kdesktop-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kdesktop/files/kdesktop-3.5.3-screensaver.patch b/kde-base/kdesktop/files/kdesktop-3.5.3-screensaver.patch
deleted file mode 100644
index 8edf3a6b97c4..000000000000
--- a/kde-base/kdesktop/files/kdesktop-3.5.3-screensaver.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: kdesktop/lockeng.cc
-===================================================================
---- kdesktop/lockeng.cc	(revision 548007)
-+++ kdesktop/lockeng.cc	(revision 548008)
-@@ -42,9 +42,6 @@
-     XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval,
-                     &mXBlanking, &mXExposures);
- 
--    // We'll handle blanking
--    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
--
-     mState = Waiting;
-     mXAutoLock = 0;
-     mEnabled = false;
-@@ -158,6 +155,9 @@
-         mXAutoLock->setDPMS(mDPMS);
- 	//mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight);
- 
-+        // We'll handle blanking 
-+        XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
-+
-         mXAutoLock->start();
- 
-         kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl;
-@@ -170,6 +170,7 @@
- 	    mXAutoLock = 0;
- 	}
- 
-+	XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
-         kdDebug(1204) << "Saver Engine disabled" << endl;
-     }
- 
-@@ -291,7 +292,6 @@
-     kdDebug(1204) << "SaverEngine: stopping lock" << endl;
-     emitDCOPSignal("KDE_stop_screensaver()", QByteArray());
- 
--
-     mLockProcess.kill();
- 
-     if (mXAutoLock)
-@@ -300,6 +300,7 @@
-     }
-     processLockTransactions();
-     mState = Waiting;
-+    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
- }
- 
- void SaverEngine::lockProcessExited()
-@@ -314,6 +315,7 @@
-     }
-     processLockTransactions();
-     mState = Waiting;
-+    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
- }
- 
- //---------------------------------------------------------------------------
-@@ -322,6 +324,8 @@
- //
- void SaverEngine::idleTimeout()
- {
-+    // disable X screensaver
-+    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
-     startLockProcess( DefaultLock );
- }
- 
-Index: kdesktop/xautolock.cc
-===================================================================
---- kdesktop/xautolock.cc	(revision 548007)
-+++ kdesktop/xautolock.cc	(revision 548008)
-@@ -192,6 +192,7 @@
- 
-     bool activate = false;
- 
-+    kdDebug() << now << " " << mTrigger << endl;
-     if (now >= mTrigger)
-     {
-         resetTrigger();
-@@ -202,6 +203,8 @@
-     BOOL on;
-     CARD16 state;
-     DPMSInfo( qt_xdisplay(), &state, &on );
-+
-+    kdDebug() << "DPMSInfo " << state << " " << on << endl;
-     // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time
-     // that is always smaller than DPMS timeout (X bug I guess). So if DPMS
-     // saving is active, simply always activate our saving too, otherwise
-@@ -217,9 +220,11 @@
- #ifdef HAVE_XSCREENSAVER
-     static XScreenSaverInfo* mitInfo = 0;
-     if (!mitInfo) mitInfo = XScreenSaverAllocInfo ();
--    XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo);
--    if (mitInfo->state == ScreenSaverDisabled)
--	activate = false;
-+    if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) {
-+        kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl;
-+        if (mitInfo->state == ScreenSaverDisabled)
-+	    activate = false;
-+    }
- #endif
- 
-     if(mActive && activate)
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index e4efaa71e804..65f507fc20e4 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.196 2007/02/04 17:46:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.197 2007/02/05 12:22:11 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeutils-3.4.3-klaptopdaemon.patch,
+  -files/kdeutils-3.4-configure.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdeutils-3.5.6.ebuild:
   Marked ~hppa.
diff --git a/kde-base/kdeutils/files/kdeutils-3.4-configure.patch b/kde-base/kdeutils/files/kdeutils-3.4-configure.patch
deleted file mode 100644
index 939faa527246..000000000000
--- a/kde-base/kdeutils/files/kdeutils-3.4-configure.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Nur kdeutils-3.4.2.orig/kmilo/configure.in.in kdeutils-3.4.2/kmilo/configure.in.in
---- kdeutils-3.4.2.orig/kmilo/configure.in.in	2005-05-23 14:09:22.000000000 +0200
-+++ kdeutils-3.4.2/kmilo/configure.in.in	2005-07-26 14:42:57.000000000 +0200
-@@ -9,6 +9,15 @@
- dnl ---------------------------------------------------------------------
- dnl PowerBook IPC Library
- 
-+AC_ARG_WITH(powerbook,
-+  [AC_HELP_STRING(--with-powerbook,
-+    [enable support for PPC PowerBook @<:@default=check@:>@])],
-+  [], with_powerbook=check)
-+
-+have_pbbipc=""
-+have_pbb=""
-+if test "x$with_powerbook" != xno; then
-+
- KDE_CHECK_LIB(pbbipc, create_msgport,
- [
- KEYBOARD_LIBS="-lpbbipc $KEYBOARD_LIBS"
-@@ -23,6 +32,10 @@
- have_pbb=true
- ])
- 
-+if test "x$with_powerbook" != xcheck && test -z "$have_pbbipc$have_pbb"; then
-+  AC_MSG_ERROR([--with-powerbook was given, but test for libpbb failed])
-+fi
-+fi
- 
- AM_CONDITIONAL(include_kmilo_powerbook, test x$have_pbbipc = xtrue)
- AM_CONDITIONAL(include_kmilo_pbb, test x$have_pbb = xtrue)
-diff -Nur kdeutils-3.4.2.orig/ksim/monitors/snmp/configure.in.in kdeutils-3.4.2/ksim/monitors/snmp/configure.in.in
---- kdeutils-3.4.2.orig/ksim/monitors/snmp/configure.in.in	2005-05-23 14:09:17.000000000 +0200
-+++ kdeutils-3.4.2/ksim/monitors/snmp/configure.in.in	2005-07-26 14:43:14.000000000 +0200
-@@ -1,17 +1,20 @@
-+AC_ARG_WITH(snmp,
-+  [AC_HELP_STRING(--with-snmp,
-+    [enable support for SNMP @<:@default=check@:>@])],
-+  [], with_snmp=check)
-+
-+enable_snmp=no
-+if test "x$with_snmp" != xno; then
-+  KDE_CHECK_HEADER( net-snmp/library/snmp_api.h, [ have_netsnmp_h=yes ], [ have_netsnmp_h=no ] )
- 
--KDE_CHECK_HEADER( net-snmp/library/snmp_api.h, [ have_netsnmp_h=yes ], [ have_netsnmp_h=no ] )
--
--enable_snmp=
--
--if test "$have_netsnmp_h" = yes; then
-+  if test "$have_netsnmp_h" = yes; then
-     KDE_CHECK_LIB( netsnmp, snmp_sess_init, [
-         AC_SUBST( LIBSNMP, "-lnetsnmp" )
-         enable_snmp=yes
-     ], [], [] )
--fi
--
--if test "$enable_snmp" != yes; then
-+  fi
- 
-+  if test "$enable_snmp" != yes; then
-     AC_MSG_CHECKING([if libnetsnmp needs -lcrypto])
- 
-     dnl use a different symbol to prevent autoconf from caching
-@@ -22,7 +25,11 @@
-     ], [
-         AC_MSG_RESULT(no)
-     ], [-lcrypto] )
--fi
-+  fi
- 
--AM_CONDITIONAL(include_ksim_monitors_snmp, test -n "$enable_snmp")
-+  if test "x$with_snmp" != xcheck && test "x$enable_snmp" != xyes; then
-+    AC_MSG_ERROR([--with-snmp was given, but test for net-snmp failed])
-+  fi
-+fi
- 
-+AM_CONDITIONAL(include_ksim_monitors_snmp, test "x$enable_snmp" = xyes)
diff --git a/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch b/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch
deleted file mode 100644
index 28344217e647..000000000000
--- a/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp
---- kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp	2005-10-05 15:26:42.000000000 +0200
-+++ kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp	2005-10-18 15:38:21.000000000 +0200
-@@ -919,7 +919,7 @@
- 	// the lid button turns stuff on when it's down and back off again when it's raised
- 	// 	(kind of like the fridge door light)
- 	//
--	if (lid_state != laptop_portable::get_button(laptop_portable::LidButton)) {
-+	if (s.enable_lid_button && (lid_state != laptop_portable::get_button(laptop_portable::LidButton))) {
- 		lid_state = !lid_state;
- 		if (lid_state) {
- 			if (s.button_lid_bright_enabled) {
-@@ -982,7 +982,7 @@
- 	//
- 	// the power button on the other hand is an off/on switch for non-suspend type ops
- 	//
--	if (power_state != laptop_portable::get_button(laptop_portable::PowerButton)) {
-+	if (s.enable_power_button && (power_state != laptop_portable::get_button(laptop_portable::PowerButton))) {
- 		power_state = !power_state;
- 		if (power_state) {
- 			if (power_button_off) {
-diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp kdeutils-3.4.3/klaptopdaemon/portable.cpp
---- kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp	2005-10-05 15:26:42.000000000 +0200
-+++ kdeutils-3.4.3/klaptopdaemon/portable.cpp	2005-10-18 15:38:21.000000000 +0200
-@@ -1937,19 +1937,19 @@
- laptop_portable::get_button(LaptopButton l)	// true if a button is pressed
- {
- 	if (::has_acpi()) {
--		QString *name=0;
-+		QString name;
- 		switch (l) {
- 		case LidButton:
--			name = &acpi_lid_name;
-+			name = acpi_lid_name;
- 			break;
- 		case PowerButton:
--			name = &acpi_power_name;
-+			name = acpi_power_name;
- 			break;
- 		default:
- 			break;
- 		}
--		if (name) {
--			QFile f(*name);
-+		if (!name.isNull()) {
-+			QFile f(name);
- 			if (f.open(IO_ReadOnly)) {
- 				while (!f.atEnd()) {
- 					QString l;
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 98e75a313b83..4deb54a12582 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.89 2007/02/04 02:21:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.90 2007/02/05 11:42:38 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.4.3-noimake.patch, -files/kdebase-3.4.3-xdmcp.patch,
+  -files/post-3.5.0-kdebase-kdm.diff,
+  -files/kdm-3.5.3-strict-aliasing.patch, -files/kdm-3.5.4-grub-patch.diff,
+  -files/kdm-3.5.4-strict-aliasing.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kdm-3.5.2-r1.ebuild:
   Remove old versions.
diff --git a/kde-base/kdm/files/kdebase-3.4.3-noimake.patch b/kde-base/kdm/files/kdebase-3.4.3-noimake.patch
deleted file mode 100644
index 4718f1587a3f..000000000000
--- a/kde-base/kdm/files/kdebase-3.4.3-noimake.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nur kdebase-3.4.3.orig/kdm/configure.in.in kdebase-3.4.3/kdm/configure.in.in
---- kdebase-3.4.3.orig/kdm/configure.in.in	2005-10-05 15:39:13.000000000 +0200
-+++ kdebase-3.4.3/kdm/configure.in.in	2005-10-19 11:26:29.000000000 +0200
-@@ -1,42 +1,22 @@
- 
- dnl this is for kdm:
- 
--KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
-+AC_MSG_CHECKING([X paths for KDM])
- 
--dnl ask imake about various X settings
--AC_MSG_CHECKING([X paths])
--imkv=8
--test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
--AC_CACHE_VAL(kde_cv_defines_imake, [
--  rm -fr conftestdir
--  if mkdir conftestdir; then
--    cd conftestdir
--    cat > Imakefile <<'EOF'[
--
--acimake:
--	@echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
--
--]EOF
--    if $XMKMF >&5 2>&1 && test -f Makefile; then
--	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
--	kde_cv_defines_imake_version=$imkv
--    else
--        AC_MSG_RESULT([failed])
--	AC_MSG_ERROR([$XMKMF (imake) failed.
--Make sure you have all necessary X development packages installed.
--On some systems a missing /lib/cpp symlink is at fault.])
--    fi
--    cd ..
--    rm -fr conftestdir
--  else
--    AC_MSG_RESULT([failed])
--    AC_MSG_ERROR([cannot create temporary directory])
--  fi
--])
--AC_MSG_RESULT([done])
--eval "$kde_cv_defines_imake"
--AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
--AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])
-+AC_ARG_WITH(x-binaries-dir,
-+	[AS_HELP_STRING(--with-x-binaries-dir=DIR,
-+		[set the location of X binaries for KDM])],
-+	[], [with_x_binaries_dir=`echo $kde_x_libraries | sed -e 's,/lib.*,/bin,'`])
-+
-+AC_ARG_WITH(x-libraries-dir,
-+	[AS_HELP_STRING(--with-x-libraries-dir=DIR,
-+		[set the location of X libraries for KDM])],
-+	[], [with_x_libraries_dir=$kde_x_libraries])
-+
-+AC_MSG_RESULT([binaries in $with_x_binaries_dir, libraries in $with_x_libraries_dir])
-+
-+AC_DEFINE_UNQUOTED(XBINDIR, "$with_x_binaries_dir", [X binaries directory])
-+AC_DEFINE_UNQUOTED(XLIBDIR, "$with_x_libraries_dir", [X libraries directory])
- 
- if test -f /etc/ttys; then
-   AC_DEFINE(BSD_INIT, 1, [Define if the system uses a BSD-style init])
diff --git a/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch b/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch
deleted file mode 100644
index 96b666902ae7..000000000000
--- a/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur kdebase-3.4.3.orig/kdm/backend/xdmcp.c kdebase-3.4.3/kdm/backend/xdmcp.c
---- kdebase-3.4.3.orig/kdm/backend/xdmcp.c	2005-10-05 15:39:11.000000000 +0200
-+++ kdebase-3.4.3/kdm/backend/xdmcp.c	2005-10-18 15:30:05.000000000 +0200
-@@ -940,7 +940,12 @@
- 			}
- 			DisposeProtoDisplay( pdpy );
- 			Debug( "starting display %s,%s\n", d->name, d->class2 );
--			StartDisplay( d );
-+			if (LoadDisplayResources( d ) < 0) {
-+				LogError( "Unable to read configuration for display %s; "
-+				          "stopping it.\n", d->name );
-+				StopDisplay( d );
-+			} else
-+				StartDisplay( d );
- 			CloseGetter();
- 		}
- 	}
diff --git a/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch b/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch
deleted file mode 100644
index fcdb060f5d25..000000000000
--- a/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kdebase-3.5.3/kdm/backend/Makefile.am
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/Makefile.am
-+++ kdebase-3.5.3/kdm/backend/Makefile.am
-@@ -7,6 +7,7 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(P
-     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
- 
- bin_PROGRAMS = kdm
-+kdm_CFLAGS = -fno-strict-aliasing
- kdm_SOURCES = \
-     access.c \
-     auth.c \
-Index: kdebase-3.5.3/kdm/backend/xdmcp.c
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/xdmcp.c
-+++ kdebase-3.5.3/kdm/backend/xdmcp.c
-@@ -160,7 +160,7 @@ all_query_respond( struct sockaddr *from
- 	int family;
- 	int length;
- 
--	family = ConvertAddr( (XdmcpNetaddr)from, &length, (char **)&(addr.data) );
-+	family = ConvertAddr( (XdmcpNetaddr)from, &length, &(addr.data) );
- 	addr.length = length; /* convert int to short */
- 	Debug( "all_query_respond: conntype=%d, addr=%02[*:hhx\n",
- 	       family, addr.length, addr.data );
-Index: kdebase-3.5.3/kdm/kfrontend/kdm_config.c
-===================================================================
---- kdebase-3.5.3.orig/kdm/kfrontend/kdm_config.c
-+++ kdebase-3.5.3/kdm/kfrontend/kdm_config.c
-@@ -733,7 +733,7 @@ CvtValue( Ent *et, Value *retval, int va
- 				}
- 			}
- 			retval->ptr = 0;
--			if (sscanf( buf, "%li", (long *)&retval->ptr ) != 1)
-+			if (sscanf( buf, "%li", &retval->ptr ) != 1)
- 				return "integer";
- 			return 0;
- 		case C_TYPE_STR:
diff --git a/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff b/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff
deleted file mode 100644
index 6fd004931d4a..000000000000
--- a/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r kdm-3.5.4-orig/kdm/backend/bootman.c kdm-3.5.4/kdm/backend/bootman.c
---- kdm-3.5.4-orig/kdm/backend/bootman.c	2006-08-30 17:41:12.000000000 +0200
-+++ kdm-3.5.4/kdm/backend/bootman.c	2006-08-30 17:50:20.000000000 +0200
-@@ -77,28 +77,30 @@
- static int
- getGrub( char ***opts, int *def, int *cur )
- {
- 	FILE *f;
--	char *ptr;
-+	char *ptr, *linp;
- 	int len;
- 	char line[1000];
- 
--	if (!grub && !(grub = locate( "grub" )))
-+	if (!grub && !(grub = locate( "grub-set-default" )))
- 		return BO_NOMAN;
- 
- 	*def = 0;
- 	*cur = -1;
- 	*opts = initStrArr( 0 );
- 
- 	if (!(f = fopen( GRUB_MENU, "r" )))
- 		return errno == ENOENT ? BO_NOMAN : BO_IO;
--	while ((len = fGets( line, sizeof(line), f )) != -1)
--		if ((ptr = match( line, &len, "default", 7 )))
-+	while ((len = fGets( line, sizeof(line), f )) != -1) {
-+		for (linp = line; isspace(*linp); linp++, len--);
-+		if ((ptr = match( linp, &len, "default", 7 )))
- 			*def = atoi( ptr );
--		else if ((ptr = match( line, &len, "title", 5 ))) {
-+		else if ((ptr = match( linp, &len, "title", 5 ))) {
- 			for (; isspace( ptr[len - 1] ); len--);
- 			*opts = addStrArr( *opts, ptr, len );
- 		}
-+	}
- 	fclose( f );
- 
- 	return BO_OK;
- }
-@@ -129,21 +131,16 @@
- 
- static void
- commitGrub( void )
- {
--	FILE *f;
--	int pid;
--	static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
-+	char command[256];
- 
- 	if (sdRec.bmstamp != mTime( GRUB_MENU ) &&
- 	    setGrub( sdRec.osname, &sdRec ) != BO_OK)
- 		return;
- 
--	args[0] = grub;
--	if ((f = pOpen( (char **)args, 'w', &pid ))) {
--		fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex );
--		pClose( f, pid );
--	}
-+	sprintf(command, "%s %d", grub, sdRec.osindex);
-+	system(command);
- }
- 
- static char *lilo;
- 
diff --git a/kde-base/kdm/files/kdm-3.5.4-strict-aliasing.patch b/kde-base/kdm/files/kdm-3.5.4-strict-aliasing.patch
deleted file mode 100644
index f732c7024b5e..000000000000
--- a/kde-base/kdm/files/kdm-3.5.4-strict-aliasing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: kdebase-3.5.3/kdm/backend/Makefile.am
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/Makefile.am
-+++ kdebase-3.5.3/kdm/backend/Makefile.am
-@@ -7,6 +7,7 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(P
-     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
- 
- bin_PROGRAMS = kdm
-+kdm_CFLAGS = -fno-strict-aliasing
- kdm_SOURCES = \
-     access.c \
-     auth.c \
diff --git a/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff b/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff
deleted file mode 100644
index 129a10594be4..000000000000
--- a/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: kdm/backend/client.c
-===================================================================
---- kdm/backend/client.c	(revision 547560)
-+++ kdm/backend/client.c	(working copy)
-@@ -1537,16 +1542,6 @@ ReadDmrc()
- 
- 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
- 		return GE_Error;
--	if ((curdmrc = iniLoad( fname ))) {
--		free( fname );
--		return GE_Ok;
--	}
--
--	if (errno != EACCES) {
--		free( fname );
--		return GE_NoFile;
--	}
--
- 	if (pipe( pfd ))
- 		return GE_Error;
- 	if ((pid = Fork()) < 0) {
diff --git a/kde-base/kghostview/ChangeLog b/kde-base/kghostview/ChangeLog
index 0b4b8bf37ad1..7260c6e813bc 100644
--- a/kde-base/kghostview/ChangeLog
+++ b/kde-base/kghostview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kghostview
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/ChangeLog,v 1.68 2007/02/04 02:26:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/ChangeLog,v 1.69 2007/02/05 12:28:38 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdegraphics-3.4-gcc4.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kghostview-3.5.2.ebuild:
diff --git a/kde-base/kghostview/files/kdegraphics-3.4-gcc4.patch b/kde-base/kghostview/files/kdegraphics-3.4-gcc4.patch
deleted file mode 100644
index d9bb7a101acd..000000000000
--- a/kde-base/kghostview/files/kdegraphics-3.4-gcc4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur kdegraphics-3.4.2.orig/kghostview/displayoptions.cpp kdegraphics-3.4.2/kghostview/displayoptions.cpp
---- kdegraphics-3.4.2.orig/kghostview/displayoptions.cpp	2005-07-20 12:00:39.000000000 +0200
-+++ kdegraphics-3.4.2/kghostview/displayoptions.cpp	2005-08-05 12:02:27.000000000 +0200
-@@ -56,7 +56,7 @@
- 	res.setMagnification( args->getOption( "scale" ).toFloat() );
- 	res.setPage( args->getOption( "page" ).toInt() - 1 ); // transform from 1-based into 0-based
- 	//res._overridePageMedia = args->getOption( "paper" );
--	kdDebug(4500 ) << "Parsed options: " << res << endl;
-+	kdDebug(4500 ) << "Parsed options: " << DisplayOptions::toString( res ) << endl;
- 	return res;
- }
- 
-diff -Nur kdegraphics-3.4.2.orig/kghostview/displayoptions.h kdegraphics-3.4.2/kghostview/displayoptions.h
---- kdegraphics-3.4.2.orig/kghostview/displayoptions.h	2005-05-23 14:06:10.000000000 +0200
-+++ kdegraphics-3.4.2/kghostview/displayoptions.h	2005-08-05 12:02:27.000000000 +0200
-@@ -109,10 +109,4 @@
- 	setMagnification( 1.0 );
- }
- 
--template <typename OutStream>
--OutStream& operator << ( OutStream& out, const DisplayOptions& obj ) {
--	out << DisplayOptions::toString( obj ).utf8().data();
--	return out;
--}
--
- #endif // DISPLAYOPTIONS_H
diff --git a/kde-base/khexedit/ChangeLog b/kde-base/khexedit/ChangeLog
index d918b91b125a..f683f5bb7cdf 100644
--- a/kde-base/khexedit/ChangeLog
+++ b/kde-base/khexedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/khexedit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/ChangeLog,v 1.64 2007/02/04 02:27:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/ChangeLog,v 1.65 2007/02/05 11:52:54 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/khexedit-configure-magic.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -khexedit-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/khexedit/files/khexedit-configure-magic.diff b/kde-base/khexedit/files/khexedit-configure-magic.diff
deleted file mode 100644
index 063a164f2159..000000000000
--- a/kde-base/khexedit/files/khexedit-configure-magic.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- khexedit/configure.in.in	2003-11-03 21:11:09.000000000 +0200
-+++ khexedit/configure.in.in	2004-10-16 18:40:54.523771976 +0200
-@@ -1,8 +1,4 @@
--# kossebau: copied from kdelibs/configure.in.in for khexedit
- AC_LANG_SAVE
- AC_LANG_C
--dnl AC_C_BIGENDIAN has a bug (one of its tests uses "main()" instead of
--dnl "int main()") so C++ compilers would break. Thats why we switch languages
- AC_C_BIGENDIAN
- AC_LANG_RESTORE
--# kossebau end
-\ No newline at end of file
diff --git a/kde-base/kicker-applets/ChangeLog b/kde-base/kicker-applets/ChangeLog
index 0875029f2997..bd3fb225f13e 100644
--- a/kde-base/kicker-applets/ChangeLog
+++ b/kde-base/kicker-applets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kicker-applets
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/ChangeLog,v 1.68 2007/02/04 02:28:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/ChangeLog,v 1.69 2007/02/05 12:17:21 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/configure-fix-kdeaddons-xmms.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kicker-applets-3.5.2.ebuild:
diff --git a/kde-base/kicker-applets/files/configure-fix-kdeaddons-xmms.patch b/kde-base/kicker-applets/files/configure-fix-kdeaddons-xmms.patch
deleted file mode 100644
index be33d011b9b3..000000000000
--- a/kde-base/kicker-applets/files/configure-fix-kdeaddons-xmms.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: kicker-applets/mediacontrol/configure.in.in
-===================================================================
---- kicker-applets/mediacontrol/configure.in.in	(revision 428268)
-+++ kicker-applets/mediacontrol/configure.in.in	(working copy)
-@@ -32,6 +32,18 @@
-   fi
- ])
- 
--AC_CHECK_XMMS
-+AC_ARG_WITH(xmms,
-+  [AS_HELP_STRING(--with-xmms,
-+    [enable XMMS control applet @<:@default=check@:>@])],
-+  [], with_xmms=check)
-+
-+if test "x$with_xmms" != xno; then
-+  AC_CHECK_XMMS
-+
-+  if test "x$with_xmms" != xcheck && test "x$ac_cv_have_xmms" != xyes; then
-+    AC_MSG_FAILURE([--with-xmms was given, but test for XMMS failed])
-+  fi
-+fi
-+
- AC_SUBST(XMMS_LIBS)
- AC_SUBST(XMMS_INCLUDES)
diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog
index 7a7a7064d060..3803b9c9e05d 100644
--- a/kde-base/kicker/ChangeLog
+++ b/kde-base/kicker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kicker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.75 2007/02/04 02:28:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.76 2007/02/05 12:22:36 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/applets-configure.in.in.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kicker-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kicker/files/applets-configure.in.in.diff b/kde-base/kicker/files/applets-configure.in.in.diff
deleted file mode 100644
index 65dde9084694..000000000000
--- a/kde-base/kicker/files/applets-configure.in.in.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- kicker/applets/configure.in.in	1970-01-01 02:00:00.000000000 +0200
-+++ kicker/applets/configure.in.in	2004-10-10 16:37:13.000000000 +0200
-@@ -0,0 +1,24 @@
-+AC_MSG_CHECKING([whether devices kioslave should be compiled])
-+
-+case `uname -s` in
-+    FreeBSD)
-+        DEVICESDIR=devices
-+        ;;
-+    Linux)
-+        DEVICESDIR=devices
-+        ;;
-+    *)
-+        DEVICESDIR=
-+        ;;
-+esac
-+
-+AC_SUBST(DEVICESDIR)
-+if test x$DEVICESDIR != x; then
-+    AC_MSG_RESULT([yes])
-+else
-+    AC_MSG_RESULT([no])
-+fi
-+
-+AM_CONDITIONAL(include_devicesdir, test -n "$DEVICESDIR")
-+
-+AC_CHECK_FUNCS(setmntent)
diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog
index 5c354a7f0b02..e70626a9c7bd 100644
--- a/kde-base/klaptopdaemon/ChangeLog
+++ b/kde-base/klaptopdaemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/klaptopdaemon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.72 2007/02/04 02:32:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.73 2007/02/05 12:10:28 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeutils-3.4.3-klaptopdaemon.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -klaptopdaemon-3.5.2.ebuild:
diff --git a/kde-base/klaptopdaemon/files/kdeutils-3.4.3-klaptopdaemon.patch b/kde-base/klaptopdaemon/files/kdeutils-3.4.3-klaptopdaemon.patch
deleted file mode 100644
index 28344217e647..000000000000
--- a/kde-base/klaptopdaemon/files/kdeutils-3.4.3-klaptopdaemon.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp
---- kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp	2005-10-05 15:26:42.000000000 +0200
-+++ kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp	2005-10-18 15:38:21.000000000 +0200
-@@ -919,7 +919,7 @@
- 	// the lid button turns stuff on when it's down and back off again when it's raised
- 	// 	(kind of like the fridge door light)
- 	//
--	if (lid_state != laptop_portable::get_button(laptop_portable::LidButton)) {
-+	if (s.enable_lid_button && (lid_state != laptop_portable::get_button(laptop_portable::LidButton))) {
- 		lid_state = !lid_state;
- 		if (lid_state) {
- 			if (s.button_lid_bright_enabled) {
-@@ -982,7 +982,7 @@
- 	//
- 	// the power button on the other hand is an off/on switch for non-suspend type ops
- 	//
--	if (power_state != laptop_portable::get_button(laptop_portable::PowerButton)) {
-+	if (s.enable_power_button && (power_state != laptop_portable::get_button(laptop_portable::PowerButton))) {
- 		power_state = !power_state;
- 		if (power_state) {
- 			if (power_button_off) {
-diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp kdeutils-3.4.3/klaptopdaemon/portable.cpp
---- kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp	2005-10-05 15:26:42.000000000 +0200
-+++ kdeutils-3.4.3/klaptopdaemon/portable.cpp	2005-10-18 15:38:21.000000000 +0200
-@@ -1937,19 +1937,19 @@
- laptop_portable::get_button(LaptopButton l)	// true if a button is pressed
- {
- 	if (::has_acpi()) {
--		QString *name=0;
-+		QString name;
- 		switch (l) {
- 		case LidButton:
--			name = &acpi_lid_name;
-+			name = acpi_lid_name;
- 			break;
- 		case PowerButton:
--			name = &acpi_power_name;
-+			name = acpi_power_name;
- 			break;
- 		default:
- 			break;
- 		}
--		if (name) {
--			QFile f(*name);
-+		if (!name.isNull()) {
-+			QFile f(name);
- 			if (f.open(IO_ReadOnly)) {
- 				while (!f.atEnd()) {
- 					QString l;
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 93020db73f2d..ff8aada097c5 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.98 2007/02/04 02:35:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.99 2007/02/05 11:54:33 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kmail-3.5.2-imap-fixes-2.diff, -files/kmail-3.5.2-misc-fixes.diff,
+  -files/kmail-3.5.2-misc-fixes-2.diff,
+  -files/kmail-3.5-ham_spam_icons.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kmail-3.5.2-r4.ebuild,
   -kmail-3.5.6.ebuild:
diff --git a/kde-base/kmail/files/kmail-3.5-ham_spam_icons.diff b/kde-base/kmail/files/kmail-3.5-ham_spam_icons.diff
deleted file mode 100644
index c85eb013a795..000000000000
--- a/kde-base/kmail/files/kmail-3.5-ham_spam_icons.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -urN kdepim-3.5.0.old/kmail/kmail-3.5-filter-icons.pl kdepim-3.5.0/kmail/kmail-3.5-filter-icons.pl
---- kdepim-3.5.0.old/kmail/kmail-3.5-filter-icons.pl	1970-01-01 01:00:00.000000000 +0100
-+++ kdepim-3.5.0/kmail/kmail-3.5-filter-icons.pl	2005-12-19 21:47:43.000000000 +0100
-@@ -0,0 +1,22 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+# This script updates some configuration keys
-+
-+# read the whole config file
-+my $currentGroup = "";
-+my %configFile;
-+while ( <> ) {
-+  chomp; # eat the trailing '\n'
-+  next if ( /^$/ ); # skip empty lines
-+  next if ( /^\#/ ); # skip comments
-+  if ( /^\[/ ) { # group begin
-+    $currentGroup = $_;
-+    next;
-+  } elsif ( $currentGroup =~ /^\[Filter #[0-9]+\]$/ && /^Icon=/ ) {
-+    my ($key,$value) = split /=/;
-+    print "# DELETE $currentGroup$key\n${currentGroup}\nIcon=mail_spam\n" if $value eq "mark_as_spam";
-+    print "# DELETE $currentGroup$key\n${currentGroup}\nIcon=mail_ham\n" if $value eq "mark_as_ham";
-+  }
-+}
-diff -urN kdepim-3.5.0.old/kmail/kmail.upd kdepim-3.5.0/kmail/kmail.upd
---- kdepim-3.5.0.old/kmail/kmail.upd	2005-09-10 10:24:01.000000000 +0200
-+++ kdepim-3.5.0/kmail/kmail.upd	2005-12-19 21:31:18.000000000 +0100
-@@ -158,6 +158,10 @@
- Id=3.4.1
- File=kmailrc
- Script=kmail-3.4.1-update-status-filters.pl,perl
-+# Update icon names for spam/ham filters
-+Id=3.5-filter-icons
-+File=kmailrc
-+Script=kmail-3.5-filter-icons.pl,perl
- #
- # Important notice:
- # If you add updates here, keep this text below them.
-diff -urN kdepim-3.5.0.old/kmail/kmstartup.cpp kdepim-3.5.0/kmail/kmstartup.cpp
---- kdepim-3.5.0.old/kmail/kmstartup.cpp	2005-11-08 23:33:29.000000000 +0100
-+++ kdepim-3.5.0/kmail/kmstartup.cpp	2005-12-19 21:21:00.000000000 +0100
-@@ -113,7 +113,8 @@
-     "3.4-misc",
-     "3.4a",
-     "3.4b",
--    "3.4.1"
-+    "3.4.1",
-+    "3.5-filter-icons"
-   };
-   static const int numUpdates = sizeof updates / sizeof *updates;
-   // Warning: do not remove entries in the above array, or the update-level check below will break
-diff -urN kdepim-3.5.0.old/kmail/Makefile.am kdepim-3.5.0/kmail/Makefile.am
---- kdepim-3.5.0.old/kmail/Makefile.am	2005-12-19 21:04:14.000000000 +0100
-+++ kdepim-3.5.0/kmail/Makefile.am	2005-12-19 21:54:08.000000000 +0100
-@@ -175,7 +175,8 @@
-                 kmail-3.3-misc.pl \
-                 kmail-3.3b1-misc.pl \
-                 kmail-3.4-misc.pl \
--                kmail-3.4.1-update-status-filters.pl
-+                kmail-3.4.1-update-status-filters.pl \
-+		kmail-3.5-filter-icons.pl
- 
- confdir = $(kde_confdir)
- conf_DATA = kmail.antispamrc kmail.antivirusrc
diff --git a/kde-base/kmail/files/kmail-3.5.2-imap-fixes-2.diff b/kde-base/kmail/files/kmail-3.5.2-imap-fixes-2.diff
deleted file mode 100644
index f8d7326327f9..000000000000
--- a/kde-base/kmail/files/kmail-3.5.2-imap-fixes-2.diff
+++ /dev/null
@@ -1,434 +0,0 @@
---- kdepim/kmail/kmheaders.cpp	2006/03/02 12:26:51	515022
-+++ kdepim/kmail/kmheaders.cpp	2006/04/22 08:13:05	532593
-@@ -1841,7 +1841,7 @@
-   bool foundUnreadMessage = false;
- 
-   if (!mFolder) return -1;
--  if (!(mFolder->count()) > 0) return -1;
-+  if (mFolder->count() <= 0) return -1;
- 
-   if ((aStartAt >= 0) && (aStartAt < (int)mItems.size()))
-     item = mItems[aStartAt];
-@@ -2041,7 +2041,7 @@
- 
-   int idx = item->msgId();
-   KMMessage *msg = mFolder->getMsg(idx);
--  if (!msg->transferInProgress())
-+  if (msg && !msg->transferInProgress())
-   {
-     emit activated(mFolder->getMsg(idx));
-   }
-@@ -3280,7 +3280,8 @@
-         unlink(QFile::encodeName(sortFile));
-         kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
-         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
--        //kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile ));
-+
-+        return true;
-     }
-     if(sortStream)
-         fclose(sortStream);
---- kdepim/kmail/imapaccountbase.cpp	2006/02/23 14:32:38	512746
-+++ kdepim/kmail/imapaccountbase.cpp	2006/04/15 13:05:11	530119
-@@ -1098,10 +1098,10 @@
-       {
-         DwBodyPart* newparent = dwpart;
-         const DwMessage* newmsg = dwmsg;
--        if ( part->originalContentTypeStr() == "MESSAGE/RFC822" &&
-+        if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart &&
-              dwpart->Body().Message() )
-         {
--          // set the encapsulated message as new parent message
-+          // set the encapsulated message as the new message
-           newparent = 0;
-           newmsg = dwpart->Body().Message();
-         }
-@@ -1281,7 +1281,8 @@
-     if ( delim.isEmpty() ) {
-       delim = "/";
-     }
--    if ( !newName.endsWith( delim ) && !folderName.startsWith( delim ) ) {
-+    if ( !newName.isEmpty() && 
-+         !newName.endsWith( delim ) && !folderName.startsWith( delim ) ) {
-       newName = newName + delim;
-     }
-     newName = newName + folderName;
---- kdepim/kmail/kmfolderimap.cpp	2006/03/15 14:19:26	518857
-+++ kdepim/kmail/kmfolderimap.cpp	2006/04/15 13:05:11	530119
-@@ -110,6 +110,11 @@
-   if (mOpenCount <= 0 ) return;
-   if (mOpenCount > 0) mOpenCount--;
-   if (mOpenCount > 0 && !aForced) return;
-+  if (isSelected() && !aForced) {
-+      kdWarning(5006) << "Trying to close the selected folder " << label() << 
-+          " - ignoring!" << endl;
-+      return;
-+  }
-   // FIXME is this still needed?
-   if (mAccount)
-     mAccount->ignoreJobsForFolder( folder() );
-@@ -873,8 +878,10 @@
-     }
-     kmkernel->imapFolderMgr()->contentsChanged();
-   }
--  f->initializeFrom( this, "/INBOX/", "message/directory" );
--  f->setChildrenState( QString::null );
-+  if ( f ) {
-+    f->initializeFrom( this, "/INBOX/", "message/directory" );
-+    f->setChildrenState( QString::null );
-+  }
-   // so we have an INBOX
-   mAccount->setHasInbox( true );
- }
-@@ -1086,17 +1093,20 @@
-     int a = cstr.find("X-uidValidity: ");
-     int b = cstr.find("\r\n", a);
-     QString uidv;
--    if ( (b - a - 15) >= 0 ) uidv = cstr.mid(a + 15, b - a - 15);
-+    if ( (b - a - 15) >= 0 ) 
-+        uidv = cstr.mid(a + 15, b - a - 15);
-     a = cstr.find("X-Access: ");
-     b = cstr.find("\r\n", a);
-     QString access;
--    if ( (b - a - 10) >= 0 ) access = cstr.mid(a + 10, b - a - 10);
-+    if ( (b - a - 10) >= 0 ) 
-+        access = cstr.mid(a + 10, b - a - 10);
-     mReadOnly = access == "Read only";
-     a = cstr.find("X-Count: ");
-     b = cstr.find("\r\n", a);
-     int exists = -1;
--    bool ok;
--    if ( (b - a - 9) >= 0 ) exists = cstr.mid(a + 9, b - a - 9).toInt(&ok);
-+    bool ok = false;
-+    if ( (b - a - 9) >= 0 ) 
-+        exists = cstr.mid(a + 9, b - a - 9).toInt(&ok);
-     if ( !ok ) exists = -1;
-     QString startUid;
-     if (uidValidity() != uidv)
---- kdepim/kmail/kmfoldercachedimap.cpp	2006/02/11 22:39:04	508499
-+++ kdepim/kmail/kmfoldercachedimap.cpp	2006/05/01 18:24:21	536266
-@@ -539,8 +539,11 @@
-   mRecurse = recurse;
-   assert( account() );
- 
--  mAccount->mailCheckProgressItem()->reset();
--  mAccount->mailCheckProgressItem()->setTotalItems( 100 );
-+  ProgressItem *progressItem = mAccount->mailCheckProgressItem();
-+  if ( progressItem ) {
-+    progressItem->reset();
-+    progressItem->setTotalItems( 100 );
-+  }
-   mProgress = 0;
- 
- #if 0
-@@ -1115,12 +1118,12 @@
-       job->start();
-       return;
-     } else {
--      const QString msg ( i18n( "<p>There are new messages in this folder, which "
-+      const QString msg ( i18n( "<p>There are new messages in this folder (%1), which "
-             "have not been uploaded to the server yet, but you do not seem to "
-             "have sufficient access rights on the folder now to upload them. "
-             "Please contact your administrator to allow upload of new messages "
-             "to you, or move them out of this folder.</p> "
--            "<p>Do you want to move these messages to another folder now?</p>") );
-+            "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) );
-       if ( KMessageBox::warningYesNo( 0, msg, QString::null, i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) {
-         KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(),
-             i18n("Move Messages to Folder"), true );
-@@ -1746,11 +1749,14 @@
-         f = static_cast<KMFolderCachedImap*>(newFolder->storage());
-       }
-     }
--    f->setAccount( mAccount );
--    f->setImapPath( "/INBOX/" );
--    f->folder()->setLabel( i18n("inbox") );
-+    if ( f ) {
-+      f->setAccount( mAccount );
-+      f->setImapPath( "/INBOX/" );
-+      f->folder()->setLabel( i18n("inbox") );
-+    }
-     if (!node) {
--      f->close();
-+      if ( f )
-+        f->close();
-       kmkernel->dimapFolderMgr()->contentsChanged();
-     }
-     // so we have an INBOX
---- kdepim/kmail/kmfoldertree.cpp	2006/02/13 20:29:00	509156
-+++ kdepim/kmail/kmfoldertree.cpp	2006/04/28 09:54:26	534978
-@@ -139,7 +139,7 @@
-   KIconLoader * il = KGlobal::instance()->iconLoader();
-   QPixmap pm = il->loadIcon( icon, KIcon::Small, size,
-                              KIcon::DefaultState, 0, true );
--  if ( pm.isNull() ) {
-+  if ( mFolder && pm.isNull() ) {
-       pm = il->loadIcon( mFolder->normalIconPath(), KIcon::Small, size,
-                          KIcon::DefaultState, 0, true );
-   }
-@@ -157,7 +157,7 @@
-     pm = normalIcon( size );
- 
-   KIconLoader * il = KGlobal::instance()->iconLoader();
--  if ( mFolder->useCustomIcons() ) {
-+  if ( mFolder && mFolder->useCustomIcons() ) {
-     pm = il->loadIcon( mFolder->unreadIconPath(), KIcon::Small, size,
-                        KIcon::DefaultState, 0, true );
-     if ( pm.isNull() )
-@@ -1020,10 +1020,10 @@
-       mMainWidget->action("compact")->plug(folderMenu);
- 
-       folderMenu->insertSeparator();
--      if ( !fti->folder()->isSystemFolder() )
-+      if ( !fti->folder()->isSystemFolder() ) {
-         mMainWidget->action("delete_folder")->plug(folderMenu);
--
--      folderMenu->insertSeparator();
-+        folderMenu->insertSeparator();
-+      }
-       mMainWidget->action("empty")->plug(folderMenu);
-       folderMenu->insertSeparator();
-     }
-@@ -1472,7 +1472,7 @@
- 
-   KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>(item);
- 
--  if (fti && fti->folder() && col != 0 && !currentFolder()->child())
-+  if ((!fti) || (fti && fti->folder() && col != 0 && !currentFolder()->child()))
-           return;
- 
-   QString fldName, oldFldName;
-@@ -1546,10 +1546,12 @@
- 
-   // get the unread count
-   int count = 0;
--  if (folder->noContent()) // always empty
-+  if (folder && folder->noContent()) // always empty
-     count = -1;
--  else
--    count = fti->folder()->countUnread();
-+  else {
-+    if ( fti->folder() ) 
-+      count = fti->folder()->countUnread();
-+  }
- 
-   // set it
-   bool repaint = false;
-@@ -1848,6 +1850,9 @@
- void KMFolderTree::moveFolder( KMFolder* destination )
- {
-   KMFolder* folder = currentFolder();
-+  if (!folder)
-+	return;
-+
-   KMFolderDir* parent = &(kmkernel->folderMgr()->dir());
-   if ( destination )
-     parent = destination->createChildFolder();
-@@ -1857,7 +1862,7 @@
- 
-   KMFolderDir* folderDir = parent;
-   // check that the folder can be moved
--  if ( folder && folder->child() )
-+  if ( folder->child() )
-   {
-     while ( folderDir && ( folderDir != &kmkernel->folderMgr()->dir() ) &&
-         ( folderDir != folder->parent() ) )
-@@ -1871,13 +1876,13 @@
-     }
-   }
- 
--  if( folder && folder->child() && parent &&
-+  if( folder->child() && parent &&
-       ( parent->path().find( folder->child()->path() + "/" ) == 0 ) ) {
-     KMessageBox::error( this, message );
-     return;
-   }
- 
--  if( folder && folder->child()
-+  if( folder->child()
-       && ( parent == folder->child() ) ) {
-     KMessageBox::error( this, message );
-     return;
---- kdepim/kmail/imapjob.cpp	2005/08/12 17:17:32	446148
-+++ kdepim/kmail/imapjob.cpp	2006/05/04 21:30:58	537478
-@@ -97,11 +97,12 @@
-   // imap folder, use its account for keeping track of the job. Otherwise,
-   // this is a get job and the src folder is an imap one. Use its account
-   // then.
--  KMAcctImap *account;
-+  KMAcctImap *account = 0;
-   if (folder) {
-     account = folder->account();
-   } else {
--    account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
-+    if ( msg_parent && msg_parent->storage() )
-+      account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
-   }
-   if ( !account ||
-        account->makeConnection() == ImapAccountBase::Error ) {
-@@ -127,7 +128,7 @@
-       url.setPath( folder->imapPath() + ";SECTION=" + flags );
-       ImapAccountBase::jobData jd;
-       jd.parent = 0; jd.offset = 0; jd.done = 0;
--      jd.total = ( curMsg->msgSizeServer() > 0 ) ? 
-+      jd.total = ( curMsg->msgSizeServer() > 0 ) ?
-         curMsg->msgSizeServer() : curMsg->msgSize();
-       jd.msgList.append( curMsg );
-       QCString cstr( curMsg->asString() );
-@@ -192,7 +193,7 @@
-                           "ImapJobCopyMove"+ProgressManager::getUniqueID(),
-                           i18n("Server operation"),
-                           i18n("Source folder: %1 - Destination folder: %2")
--                            .arg( msg_parent->prettyURL(), 
-+                            .arg( msg_parent->prettyURL(),
-                                   mDestFolder->prettyURL() ),
-                           true,
-                           account->useSSL() || account->useTLS() );
-@@ -223,21 +224,23 @@
-   if ( mDestFolder )
-   {
-     KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
--    if ( account &&  mJob ) {
--      ImapAccountBase::JobIterator it = account->findJob( mJob );
--      if ( it != account->jobsEnd() ) {
--        if( (*it).progressItem ) {
--          (*it).progressItem->setComplete();
--          (*it).progressItem = 0;
--        }
--        if ( !(*it).msgList.isEmpty() ) {
--          for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
--            mit.current()->setTransferInProgress( false );
-+    if ( account ) {
-+      if ( mJob ) {
-+        ImapAccountBase::JobIterator it = account->findJob( mJob );
-+        if ( it != account->jobsEnd() ) {
-+          if( (*it).progressItem ) {
-+            (*it).progressItem->setComplete();
-+            (*it).progressItem = 0;
-+          }
-+          if ( !(*it).msgList.isEmpty() ) {
-+            for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
-+              mit.current()->setTransferInProgress( false );
-+          }
-         }
-+        account->removeJob( mJob );
-       }
--      account->removeJob( mJob );
-+      account->mJobList.remove( this );
-     }
--    account->mJobList.remove( this );
-     mDestFolder->close();
-   }
- 
-@@ -245,21 +248,23 @@
-     if (!mDestFolder || mDestFolder != mSrcFolder) {
-       if (! (mSrcFolder->folderType() == KMFolderTypeImap) ) return;
-       KMAcctImap *account = static_cast<KMFolderImap*>(mSrcFolder->storage())->account();
--      if ( account && mJob ) {
--        ImapAccountBase::JobIterator it = account->findJob( mJob );
--        if ( it != account->jobsEnd() ) {
--          if( (*it).progressItem ) {
--            (*it).progressItem->setComplete();
--            (*it).progressItem = 0;
--          }
--          if ( !(*it).msgList.isEmpty() ) {
--            for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
--              mit.current()->setTransferInProgress( false );
-+      if ( account ) {
-+        if ( mJob ) {
-+          ImapAccountBase::JobIterator it = account->findJob( mJob );
-+          if ( it != account->jobsEnd() ) {
-+            if( (*it).progressItem ) {
-+              (*it).progressItem->setComplete();
-+              (*it).progressItem = 0;
-+            }
-+            if ( !(*it).msgList.isEmpty() ) {
-+              for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
-+                mit.current()->setTransferInProgress( false );
-+            }
-           }
-+          account->removeJob( mJob ); // remove the associated kio job
-         }
--        account->removeJob( mJob ); // remove the associated kio job
-+        account->mJobList.remove( this ); // remove the folderjob
-       }
--      account->mJobList.remove( this ); // remove the folderjob
-     }
-     mSrcFolder->close();
-   }
-@@ -270,15 +275,15 @@
- void ImapJob::slotGetNextMessage()
- {
-   KMMessage *msg = mMsgList.first();
--  KMFolderImap *msgParent = static_cast<KMFolderImap*>(msg->storage());
--  KMAcctImap *account = msgParent->account();
--  if ( msg->UID() == 0 )
-+  KMFolderImap *msgParent = msg ? static_cast<KMFolderImap*>(msg->storage()) : 0;
-+  if ( !msgParent || msg->UID() == 0 )
-   {
-     // broken message
-     emit messageRetrieved( 0 );
-     deleteLater();
-     return;
-   }
-+  KMAcctImap *account = msgParent->account();
-   KURL url = account->getUrl();
-   QString path = msgParent->imapPath() + ";UID=" + QString::number(msg->UID());
-   ImapAccountBase::jobData jd;
-@@ -391,7 +396,7 @@
-         dataSize = Util::crlf2lf( (*it).data.data(), dataSize ); // always <=
-         (*it).data.resize( dataSize );
- 
--        // During the construction of the message from the byteArray it does 
-+        // During the construction of the message from the byteArray it does
-         // not have a uid. Therefore we have to make sure that no connected
-         // slots are called, since they would operate on uid == 0.
-         msg->parent()->storage()->blockSignals( true );
-@@ -445,7 +450,7 @@
-       parent->ignoreJobsForMessage( msg );
-       int idx = parent->find( msg );
-       if (idx != -1) parent->removeMsg( idx, true );
--      // the removeMsg will unGet the message, which will delete all 
-+      // the removeMsg will unGet the message, which will delete all
-       // jobs, including this one
-       return;
-     }
---- kdepim/kmail/kmacctcachedimap.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/kmail/kmacctcachedimap.cpp	2006/05/06 09:14:35	537923
-@@ -381,14 +381,14 @@
- //-----------------------------------------------------------------------------
- void KMAcctCachedImap::addDeletedFolder( KMFolder* folder )
- {
--  if ( folder->folderType() != KMFolderTypeCachedImap )
-+  if ( !folder || folder->folderType() != KMFolderTypeCachedImap )
-     return;
-   KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>(folder->storage());
-   addDeletedFolder( storage->imapPath() );
-   kdDebug(5006) << k_funcinfo << storage->imapPath() << endl;
- 
-   // Add all child folders too
--  if( folder && folder->child() ) {
-+  if( folder->child() ) {
-     KMFolderNode *node = folder->child()->first();
-     while( node ) {
-       if( !node->isDir() ) {
---- kdepim/kmail/kmcommands.cpp	2006/03/14 20:17:40	518656
-+++ kdepim/kmail/kmcommands.cpp	2006/05/06 09:14:35	537923
-@@ -1724,7 +1724,7 @@
-       msg = srcFolder->getMsg(idx);
-     }
- 
--    if (srcFolder &&
-+    if (srcFolder && mDestFolder &&
-         (srcFolder->folderType()== KMFolderTypeImap) &&
-         (mDestFolder->folderType() == KMFolderTypeImap) &&
-         (static_cast<KMFolderImap*>(srcFolder->storage())->account() ==
-@@ -1761,7 +1761,7 @@
-       }
-     }
- 
--    if (!isMessage && list.isEmpty())
-+    if (srcFolder && !isMessage && list.isEmpty())
-     {
-       assert(idx != -1);
-       srcFolder->unGetMsg( idx );
diff --git a/kde-base/kmail/files/kmail-3.5.2-misc-fixes-2.diff b/kde-base/kmail/files/kmail-3.5.2-misc-fixes-2.diff
deleted file mode 100644
index f05626b998f5..000000000000
--- a/kde-base/kmail/files/kmail-3.5.2-misc-fixes-2.diff
+++ /dev/null
@@ -1,329 +0,0 @@
---- kdepim/kmail/attachmentlistview.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/kmail/attachmentlistview.cpp	2006/04/15 06:51:13	530022
-@@ -92,7 +92,7 @@
-     QBuffer serNumBuffer( serNums );
-     serNumBuffer.open( IO_ReadOnly );
-     QDataStream serNumStream( &serNumBuffer );
--    unsigned long serNum;
-+    Q_UINT32 serNum;
-     KMFolder *folder = 0;
-     int idx;
-     QPtrList<KMMsgBase> messageList;
---- kdepim/kmail/kmedit.cpp	2006/02/20 11:40:20	511574
-+++ kdepim/kmail/kmedit.cpp	2006/04/15 06:51:13	530022
-@@ -144,7 +144,7 @@
-         QBuffer serNumBuffer(serNums);
-         serNumBuffer.open(IO_ReadOnly);
-         QDataStream serNumStream(&serNumBuffer);
--        unsigned long serNum;
-+        Q_UINT32 serNum;
-         KMFolder *folder = 0;
-         int idx;
-         QPtrList<KMMsgBase> messageList;
---- kdepim/kmail/kmkernel.cpp	2006/04/09 09:53:18	527760
-+++ kdepim/kmail/kmkernel.cpp	2006/04/09 09:53:52	527761
-@@ -1463,6 +1463,9 @@
- 
- void KMKernel::readConfig()
- {
-+  //Needed here, since this function is also called when the configuration
-+  //changes, and the static variables should be updated then - IOF
-+  KMMessage::readConfig();
- }
- 
- void KMKernel::cleanupImapFolders()
---- kdepim/kmail/kmmsgbase.cpp	2006/01/11 14:34:42	496941
-+++ kdepim/kmail/kmmsgbase.cpp	2006/04/15 13:05:11	530119
-@@ -870,7 +870,7 @@
- 
-   char *l;
-   for ( l = latin.data(); *l; ++l ) {
--    if ( ( *l & 0xE0 == 0 ) || ( *l & 0x80 ) )
-+    if ( ( ( *l & 0xE0 ) == 0 ) || ( *l & 0x80 ) )
-       // *l is control character or 8-bit char
-       break;
-   }
---- kdepim/kmail/kmmsgdict.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/kmail/kmmsgdict.cpp	2006/04/15 13:05:11	530119
-@@ -205,7 +205,16 @@
-   }
- 
-   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
--  if (folder && index == -1)
-+  if ( !folder ) {
-+    kdDebug(5006) << "KMMsgDict::insert: Cannot insert the message, "
-+      << "null pointer to storage. Requested serial: " << msgSerNum
-+      << endl;
-+    kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
-+      << msg->toStrip() << ", Date: " << msg->dateStr() << endl; 
-+    return 0;
-+  }
-+
-+  if (index == -1)
-     index = folder->find(msg);
- 
-   // Should not happen, indicates id file corruption
-@@ -241,7 +250,16 @@
- 		       const KMMsgBase *msg, int index)
- {
-   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
--  if ( folder && index == -1 )
-+  if ( !folder ) {
-+    kdDebug(5006) << "KMMsgDict::replace: Cannot replace the message serial "
-+      << "number, null pointer to storage. Requested serial: " << msgSerNum
-+      << endl;
-+    kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
-+      << msg->toStrip() << ", Date: " << msg->dateStr() << endl; 
-+    return;
-+  }
-+
-+  if ( index == -1 )
-     index = folder->find( msg );
- 
-   remove( msgSerNum );
---- kdepim/kmail/renamejob.cpp	2005/12/10 04:41:02	487311
-+++ kdepim/kmail/renamejob.cpp	2006/04/15 13:05:11	530119
-@@ -59,11 +59,13 @@
-    mNewName( newName ), mNewFolder( 0 )
- {
-   mStorageTempOpened = 0;
--  mOldName = storage->name();
--  if ( storage->folderType() == KMFolderTypeImap ) {
--    mOldImapPath = static_cast<KMFolderImap*>(storage)->imapPath();
--  } else if ( storage->folderType() == KMFolderTypeCachedImap ) {
--    mOldImapPath = static_cast<KMFolderCachedImap*>(storage)->imapPath();
-+  if ( storage ) {
-+    mOldName = storage->name();
-+    if ( storage->folderType() == KMFolderTypeImap ) {
-+      mOldImapPath = static_cast<KMFolderImap*>(storage)->imapPath();
-+    } else if ( storage->folderType() == KMFolderTypeCachedImap ) {
-+      mOldImapPath = static_cast<KMFolderCachedImap*>(storage)->imapPath();
-+    }
-   }
- }
- 
---- kdepim/kmail/configuredialog_p.h	2005/08/19 15:04:44	450950
-+++ kdepim/kmail/configuredialog_p.h	2006/04/01 23:19:36	525407
-@@ -715,8 +715,7 @@
-   void slotOutlookCompatibleClicked();
- 
- private:
--  //virtual void doLoadFromGlobalSettings();
--  virtual void doLoadOther();
-+  virtual void doLoadFromGlobalSettings();
-   //FIXME virtual void doResetToDefaultsOther();
- 
- private:
---- kdepim/kmail/replyphrases.kcfg	2006/04/09 09:53:18	527760
-+++ kdepim/kmail/replyphrases.kcfg	2006/04/09 09:53:52	527761
-@@ -20,17 +20,14 @@
-     <entry name="PhraseForward" type="String" key="phrase-forward">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>Forwarded Message</default>
-     </entry>
-     <entry name="PhraseReplySender" type="String" key="phrase-reply">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>On %D, you wrote:</default>
-     </entry>
-     <entry name="PhraseReplyAll" type="String" key="phrase-reply-all">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>On %D, %F wrote:</default>
-     </entry>
- 
-   </group>
---- kdepim/kmail/kmfolder.cpp	2005/12/06 21:29:44	486141
-+++ kdepim/kmail/kmfolder.cpp	2006/04/18 20:41:15	531267
-@@ -84,12 +84,6 @@
-     }
-   }
- 
--   // trigger from here, since it needs a fully constructed FolderStorage
--  if ( mExportsSernums )
--    mStorage->registerWithMessageDict();
--  if ( !mHasIndex )
--    mStorage->setAutoCreateIndex( false );
--
-   if ( aParent ) {
-     connect( mStorage, SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-              aParent->manager(), SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-@@ -133,8 +127,16 @@
-                 this, SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) );
- 
-   //FIXME: Centralize all the readConfig calls somehow - Zack
-+  // Meanwhile, readConfig must be done before registerWithMessageDict, since
-+  // that one can call writeConfig in some circumstances - David
-   mStorage->readConfig();
- 
-+   // trigger from here, since it needs a fully constructed FolderStorage
-+  if ( mExportsSernums )
-+    mStorage->registerWithMessageDict();
-+  if ( !mHasIndex )
-+    mStorage->setAutoCreateIndex( false );
-+
-   if ( mId == 0 && aParent )
-     mId = aParent->manager()->createId();
- }
---- kdepim/kmail/configuredialog.cpp	2006/01/21 12:34:03	500799
-+++ kdepim/kmail/configuredialog.cpp	2006/05/03 08:46:45	536841
-@@ -2276,7 +2276,7 @@
-     const QString encoding = KGlobal::charsets()->encodingForName(*it);
-     if ( encoding == "iso-8859-15" )
-         indexOfLatin9 = i;
--    if( false && encoding == currentEncoding )
-+    if( encoding == currentEncoding )
-     {
-       mCharsetCombo->setCurrentItem( i );
-       found = true;
-@@ -3348,15 +3348,12 @@
-            mAttachWordsListEditor, SLOT(setEnabled(bool)) );
- }
- 
--void ComposerPage::AttachmentsTab::doLoadOther() {
--  KConfigGroup composer( KMKernel::config(), "Composer" );
--
-+void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() {
-   mOutlookCompatibleCheck->setChecked(
--    composer.readBoolEntry( "outlook-compatible-attachments", false ) );
-+    GlobalSettings::self()->outlookCompatibleAttachments() );
-   mMissingAttachmentDetectionCheck->setChecked(
--    composer.readBoolEntry( "showForgottenAttachmentWarning", true ) );
--  QStringList attachWordsList =
--    composer.readListEntry( "attachment-keywords" );
-+    GlobalSettings::self()->showForgottenAttachmentWarning() );
-+  QStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
-   if ( attachWordsList.isEmpty() ) {
-     // default value
-     attachWordsList << QString::fromLatin1("attachment")
-@@ -3371,13 +3368,12 @@
- }
- 
- void ComposerPage::AttachmentsTab::save() {
--  KConfigGroup composer( KMKernel::config(), "Composer" );
--  composer.writeEntry( "outlook-compatible-attachments",
--                       mOutlookCompatibleCheck->isChecked() );
--  composer.writeEntry( "showForgottenAttachmentWarning",
--                       mMissingAttachmentDetectionCheck->isChecked() );
--  composer.writeEntry( "attachment-keywords",
--                       mAttachWordsListEditor->stringList() );
-+  GlobalSettings::self()->setOutlookCompatibleAttachments(
-+    mOutlookCompatibleCheck->isChecked() );
-+  GlobalSettings::self()->setShowForgottenAttachmentWarning(
-+    mMissingAttachmentDetectionCheck->isChecked() );
-+  GlobalSettings::self()->setAttachmentKeywords(
-+    mAttachWordsListEditor->stringList() );
- }
- 
- void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked()
---- kdepim/kmail/antispamwizard.cpp	2005/12/30 00:15:02	492457
-+++ kdepim/kmail/antispamwizard.cpp	2006/05/06 09:14:35	537923
-@@ -502,7 +502,7 @@
-       while ( account ) {
-         if ( account->type() == "pop" || account->type().contains( "imap" ) ) {
-           const NetworkAccount * n = dynamic_cast<const NetworkAccount*>( account );
--          if ( n->host().lower().contains( pattern.lower() ) ) {
-+          if ( n && n->host().lower().contains( pattern.lower() ) ) {
-             mInfoPage->addAvailableTool( (*it).getVisibleName() );
-             found = true;
-           }
---- kdepim/kmail/kmmessage.cpp	2006/03/16 12:47:35	519171
-+++ kdepim/kmail/kmmessage.cpp	2006/05/06 09:14:35	537923
-@@ -2667,7 +2667,7 @@
-       parts.removeLast();
-     }
- 
--    if (part->Body().Message() &&
-+    if (part && part->Body().Message() &&
-         part->Body().Message()->Body().FirstBodyPart())
-     {
-       part = part->Body().Message()->Body().FirstBodyPart();
---- kdepim/kmail/kmreaderwin.cpp	2006/02/20 20:15:05	511744
-+++ kdepim/kmail/kmreaderwin.cpp	2006/05/06 09:14:35	537923
-@@ -371,7 +371,7 @@
-         if( dataNode->parentNode() && !weAreReplacingTheRootNode ) {
- kdDebug(5006) << "dataNode is NOT replacing the root node:  Store the headers." << endl;
-           resultingData += headers->AsString().c_str();
--        } else if( weAreReplacingTheRootNode && part->hasHeaders() ){
-+        } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){
- kdDebug(5006) << "dataNode replace the root node:  Do NOT store the headers but change" << endl;
- kdDebug(5006) << "                                 the Message's headers accordingly." << endl;
- kdDebug(5006) << "              old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl;
---- kdepim/kmail/kmsender.cpp	2006/03/20 17:51:08	520754
-+++ kdepim/kmail/kmsender.cpp	2006/05/06 09:14:35	537923
-@@ -373,12 +373,14 @@
-       KMessageBox::information(0, i18n("Critical error: "
-                    "Unable to process sent mail (out of space?)"
-                    "Moving failing message to \"sent-mail\" folder."));
--      sentFolder->moveMsg(mCurrentMsg);
--      sentFolder->close();
-+      if ( sentFolder ) {
-+        sentFolder->moveMsg(mCurrentMsg);
-+        sentFolder->close();
-+      }
-       cleanup();
-       return;
-     case 1:
--      if (sentFolder->moveMsg(mCurrentMsg) != 0)
-+      if ( sentFolder && sentFolder->moveMsg(mCurrentMsg) != 0 )
-       {
-         KMessageBox::error(0, i18n("Moving the sent message \"%1\" from the "
-           "\"outbox\" to the \"sent-mail\" folder failed.\n"
---- kdepim/kmail/objecttreeparser.cpp	2005/12/16 16:18:58	488973
-+++ kdepim/kmail/objecttreeparser.cpp	2006/05/06 09:14:35	537923
-@@ -92,6 +92,7 @@
- #include <qbuffer.h>
- #include <qpixmap.h>
- #include <qpainter.h>
-+#include <qregexp.h>
- 
- // other headers
- #include <memory>
-@@ -277,7 +278,7 @@
-                               << node->typeString() << '/' << node->subTypeString()
-                               << ')' << endl;
- 
--        if ( !bpf->process( this, node, processResult ) )
-+        if ( bpf && !bpf->process( this, node, processResult ) )
-           defaultHandling( node, processResult );
-       }
-       node->setProcessed( true, false );
-@@ -765,30 +766,21 @@
-   //static
-   bool ObjectTreeParser::containsExternalReferences( const QCString & str )
-   {
--    int httpPos = str.find( "\"http:", 0, true );
--    int httpsPos = str.find( "\"https:", 0, true );
-+    QRegExp httpRegExp("(\\\"|\\\'|url\\s*\\(\\s*)http[s]?:");
-+    int httpPos = str.find( httpRegExp, 0 );
- 
--    while ( httpPos >= 0 || httpsPos >= 0 ) {
--      // pos = index of next occurrence of "http: or "https: whichever comes first
--      int pos = ( httpPos < httpsPos )
--                ? ( ( httpPos >= 0 ) ? httpPos : httpsPos )
--                : ( ( httpsPos >= 0 ) ? httpsPos : httpPos );
-+    while ( httpPos >= 0 ) {
-       // look backwards for "href"
--      if ( pos > 5 ) {
--        int hrefPos = str.findRev( "href", pos - 5, true );
-+      if ( httpPos > 5 ) {
-+        int hrefPos = str.findRev( "href", httpPos - 5, true );
-         // if no 'href' is found or the distance between 'href' and '"http[s]:'
-         // is larger than 7 (7 is the distance in 'href = "http[s]:') then
-         // we assume that we have found an external reference
--        if ( ( hrefPos == -1 ) || ( pos - hrefPos > 7 ) )
-+        if ( ( hrefPos == -1 ) || ( httpPos - hrefPos > 7 ) )
-           return true;
-       }
-       // find next occurrence of "http: or "https:
--      if ( pos == httpPos ) {
--        httpPos = str.find( "\"http:", httpPos + 6, true );
--      }
--      else {
--        httpsPos = str.find( "\"https:", httpsPos + 7, true );
--      }
-+      httpPos = str.find( httpRegExp, httpPos + 6 );
-     }
-     return false;
-   }
diff --git a/kde-base/kmail/files/kmail-3.5.2-misc-fixes.diff b/kde-base/kmail/files/kmail-3.5.2-misc-fixes.diff
deleted file mode 100644
index 001a0487d338..000000000000
--- a/kde-base/kmail/files/kmail-3.5.2-misc-fixes.diff
+++ /dev/null
@@ -1,273 +0,0 @@
---- kdepim/kmail/attachmentlistview.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/kmail/attachmentlistview.cpp	2006/04/15 06:51:13	530022
-@@ -92,7 +92,7 @@
-     QBuffer serNumBuffer( serNums );
-     serNumBuffer.open( IO_ReadOnly );
-     QDataStream serNumStream( &serNumBuffer );
--    unsigned long serNum;
-+    Q_UINT32 serNum;
-     KMFolder *folder = 0;
-     int idx;
-     QPtrList<KMMsgBase> messageList;
---- kdepim/kmail/configuredialog.cpp	2006/01/21 12:34:03	500799
-+++ kdepim/kmail/configuredialog.cpp	2006/04/01 23:19:36	525407
-@@ -3348,15 +3348,12 @@
-            mAttachWordsListEditor, SLOT(setEnabled(bool)) );
- }
- 
--void ComposerPage::AttachmentsTab::doLoadOther() {
--  KConfigGroup composer( KMKernel::config(), "Composer" );
--
-+void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() {
-   mOutlookCompatibleCheck->setChecked(
--    composer.readBoolEntry( "outlook-compatible-attachments", false ) );
-+    GlobalSettings::self()->outlookCompatibleAttachments() );
-   mMissingAttachmentDetectionCheck->setChecked(
--    composer.readBoolEntry( "showForgottenAttachmentWarning", true ) );
--  QStringList attachWordsList =
--    composer.readListEntry( "attachment-keywords" );
-+    GlobalSettings::self()->showForgottenAttachmentWarning() );
-+  QStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
-   if ( attachWordsList.isEmpty() ) {
-     // default value
-     attachWordsList << QString::fromLatin1("attachment")
-@@ -3371,13 +3368,12 @@
- }
- 
- void ComposerPage::AttachmentsTab::save() {
--  KConfigGroup composer( KMKernel::config(), "Composer" );
--  composer.writeEntry( "outlook-compatible-attachments",
--                       mOutlookCompatibleCheck->isChecked() );
--  composer.writeEntry( "showForgottenAttachmentWarning",
--                       mMissingAttachmentDetectionCheck->isChecked() );
--  composer.writeEntry( "attachment-keywords",
--                       mAttachWordsListEditor->stringList() );
-+  GlobalSettings::self()->setOutlookCompatibleAttachments(
-+    mOutlookCompatibleCheck->isChecked() );
-+  GlobalSettings::self()->setShowForgottenAttachmentWarning(
-+    mMissingAttachmentDetectionCheck->isChecked() );
-+  GlobalSettings::self()->setAttachmentKeywords(
-+    mAttachWordsListEditor->stringList() );
- }
- 
- void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked()
---- kdepim/kmail/kmedit.cpp	2006/02/20 11:40:20	511574
-+++ kdepim/kmail/kmedit.cpp	2006/04/15 06:51:13	530022
-@@ -144,7 +144,7 @@
-         QBuffer serNumBuffer(serNums);
-         serNumBuffer.open(IO_ReadOnly);
-         QDataStream serNumStream(&serNumBuffer);
--        unsigned long serNum;
-+        Q_UINT32 serNum;
-         KMFolder *folder = 0;
-         int idx;
-         QPtrList<KMMsgBase> messageList;
---- kdepim/kmail/kmkernel.cpp	2006/04/09 09:53:18	527760
-+++ kdepim/kmail/kmkernel.cpp	2006/04/09 09:53:52	527761
-@@ -1463,6 +1463,9 @@
- 
- void KMKernel::readConfig()
- {
-+  //Needed here, since this function is also called when the configuration
-+  //changes, and the static variables should be updated then - IOF
-+  KMMessage::readConfig();
- }
- 
- void KMKernel::cleanupImapFolders()
---- kdepim/kmail/kmmsgbase.cpp	2006/01/11 14:34:42	496941
-+++ kdepim/kmail/kmmsgbase.cpp	2006/04/15 13:05:11	530119
-@@ -870,7 +870,7 @@
- 
-   char *l;
-   for ( l = latin.data(); *l; ++l ) {
--    if ( ( *l & 0xE0 == 0 ) || ( *l & 0x80 ) )
-+    if ( ( ( *l & 0xE0 ) == 0 ) || ( *l & 0x80 ) )
-       // *l is control character or 8-bit char
-       break;
-   }
---- kdepim/kmail/kmmsgdict.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/kmail/kmmsgdict.cpp	2006/04/15 13:05:11	530119
-@@ -205,7 +205,16 @@
-   }
- 
-   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
--  if (folder && index == -1)
-+  if ( !folder ) {
-+    kdDebug(5006) << "KMMsgDict::insert: Cannot insert the message, "
-+      << "null pointer to storage. Requested serial: " << msgSerNum
-+      << endl;
-+    kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
-+      << msg->toStrip() << ", Date: " << msg->dateStr() << endl; 
-+    return 0;
-+  }
-+
-+  if (index == -1)
-     index = folder->find(msg);
- 
-   // Should not happen, indicates id file corruption
-@@ -241,7 +250,16 @@
- 		       const KMMsgBase *msg, int index)
- {
-   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
--  if ( folder && index == -1 )
-+  if ( !folder ) {
-+    kdDebug(5006) << "KMMsgDict::replace: Cannot replace the message serial "
-+      << "number, null pointer to storage. Requested serial: " << msgSerNum
-+      << endl;
-+    kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
-+      << msg->toStrip() << ", Date: " << msg->dateStr() << endl; 
-+    return;
-+  }
-+
-+  if ( index == -1 )
-     index = folder->find( msg );
- 
-   remove( msgSerNum );
---- kdepim/kmail/kmsender.cpp	2006/03/20 17:51:08	520754
-+++ kdepim/kmail/kmsender.cpp	2006/04/15 13:05:11	530119
-@@ -373,8 +373,10 @@
-       KMessageBox::information(0, i18n("Critical error: "
-                    "Unable to process sent mail (out of space?)"
-                    "Moving failing message to \"sent-mail\" folder."));
--      sentFolder->moveMsg(mCurrentMsg);
--      sentFolder->close();
-+      if ( sentFolder ) {
-+        sentFolder->moveMsg(mCurrentMsg);
-+        sentFolder->close();
-+      }
-       cleanup();
-       return;
-     case 1:
---- kdepim/kmail/objecttreeparser.cpp	2005/12/16 16:18:58	488973
-+++ kdepim/kmail/objecttreeparser.cpp	2006/04/02 13:18:14	525563
-@@ -92,6 +92,7 @@
- #include <qbuffer.h>
- #include <qpixmap.h>
- #include <qpainter.h>
-+#include <qregexp.h>
- 
- // other headers
- #include <memory>
-@@ -765,30 +766,21 @@
-   //static
-   bool ObjectTreeParser::containsExternalReferences( const QCString & str )
-   {
--    int httpPos = str.find( "\"http:", 0, true );
--    int httpsPos = str.find( "\"https:", 0, true );
-+    QRegExp httpRegExp("(\\\"|\\\'|url\\s*\\(\\s*)http[s]?:");
-+    int httpPos = str.find( httpRegExp, 0 );
- 
--    while ( httpPos >= 0 || httpsPos >= 0 ) {
--      // pos = index of next occurrence of "http: or "https: whichever comes first
--      int pos = ( httpPos < httpsPos )
--                ? ( ( httpPos >= 0 ) ? httpPos : httpsPos )
--                : ( ( httpsPos >= 0 ) ? httpsPos : httpPos );
-+    while ( httpPos >= 0 ) {
-       // look backwards for "href"
--      if ( pos > 5 ) {
--        int hrefPos = str.findRev( "href", pos - 5, true );
-+      if ( httpPos > 5 ) {
-+        int hrefPos = str.findRev( "href", httpPos - 5, true );
-         // if no 'href' is found or the distance between 'href' and '"http[s]:'
-         // is larger than 7 (7 is the distance in 'href = "http[s]:') then
-         // we assume that we have found an external reference
--        if ( ( hrefPos == -1 ) || ( pos - hrefPos > 7 ) )
-+        if ( ( hrefPos == -1 ) || ( httpPos - hrefPos > 7 ) )
-           return true;
-       }
-       // find next occurrence of "http: or "https:
--      if ( pos == httpPos ) {
--        httpPos = str.find( "\"http:", httpPos + 6, true );
--      }
--      else {
--        httpsPos = str.find( "\"https:", httpsPos + 7, true );
--      }
-+      httpPos = str.find( httpRegExp, httpPos + 6 );
-     }
-     return false;
-   }
---- kdepim/kmail/renamejob.cpp	2005/12/10 04:41:02	487311
-+++ kdepim/kmail/renamejob.cpp	2006/04/15 13:05:11	530119
-@@ -59,11 +59,13 @@
-    mNewName( newName ), mNewFolder( 0 )
- {
-   mStorageTempOpened = 0;
--  mOldName = storage->name();
--  if ( storage->folderType() == KMFolderTypeImap ) {
--    mOldImapPath = static_cast<KMFolderImap*>(storage)->imapPath();
--  } else if ( storage->folderType() == KMFolderTypeCachedImap ) {
--    mOldImapPath = static_cast<KMFolderCachedImap*>(storage)->imapPath();
-+  if ( storage ) {
-+    mOldName = storage->name();
-+    if ( storage->folderType() == KMFolderTypeImap ) {
-+      mOldImapPath = static_cast<KMFolderImap*>(storage)->imapPath();
-+    } else if ( storage->folderType() == KMFolderTypeCachedImap ) {
-+      mOldImapPath = static_cast<KMFolderCachedImap*>(storage)->imapPath();
-+    }
-   }
- }
- 
---- kdepim/kmail/configuredialog_p.h	2005/08/19 15:04:44	450950
-+++ kdepim/kmail/configuredialog_p.h	2006/04/01 23:19:36	525407
-@@ -715,8 +715,7 @@
-   void slotOutlookCompatibleClicked();
- 
- private:
--  //virtual void doLoadFromGlobalSettings();
--  virtual void doLoadOther();
-+  virtual void doLoadFromGlobalSettings();
-   //FIXME virtual void doResetToDefaultsOther();
- 
- private:
---- kdepim/kmail/replyphrases.kcfg	2006/04/09 09:53:18	527760
-+++ kdepim/kmail/replyphrases.kcfg	2006/04/09 09:53:52	527761
-@@ -20,17 +20,14 @@
-     <entry name="PhraseForward" type="String" key="phrase-forward">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>Forwarded Message</default>
-     </entry>
-     <entry name="PhraseReplySender" type="String" key="phrase-reply">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>On %D, you wrote:</default>
-     </entry>
-     <entry name="PhraseReplyAll" type="String" key="phrase-reply-all">
-       <label></label>
-       <whatsthis></whatsthis>
--      <default>On %D, %F wrote:</default>
-     </entry>
- 
-   </group>
---- kdepim/kmail/kmfolder.cpp	2005/12/06 21:29:44	486141
-+++ kdepim/kmail/kmfolder.cpp	2006/04/18 20:41:15	531267
-@@ -84,12 +84,6 @@
-     }
-   }
- 
--   // trigger from here, since it needs a fully constructed FolderStorage
--  if ( mExportsSernums )
--    mStorage->registerWithMessageDict();
--  if ( !mHasIndex )
--    mStorage->setAutoCreateIndex( false );
--
-   if ( aParent ) {
-     connect( mStorage, SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-              aParent->manager(), SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-@@ -133,8 +127,16 @@
-                 this, SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) );
- 
-   //FIXME: Centralize all the readConfig calls somehow - Zack
-+  // Meanwhile, readConfig must be done before registerWithMessageDict, since
-+  // that one can call writeConfig in some circumstances - David
-   mStorage->readConfig();
- 
-+   // trigger from here, since it needs a fully constructed FolderStorage
-+  if ( mExportsSernums )
-+    mStorage->registerWithMessageDict();
-+  if ( !mHasIndex )
-+    mStorage->setAutoCreateIndex( false );
-+
-   if ( mId == 0 && aParent )
-     mId = aParent->manager()->createId();
- }
diff --git a/kde-base/kmailcvt/ChangeLog b/kde-base/kmailcvt/ChangeLog
index 889823cbf2c4..aa851bc8332d 100644
--- a/kde-base/kmailcvt/ChangeLog
+++ b/kde-base/kmailcvt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmailcvt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.61 2007/02/04 02:35:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.62 2007/02/05 12:29:15 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/fix-kmailcvt-compilation.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kmailcvt-3.5.1.ebuild:
   Remove old versions.
diff --git a/kde-base/kmailcvt/files/fix-kmailcvt-compilation.diff b/kde-base/kmailcvt/files/fix-kmailcvt-compilation.diff
deleted file mode 100644
index 04ec9b34e1f7..000000000000
--- a/kde-base/kmailcvt/files/fix-kmailcvt-compilation.diff
+++ /dev/null
@@ -1,169 +0,0 @@
-bugs.gentoo.org #99643, bugs.kde.org #106274, in upstream BRANCH post 3.4.2
-
-Index: kmailcvt/filters.hxx
-===================================================================
---- kmailcvt/filters.hxx	(revision 438560)
-+++ kmailcvt/filters.hxx	(revision 438561)
-@@ -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
-Index: kmailcvt/filter_pmail.cxx
-===================================================================
---- kmailcvt/filter_pmail.cxx	(revision 438560)
-+++ kmailcvt/filter_pmail.cxx	(revision 438561)
-@@ -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) {
-Index: kmailcvt/filter_oe.cxx
-===================================================================
---- kmailcvt/filter_oe.cxx	(revision 438560)
-+++ kmailcvt/filter_oe.cxx	(revision 438561)
-@@ -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;
- }
-Index: kmailcvt/filter_pmail.hxx
-===================================================================
---- kmailcvt/filter_pmail.hxx	(revision 438560)
-+++ kmailcvt/filter_pmail.hxx	(revision 438561)
-@@ -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;
-Index: kmailcvt/filter_oe.hxx
-===================================================================
---- kmailcvt/filter_oe.hxx	(revision 438560)
-+++ kmailcvt/filter_oe.hxx	(revision 438561)
-@@ -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 --git a/kde-base/kmilo/ChangeLog b/kde-base/kmilo/ChangeLog
index 186e5f9c3461..68e686166302 100644
--- a/kde-base/kmilo/ChangeLog
+++ b/kde-base/kmilo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmilo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/ChangeLog,v 1.66 2007/02/04 02:36:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/ChangeLog,v 1.67 2007/02/05 11:55:03 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/configure-fix-kdeutils-powerbook.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kmilo-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kmilo/files/configure-fix-kdeutils-powerbook.patch b/kde-base/kmilo/files/configure-fix-kdeutils-powerbook.patch
deleted file mode 100644
index a54c727876ea..000000000000
--- a/kde-base/kmilo/files/configure-fix-kdeutils-powerbook.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: kmilo/configure.in.in
-===================================================================
---- kmilo/configure.in.in	(revision 433553)
-+++ kmilo/configure.in.in	(working copy)
-@@ -9,6 +9,15 @@
- dnl ---------------------------------------------------------------------
- dnl PowerBook IPC Library
- 
-+AC_ARG_WITH(powerbook,
-+  [AS_HELP_STRING(--with-powerbook,
-+    [enable support for PPC PowerBook @<:@default=check@:>@])],
-+  [], with_powerbook=check)
-+
-+have_pbbipc=""
-+have_pbb=""
-+if test "x$with_powerbook" != xno; then
-+
- KDE_CHECK_LIB(pbbipc, create_msgport,
- [
- KEYBOARD_LIBS="-lpbbipc $KEYBOARD_LIBS"
-@@ -23,6 +32,10 @@
- have_pbb=true
- ])
- 
-+if test "x$with_powerbook" != xcheck && test -z "$have_pbbipc$have_pbb"; then
-+  AC_MSG_FAILURE([--with-powerbook was given, but test for libpbb failed])
-+fi
-+fi
- 
- AM_CONDITIONAL(include_kmilo_powerbook, test x$have_pbbipc = xtrue)
- AM_CONDITIONAL(include_kmilo_pbb, test x$have_pbb = xtrue)
diff --git a/kde-base/kommander/ChangeLog b/kde-base/kommander/ChangeLog
index c3283e23b1fe..6d79a12a3989 100644
--- a/kde-base/kommander/ChangeLog
+++ b/kde-base/kommander/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kommander
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.66 2007/02/04 02:42:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.67 2007/02/05 12:27:59 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/post-3.4-kdewebdev-2.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kommander-3.5.2.ebuild:
diff --git a/kde-base/kommander/files/post-3.4-kdewebdev-2.diff b/kde-base/kommander/files/post-3.4-kdewebdev-2.diff
deleted file mode 100644
index 5bf3f475f94b..000000000000
--- a/kde-base/kommander/files/post-3.4-kdewebdev-2.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: instance.cpp
-===================================================================
-RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v
-retrieving revision 1.49
-diff -u -3 -d -p -r1.49 instance.cpp
---- kommander/executor/instance.cpp	29 Dec 2004 09:58:46 -0000	1.49
-+++ kommander/executor/instance.cpp	13 Apr 2005 19:18:57 -0000
-@@ -131,6 +131,35 @@ bool Instance::build(QFile *a_file)
- 
- bool Instance::run(QFile *a_file)
- {
-+  // Check whether extension is *.kmdr
-+  if (!m_uiFileName.fileName().endsWith(".kmdr")) {
-+    KMessageBox::error(0, i18n("<qt>This file does not have a <b>.kmdr</b> extension. As a security precaution "
-+           "Kommander will only run Kommander scripts with a clear identity.</qt>"),
-+           i18n("Wrong Extension"));
-+    return false;
-+  }
-+  
-+  // Check whether file is not in some temporary directory.
-+  QStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp");
-+  tmpDirs += KGlobal::dirs()->resourceDirs("cache");
-+  tmpDirs.append("/tmp/");
-+  tmpDirs.append("/var/tmp/");
-+  
-+  bool inTemp = false;
-+  for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I)
-+    if (m_uiFileName.directory(false).startsWith(*I))
-+      inTemp = true;
-+        
-+  if (inTemp)
-+  {
-+     if (KMessageBox::warningYesNo(0, i18n("<qt>This dialog is running from your <i>/tmp</i> directory. "
-+         " This may mean that it was run from a KMail attachment or from a webpage. "
-+         "<p>Any script contained in this dialog will have write access to all of your home directory; "
-+         "<b>running such dialogs may be dangerous: </b>"
-+         "<p>are you sure you want to continue?</qt>")) == KMessageBox::No)
-+       return false;
-+  }
-+  
-   /* add runtime arguments */
-   if (m_cmdArguments) {
-     QString args;
-@@ -143,18 +172,7 @@ bool Instance::run(QFile *a_file)
-     KommanderWidget::setGlobal("ARGS", args);
-   }
-   KommanderWidget::setGlobal("ARGCOUNT", QString("%1").arg(m_cmdArguments));
--    
--  if (m_uiFileName.directory().startsWith(locateLocal("tmp", "") + "/") ||
--      m_uiFileName.directory().startsWith("/tmp/"))
--  {
--     if (KMessageBox::warningYesNo(0, i18n("<qt>This dialog is running from your <i>/tmp</i> directory. "
--         " This may mean that it was run from a KMail attachment or from a webpage. "
--         "<p>Any script contained in this dialog will have write access to all of your home directory; "
--         "<b>running such dialogs may be dangerous: </b>"
--         "<p>are you sure you want to continue?</qt>")) == KMessageBox::No)
--       return false;
--  }
--  
-+     
-   if (!m_uiFileName.isEmpty()) 
-   {
-     KommanderWidget::setGlobal("_KDDIR", m_uiFileName.directory());
diff --git a/kde-base/konq-plugins/ChangeLog b/kde-base/konq-plugins/ChangeLog
index 53fec978c31c..2e562a410d7e 100644
--- a/kde-base/konq-plugins/ChangeLog
+++ b/kde-base/konq-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konq-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.66 2007/02/04 02:43:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.67 2007/02/05 12:17:53 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/konq-plugins-3.5.2-arkplugin-crash-fix.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -konq-plugins-3.5.2-r1.ebuild, -konq-plugins-3.5.6.ebuild:
diff --git a/kde-base/konq-plugins/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff b/kde-base/konq-plugins/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
deleted file mode 100644
index ed846c8ee850..000000000000
--- a/kde-base/konq-plugins/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
+++ /dev/null
@@ -1,253 +0,0 @@
---- kdeaddons/konq-plugins/arkplugin/arkplugin.cpp	2006/03/12 01:18:18	517743
-+++ kdeaddons/konq-plugins/arkplugin/arkplugin.cpp	2006/04/01 23:42:40	525413
-@@ -58,10 +58,15 @@
-     KGlobal::locale()->insertCatalogue("ark_plugin");
- 
-     extMimeTypes();
--    m_list = popupmenu->fileItemList();
-+    KFileItemList itemList = popupmenu->fileItemList();
-+    for ( KFileItem *item = itemList.first(); item; item = itemList.next() )
-+    {
-+        m_urlList.append( item->url() );
-+        m_urlStringList.append( item->url().url() );
-+    }
-     m_dir = popupmenu->url().url() + "/";
--    unsigned int itemCount = m_list.count();
--    KFileItemListIterator it( m_list );
-+    unsigned int itemCount = m_urlList.count();
-+    KFileItemListIterator it( itemList );
-     KFileItem * item;
-     bool hasArchives = false;
-     bool hasOther = false;
-@@ -84,15 +89,15 @@
-     QString ext;
-     KActionMenu * actionMenu;
-     KAction * action;
--    if ( hasOther &&  m_list.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
-+    if ( hasOther &&  itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
-     {
-         compMimeTypes();
-         actionMenu = new KActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu"  );
-         m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" );
-         if ( itemCount == 1 )
-         {
--            item = m_list.first();
--            m_name = m_list.first()->name();
-+            item = itemList.first();
-+            m_name = itemList.first()->name();
-             action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
-                                     SLOT( slotCompressAsDefault() ), actionCollection() );
-         }
-@@ -109,7 +114,7 @@
- 
- 
-         m_addToMenu = new KActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
--        if ( m_list.first()->url().isLocalFile() )
-+        if ( itemList.first()->url().isLocalFile() )
-             actionMenu->insert( m_addToMenu );
- 
-         connect( m_compAsMenu->popupMenu(), SIGNAL( aboutToShow() ),
-@@ -136,7 +141,7 @@
-             // stolen from arkwidget.cpp
-             if ( itemCount == 1 )
-             {
--                QString targetName = m_list.first()->name();
-+                QString targetName = itemList.first()->name();
-                 stripExtension( targetName );
-                 action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
-                                         SLOT( slotExtractToSubfolders() ), actionCollection() );
-@@ -187,7 +192,7 @@
-         (*eit).remove( '*' );
-         if ( *eit == ".tar.bz" )                   // tbz mimetype, has tar.bz as first entry :}
-             *eit = ".tar.bz2";
--        if ( m_list.count() == 1 )
-+        if ( m_urlList.count() == 1 )
-         {
-             action = new KAction( m_name + (*eit), 0, m_compAsMapper,
-                     SLOT( map() ), actionCollection() );
-@@ -231,7 +236,7 @@
-     QCString actionName;
-     QStringList::Iterator mit;
-     KURL archive;
--    QDir dir( m_list.first()->url().directory() );
-+    QDir dir( m_urlList.first().directory() );
-     QStringList entries = dir.entryList();
-     QStringList::Iterator uit = entries.begin();
-     for ( ; uit != entries.end(); ++uit )
-@@ -254,7 +259,7 @@
- 
- void ArkMenu::compMimeTypes()
- {
--    unsigned int itemCount = m_list.count();
-+    unsigned int itemCount = m_urlList.count();
- 
-     bool havegz = false;
-     if ( !KStandardDirs::findExe( "gzip" ).isNull() && m_conf->readBoolEntry( "UseGz", true ) )
-@@ -401,14 +406,8 @@
-     QCString name;
-     QString extension, mimeType;
-     KURL target;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    QStringList filelist;
--    while (  ( item = it.current() ) != 0 )
--    {
--         ++it;
--         filelist.append( item->url().url() );
--    }
-+    QStringList filelist( m_urlStringList );
-+
-     //if KMimeType returns .ZIP or .RAR. convert them to lowercase
-     if ( m_extensionList[ pos ].contains ( ".ZIP" ) )
-          m_extensionList[ pos ] = ".zip";
-@@ -458,17 +457,10 @@
- 
- void ArkMenu::slotCompressAsDefault()
- {
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
-     KURL name;
--    QStringList filelist;
--    while (  ( item = it.current() ) != 0 )
--    {
--         ++it;
--         filelist.append( item->url().url() );
--    }
--    if ( filelist.count() == 1)
--         name = filelist.first() + m_ext;
-+
-+    if ( m_urlStringList.count() == 1)
-+         name = m_urlStringList.first() + m_ext;
-     else
-     {
-         name = m_dir + i18n("Archive") + m_ext;
-@@ -479,7 +471,7 @@
-             i++;
-         }
-     }
--    compressAs( filelist, name );
-+    compressAs( m_urlStringList, name );
- }
- 
- // make work for URLs
-@@ -494,16 +486,10 @@
- 
- void ArkMenu::slotAddTo( int pos )
- {
--    QStringList args;
--    args << "--add-to";
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        ++it;
--        args << item->url().url();
--    }
--    KURL archive( m_list.first()->url() );
-+    QStringList args( m_urlStringList );
-+    args.prepend( "--add-to" );
-+
-+    KURL archive( m_urlStringList.first() );
-     archive.setPath( archive.directory( false ) );
-     archive.setFileName( m_archiveList[ pos ].fileName() );
- 
-@@ -513,63 +499,53 @@
- 
- void ArkMenu::slotAdd()
- {
--    QStringList args;
--    args << "--add";
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        ++it;
--        args << item->url().url();
--    }
-+    QStringList args( m_urlStringList );
-+    args.prepend( "--add" );
-+
-     kapp->kdeinitExec( "ark", args );
- }
- 
- void ArkMenu::slotExtractHere()
- {
--    QStringList args;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
-+    for ( QValueList<KURL>::ConstIterator it = m_urlList.constBegin();
-+          it != m_urlList.constEnd();
-+          ++it )
-     {
--        args.clear();
--        ++it;
--        KURL targetDirectory = item->url();
-+        QStringList args;
-+        KURL targetDirectory = ( *it ).url();
-         targetDirectory.setPath( targetDirectory.directory() );
--        args << "--extract-to"  << targetDirectory.url() << item->url().url();
-+        args << "--extract-to"  << targetDirectory.url() << ( *it ).url();
-         kapp->kdeinitExec( "ark", args );
-     }
- }
- 
- void ArkMenu::slotExtractToSubfolders()
- {
--    QStringList args;
--    QString dirName;
--    KURL targetDir;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        args.clear();
--        ++it;
--        targetDir = item->url();
-+    for ( QStringList::ConstIterator it = m_urlStringList.constBegin();
-+          it != m_urlStringList.constEnd();
-+          ++it )
-+    {
-+        KURL targetDir;
-+        QString dirName;
-+        QStringList args;
-+
-+        targetDir = *it;
-         dirName = targetDir.path();
-         stripExtension( dirName );
-         targetDir.setPath( dirName );
--        args << "--extract-to"  << targetDir.url() << item->url().url();
-+        args << "--extract-to"  << targetDir.url() << *it;
-         kapp->kdeinitExec( "ark", args );
-     }
- }
- 
- void ArkMenu::slotExtractTo()
- {
--    QStringList args;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
-+    for ( QStringList::ConstIterator it = m_urlStringList.constBegin();
-+          it != m_urlStringList.constEnd();
-+          ++it )
-     {
--        ++it;
--        args << "--extract"  << item->url().url();
-+        QStringList args;
-+        args << "--extract" << *it;
-         kapp->kdeinitExec( "ark", args );
-     }
- }
---- kdeaddons/konq-plugins/arkplugin/arkplugin.h	2005/09/29 14:33:08	465369
-+++ kdeaddons/konq-plugins/arkplugin/arkplugin.h	2006/04/01 23:42:40	525413
-@@ -54,7 +54,8 @@
- 
- private:
-     QString m_name, m_ext;
--    KFileItemList m_list;
-+    QValueList<KURL> m_urlList;
-+    QStringList m_urlStringList;
-     KURL::List m_archiveList;
-     QStringList m_archiveMimeTypes;
-     QStringList m_extractMimeTypes;
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index f6355babaf0e..4e02c5ff662f 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.74 2007/02/04 02:43:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.75 2007/02/05 12:36:13 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.4.2-konqueror-filter.patch,
+  -files/konqueror-3.5.4-clear-history.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -konqueror-3.5.2.ebuild:
diff --git a/kde-base/konqueror/files/kdebase-3.4.2-konqueror-filter.patch b/kde-base/konqueror/files/kdebase-3.4.2-konqueror-filter.patch
deleted file mode 100644
index 9222e61f8f86..000000000000
--- a/kde-base/konqueror/files/kdebase-3.4.2-konqueror-filter.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kdebase-3.4.2/konqueror/konq_mainwindow_old.cc	2005-08-05 17:29:06.000000000 -0400
-+++ kdebase-3.4.2/konqueror/konq_mainwindow.cc	2005-08-05 19:05:53.000000000 -0400
-@@ -39,6 +39,7 @@
- #include <kzip.h>
- #include <config.h>
- #include <pwd.h>
-+#include <kio/netaccess.h>
- // we define STRICT_ANSI to get rid of some warnings in glibc
- #ifndef __STRICT_ANSI__
- #define __STRICT_ANSI__
-@@ -428,7 +429,7 @@
-         QString fileName = path.mid( lastSlash + 1 );
-         QString testPath = path.left( lastSlash + 1 );
-         if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
--             && ( !url.isLocalFile() || QFile::exists( testPath ) ) )
-+             && ( !url.isLocalFile() || QFile::exists( testPath ) ) && !KIO::NetAccess::exists( url, true ) )
-         {
-             nameFilter = fileName;
-             url.setFileName( QString::null );
diff --git a/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch b/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch
deleted file mode 100644
index 9e8a9d88b877..000000000000
--- a/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r konqueror-3.5.4-orig/konqueror/konq_combo.cc konqueror-3.5.4/konqueror/konq_combo.cc
---- konqueror-3.5.4-orig/konqueror/konq_combo.cc	2006-09-25 15:00:01.000000000 +0200
-+++ konqueror-3.5.4/konqueror/konq_combo.cc	2006-09-25 15:00:57.000000000 +0200
-@@ -121,8 +121,9 @@
- 
-     // Make the lineedit consume the Key_Enter event...
-     setTrapReturnKey( true );
- 
-+    connect( KonqHistoryManager::kself(), SIGNAL(cleared()), SLOT(slotCleared()) );
-     connect( this, SIGNAL(cleared() ), SLOT(slotCleared()) );
-     connect( this, SIGNAL(highlighted( int )), SLOT(slotSetIcon( int )) );
-     connect( this, SIGNAL(activated( const QString& )),
-              SLOT(slotActivated( const QString& )) );
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 7db38c19f687..ca8613c1dadb 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.73 2007/02/04 02:44:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.74 2007/02/05 12:01:00 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/konsole-3.5.1-detach-send2all.patch,
+  -files/konsole-3.5.2-session-save-crash.fix.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -konsole-3.5.2-r1.ebuild:
diff --git a/kde-base/konsole/files/konsole-3.5.1-detach-send2all.patch b/kde-base/konsole/files/konsole-3.5.1-detach-send2all.patch
deleted file mode 100644
index d75fd340575f..000000000000
--- a/kde-base/konsole/files/konsole-3.5.1-detach-send2all.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: kdebase-3.5.1/konsole/konsole/konsole.cpp
-===================================================================
---- kdebase-3.5.1.orig/konsole/konsole/konsole.cpp
-+++ kdebase-3.5.1/konsole/konsole/konsole.cpp
-@@ -3619,6 +3619,21 @@ void Konsole::detachSession(TESession* _
-   sessions.remove(_se);
-   delete ra;
- 
-+  if ( _se->isMasterMode() ) {
-+    // Disable master mode when detaching master
-+    setMasterMode(false);
-+  } else {
-+    QPtrListIterator<TESession> from_it(sessions);
-+    for(; from_it.current(); ++from_it) {
-+      TESession *from = from_it.current();
-+      if(from->isMasterMode())
-+        disconnect(from->widget(), SIGNAL(keyPressedSignal(QKeyEvent*)),
-+	           _se->getEmulation(), SLOT(onKeyPress(QKeyEvent*)));
-+    }
-+  }
-+
-+  disconnect(0, 0, _se->getEmulation(), SLOT(onKeyPress(QKeyEvent*)));
-+
-   QColor se_tabtextcolor = tabwidget->tabColor( _se->widget() );
- 
-   disconnect( _se,SIGNAL(done(TESession*)),
diff --git a/kde-base/konsole/files/konsole-3.5.2-session-save-crash.fix.diff b/kde-base/konsole/files/konsole-3.5.2-session-save-crash.fix.diff
deleted file mode 100644
index 4165f76ef523..000000000000
--- a/kde-base/konsole/files/konsole-3.5.2-session-save-crash.fix.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdebase/konsole/konsole/konsole.cpp	2006/02/26 19:37:06	513867
-+++ kdebase/konsole/konsole/konsole.cpp	2006/04/03 17:02:58	526028
-@@ -214,6 +214,7 @@
- ,selectScrollbar(0)
- ,selectTabbar(0)
- ,selectBell(0)
-+,selectSetEncoding(0)
- ,m_clearHistory(0)
- ,m_findHistory(0)
- ,m_saveHistory(0)
diff --git a/kde-base/kooka/ChangeLog b/kde-base/kooka/ChangeLog
index d5955f62edd1..3442fd8d43a6 100644
--- a/kde-base/kooka/ChangeLog
+++ b/kde-base/kooka/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kooka
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/ChangeLog,v 1.64 2007/02/04 02:45:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/ChangeLog,v 1.65 2007/02/05 11:55:30 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdegraphics-3.4.1-gocr.patch,
+  -files/configure-fix-kdegraphics-kadmos.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kooka-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch b/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch
deleted file mode 100644
index 1f0334b99ef9..000000000000
--- a/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: kooka/configure.in.in
-===================================================================
---- kooka/configure.in.in	(revision 428265)
-+++ kooka/configure.in.in	(working copy)
-@@ -2,21 +2,32 @@
- dnl AC_CHECK_LIB(Pgm2asc,pgm2asc)
- dnl should define HAVE_LIBPGM2ASC if available
- 
--AC_ARG_WITH(kadmos-dir,
--AC_HELP_STRING([--with-kadmos-dir],[sets the path to the kadmos engine]),
--	[ac_kadmos_value=$withval], [ac_kadmos_value=NONE])
-+AC_ARG_WITH([kadmos],
-+  [AS_HELP_STRING([--with-kadmos],
-+    [Enable the kadmos OCR engine @<:@default=check@:>@])],
-+  [], with_kadmos=check)
- 
-+AC_ARG_WITH([kadmos-dir],
-+  AS_HELP_STRING([--with-kadmos-dir],
-+    [sets the path to the kadmos engine @<:@default=/usr/local@:>@]),
-+  [ac_kadmos_value=$withval], [ac_kadmos_value=/usr/local])
-+
- KADMOS_INC=
- KADMOS_LIB=
- 
--if test -r "$ac_kadmos_value/kadmos.h"; then
--	KADMOS_INC="-I$ac_kadmos_value"
--	KADMOS_LIB="$ac_kadmos_value/librep.a"
--	AC_DEFINE_UNQUOTED(HAVE_KADMOS, 1, [Defines if your system has the kadmos libraries])
--elif test ! "x$ac_kadmos_value" = "xNONE"; then
--	AC_MSG_WARN([couldn't find kadmos engine header file under $ac_kadmos_value/kadmos.h])
-+if test "x$with_kadmos" != xno; then
-+	if test -r "$ac_kadmos_value/kadmos.h"; then
-+		KADMOS_INC="-I$ac_kadmos_value"
-+		KADMOS_LIB="$ac_kadmos_value/librep.a"
-+		AC_DEFINE_UNQUOTED(HAVE_KADMOS, 1, [Defines if your system has the kadmos libraries])
-+	else
-+		AC_MSG_WARN([couldn't find kadmos engine header file under $ac_kadmos_value/kadmos.h])
-+	fi
-+
-+	if test "x$with_kadmos" != xcheck && test -z "$KADMOS_LIB"; then
-+		AC_MSG_FAILURE([--with-kadmos was given, but test for kadmos failed])
-+	fi
- fi
- 
- AC_SUBST(KADMOS_LIB)
- AC_SUBST(KADMOS_INC)
--
diff --git a/kde-base/kooka/files/kdegraphics-3.4.1-gocr.patch b/kde-base/kooka/files/kdegraphics-3.4.1-gocr.patch
deleted file mode 100644
index 1edb6b89bf9a..000000000000
--- a/kde-base/kooka/files/kdegraphics-3.4.1-gocr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur kdegraphics-3.4.1.orig/kooka/ksaneocr.cpp kdegraphics-3.4.1/kooka/ksaneocr.cpp
---- kdegraphics-3.4.1.orig/kooka/ksaneocr.cpp	2005-05-23 14:05:50.000000000 +0200
-+++ kdegraphics-3.4.1/kooka/ksaneocr.cpp	2005-05-31 18:31:43.000000000 +0200
-@@ -108,6 +108,10 @@
- 	{
- 	    m_ocrEngine = OCRAD;
- 	}
-+	else if( eng == "gocr" )
-+	{
-+	    m_ocrEngine = GOCR;
-+	}
- 
- #ifdef HAVE_KADMOS
-         else if( eng == QString("kadmos") ) m_ocrEngine = KADMOS;
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index c91125f9d8c0..d7a215c71c28 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.104 2007/02/04 02:46:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.105 2007/02/05 12:24:44 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kopete-0.12.1-icqfix3.patch, -files/kopete-3.5.3-icqfix.patch,
+  -files/kopete-3.5.x-oscarcontacts.patch,
+  -files/configure-fix-kdenetwork-gadu.patch,
+  -files/configure-fix-kdenetwork-xmms.patch, -files/disable-meanwhile.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kopete-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kopete/files/configure-fix-kdenetwork-gadu.patch b/kde-base/kopete/files/configure-fix-kdenetwork-gadu.patch
deleted file mode 100644
index 16b62aef9c0e..000000000000
--- a/kde-base/kopete/files/configure-fix-kdenetwork-gadu.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: kopete/protocols/configure.in.in
-===================================================================
---- kopete/protocols/configure.in.in	(revision 433553)
-+++ kopete/protocols/configure.in.in	(working copy)
-@@ -10,6 +10,11 @@
- ac_libgadu_includes=""
- ac_libgadu_libs=""
- 
-+AC_ARG_WITH(external-libgadu,
-+  [AS_HELP_STRING(--with-external-libgadu,
-+    [use external libgadu library @<:@default=check@:>@])],
-+  [], with_external_libgadu=check)
-+
- AC_ARG_WITH(libgadu-includes,
- 	AC_HELP_STRING([--with-libgadu-includes=DIR], [where the libgadu includes are.]),
- 	[  ac_libgadu_includes="$withval" ])
-@@ -26,12 +31,12 @@
- 	LIBGG_LIBS="-L$ac_libgadu_libs"
- fi
- 
--
--ac_save_LIBS="$LIBS"
--ac_save_CFLAGS="$CFLAGS"
--LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
--CFLAGS="$CFLAGS $LIBGG_INCLUDES"
--AC_MSG_CHECKING([libgadu version 1.5(rcX) with pthread support])
-+if test "x$with_external_libgadu" != xno; then
-+	ac_save_LIBS="$LIBS"
-+	ac_save_CFLAGS="$CFLAGS"
-+	LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
-+	CFLAGS="$CFLAGS $LIBGG_INCLUDES"
-+	AC_MSG_CHECKING([libgadu version 1.5(rcX) with pthread support])
- 	AC_TRY_RUN(
- 	[
- 	
-@@ -61,29 +66,38 @@
- 	], [
- 	LIBGG_LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
- 	AC_MSG_RESULT([yes])
--	AC_SUBST(LIBGG_INCLUDES)
--	AC_SUBST(LIBGG_LIBS)
- 	COMPILE_GADU=true
--	AC_SUBST(COMPILE_GADU)
- 	use_libgadu_copy=
- 	], [
--	if test "$kde_use_threading" = "yes" ; then
--	AC_MSG_RESULT([no, falling back on supplied libgadu-copy])
--	use_libgadu_copy=yes
--	COMPILE_GADU=true
-+	AC_MSG_RESULT([no])
-+	])
-+	LIBS="$ac_save_LIBS"
-+	CFLAGS="$ac_save_CFLAGS"
-+
-+	if test "x$with_external_libgadu" != xcheck && test -z "$COMPILE_GADU"; then
-+		AC_MSG_FAILURE([--with-external-libgadu was given, but test for libgadu failed])
-+	fi
-+fi
-+
-+if test -z "$COMPILE_GADU"; then
-+	AC_MSG_CHECKING([if supplied libgadu-copy can be used])
-+	if test "$kde_use_threading" = "yes"; then
-+		AC_MSG_RESULT([yes])
-+		use_libgadu_copy=yes
-+		COMPILE_GADU=true
- 	else
--	use_libgadu_copy=
--	AC_MSG_RESULT([no, cannot fall back on libgadu-copy (no pthread)])
--	COMPILE_GADU=	
-+		AC_MSG_RESULT([no (no pthread), support for Gadu-Gadu will be disabled])
-+		use_libgadu_copy=
-+		COMPILE_GADU=
- 	fi
--	AC_SUBST(COMPILE_GADU)	
--	])
-+fi
-+
-+AC_SUBST(LIBGG_INCLUDES)
-+AC_SUBST(LIBGG_LIBS)
-+AC_SUBST(COMPILE_GADU)
- AM_CONDITIONAL(include_gadu, test -n "$COMPILE_GADU")
- AM_CONDITIONAL(include_libggcopy, test -n "$use_libgadu_copy")
--LIBS="$ac_save_LIBS"
--CFLAGS="$ac_save_CFLAGS"
- 
--
- if test "$use_libgadu_copy" = "yes"; then
- 	cp ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.in \
- 	${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
diff --git a/kde-base/kopete/files/configure-fix-kdenetwork-xmms.patch b/kde-base/kopete/files/configure-fix-kdenetwork-xmms.patch
deleted file mode 100644
index b9e9773a7abe..000000000000
--- a/kde-base/kopete/files/configure-fix-kdenetwork-xmms.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kopete/plugins/nowlistening/configure.in.in
-===================================================================
---- kopete/plugins/nowlistening/configure.in.in	(revision 433553)
-+++ kopete/plugins/nowlistening/configure.in.in	(working copy)
-@@ -41,7 +41,19 @@
-   fi
- ])
- 
--AC_CHECK_XMMS
-+AC_ARG_WITH(xmms,
-+  [AS_HELP_STRING(--with-xmms,
-+    [enable support for XMMS @<:@default=check@:>@])],
-+  [], with_xmms=check)
-+
-+if test "x$with_xmms" != xno; then
-+  AC_CHECK_XMMS
-+
-+  if test "x$with_xmms" != xcheck && test "x$ac_cv_have_xmms" = xno; then
-+    AC_MSG_FAILURE([--with-xmms was given, but test for XMMS failed])
-+  fi
-+fi
-+
- AC_SUBST(XMMS_LIBS)
- AC_SUBST(XMMS_LDFLAGS)
- AC_SUBST(XMMS_INCLUDES)
-Index: configure.in.bot
-===================================================================
---- configure.in.bot	(revision 433553)
-+++ configure.in.bot	(working copy)
-@@ -63,7 +63,7 @@
-   all_tests=bad
- fi
- 
--if test -z "$XMMS_LIBS"; then
-+if test "x$with_xmms" = xcheck && test -z "$XMMS_LIBS"; then
-   echo ""
-   echo "You're missing the XMMS libraries, or the libxmms development package."
-   echo "Without libxmms Kopete's NowListening plugin won't be able to talk to"
diff --git a/kde-base/kopete/files/disable-meanwhile.diff b/kde-base/kopete/files/disable-meanwhile.diff
deleted file mode 100644
index 7ecb0e6dfff5..000000000000
--- a/kde-base/kopete/files/disable-meanwhile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kopete/protocols/configure.in.in	2005-05-23 15:07:47.000000000 +0300
-+++ kopete/protocols/configure.in.in	2005-06-30 21:51:09.000000000 +0300
-@@ -196,7 +196,7 @@
- 	AC_MSG_RESULT([yes])
- 	AC_SUBST(MEANWHILE_INCLUDES)
- 	AC_SUBST(MEANWHILE_LIBS)
--	COMPILE_MEANWHILE=true
-+	COMPILE_MEANWHILE=
- 	AC_SUBST(COMPILE_MEANWHILE)
- ], [
- 	AC_MSG_RESULT([no])
diff --git a/kde-base/kopete/files/kopete-0.12.1-icqfix3.patch b/kde-base/kopete/files/kopete-0.12.1-icqfix3.patch
deleted file mode 100644
index ac786297eb5e..000000000000
--- a/kde-base/kopete/files/kopete-0.12.1-icqfix3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kopete/protocols/oscar/liboscar/oscartypes.h
-===================================================================
---- kopete/protocols/oscar/liboscar/oscartypes.h	(revision 568242)
-+++ kopete/protocols/oscar/liboscar/oscartypes.h	(revision 568243)
-@@ -239,7 +239,7 @@
- 	const WORD ICQ_MAJOR 			= 0x0014;
- 	const WORD ICQ_MINOR 			= 0x0034;
- 	const WORD ICQ_POINT 			= 0x0000;
--	const WORD ICQ_BUILD 			= 0x0A0F;
-+	const WORD ICQ_BUILD 			= 0x0BB8;
- 	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
- 	const char ICQ_COUNTRY[] 		= "us";
- 	const char ICQ_LANG[] 			= "en";
diff --git a/kde-base/kopete/files/kopete-3.5.3-icqfix.patch b/kde-base/kopete/files/kopete-3.5.3-icqfix.patch
deleted file mode 100644
index 6370565cf64a..000000000000
--- a/kde-base/kopete/files/kopete-3.5.3-icqfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: kopete/protocols/oscar/liboscar/oscartypes.h
-===================================================================
---- kopete/protocols/oscar/liboscar/oscartypes.h	(revision 561015)
-+++ kopete/protocols/oscar/liboscar/oscartypes.h	(revision 561016)
-@@ -232,13 +232,13 @@
- 
- 	/* ICQ Version Characteristics */
- 	const unsigned char ICQ_TCP_VERSION 	= 0x0008;
--	const char ICQ_CLIENTSTRING[] 		= "ICQ Inc. - Product of ICQ (TM).2003a.5.45.1.3777.85";
-+	const char ICQ_CLIENTSTRING[] 		= "ICQBasic";
- 	const WORD ICQ_CLIENTID 		= 0x010A;
--	const WORD ICQ_MAJOR 			= 0x0005;
--	const WORD ICQ_MINOR 			= 0x002D;
--	const WORD ICQ_POINT 			= 0x0001;
--	const WORD ICQ_BUILD 			= 0x0EC1;
--	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x00, 0x55 };
-+	const WORD ICQ_MAJOR 			= 0x0014;
-+	const WORD ICQ_MINOR 			= 0x0034;
-+	const WORD ICQ_POINT 			= 0x0000;
-+	const WORD ICQ_BUILD 			= 0x0A0F;
-+	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
- 	const char ICQ_COUNTRY[] 		= "us";
- 	const char ICQ_LANG[] 			= "en";
- 
diff --git a/kde-base/kopete/files/kopete-3.5.x-oscarcontacts.patch b/kde-base/kopete/files/kopete-3.5.x-oscarcontacts.patch
deleted file mode 100644
index 7ea35079f58e..000000000000
--- a/kde-base/kopete/files/kopete-3.5.x-oscarcontacts.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=141675
-http://bugs.kde.org/show_bug.cgi?id=104243
-
-Index: kopete/protocols/oscar/liboscar/ssimanager.cpp
-===================================================================
---- kopete/protocols/oscar/liboscar/ssimanager.cpp	(revision 565951)
-+++ kopete/protocols/oscar/liboscar/ssimanager.cpp	(working copy)
-@@ -71,18 +71,65 @@
- 		while ( it != d->SSIList.end() && d->SSIList.count() > 0 )
- 			it = d->SSIList.remove( it );
- 	};
-+	
-+	d->nextContactId = 0;
-+	d->nextGroupId = 0;
- }
- 
- WORD SSIManager::nextContactId()
- {
--	d->nextContactId++;
--	return d->nextContactId;
-+	if ( d->nextContactId == 0 )
-+		d->nextContactId++;
-+	
-+	QValueList<Oscar::SSI>::const_iterator it, listEnd;
-+	
-+	for ( ; d->nextContactId < 0x8000; d->nextContactId++ )
-+	{
-+		bool freeId = true;
-+		listEnd = d->SSIList.end();
-+		for ( it = d->SSIList.begin(); it != listEnd; ++it )
-+		{
-+			if ( ( *it ).bid() == d->nextContactId )
-+			{
-+				freeId = false;
-+				break;
-+			}
-+		}
-+	
-+		if ( freeId )
-+			return d->nextContactId;
-+	}
-+	
-+	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No free id!" << endl;
-+	return 0xFFFF;
- }
- 
- WORD SSIManager::nextGroupId()
- {
--	d->nextGroupId++;
--	return d->nextGroupId;
-+	if ( d->nextGroupId == 0 )
-+		d->nextGroupId++;
-+	
-+	QValueList<Oscar::SSI>::const_iterator it, listEnd;
-+	
-+	for ( ; d->nextGroupId < 0x8000; d->nextGroupId++ )
-+	{
-+		bool freeId = true;
-+		listEnd = d->SSIList.end();
-+		for ( it = d->SSIList.begin(); it != listEnd; ++it )
-+		{
-+			if ( ( *it ).type() == ROSTER_GROUP && ( *it ).gid() == d->nextGroupId )
-+			{
-+				freeId = false;
-+				break;
-+			}
-+		}
-+		
-+		if ( freeId )
-+			return d->nextGroupId;
-+	}
-+	
-+	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No free group id!" << endl;
-+	return 0xFFFF;
- }
- 
- WORD SSIManager::numberOfItems() const
-@@ -379,8 +426,6 @@
- 	if ( !group.name().isEmpty() ) //avoid the group with gid 0 and bid 0
- 	{	// the group is really new
- 		kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding group '" << group.name() << "' to SSI list" << endl;
--		if ( group.gid() > d->nextGroupId )
--			d->nextGroupId = group.gid();
- 		
- 		d->SSIList.append( group );
- 		emit groupAdded( group );
-@@ -394,6 +439,10 @@
- 	QString groupName = group.name();
- 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Removing group " << group.name() << endl;
- 	int remcount = d->SSIList.remove( group );
-+	
-+	if ( d->nextGroupId > group.gid() )
-+		d->nextGroupId = group.gid();
-+	
- 	if ( remcount == 0 )
- 	{
- 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No groups removed" << endl;
-@@ -420,13 +469,6 @@
- 
- bool SSIManager::newContact( const Oscar::SSI& contact )
- {
--	//what to validate?
--	if ( contact.bid() > d->nextContactId )
--	{
--		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Setting next contact ID to " << contact.bid() << endl;
--		d->nextContactId = contact.bid();
--	}
--	
- 	if ( d->SSIList.findIndex( contact ) == -1 )
- 	{
- 		kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding contact '" << contact.name() << "' to SSI list" << endl;
-@@ -443,6 +485,9 @@
- 	QString contactName = contact.name();
- 	int remcount = d->SSIList.remove( contact );
- 	
-+	if ( d->nextContactId > contact.bid() )
-+		d->nextContactId = contact.bid();
-+	
- 	if ( remcount == 0 )
- 	{
- 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No contacts were removed." << endl;
-@@ -476,6 +521,10 @@
- bool SSIManager::removeItem( const Oscar::SSI& item )
- {
- 	d->SSIList.remove( item );
-+	
-+	if ( d->nextContactId > item.bid() )
-+		d->nextContactId = item.bid();
-+	
- 	return true;
- }
- 
diff --git a/kde-base/korundum/ChangeLog b/kde-base/korundum/ChangeLog
index 71dc176c42c8..08323114c631 100644
--- a/kde-base/korundum/ChangeLog
+++ b/kde-base/korundum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/korundum
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.56 2007/02/04 02:47:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.57 2007/02/05 12:11:11 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/korundum-3.5.4-more.patch, -files/qtruby-3.5.4-more.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -korundum-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/korundum/files/korundum-3.5.4-more.patch b/kde-base/korundum/files/korundum-3.5.4-more.patch
deleted file mode 100644
index 96d2fe0a9fa7..000000000000
--- a/kde-base/korundum/files/korundum-3.5.4-more.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Index: ChangeLog
-===================================================================
---- korundum/ChangeLog	(revision 565692)
-+++ korundum/ChangeLog	(revision 578517)
-@@ -1,3 +1,8 @@
-+2006-08-18  Richard Dale  <rdale@foton.es>
-+
-+	* Added a KActionPtrList marshaller. Fixes problem reported by
-+	  eskatos on the #qtruby irc channel.
-+
- 2006-06-05  Richard Dale  <rdale@foton.es>
- 
- 	* The metaObject methods for slots and signals are no longer added when
-Index: rubylib/korundum/Korundum.cpp
-===================================================================
---- korundum/rubylib/korundum/Korundum.cpp	(revision 565692)
-+++ korundum/rubylib/korundum/Korundum.cpp	(revision 578517)
-@@ -661,6 +661,8 @@
- 	~EmitDCOPSignal() 
- 	{
- 		delete[] _stack;
-+		delete _stream;
-+		delete _data;
- 	}
-     const MocArgument &arg() { return _args[_cur]; }
-     SmokeType type() { return arg().st; }
-@@ -878,6 +880,9 @@
- 	~InvokeDCOPSlot() {
- 		delete[] _stack;
- 		delete _stream;
-+		for(int i=0;i<_items;++i) {
-+			free(_sp++);
-+		}
- 	}
- };
- 
-Index: rubylib/korundum/kdehandlers.cpp
-===================================================================
---- korundum/rubylib/korundum/kdehandlers.cpp	(revision 565692)
-+++ korundum/rubylib/korundum/kdehandlers.cpp	(revision 578517)
-@@ -642,6 +642,60 @@
- }
- #endif
- 
-+void marshall_KActionPtrList(Marshall *m) {
-+	switch(m->action()) {
-+	case Marshall::FromVALUE: 
-+		{
-+	    }			
-+		break;
-+	case Marshall::ToVALUE: 
-+		{
-+		KActionPtrList *valuelist = (KActionPtrList*)m->item().s_voidp;
-+		if (!valuelist) {
-+			*(m->var()) = Qnil;
-+			break;
-+	    }
-+
-+	    VALUE av = rb_ary_new();
-+
-+	    int ix = m->smoke()->idClass("KAction");
-+	    const char * className = m->smoke()->binding->className(ix);
-+
-+		for (	KActionPtrList::Iterator it = valuelist->begin();
-+				it != valuelist->end();
-+				++it ) 
-+		{
-+			void *p = (*it);
-+
-+			if (m->item().s_voidp == 0) {
-+		    	*(m->var()) = Qnil;
-+		    	break;
-+			}
-+
-+			VALUE obj = getPointerObject(p);
-+			if (obj == Qnil) {
-+				smokeruby_object  * o = ALLOC(smokeruby_object);
-+				o->smoke = m->smoke();
-+				o->classId = o->smoke->idClass("KAction");
-+				o->ptr = p;
-+				o->allocated = false;
-+				obj = set_obj_info(className, o);
-+			}
-+			rb_ary_push(av, obj);
-+		}
-+
-+		if (m->cleanup())
-+			delete valuelist;
-+		else
-+			*(m->var()) = av;		
-+		}
-+		break;
-+	default:
-+		m->unsupported();
-+		break;
-+	}
-+}
-+
- void marshall_KTraderOfferList(Marshall *m) {
- 	switch(m->action()) {
- 	case Marshall::FromVALUE: 
-@@ -1261,6 +1315,7 @@
- TypeHandler KDE_handlers[] = {
-     { "QCStringList", marshall_QCStringList },
-     { "KCmdLineOptions*", marshall_KCmdLineOptions },
-+    { "KActionPtrList", marshall_KActionList },
-     { "QPtrList<KAction>", marshall_KActionList },
-     { "QPtrList<KAction>&", marshall_KActionList },
-     { "KMimeType::List", marshall_KMimeTypeList },
-@@ -1291,6 +1346,8 @@
-     { "QPtrList<KParts::Plugin>", marshall_KPartPluginList },
-     { "QPtrList<KParts::ReadOnlyPart>", marshall_KPartReadOnlyPartList },
-     { "QPtrList<KServiceTypeProfile>&", marshall_KServiceTypeProfileList },
-+    { "QValueList<KAction*>", marshall_KActionPtrList },
-+    { "KActionPtrList", marshall_KActionPtrList },
-     { "QValueList<KAboutPerson>", marshall_KAboutPersonList },
-     { "QValueList<KAboutTranslator>", marshall_KAboutTranslatorList },
-     { "QValueList<KIO::CopyInfo>&", marshall_KIOCopyInfoList },
diff --git a/kde-base/korundum/files/qtruby-3.5.4-more.patch b/kde-base/korundum/files/qtruby-3.5.4-more.patch
deleted file mode 100644
index 614f495fbaeb..000000000000
--- a/kde-base/korundum/files/qtruby-3.5.4-more.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-Index: ChangeLog
-===================================================================
---- qtruby/ChangeLog	(revision 565692)
-+++ qtruby/ChangeLog	(revision 578513)
-@@ -1,3 +1,13 @@
-+2006-08-29  Richard Dale  <rdale@foton.es>
-+
-+	* Backported some memory leak fixes from Qt4 QtRuby
-+
-+2006-08-10  Richard Dale  <rdale@foton.es>
-+
-+	* The Ruby VALUE to 'uchar *' marshaller wasn't working correctly if the
-+	  Ruby string contained nulls. Fixed by Dirk Mueller (thanks) and also 
-+	  applied for 'char *' types.
-+
- 2006-07-12  Richard Dale  <rdale@foton.es>
- 
- 	* The Ruby String to 'char *' and String to 'unsigned char *' were using
-Index: rubylib/qtruby/handlers.cpp
-===================================================================
---- qtruby/rubylib/qtruby/handlers.cpp	(revision 565692)
-+++ qtruby/rubylib/qtruby/handlers.cpp	(revision 578513)
-@@ -422,6 +422,7 @@
-     Smoke::Index ccMeth = o->smoke->findMethod(o->classId, ccId);
- 
-     if(!ccMeth) {
-+	delete[] ccArg;
- 	return 0;
-     }
- 	Smoke::Index method = o->smoke->methodMaps[ccMeth].method;
-@@ -747,17 +748,21 @@
- 
- static void marshall_charP(Marshall *m) {
-     switch(m->action()) {
--      case Marshall::FromVALUE:
--	{
--	    VALUE rv = *(m->var());
--	    if(rv == Qnil) {
--                m->item().s_voidp = 0;
--                break;
--	    }
--		
--        m->item().s_voidp = strdup(StringValuePtr(rv));
--	}
--	break;
-+    case Marshall::FromVALUE:
-+    {
-+        VALUE rv = *(m->var());
-+	    if (rv == Qnil) {
-+            m->item().s_voidp = 0;
-+            break;
-+        }
-+	
-+        int len = RSTRING(rv)->len;
-+        char* mem = (char*) malloc(len+1);
-+        memcpy(mem, StringValuePtr(rv), len);
-+        mem[len] ='\0';
-+        m->item().s_voidp = mem;
-+    }
-+        break;
-       case Marshall::ToVALUE:
- 	{
- 	    char *p = (char*)m->item().s_voidp;
-@@ -777,14 +782,18 @@
- 
- void marshall_ucharP(Marshall *m) {
-     switch(m->action()) {
--      case Marshall::FromVALUE:
--	{
--	    VALUE rv = *(m->var());
--	    if(rv == Qnil) {
--		m->item().s_voidp = 0;
--		break;
--	    }
--        m->item().s_voidp = strdup(StringValuePtr(rv));
-+    case Marshall::FromVALUE:
-+    {
-+        VALUE rv = *(m->var());
-+        if (rv == Qnil) {
-+            m->item().s_voidp = 0;
-+            break;
-+        }
-+        int len = RSTRING(rv)->len;
-+        char* mem = (char*) malloc(len+1);
-+        memcpy(mem, StringValuePtr(rv), len);
-+        mem[len] ='\0';
-+        m->item().s_voidp = mem;
- 	}
- 	break;
-       case Marshall::ToVALUE:
-@@ -1836,8 +1845,8 @@
-     }
- }
- 
--#define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace { char ListIdent##STR[] = #Item; };  \
--        Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,ListIdent##STR>;
-+#define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace dummy { char ListIdent##STR[] = #Item; };  \
-+        Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,dummy::ListIdent##STR>;
- 
- DEF_VALUELIST_MARSHALLER( QVariantList, QValueList<QVariant>, QVariant, QValueList<QVariant>::Iterator )
- DEF_VALUELIST_MARSHALLER( QPixmapList, QValueList<QPixmap>, QPixmap, QValueList<QPixmap>::Iterator )
-Index: rubylib/qtruby/Qt.cpp
-===================================================================
---- qtruby/rubylib/qtruby/Qt.cpp	(revision 565692)
-+++ qtruby/rubylib/qtruby/Qt.cpp	(revision 578513)
-@@ -1351,28 +1351,32 @@
- 	return obj;
- }
- 
--static QCString
-+static QCString *
- find_cached_selector(int argc, VALUE * argv, VALUE klass, char * methodName)
- {
-     // Look in the cache
--	QCString mcid(rb_class2name(klass));
--	mcid += ';';
--	mcid += methodName;
-+static QCString * mcid = 0;
-+	if (mcid == 0) {
-+		mcid = new QCString();
-+	}
-+	*mcid = rb_class2name(klass);
-+	*mcid += ';';
-+	*mcid += methodName;
- 	for(int i=3; i<argc ; i++)
- 	{
--		mcid += ';';
--		mcid += get_VALUEtype(argv[i]);
-+		*mcid += ';';
-+		*mcid += get_VALUEtype(argv[i]);
- 	}
- 	
--	Smoke::Index *rcid = methcache.find((const char *)mcid);
-+	Smoke::Index *rcid = methcache.find((const char *)*mcid);
- #ifdef DEBUG
--	if (do_debug & qtdb_calls) qWarning("method_missing mcid: %s", (const char *) mcid);
-+	if (do_debug & qtdb_calls) qWarning("method_missing mcid: %s", (const char *) *mcid);
- #endif
- 	
- 	if (rcid) {
- 		// Got a hit
- #ifdef DEBUG
--		if (do_debug & qtdb_calls) qWarning("method_missing cache hit, mcid: %s", (const char *) mcid);
-+		if (do_debug & qtdb_calls) qWarning("method_missing cache hit, mcid: %s", (const char *) *mcid);
- #endif
- 		_current_method = *rcid;
- 	} else {
-@@ -1389,27 +1393,32 @@
-     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
- 
- 	// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
--	QString pred(rb_id2name(SYM2ID(argv[0])));
--	if (pred.endsWith("?")) {
-+static QString * pred = 0;
-+	if (pred == 0) {
-+		pred = new QString();
-+	}
-+	
-+	*pred = methodName;
-+	if (pred->endsWith("?")) {
- 		smokeruby_object *o = value_obj_info(self);
- 		if(!o || !o->ptr) {
- 			rb_call_super(argc, argv);
- 		}
- 		
- 		// Drop the trailing '?'
--		pred.replace(pred.length() - 1, 1, "");
-+		pred->replace(pred->length() - 1, 1, "");
- 		
--		pred.replace(0, 1, pred.at(0).upper());
--		pred.replace(0, 0, QString("is"));
--		Smoke::Index meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred.latin1());
-+		pred->replace(0, 1, pred->at(0).upper());
-+		pred->replace(0, 0, QString("is"));
-+		Smoke::Index meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred->latin1());
- 		
- 		if (meth == 0) {
--			pred.replace(0, 2, QString("has"));
--			meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred.latin1());
-+			pred->replace(0, 2, QString("has"));
-+			meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred->latin1());
- 		}
- 		
- 		if (meth > 0) {
--			methodName = (char *) pred.latin1();
-+			methodName = (char *) pred->latin1();
- 		}
- 	}
- 		
-@@ -1423,18 +1432,26 @@
-     }
- 
- 	{
--		QCString mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
-+		QCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
- 
- 		if (_current_method == -1) {
- 			// Find the C++ method to call. Do that from Ruby for now
- 
- 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
- 			if (_current_method == -1) {
--				QRegExp rx("^[-+%/|]$");
--				QString op(rb_id2name(SYM2ID(argv[0])));
--				if (rx.search(op) != -1) {
-+				char * op = rb_id2name(SYM2ID(argv[0]));
-+				if (	qstrcmp(op, "-") == 0
-+						|| qstrcmp(op, "+") == 0
-+						|| qstrcmp(op, "/") == 0
-+						|| qstrcmp(op, "%") == 0
-+						|| qstrcmp(op, "|") == 0 )
-+				{
- 					// Look for operator methods of the form 'operator+=', 'operator-=' and so on..
--					temp_stack[1] = rb_str_new2(op.append("=").latin1());
-+					char op1[3];
-+					op1[0] = op[0];
-+					op1[1] = '=';
-+					op1[2] = '\0';
-+					temp_stack[1] = rb_str_new2(op1);
- 					retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
- 				}
- 
-@@ -1448,26 +1465,31 @@
- 							&& isDerivedFrom(o->smoke, o->classId, o->smoke->idClass("QObject")) )
- 					{
- 						QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject"));
--						QString prop(rb_id2name(SYM2ID(argv[0])));
-+static QString * prop = 0;
-+						if (prop == 0) {
-+							prop = new QString();
-+						}
-+						
-+						*prop = rb_id2name(SYM2ID(argv[0]));
- 						QMetaObject * meta = qobject->metaObject();
- 						if (argc == 1) {
--							if (prop.endsWith("?")) {
--								prop.replace(0, 1, pred.at(0).upper());
--								prop.replace(0, 0, QString("is"));
--								if (meta->findProperty(prop.latin1(), true) == -1) {
--									prop.replace(0, 2, QString("has"));
-+							if (prop->endsWith("?")) {
-+								prop->replace(0, 1, pred->at(0).upper());
-+								prop->replace(0, 0, QString("is"));
-+								if (meta->findProperty(prop->latin1(), true) == -1) {
-+									prop->replace(0, 2, QString("has"));
- 								}
- 							}
- 
--							if (meta->findProperty(prop.latin1(), true) != -1) {
--								VALUE qvariant = rb_funcall(self, rb_intern("property"), 1, rb_str_new2(prop.latin1()));
-+							if (meta->findProperty(prop->latin1(), true) != -1) {
-+								VALUE qvariant = rb_funcall(self, rb_intern("property"), 1, rb_str_new2(prop->latin1()));
- 								return rb_funcall(qvariant, rb_intern("to_ruby"), 0);
- 							}
--						} else if (argc == 2 && prop.endsWith("=")) {
--							prop.replace("=", "");
--							if (meta->findProperty(prop.latin1(), true) != -1) {
-+						} else if (argc == 2 && prop->endsWith("=")) {
-+							prop->replace("=", "");
-+							if (meta->findProperty(prop->latin1(), true) != -1) {
- 								VALUE qvariant = rb_funcall(qvariant_class, rb_intern("new"), 1, argv[1]);
--								return rb_funcall(self, rb_intern("setProperty"), 2, rb_str_new2(prop.latin1()), qvariant);
-+								return rb_funcall(self, rb_intern("setProperty"), 2, rb_str_new2(prop->latin1()), qvariant);
- 							}
- 						}
- 					}
-@@ -1476,7 +1498,7 @@
- 				}
- 			}
- 			// Success. Cache result.
--			methcache.insert((const char *)mcid, new Smoke::Index(_current_method));
-+			methcache.insert((const char *)*mcid, new Smoke::Index(_current_method));
- 		}
- 	}
- 	
-@@ -1503,21 +1525,25 @@
-     }
- 
-     {
--		QCString mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
-+		QCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
- 
- 		if (_current_method == -1) {
- 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
-          Q_UNUSED(retval);
- 			if (_current_method != -1) {
- 				// Success. Cache result.
--				methcache.insert((const char *)mcid, new Smoke::Index(_current_method));
-+				methcache.insert((const char *)*mcid, new Smoke::Index(_current_method));
- 			}
- 		}
- 	}
- 
-     if (_current_method == -1) {
--		QRegExp rx("[a-zA-Z]+");
--		if (rx.search(methodName) == -1) {
-+static QRegExp * rx = 0;
-+		if (rx == 0) {
-+			rx = new QRegExp("[a-zA-Z]+");
-+		}
-+
-+		if (rx->search(methodName) == -1) {
- 			// If an operator method hasn't been found as an instance method,
- 			// then look for a class method - after 'op(self,a)' try 'self.op(a)' 
- 	    	VALUE * method_stack = (VALUE *) calloc(argc - 1, sizeof(VALUE));
-@@ -1584,10 +1610,10 @@
- 	if (TYPE(self) == T_DATA) {
- 		// If a ruby block was passed then run that now
- 		if (rb_block_given_p()) {
--		rb_funcall(qt_internal_module, rb_intern("run_initializer_block"), 2, self, rb_block_proc());
-+			rb_funcall(qt_internal_module, rb_intern("run_initializer_block"), 2, self, rb_block_proc());
- 		}
-     
--	return self;
-+		return self;
-     }
- 
-     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
-@@ -1599,19 +1625,19 @@
-     temp_stack[2] = klass;
-     temp_stack[3] = self;
-     for (int count = 0; count < argc; count++) {
--	temp_stack[count+4] = argv[count];
-+		temp_stack[count+4] = argv[count];
-     }
- 
- 	{ 
- 		// Put this in a C block so that the mcid will be de-allocated at the end of the block,
- 		// rather than on f'n exit, to avoid the longjmp problem described below
--		QCString mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
-+		QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
- 
- 		if (_current_method == -1) {
- 			retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack);
- 			if (_current_method != -1) {
- 				// Success. Cache result.
--				methcache.insert((const char *)mcid, new Smoke::Index(_current_method));
-+				methcache.insert((const char *)*mcid, new Smoke::Index(_current_method));
- 			}
- 		}
- 	}
-@@ -1652,7 +1678,7 @@
-     VALUE * temp_stack = (VALUE *) calloc(argc + 1, sizeof(VALUE));
-     temp_stack[0] = rb_obj_alloc(klass);
-     for (int count = 0; count < argc; count++) {
--	temp_stack[count+1] = argv[count];
-+		temp_stack[count+1] = argv[count];
-     }
- 
-     VALUE result = rb_funcall2(qt_internal_module, rb_intern("try_initialize"), argc+1, temp_stack);
-@@ -1668,16 +1694,16 @@
-     VALUE result = Qnil;
- 
-     if (argc == 1 && TYPE(argv[0]) == T_ARRAY) {
--	// Convert '(ARGV)' to '(NUM, [$0]+ARGV)'
--	VALUE * local_argv = (VALUE *) calloc(argc + 1, sizeof(VALUE));
--	VALUE temp = rb_ary_dup(argv[0]);
--	rb_ary_unshift(temp, rb_gv_get("$0"));
--	local_argv[0] = INT2NUM(RARRAY(temp)->len);
--	local_argv[1] = temp;
--	result = new_qt(2, local_argv, klass);
--	free(local_argv);
-+		// Convert '(ARGV)' to '(NUM, [$0]+ARGV)'
-+		VALUE * local_argv = (VALUE *) calloc(argc + 1, sizeof(VALUE));
-+		VALUE temp = rb_ary_dup(argv[0]);
-+		rb_ary_unshift(temp, rb_gv_get("$0"));
-+		local_argv[0] = INT2NUM(RARRAY(temp)->len);
-+		local_argv[1] = temp;
-+		result = new_qt(2, local_argv, klass);
-+		free(local_argv);
-     } else {
--	result = new_qt(argc, argv, klass);
-+		result = new_qt(argc, argv, klass);
-     }
- 
-     rb_gv_set("$qApp", result);
-@@ -1735,9 +1761,9 @@
-     if(index < 0) return Qnil;
- 
-     if (isSignal) {
--	member = rb_funcall(qt_internal_module, rb_intern("signalAt"), 2, self, INT2NUM(index));
-+		member = rb_funcall(qt_internal_module, rb_intern("signalAt"), 2, self, INT2NUM(index));
-     } else {
--	member = rb_funcall(qt_internal_module, rb_intern("slotAt"), 2, self, INT2NUM(index));
-+		member = rb_funcall(qt_internal_module, rb_intern("slotAt"), 2, self, INT2NUM(index));
-     }
- 
-     VALUE mocArgs = rb_funcall(qt_internal_module, rb_intern("getMocArguments"), 1, member);
-@@ -1815,7 +1841,12 @@
-     }
- 
-     QString name(slotname);
--    name.replace(QRegExp("\\(.*"), "");
-+static QRegExp * rx = 0;
-+	if (rx == 0) {
-+		rx = new QRegExp("\\(.*");
-+	}
-+	name.replace(*rx, "");
-+
-     InvokeSlot slot(self, rb_intern(name.latin1()), mocArgs, _o);
-     slot.next();
- 
-@@ -2568,7 +2599,10 @@
- {
- 	VALUE klass = Qnil;
- 	QString packageName(package);
--	QRegExp scope_op("^([^:]+)::([^:]+)$");
-+static QRegExp * scope_op = 0;
-+	if (scope_op == 0) {
-+		scope_op = new QRegExp("^([^:]+)::([^:]+)$");
-+	 }
- 
- 	if (packageName.startsWith("KDE::ConfigSkeleton::ItemEnum::")) {
- 		klass = rb_define_class_under(kconfigskeleton_itemenum_class, package+strlen("KDE::ConfigSkeleton::EnumItem::"), base_class);
-@@ -2606,7 +2640,7 @@
- 	} else if (packageName.startsWith("Kontact::")) {
- 		klass = rb_define_class_under(kontact_module, package+strlen("Kontact::"), base_class);
- 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
--	} else if (packageName.startsWith("Ko") && scope_op.search(packageName) == -1) {
-+	} else if (packageName.startsWith("Ko") && scope_op->search(packageName) == -1) {
- 		klass = rb_define_class_under(koffice_module, package+strlen("Ko"), base_class);
- 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
- 	} else if (packageName.startsWith("Kate::")) {
-@@ -2618,11 +2652,11 @@
- 	} else if (packageName.startsWith("KTextEditor::")) {
- 		klass = rb_define_class_under(ktexteditor_module, package+strlen("KTextEditor::"), base_class);
- 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
--	} else if (scope_op.search(packageName) != -1) {
-+	} else if (scope_op->search(packageName) != -1) {
- 		// If an unrecognised classname of the form 'XXXXXX::YYYYYY' is found,
- 		// then create a module XXXXXX to put the class YYYYYY under
--		VALUE module = rb_define_module(scope_op.cap(1).latin1());
--		klass = rb_define_class_under(module, scope_op.cap(2).latin1(), base_class);
-+		VALUE module = rb_define_module(scope_op->cap(1).latin1());
-+		klass = rb_define_class_under(module, scope_op->cap(2).latin1(), base_class);
- 	} else if (	packageName.startsWith("K") 
- 				&& packageName.mid(1, 1).contains(QRegExp("[A-Z]")) == 1 ) 
- 	{
-@@ -2792,6 +2826,7 @@
- 
-     methcache.setAutoDelete(true);
-     classcache.setAutoDelete(true);
-+    classname.setAutoDelete(true);
- 
- 	if (qt_module == Qnil) {
- 		qt_module = rb_define_module("Qt");
diff --git a/kde-base/kpilot/ChangeLog b/kde-base/kpilot/ChangeLog
index 74e7b2425fc8..45682f43935a 100644
--- a/kde-base/kpilot/ChangeLog
+++ b/kde-base/kpilot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kpilot
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/ChangeLog,v 1.56 2007/01/27 15:17:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/ChangeLog,v 1.57 2007/02/05 12:25:24 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdepim-3.4.1-kpilot-fix.patch:
+  Remove unneeded patches.
 
   27 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kpilot-3.5.6.ebuild:
   Update the dependency version so who tries to unmask this will see what the
diff --git a/kde-base/kpilot/files/kdepim-3.4.1-kpilot-fix.patch b/kde-base/kpilot/files/kdepim-3.4.1-kpilot-fix.patch
deleted file mode 100644
index a6dcc7702e35..000000000000
--- a/kde-base/kpilot/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/kppp/ChangeLog b/kde-base/kppp/ChangeLog
index ae54fe87e8d0..789d184f4deb 100644
--- a/kde-base/kppp/ChangeLog
+++ b/kde-base/kppp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kppp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.64 2007/02/04 02:50:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.65 2007/02/05 11:45:02 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kppp-3.5.0-bindnow.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kppp-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kppp/files/kppp-3.5.0-bindnow.patch b/kde-base/kppp/files/kppp-3.5.0-bindnow.patch
deleted file mode 100644
index c52d94b16042..000000000000
--- a/kde-base/kppp/files/kppp-3.5.0-bindnow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdenetwork-3.5.0/kppp/Makefile.am
-===================================================================
---- kdenetwork-3.5.0.orig/kppp/Makefile.am
-+++ kdenetwork-3.5.0/kppp/Makefile.am
-@@ -51,7 +51,7 @@ kppp_SOURCES	= kpppwidget.cpp \
- 		KPPPIface.skel
- 
- # the library search path
--kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(BINDNOW_FLAGS)
- 
- # the libraries to link against. Be aware of the order. First the libraries,
- # that depend on the following ones.
diff --git a/kde-base/ksayit/ChangeLog b/kde-base/ksayit/ChangeLog
index 9586ccc65bba..fe8203cf3152 100644
--- a/kde-base/ksayit/ChangeLog
+++ b/kde-base/ksayit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksayit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ChangeLog,v 1.70 2007/02/04 02:53:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ChangeLog,v 1.71 2007/02/05 12:26:08 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/ksayit-3.4.3-pointer.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -ksayit-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/ksayit/files/ksayit-3.4.3-pointer.patch b/kde-base/ksayit/files/ksayit-3.4.3-pointer.patch
deleted file mode 100644
index 29fec54ab0bb..000000000000
--- a/kde-base/ksayit/files/ksayit-3.4.3-pointer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ksayit/src/fxpluginhandler.cpp.old	2005-11-27 05:19:14.000000000 +0900
-+++ ksayit/src/fxpluginhandler.cpp	2005-11-27 05:19:30.000000000 +0900
-@@ -97,7 +97,8 @@
-         plugin.description = p->getDescription_KS();
-         plugin.EffectID    = 0;
-         kdDebug(100200) << "FX-Plugin " << plugin.name << " Handle: " << plugin.handle << " registered." << endl;
--        destroyPlugin(p);
-+	// destroyPlugin(p);
-+	p = NULL;
-         plugin.p = NULL;
-         // add to list of available plugins
-         pmap[plugin.name] = plugin;
diff --git a/kde-base/ksim/ChangeLog b/kde-base/ksim/ChangeLog
index f30ee538dc63..bac450090715 100644
--- a/kde-base/ksim/ChangeLog
+++ b/kde-base/ksim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ChangeLog,v 1.71 2007/02/04 02:55:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ChangeLog,v 1.72 2007/02/05 11:45:28 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/configure-fix-kdeutils-snmp.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -ksim-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/ksim/files/configure-fix-kdeutils-snmp.patch b/kde-base/ksim/files/configure-fix-kdeutils-snmp.patch
deleted file mode 100644
index 9f48f7f6cf94..000000000000
--- a/kde-base/ksim/files/configure-fix-kdeutils-snmp.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: ksim/monitors/snmp/configure.in.in
-===================================================================
---- ksim/monitors/snmp/configure.in.in	(revision 433553)
-+++ ksim/monitors/snmp/configure.in.in	(working copy)
-@@ -1,17 +1,20 @@
-+AC_ARG_WITH(snmp,
-+  [AS_HELP_STRING(--with-snmp,
-+    [enable support for SNMP @<:@default=check@:>@])],
-+  [], with_snmp=check)
- 
--KDE_CHECK_HEADER( net-snmp/library/snmp_api.h, [ have_netsnmp_h=yes ], [ have_netsnmp_h=no ] )
-+enable_snmp=no
-+if test "x$with_snmp" != xno; then
-+  KDE_CHECK_HEADER( net-snmp/library/snmp_api.h, [ have_netsnmp_h=yes ], [ have_netsnmp_h=no ] )
- 
--enable_snmp=
--
--if test "$have_netsnmp_h" = yes; then
-+  if test "$have_netsnmp_h" = yes; then
-     KDE_CHECK_LIB( netsnmp, snmp_sess_init, [
-         AC_SUBST( LIBSNMP, "-lnetsnmp" )
-         enable_snmp=yes
-     ], [], [] )
--fi
-+  fi
- 
--if test "$enable_snmp" != yes; then
--
-+  if test "$enable_snmp" != yes; then
-     AC_MSG_CHECKING([if libnetsnmp needs -lcrypto])
- 
-     dnl use a different symbol to prevent autoconf from caching
-@@ -22,7 +25,11 @@
-     ], [
-         AC_MSG_RESULT(no)
-     ], [-lcrypto] )
-+  fi
-+
-+  if test "x$with_snmp" != xcheck && test "x$enable_snmp" != xyes; then
-+    AC_MSG_FAILURE([--with-snmp was given, but test for net-snmp failed])
-+  fi
- fi
- 
--AM_CONDITIONAL(include_ksim_monitors_snmp, test -n "$enable_snmp")
--
-+AM_CONDITIONAL(include_ksim_monitors_snmp, test "x$enable_snmp" = xyes)
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index 6ae0f4edd15b..413eadcc3139 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.58 2007/02/04 02:56:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.59 2007/02/05 12:09:35 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/ksmserver-3.5.2-freebsd-time.h-test.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -ksmserver-3.5.2.ebuild:
diff --git a/kde-base/ksmserver/files/ksmserver-3.5.2-freebsd-time.h-test.diff b/kde-base/ksmserver/files/ksmserver-3.5.2-freebsd-time.h-test.diff
deleted file mode 100644
index e3ec3a6634cd..000000000000
--- a/kde-base/ksmserver/files/ksmserver-3.5.2-freebsd-time.h-test.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdebase/ksmserver/legacy.cpp	2006/01/26 07:02:41	502474
-+++ kdebase/ksmserver/legacy.cpp	2006/03/29 11:44:07	523859
-@@ -40,6 +40,10 @@
- 
- #include "server.h"
- 
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+
- #include <unistd.h>
- 
- #include <qtimer.h>
diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index cc5d60edcbe3..e9a5b63109aa 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.79 2007/02/04 02:59:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.80 2007/02/05 11:47:35 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.4.1-configure.patch,
+  -files/ksysguard-3.5.2-crash-fix.diff, -files/ksysguard-3.5.2-fixes.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -ksysguard-3.5.2-r2.ebuild:
diff --git a/kde-base/ksysguard/files/kdebase-3.4.1-configure.patch b/kde-base/ksysguard/files/kdebase-3.4.1-configure.patch
deleted file mode 100644
index 9bc10ebbf56f..000000000000
--- a/kde-base/ksysguard/files/kdebase-3.4.1-configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: ksysguard/configure.in.in
-===================================================================
---- ksysguard/configure.in.in	(revision 420060)
-+++ ksysguard/configure.in.in	(working copy)
-@@ -23,17 +23,27 @@
- AM_CONDITIONAL(include_ksysguardd_openbsd, test "$UNAME" = OpenBSD)
- AC_SUBST(UNAME)
- 
--KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
--AC_SUBST(LIBSENSORS)
-+AC_ARG_WITH(sensors,
-+	[AS_HELP_STRING(--with-sensors,
-+		[enable support for lm_sensors @<:@default=check@:>@])],
-+	[], with_sensors=check)
- 
--dnl Check for dell laptop support
--AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
-+if test "x$with_sensors" != xno; then
-+	KDE_CHECK_HEADERS(sensors/sensors.h)
-+	KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
- 
-+	if test "x$with_readline" != xcheck && test -z "$LIBSENSORS"; then
-+        	AC_MSG_FAILURE([--with-sensors was given, but test for lm_sensors failed])
-+	fi
-+fi
-+
- case "$UNAME" in
- 	Linux) LIBHOSTS="$LIBSENSORS" ;;
- 	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
- 	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
- esac
- AC_SUBST(LIBHOSTS)
-+AC_SUBST(LIBSENSORS)
- 
--KDE_CHECK_HEADERS(sensors/sensors.h)
-+dnl Check for dell laptop support
-+AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
diff --git a/kde-base/ksysguard/files/ksysguard-3.5.2-crash-fix.diff b/kde-base/ksysguard/files/ksysguard-3.5.2-crash-fix.diff
deleted file mode 100644
index 789c0c26da45..000000000000
--- a/kde-base/ksysguard/files/ksysguard-3.5.2-crash-fix.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- branches/KDE/3.5/kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2005/09/29 13:24:25	465343
-+++ branches/KDE/3.5/kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2006/03/27 09:04:59	523046
-@@ -41,7 +41,7 @@
-   if ( mDaemon ) {
-     mDaemon->writeStdin( "quit\n", strlen( "quit\n" ) );
-     delete (KShellProcess*)mDaemon;
--		mDaemon = 0;
-+    mDaemon = 0;
-   }
- }
- 	
-@@ -50,9 +50,9 @@
- {
-   mDaemon = new KShellProcess;
- 
--	setHostName( host );
--	mShell = shell;
--	mCommand = command;
-+  setHostName( host );
-+  mShell = shell;
-+  mCommand = command;
- 
-   connect( mDaemon, SIGNAL( processExited( KProcess* ) ),
-            SLOT( daemonExited( KProcess* ) ) );
-@@ -84,7 +84,7 @@
- {
-   shell = mShell;
-   command = mCommand;
--	port = -1;
-+  port = -1;
- }
- 
- void SensorShellAgent::msgSent( KProcess* )
-@@ -122,7 +122,8 @@
-   sensorManager()->hostLost( this );
-   sensorManager()->disengage( this );
- 
--  process->deleteLater();
-+  if ( mDaemon )
-+    mDaemon->deleteLater();
- }
- 
- bool SensorShellAgent::writeMsg( const char *msg, int len )
diff --git a/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff b/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff
deleted file mode 100644
index 7e14b219a191..000000000000
--- a/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff
+++ /dev/null
@@ -1,95 +0,0 @@
---- kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.cc	2005/09/29 13:24:25	465343
-+++ kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.cc	2006/04/10 09:13:08	528138
-@@ -45,7 +45,8 @@
-   : KSGRD::SensorDisplay( parent, name, title, noFrame_, isApplet )
- {
-   mBars = 0;
--  mFlags = 0;
-+  mFlags = QBitArray(100);
-+  mFlags.fill( false );
- 
-   if ( noFrame() )
-     mPlotter = new BarGraph( this );
-@@ -245,16 +246,16 @@
- 	
-   if ( id < 100 ) {
-     mSampleBuffer[ id ] = answer.toDouble();
--    if ( mFlags & ( 1 << id ) ) {
-+    if ( mFlags.testBit( id ) == true ) {
-       kdDebug(1215) << "ERROR: DancingBars lost sample (" << mFlags
-                     << ", " << mBars << ")" << endl;
-       sensorError( id, true );
-     }
--    mFlags |= 1 << id;
-+    mFlags.setBit( id, true );
- 
--    if ( mFlags == (uint)( ( 1 << mBars ) - 1 ) ) {
-+    if ( mFlags.testBit( ( 1 << mBars ) - 1 ) == true ) {
-       mPlotter->updateSamples( mSampleBuffer );
--      mFlags = 0;
-+      mFlags.fill( false );
-     }
-   } else if ( id >= 100 ) {
-     KSGRD::SensorIntegerInfo info( answer );
---- kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.h	2005/09/29 13:24:25	465343
-+++ kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.h	2006/04/10 09:13:08	528138
-@@ -25,6 +25,7 @@
- #define KSG_DANCINGBARS_H
- 
- #include <SensorDisplay.h>
-+#include <qbitarray.h>
- 
- class KIntNumInput;
- 
-@@ -83,7 +84,7 @@
-       been received.
-      */
-     QMemArray<double> mSampleBuffer;
--    ulong mFlags;
-+    QBitArray mFlags;
- };
- 
- #endif
---- kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2005/09/29 13:24:25	465343
-+++ kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2006/03/27 09:04:59	523046
-@@ -41,7 +41,7 @@
-   if ( mDaemon ) {
-     mDaemon->writeStdin( "quit\n", strlen( "quit\n" ) );
-     delete (KShellProcess*)mDaemon;
--		mDaemon = 0;
-+    mDaemon = 0;
-   }
- }
- 	
-@@ -50,9 +50,9 @@
- {
-   mDaemon = new KShellProcess;
- 
--	setHostName( host );
--	mShell = shell;
--	mCommand = command;
-+  setHostName( host );
-+  mShell = shell;
-+  mCommand = command;
- 
-   connect( mDaemon, SIGNAL( processExited( KProcess* ) ),
-            SLOT( daemonExited( KProcess* ) ) );
-@@ -84,7 +84,7 @@
- {
-   shell = mShell;
-   command = mCommand;
--	port = -1;
-+  port = -1;
- }
- 
- void SensorShellAgent::msgSent( KProcess* )
-@@ -122,7 +122,8 @@
-   sensorManager()->hostLost( this );
-   sensorManager()->disengage( this );
- 
--  process->deleteLater();
-+  if ( mDaemon )
-+    mDaemon->deleteLater();
- }
- 
- bool SensorShellAgent::writeMsg( const char *msg, int len )
diff --git a/kde-base/kttsd/ChangeLog b/kde-base/kttsd/ChangeLog
index 239a5dccb24b..28eafbc1e9bc 100644
--- a/kde-base/kttsd/ChangeLog
+++ b/kde-base/kttsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kttsd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.65 2007/02/04 03:02:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.66 2007/02/05 11:56:26 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeaccessibility-3.4.0-noarts.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kttsd-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kttsd/files/kdeaccessibility-3.4.0-noarts.patch b/kde-base/kttsd/files/kdeaccessibility-3.4.0-noarts.patch
deleted file mode 100644
index f5fbabeb26f5..000000000000
--- a/kde-base/kttsd/files/kdeaccessibility-3.4.0-noarts.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- kttsd/configure.in.in.org	2005-03-17 22:25:56.000000000 +0100
-+++ kttsd/configure.in.in	2005-03-17 22:26:25.000000000 +0100
-@@ -2,10 +2,6 @@
- 
- ### AM_INIT_AUTOMAKE(kttsd,0.2.0)
- 
--if test "x$build_arts" = "xno"; then
--	DO_NOT_COMPILE="$DO_NOT_COMPILE kttsd"
--fi
--
- AC_ARG_ENABLE(kttsd-gstreamer,
-               AC_HELP_STRING([--enable-kttsd-gstreamer],
-                              [build KTTSD GStreamer audio plugin [default=no]]),
---- kttsd/plugins/freetts/configure.in.in.org	2005-03-17 22:29:06.000000000 +0100
-+++ kttsd/plugins/freetts/configure.in.in	2005-03-17 22:29:13.000000000 +0100
-@@ -13,6 +13,10 @@
- if test "x$freetts_plugin" = "xno"; then
-   compile_freetts_plugin="no"
- fi
-+if test "x$build_arts" = "xno"; then
-+  compile_freetts_plugin="no"
-+fi
-+
- 
- dnl Check for festival executable.
- dnl Note that Festival Interactive plugin is always built
---- kttsd/configure.in.in.org	2005-03-17 22:25:56.000000000 +0100
-+++ kttsd/configure.in.in	2005-03-17 22:49:26.000000000 +0100
-@@ -126,6 +126,7 @@
- fi
- 
- AM_CONDITIONAL(include_kttsd_gstplayer, [test "x$have_gst" = "xyes" && test "x$gstreamer_plugin" = "xyes"])
-+AM_CONDITIONAL(include_kttsd_arts, [test "x$build_arts" = "xyes"])
- 
- dnl ================================================================================
- 
---- kttsd/players/Makefile.am.orig	2005-03-17 22:55:21.000000000 +0100
-+++ kttsd/players/Makefile.am	2005-03-17 22:54:34.000000000 +0100
-@@ -3,8 +3,10 @@
-     gstplayer_DIR = gstplayer
- endif
- 
--SUBDIRS = \
--    artsplayer \
--    $(gstplayer_DIR)
-+if include_kttsd_arts
-+   artsplayer_DIR = artsplayer
-+endif
-+
-+SUBDIRS = $(artsplayer_DIR) $(gstplayer_DIR)
- 
- kde_servicetypes_DATA = kttsd_audioplugin.desktop
---- kttsd/plugins/command/Makefile.am.org	2005-03-17 22:59:24.000000000 +0100
-+++ kttsd/plugins/command/Makefile.am	2005-03-17 22:59:58.000000000 +0100
-@@ -16,7 +16,7 @@
-         commandproc.cpp \
-         commandplugin.cpp
- libkttsd_commandplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libkttsd_commandplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
-+libkttsd_commandplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
- 
- services_DATA = kttsd_commandplugin.desktop
- servicesdir = $(kde_servicesdir)
---- kttsd/plugins/epos/Makefile.am.org	2005-03-17 22:59:35.000000000 +0100
-+++ kttsd/plugins/epos/Makefile.am	2005-03-17 23:00:05.000000000 +0100
-@@ -16,7 +16,7 @@
-         eposproc.cpp \
-         eposplugin.cpp 
- libkttsd_eposplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libkttsd_eposplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
-+libkttsd_eposplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
- 
- services_DATA = kttsd_eposplugin.desktop
- servicesdir = $(kde_servicesdir)
---- kttsd/plugins/flite/Makefile.am.org	2005-03-17 22:59:42.000000000 +0100
-+++ kttsd/plugins/flite/Makefile.am	2005-03-17 23:00:11.000000000 +0100
-@@ -16,7 +16,7 @@
-         fliteproc.cpp \
-         fliteplugin.cpp 
- libkttsd_fliteplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libkttsd_fliteplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
-+libkttsd_fliteplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
- 
- services_DATA = kttsd_fliteplugin.desktop
- servicesdir = $(kde_servicesdir)
---- kttsd/plugins/hadifix/Makefile.am.org	2005-03-17 22:59:50.000000000 +0100
-+++ kttsd/plugins/hadifix/Makefile.am	2005-03-17 23:00:20.000000000 +0100
-@@ -17,7 +17,7 @@
- 	hadifixconfigui.ui \
- 	voicefileui.ui
- libkttsd_hadifixplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--libkttsd_hadifixplugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) -lartskde $(top_builddir)/kttsd/libkttsd/libkttsd.la
-+libkttsd_hadifixplugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/kttsd/libkttsd/libkttsd.la
- 
- EXTRA_DIST = male.png female.png 
- 
diff --git a/kde-base/kvoctrain/ChangeLog b/kde-base/kvoctrain/ChangeLog
index aa03f8fa75c2..1743f2c8e247 100644
--- a/kde-base/kvoctrain/ChangeLog
+++ b/kde-base/kvoctrain/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kvoctrain
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/ChangeLog,v 1.69 2007/02/04 03:06:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/ChangeLog,v 1.70 2007/02/05 11:57:10 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/post-3.4.2-kdeedu.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kvoctrain-3.5.2.ebuild:
diff --git a/kde-base/kvoctrain/files/post-3.4.2-kdeedu.diff b/kde-base/kvoctrain/files/post-3.4.2-kdeedu.diff
deleted file mode 100644
index 1d75c63bac18..000000000000
--- a/kde-base/kvoctrain/files/post-3.4.2-kdeedu.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: kvoctrain/kvoctrain/langen2kvtml
-===================================================================
---- kvoctrain/kvoctrain/langen2kvtml	(revision 443975)
-+++ kvoctrain/kvoctrain/langen2kvtml	(working copy)
-@@ -89,6 +89,9 @@
- 
- require "flush.pl";
- use Getopt::Long;
-+use File::Temp qw(tempdir);
-+my $tmpdir = tempdir(TEMPDIR => 1, CLEANUP => 1 );
-+
- $/="\r\n";	# we work with dos files
- 
- #
-@@ -165,10 +168,6 @@
-     $country="GB";
- }
- 
--# All logging information goes into this file
--$logfile = "/tmp/langen2kvtml.log";
--open(LOG, ">$logfile") || die "Cannot create $logfile: $!";
--
- &printflush(STDOUT,"Waiting for generating files ...\n");
- $tmp1=$#ARGV+1;
- &printflush(STDOUT,"... $tmp1 files given via command line ...\n");
-@@ -178,13 +177,11 @@
-     if ($proxy) {
-         &printflush(STDOUT,"... using proxy service $proxy ...\n");
-     }
--    `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip >/tmp/Voc-$country.zip`;
--    # unzip -u update only!
--    # unzip -o overwrite!
--    `unzip -u /tmp/Voc-$country.zip >/tmp/unzip.log`;
-+    `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip >$tmpdir/Voc-$country.zip`;
-     &printflush(STDOUT,"... updating Voc-$country.zip ...\n");
-     $/="\n";	# we work with a unix file
--    open(ZIP,"</tmp/unzip.log");
-+    # unzip -u update only!
-+    open(ZIP,"unzip -u $tmpdir/Voc-$country.zip |");
-     while(<ZIP>) {
- 	chomp;
- 	if( /voc/ ) {
-@@ -194,20 +191,16 @@
- 	}
-     }
-     close(ZIP);
--    unlink("/tmp/unzip.log");
-     $/="\r\n";	# we work with a dos file
- }
- 
- for my $file (@res, @ARGV) {
-     $vocfile = $file;
--    &printflush(LOG,"... generating \"$kvtfile\"...\n");
-     $lang		= "";		# initially unset
-     $filestage	= 0;		# file stage
-     &process_vocfile($vocfile);
- }
- print STDERR "...\tAll Complete.\n";
--&printflush(LOG,"\nAll Complete.\n");
--close(LOG);
- 
- exit;
- 
diff --git a/kde-base/kwalletmanager/ChangeLog b/kde-base/kwalletmanager/ChangeLog
index 4a3f0271e50e..34151c465e2c 100644
--- a/kde-base/kwalletmanager/ChangeLog
+++ b/kde-base/kwalletmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwalletmanager
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/ChangeLog,v 1.64 2007/02/04 03:06:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/ChangeLog,v 1.65 2007/02/05 11:52:01 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kwalletmanager-3.5.4-systray-fix.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kwalletmanager-3.5.2.ebuild:
diff --git a/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch b/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch
deleted file mode 100644
index b8f6f0185103..000000000000
--- a/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r kwalletmanager-3.5.4-orig/kwallet/kwalletmanager.cpp kwalletmanager-3.5.4/kwallet/kwalletmanager.cpp
---- kwalletmanager-3.5.4-orig/kwallet/kwalletmanager.cpp	2006-09-27 00:38:20.000000000 +0200
-+++ kwalletmanager-3.5.4/kwallet/kwalletmanager.cpp	2006-09-27 00:39:40.000000000 +0200
-@@ -42,8 +42,9 @@
- #include <qaccel.h>
- #include <qguardedptr.h>
- #include <qptrstack.h>
- #include <qregexp.h>
-+#include <qtimer.h>
- #include <qtooltip.h>
- 
- KWalletManager::KWalletManager(QWidget *parent, const char *name, WFlags f)
- : KMainWindow(parent, name, f), DCOPObject("KWalletManager") {
-@@ -74,9 +75,9 @@
- 		}
- 		if (!isOpen && kapp->isRestored()) {
- 			delete _tray;
- 			_tray = 0L;
--			kapp->exit();
-+			QTimer::singleShot( 0, kapp, SLOT( quit()));
- 			return;
- 		}
- 	} else {
- 		_tray = 0L;
diff --git a/kde-base/kweather/ChangeLog b/kde-base/kweather/ChangeLog
index a12e0ef504aa..7f888c0220a9 100644
--- a/kde-base/kweather/ChangeLog
+++ b/kde-base/kweather/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kweather
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.64 2007/02/04 03:06:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.65 2007/02/05 12:10:01 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kweather-3.4.1-fix-icon-size.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kweather-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kweather/files/kweather-3.4.1-fix-icon-size.diff b/kde-base/kweather/files/kweather-3.4.1-fix-icon-size.diff
deleted file mode 100644
index e0484d9dd687..000000000000
--- a/kde-base/kweather/files/kweather-3.4.1-fix-icon-size.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp kweather-old/dockwidget.cpp kweather/dockwidget.cpp
---- kweather-old/dockwidget.cpp	2005-05-24 00:09:06.000000000 +1200
-+++ kweather/dockwidget.cpp	2005-06-07 09:42:49.000000000 +1200
-@@ -169,6 +169,7 @@ void dockwidget::resizeView( const QSize
-             m_lblTemp->setGeometry(h+1, 0, w-h, h/3);
-             m_lblWind->setGeometry(h+1, h/3, w-h, h/3);
-             m_lblPres->setGeometry(h+1, 2*h/3, w-h, h/3);
-+	    m_button->setGeometry(0, 0, h, h);
-         }
-         else if ( m_mode == ShowTempOnly)
-         {
diff --git a/kde-base/kwifimanager/ChangeLog b/kde-base/kwifimanager/ChangeLog
index dc03498715a0..f44ffd2393fc 100644
--- a/kde-base/kwifimanager/ChangeLog
+++ b/kde-base/kwifimanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwifimanager
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/ChangeLog,v 1.51 2007/02/04 03:07:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/ChangeLog,v 1.52 2007/02/05 12:12:12 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/wireless-extensions-api.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kwifimanager-3.5.2.ebuild:
diff --git a/kde-base/kwifimanager/files/wireless-extensions-api.diff b/kde-base/kwifimanager/files/wireless-extensions-api.diff
deleted file mode 100644
index e6ca15c3112c..000000000000
--- a/kde-base/kwifimanager/files/wireless-extensions-api.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- wifi/interface_wireless_wirelessextensions.cpp	2005/05/04 06:07:06	409205
-+++ wifi/interface_wireless_wirelessextensions.cpp	2005/06/23 11:03:38	428163
-@@ -418,7 +418,7 @@
-   essid = (WIFI_CONFIG(info,essid_on) ? WIFI_CONFIG(info,essid) : "any");
-   char
-     ap_addr[256];
--  iw_pr_ether (ap_addr, (const unsigned char *) info.ap_addr.sa_data);
-+  iw_ether_ntop ( (const ether_addr *) info.ap_addr.sa_data, ap_addr);
-   if (access_point_address != ap_addr)
-     emitStatusChanged = true;
-   access_point_address = ap_addr;
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index fc89c73f331d..6e1d6fa3c30b 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.89 2007/02/04 03:07:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.90 2007/02/05 11:46:49 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff,
+  -files/kwin-3.5.2-alt_tab_crash.diff,
+  -files/kwin-3.5.2-parallel-make.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kwin-3.5.2-r2.ebuild:
   Remove old versions.
diff --git a/kde-base/kwin/files/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff b/kde-base/kwin/files/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff
deleted file mode 100644
index e21e408846ca..000000000000
--- a/kde-base/kwin/files/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff
+++ /dev/null
@@ -1,391 +0,0 @@
-diff -ur kwin.orig/activation.cpp kwin/activation.cpp
---- kdebase/kwin.orig/activation.cpp	2006-04-16 14:50:58.000000000 +0200
-+++ kdebase/kwin/activation.cpp	2006-04-16 15:17:55.000000000 +0200
-@@ -231,7 +231,7 @@
-         last_active_client = active_client;
-     if ( active_client ) 
-         {
--        updateFocusChains( active_client, true ); // make it first in focus chain
-+        updateFocusChains( active_client, FocusChainMakeFirst );
-         active_client->demandAttention( false );
-         }
-     pending_take_activity = NULL;
-diff -ur kwin.orig/client.cpp kwin/client.cpp
---- kdebase/kwin.orig/client.cpp	2006-04-16 14:50:58.000000000 +0200
-+++ kdebase/kwin/client.cpp	2006-04-16 15:18:17.000000000 +0200
-@@ -578,7 +578,7 @@
-     updateAllowedActions();
-     workspace()->updateMinimizedOfTransients( this );
-     updateWindowRules();
--    workspace()->updateFocusChains( this, false ); // make it last in the focus chain
-+    workspace()->updateFocusChains( this, Workspace::FocusChainMakeLast );
-     }
- 
- void Client::unminimize( bool avoid_animation )
-@@ -895,7 +895,16 @@
-         }
-     if( show )
-         {
--        if( workspace()->showingDesktop())
-+        bool belongs_to_desktop = false;
-+        for( ClientList::ConstIterator it = group()->members().begin();
-+             it != group()->members().end();
-+             ++it )
-+            if( (*it)->isDesktop())
-+                {
-+                belongs_to_desktop = true;
-+                break;
-+                }
-+        if( !belongs_to_desktop && workspace()->showingDesktop())
-             workspace()->resetShowingDesktop( true );
-         if( isShade())
-             setMappingState( IconicState );
-@@ -1149,7 +1158,8 @@
-     info->setState( b?NET::SkipTaskbar:0, NET::SkipTaskbar );
-     updateWindowRules();
-     if( was_wants_tab_focus != wantsTabFocus())
--        workspace()->updateFocusChains( this, isActive());
-+        workspace()->updateFocusChains( this,
-+            isActive() ? Workspace::FocusChainMakeFirst : Workspace::FocusChainUpdate );
-     }
- 
- void Client::setSkipPager( bool b )
-@@ -1191,7 +1201,7 @@
-         }
-     if( decoration != NULL )
-         decoration->desktopChange();
--    workspace()->updateFocusChains( this, true );
-+    workspace()->updateFocusChains( this, Workspace::FocusChainMakeFirst );
-     updateVisibility();
-     updateWindowRules();
-     }
-diff -ur kwin.orig/events.cpp kwin/events.cpp
---- kdebase/kwin.orig/events.cpp	2006-04-16 14:50:58.000000000 +0200
-+++ kdebase/kwin/events.cpp	2006-04-16 15:18:35.000000000 +0200
-@@ -370,7 +370,7 @@
-             if( c )
-                 {
-                 c->windowEvent( e );
--                updateFocusChains( c, true );
-+                updateFocusChains( c, FocusChainUpdate );
-                 return true;
-                 }
-             break;
-@@ -402,15 +402,15 @@
-             if ( e->xconfigurerequest.parent == root ) 
-                 {
-                 XWindowChanges wc;
--                unsigned int value_mask = 0;
--                wc.border_width = 0;
-+                wc.border_width = e->xconfigurerequest.border_width;
-                 wc.x = e->xconfigurerequest.x;
-                 wc.y = e->xconfigurerequest.y;
-                 wc.width = e->xconfigurerequest.width;
-                 wc.height = e->xconfigurerequest.height;
-                 wc.sibling = None;
-                 wc.stack_mode = Above;
--                value_mask = e->xconfigurerequest.value_mask | CWBorderWidth;
-+                unsigned int value_mask = e->xconfigurerequest.value_mask
-+                    & ( CWX | CWY | CWWidth | CWHeight | CWBorderWidth );
-                 XConfigureWindow( qt_xdisplay(), e->xconfigurerequest.window, value_mask, &wc );
-                 return true;
-                 }
-diff -ur kwin.orig/geometry.cpp kwin/geometry.cpp
---- kdebase/kwin.orig/geometry.cpp	2006-04-16 14:50:58.000000000 +0200
-+++ kdebase/kwin/geometry.cpp	2006-04-16 15:18:58.000000000 +0200
-@@ -1281,7 +1281,21 @@
-         { // update to match restrictions
-         QSize new_size = adjustedSize();
-         if( new_size != size() && !isFullScreen())
-+            {
-+            QRect orig_geometry = geometry();
-             resizeWithChecks( new_size );
-+            if( ( !isSpecialWindow() || isToolbar()) && !isFullScreen())
-+                {
-+                // try to keep the window in its xinerama screen if possible,
-+                // if that fails at least keep it visible somewhere
-+                QRect area = workspace()->clientArea( MovementArea, this );
-+                if( area.contains( orig_geometry ))
-+                    keepInArea( area );
-+                area = workspace()->clientArea( WorkArea, this );
-+                if( area.contains( orig_geometry ))
-+                    keepInArea( area );
-+                }
-+            }
-         }
-     updateAllowedActions(); // affects isResizeable()
-     }
-@@ -1840,7 +1854,7 @@
- 
-     // maximing one way and unmaximizing the other way shouldn't happen
-     Q_ASSERT( !( vertical && horizontal )
--        || (( max_mode & MaximizeVertical != 0 ) == ( max_mode & MaximizeHorizontal != 0 )));
-+        || ((( max_mode & MaximizeVertical ) != 0 ) == (( max_mode & MaximizeHorizontal ) != 0 )));
- 
-     QRect clientArea = workspace()->clientArea( MaximizeArea, this );
- 
-diff -ur kwin.orig/layers.cpp kwin/layers.cpp
---- kdebase/kwin.orig/layers.cpp	2006-04-16 14:50:58.000000000 +0200
-+++ kdebase/kwin/layers.cpp	2006-04-16 15:19:23.000000000 +0200
-@@ -100,7 +100,7 @@
-     {
-     if( block_stacking_updates > 0 )
-         {
--        blocked_propagating_new_clients |= propagate_new_clients;
-+        blocked_propagating_new_clients = blocked_propagating_new_clients || propagate_new_clients;
-         return;
-         }
-     ClientList new_stacking_order = constrainedStackingOrder();
-@@ -441,6 +441,21 @@
-                 }
-             }
-       	}
-+    // the same for global_focus_chain
-+    if( c->wantsTabFocus() && global_focus_chain.contains( active_client ))
-+        {
-+        global_focus_chain.remove( c );
-+        for( ClientList::Iterator it = global_focus_chain.fromLast();
-+             it != global_focus_chain.end();
-+             --it )
-+            {
-+            if( Client::belongToSameApplication( active_client, *it ))
-+                {
-+                global_focus_chain.insert( it, c );
-+                break;
-+                }
-+            }
-+      	}
-     updateStackingOrder();
-     }
- 
-diff -ur kwin.orig/tabbox.cpp kwin/tabbox.cpp
---- kdebase/kwin.orig/tabbox.cpp	2006-04-16 14:50:58.000000000 +0200
-+++ kdebase/kwin/tabbox.cpp	2006-04-16 15:19:43.000000000 +0200
-@@ -763,7 +763,7 @@
-         return;
-     if ( tab_grab || control_grab )
-         return;
--    if ( options->altTabStyle == Options::CDE )
-+    if ( options->altTabStyle == Options::CDE || !options->focusPolicyIsReasonable())
-         {
-         //XUngrabKeyboard(qt_xdisplay(), qt_x_time); // need that because of accelerator raw mode
-         // CDE style raise / lower
-@@ -789,7 +789,7 @@
-         return;
-     if( tab_grab || control_grab )
-         return;
--    if ( options->altTabStyle == Options::CDE )
-+    if ( options->altTabStyle == Options::CDE || !options->focusPolicyIsReasonable())
-         {
-         // CDE style raise / lower
-         CDEWalkThroughWindows( false );
-@@ -926,7 +926,23 @@
- 
- void Workspace::CDEWalkThroughWindows( bool forward )
-     {
--    Client* c = activeClient();
-+    Client* c = NULL;
-+// this function find the first suitable client for unreasonable focus
-+// policies - the topmost one, with some exceptions (can't be keepabove/below,
-+// otherwise it gets stuck on them)
-+    Q_ASSERT( block_stacking_updates == 0 );
-+    for( ClientList::ConstIterator it = stacking_order.fromLast();
-+         it != stacking_order.end();
-+         --it )
-+        {
-+        if ( (*it)->isOnCurrentDesktop() && !(*it)->isSpecialWindow()
-+            && (*it)->isShown( false ) && (*it)->wantsTabFocus()
-+            && !(*it)->keepAbove() && !(*it)->keepBelow())
-+            {
-+            c = *it;
-+            break;
-+            }
-+        }
-     Client* nc = c;
-     bool options_traverse_all;
-         {
-@@ -952,7 +968,7 @@
-             }
-         } while (nc && nc != c &&
-             (( !options_traverse_all && !nc->isOnDesktop(currentDesktop())) ||
--             nc->isMinimized() || !nc->wantsTabFocus() ) );
-+             nc->isMinimized() || !nc->wantsTabFocus() || nc->keepAbove() || nc->keepBelow() ) );
-     if (nc)
-         {
-         if (c && c != nc)
-@@ -1152,14 +1168,13 @@
- */
- Client* Workspace::nextFocusChainClient( Client* c ) const
-     {
--    int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
--    if ( focus_chain[desktop].isEmpty() )
-+    if ( global_focus_chain.isEmpty() )
-         return 0;
--    ClientList::ConstIterator it = focus_chain[desktop].find( c );
--    if ( it == focus_chain[desktop].end() )
--        return focus_chain[desktop].last();
--    if ( it == focus_chain[desktop].begin() )
--        return focus_chain[desktop].last();
-+    ClientList::ConstIterator it = global_focus_chain.find( c );
-+    if ( it == global_focus_chain.end() )
-+        return global_focus_chain.last();
-+    if ( it == global_focus_chain.begin() )
-+        return global_focus_chain.last();
-     --it;
-     return *it;
-     }
-@@ -1170,15 +1185,14 @@
- */
- Client* Workspace::previousFocusChainClient( Client* c ) const
-     {
--    int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
--    if ( focus_chain[desktop].isEmpty() )
-+    if ( global_focus_chain.isEmpty() )
-         return 0;
--    ClientList::ConstIterator it = focus_chain[desktop].find( c );
--    if ( it == focus_chain[desktop].end() )
--        return focus_chain[desktop].first();
-+    ClientList::ConstIterator it = global_focus_chain.find( c );
-+    if ( it == global_focus_chain.end() )
-+        return global_focus_chain.first();
-     ++it;
--    if ( it == focus_chain[desktop].end() )
--        return focus_chain[desktop].first();
-+    if ( it == global_focus_chain.end() )
-+        return global_focus_chain.first();
-     return *it;
-     }
- 
-diff -ur kwin.orig/workspace.cpp kwin/workspace.cpp
---- kdebase/kwin.orig/workspace.cpp	2006-04-16 14:50:58.000000000 +0200
-+++ kdebase/kwin/workspace.cpp	2006-04-16 15:20:05.000000000 +0200
-@@ -512,7 +512,7 @@
-         }
-     else
-         {
--        updateFocusChains( c, true );
-+        updateFocusChains( c, FocusChainUpdate ); // add to focus chain if not already there
-         clients.append( c );
-         }
-     if( !unconstrained_stacking_order.contains( c ))
-@@ -564,6 +564,7 @@
-          i <= numberOfDesktops();
-          ++i )
-         focus_chain[ i ].remove( c );
-+    global_focus_chain.remove( c );
-     attention_chain.remove( c );
-     if( c->isTopMenu())
-         removeTopMenu( c );
-@@ -590,7 +591,7 @@
-     updateClientArea();
-     }
- 
--void Workspace::updateFocusChains( Client* c, bool make_first )
-+void Workspace::updateFocusChains( Client* c, FocusChainChange change )
-     {
-     if( !c->wantsTabFocus()) // doesn't want tab focus, remove
-         {
-@@ -598,16 +599,21 @@
-              i<= numberOfDesktops();
-              ++i )
-             focus_chain[i].remove(c);
-+        global_focus_chain.remove( c );
-         return;
-         }
-     if(c->desktop() == NET::OnAllDesktops)
-         { //now on all desktops, add it to focus_chains it is not already in
-         for( int i=1; i<= numberOfDesktops(); i++)
--            { // make_first works only on current desktop, don't affect all desktops
--            if( make_first && i == currentDesktop())
-+            { // making first/last works only on current desktop, don't affect all desktops
-+            if( i == currentDesktop()
-+                && ( change == FocusChainMakeFirst || change == FocusChainMakeLast ))
-                 {
-                 focus_chain[ i ].remove( c );
--                focus_chain[ i ].append( c );
-+                if( change == FocusChainMakeFirst )
-+                    focus_chain[ i ].append( c );
-+                else
-+                    focus_chain[ i ].prepend( c );
-                 }
-             else if( !focus_chain[ i ].contains( c ))
-                 focus_chain[ i ].prepend( c ); // otherwise add as the last one
-@@ -619,11 +625,16 @@
-             {
-             if( i == c->desktop())
-                 {
--                if( make_first )
-+                if( change == FocusChainMakeFirst )
-                     {
-                     focus_chain[ i ].remove( c );
-                     focus_chain[ i ].append( c );
-                     }
-+                else if( change == FocusChainMakeLast )
-+                    {
-+                    focus_chain[ i ].remove( c );
-+                    focus_chain[ i ].prepend( c );
-+                    }
-                 else if( !focus_chain[ i ].contains( c ))
-                     focus_chain[ i ].prepend( c );
-                 }
-@@ -631,6 +642,18 @@
-                 focus_chain[ i ].remove( c );
-             }
-         }
-+    if( change == FocusChainMakeFirst )
-+        {
-+        global_focus_chain.remove( c );
-+        global_focus_chain.append( c );
-+        }
-+    else if( change == FocusChainMakeLast )
-+        {
-+        global_focus_chain.remove( c );
-+        global_focus_chain.prepend( c );
-+        }
-+    else if( !global_focus_chain.contains( c ))
-+        global_focus_chain.prepend( c );
-     }
- 
- void Workspace::updateCurrentTopMenu()
-diff -ur kwin.orig/workspace.h kwin/workspace.h
---- kdebase/kwin.orig/workspace.h	2006-04-16 14:50:58.000000000 +0200
-+++ kdebase/kwin/workspace.h	2006-04-16 15:20:32.000000000 +0200
-@@ -251,7 +251,8 @@
-         bool checkStartupNotification( Window w, KStartupInfoId& id, KStartupInfoData& data );
- 
-         void focusToNull(); // SELI public?
--        void updateFocusChains( Client* c, bool make_first );
-+        enum FocusChainChange { FocusChainMakeFirst, FocusChainMakeLast, FocusChainUpdate };
-+        void updateFocusChains( Client* c, FocusChainChange change );
-         
-         bool forcedGlobalMouseGrab() const;
-         void clientShortcutUpdated( Client* c );
-@@ -510,6 +511,7 @@
-         ClientList unconstrained_stacking_order;
-         ClientList stacking_order;
-         QValueVector< ClientList > focus_chain;
-+        ClientList global_focus_chain; // this one is only for things like tabbox's MRU
-         ClientList should_get_focus; // last is most recent
-         ClientList attention_chain;
-         
---- kdebase/kwin/utils.h	2006/02/28 13:01:47	514432
-+++ kdebase/kwin/utils.h	2006/04/11 12:49:12	528574
-@@ -232,15 +232,13 @@
- inline
- int timestampCompare( Time time1, Time time2 ) // like strcmp()
-     {
--    if( time1 == time2 )
--        return 0;
--    return ( time1 - time2 ) < 1000000000 ? 1 : -1; // time1 > time2 -> 1, handle wrapping
-+    return NET::timestampCompare( time1, time2 );
-     }
- 
- inline
- Time timestampDiff( Time time1, Time time2 ) // returns time2 - time1
--    { // no need to handle wrapping?
--    return time2 - time1;
-+    {
-+    return NET::timestampDiff( time1, time2 );
-     }
- 
- bool isLocalMachine( const QCString& host );
diff --git a/kde-base/kwin/files/kwin-3.5.2-alt_tab_crash.diff b/kde-base/kwin/files/kwin-3.5.2-alt_tab_crash.diff
deleted file mode 100644
index 0c39e9fd8f4a..000000000000
--- a/kde-base/kwin/files/kwin-3.5.2-alt_tab_crash.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdebase/kwin/tabbox.cpp	2006/02/27 09:54:03	514048
-+++ kdebase/kwin/tabbox.cpp	2006/03/31 10:42:59	524823
-@@ -1152,6 +1152,8 @@
- */
- Client* Workspace::nextFocusChainClient( Client* c ) const
-     {
-+    if ( !c )
-+        return 0;
-     int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
-     if ( focus_chain[desktop].isEmpty() )
-         return 0;
-@@ -1170,6 +1172,8 @@
- */
- Client* Workspace::previousFocusChainClient( Client* c ) const
-     {
-+    if ( !c )
-+        return 0;
-     int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
-     if ( focus_chain[desktop].isEmpty() )
-         return 0;
diff --git a/kde-base/kwin/files/kwin-3.5.2-parallel-make.diff b/kde-base/kwin/files/kwin-3.5.2-parallel-make.diff
deleted file mode 100644
index c98f1eaf3237..000000000000
--- a/kde-base/kwin/files/kwin-3.5.2-parallel-make.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- kdebase/kwin/kcmkwin/kwinrules/Makefile.am.orig	2006-05-10 09:14:29.000000000 -0400
-+++ kdebase/kwin/kcmkwin/kwinrules/Makefile.am	2006-05-10 09:14:55.000000000 -0400
-@@ -16,12 +16,12 @@
- kcm_kwinrules_la_SOURCES = kcm.cpp 
- kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
- kcm_kwinrules_la_LIBADD = libkwinrules.la 
--kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h 
-+kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
- 
- kwin_rules_dialog_la_SOURCES = main.cpp 
- kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
- kwin_rules_dialog_la_LIBADD = libkwinrules.la 
--kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h
-+kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
- 
- messages: rc.cpp
- 	$(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot
diff --git a/kde-base/kxsldbg/ChangeLog b/kde-base/kxsldbg/ChangeLog
index 7a0edf9bd612..94b2e4743253 100644
--- a/kde-base/kxsldbg/ChangeLog
+++ b/kde-base/kxsldbg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kxsldbg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/ChangeLog,v 1.73 2007/02/04 03:09:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/ChangeLog,v 1.74 2007/02/05 12:11:42 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kxsldbg-3.4.3-fmt-str.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kxsldbg-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kxsldbg/files/kxsldbg-3.4.3-fmt-str.patch b/kde-base/kxsldbg/files/kxsldbg-3.4.3-fmt-str.patch
deleted file mode 100644
index 7e47eff1a2bb..000000000000
--- a/kde-base/kxsldbg/files/kxsldbg-3.4.3-fmt-str.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp.orig	2005-12-04 11:02:02.000000000 +0100
-+++ ./kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp	2005-12-04 11:04:00.000000000 +0100
-@@ -175,7 +175,7 @@
-         } else {
- 	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
-         }
--        xsltGenericError(xsltGenericErrorContext, buffer);
-+        xsltGenericError(xsltGenericErrorContext, "%s", buffer);
-     }
-     return result;
- }
diff --git a/kde-base/libkcal/ChangeLog b/kde-base/libkcal/ChangeLog
index 20ab0d369bf8..1a5ea4ddea68 100644
--- a/kde-base/libkcal/ChangeLog
+++ b/kde-base/libkcal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkcal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/ChangeLog,v 1.69 2007/02/04 03:09:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/ChangeLog,v 1.70 2007/02/05 12:07:15 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libkcal-3.5.2-fixes.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -libkcal-3.5.2-r1.ebuild:
diff --git a/kde-base/libkcal/files/libkcal-3.5.2-fixes.diff b/kde-base/libkcal/files/libkcal-3.5.2-fixes.diff
deleted file mode 100644
index a357e45c31c4..000000000000
--- a/kde-base/libkcal/files/libkcal-3.5.2-fixes.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- kdepim/libkcal/libical/src/libical/icalarray.c	2005/07/26 18:54:59	438982
-+++ kdepim/libkcal/libical/src/libical/icalarray.c	2006/05/06 09:14:35	537923
-@@ -149,10 +149,10 @@
- 			new_space_allocated * array->element_size);
- 	*/
- 	new_data = malloc(new_space_allocated * array->element_size);
--	memcpy(new_data,array->data,array->element_size*array->space_allocated);
--	free(array->data);
- 
-     if (new_data) {
-+    	memcpy(new_data,array->data,array->element_size*array->space_allocated);
-+	free(array->data);
- 	array->data = new_data;
- 	array->space_allocated = new_space_allocated;
-     } else {
---- kdepim/libkcal/libical/src/libical/icalcomponent.c	2005/09/18 12:37:01	461680
-+++ kdepim/libkcal/libical/src/libical/icalcomponent.c	2006/05/06 09:14:35	537923
-@@ -848,8 +848,8 @@
- 
-   /** Now test against the EXRULEs **/
-   for (exrule = icalcomponent_get_first_property(comp,ICAL_EXRULE_PROPERTY);
--       exdate != NULL;
--       exdate = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
-+       exrule != NULL;
-+       exrule = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
- 	 
-     struct icalrecurrencetype recur = icalproperty_get_exrule(exrule);
-     icalrecur_iterator *exrule_itr  = icalrecur_iterator_new(recur, *dtstart);
---- kdepim/libkcal/libical/src/libical/icaltypes.c	2005/07/26 18:54:59	438982
-+++ kdepim/libkcal/libical/src/libical/icaltypes.c	2006/05/06 09:14:35	537923
-@@ -77,7 +77,7 @@
- 
-     
-     struct icaltriggertype tr, null_tr;
--    icalerrorstate es;
-+    icalerrorstate es = ICAL_ERROR_UNKNOWN;
-     icalerrorenum e;
- 
-     tr.time= icaltime_null_time();
diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 015b062de44e..ac76874a487d 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.73 2007/02/04 03:11:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.74 2007/02/05 11:51:30 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libkdepim-3.5.2-call_qt3_designer.diff,
+  -files/libkdepim-3.5.2-fixes.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -libkdepim-3.5.2-r1.ebuild:
diff --git a/kde-base/libkdepim/files/libkdepim-3.5.2-call_qt3_designer.diff b/kde-base/libkdepim/files/libkdepim-3.5.2-call_qt3_designer.diff
deleted file mode 100644
index f32ebe9c124b..000000000000
--- a/kde-base/libkdepim/files/libkdepim-3.5.2-call_qt3_designer.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdepim/libkdepim/kcmdesignerfields.cpp.orig	2006-05-07 04:05:20.000000000 +0200
-+++ kdepim/libkdepim/kcmdesignerfields.cpp	2006-05-07 04:06:33.000000000 +0200
-@@ -264,7 +264,7 @@
-   QVBoxLayout *layout = new QVBoxLayout( this, KDialog::marginHint(),
-                                          KDialog::spacingHint() );
- 
--  bool noDesigner = KStandardDirs::findExe("designer").isEmpty();
-+  bool noDesigner = KStandardDirs::findExe("/usr/qt/3/bin/designer").isEmpty();
- 
-   if ( noDesigner )
-   {
-@@ -407,7 +407,7 @@
- 
- void KCMDesignerFields::startDesigner()
- {
--  QString cmdLine = "designer";
-+  QString cmdLine = "/usr/qt/3/bin/designer";
- 
-   // check if path exists and create one if not.
-   QString cepPath = localUiDir();
diff --git a/kde-base/libkdepim/files/libkdepim-3.5.2-fixes.diff b/kde-base/libkdepim/files/libkdepim-3.5.2-fixes.diff
deleted file mode 100644
index 04fce865d08b..000000000000
--- a/kde-base/libkdepim/files/libkdepim-3.5.2-fixes.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- kdepim/libkdepim/kcmdesignerfields.cpp	2005/09/08 15:37:56	458580
-+++ kdepim/libkdepim/kcmdesignerfields.cpp	2006/04/15 12:39:26	530112
-@@ -99,8 +99,7 @@
-         }
- 
-         delete list;
--      } else
--        delete wdg;
-+      } 
-     }
- 
-     QString name() const { return mName; }
---- kdepim/libkdepim/kfoldertree.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/libkdepim/kfoldertree.cpp	2006/04/15 12:39:26	530112
-@@ -225,9 +225,9 @@
- 
-     KListViewItem::paintCell( p, cg, column, width, align );
- 
--    int r = lv ? lv->itemMargin() : 1;
-     const QPixmap *icon = pixmap( column );
-     int marg = lv ? lv->itemMargin() : 1;
-+    int r = marg;
- 
-     QString t;
-     QRect br;
-@@ -238,7 +238,7 @@
-       p->setPen( ft->paintInfo().colFore );
- 
-     if ( icon ) {
--      r += icon->width() + lv->itemMargin();
-+      r += icon->width() + marg;
-     }
-     t = text( column );
-     if ( !t.isEmpty() )
---- kdepim/libkdepim/kscoringeditor.cpp	2006/03/24 15:55:54	522155
-+++ kdepim/libkdepim/kscoringeditor.cpp	2006/05/06 09:14:35	537923
-@@ -127,8 +127,8 @@
- 
- void SingleConditionWidget::toggleRegExpButton( int selected )
- {
--  bool isRegExp = KScoringExpression::MATCH == selected &&
--      KScoringExpression::MATCHCS == selected &&
-+  bool isRegExp = (KScoringExpression::MATCH == selected ||
-+      KScoringExpression::MATCHCS == selected) &&
-       !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
-   regExpButton->setEnabled( isRegExp );
- }
-@@ -248,7 +248,8 @@
-           w = new QLabel( stack ); // empty dummy
-           break;
-       }
--      stack->addWidget(w,index++);
-+      if ( w )
-+        stack->addWidget(w,index++);
-     }
-   }
- 
diff --git a/kde-base/libkmime/ChangeLog b/kde-base/libkmime/ChangeLog
index 56684f16a8ae..ab8ff4ae6005 100644
--- a/kde-base/libkmime/ChangeLog
+++ b/kde-base/libkmime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkmime
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/ChangeLog,v 1.52 2007/02/04 03:12:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/ChangeLog,v 1.53 2007/02/05 12:30:36 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libkmime-3.5.0-fix.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -libkmime-3.5.0-r1.ebuild:
diff --git a/kde-base/libkmime/files/libkmime-3.5.0-fix.diff b/kde-base/libkmime/files/libkmime-3.5.0-fix.diff
deleted file mode 100644
index 9a06f6926bad..000000000000
--- a/kde-base/libkmime/files/libkmime-3.5.0-fix.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdepim/libkmime/kmime_content.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/libkmime/kmime_content.cpp	2006/04/15 12:39:26	530112
-@@ -395,6 +395,7 @@
-       case Headers::CEbinary :
-         ret = temp;
-         removeTrailingNewline=false;
-+      break;
-       default :
-         ret = temp;
-         removeTrailingNewline=true;
diff --git a/kde-base/libkpgp/ChangeLog b/kde-base/libkpgp/ChangeLog
index 215b47cc755a..a5d9a0b1e34b 100644
--- a/kde-base/libkpgp/ChangeLog
+++ b/kde-base/libkpgp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkpgp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.53 2007/02/04 03:13:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.54 2007/02/05 12:07:46 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libkpgp-3.5.0-fixes.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -libkpgp-3.5.0-r1.ebuild:
diff --git a/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff b/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff
deleted file mode 100644
index 85d5008f4c41..000000000000
--- a/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- kdepim/libkpgp/kpgpbase2.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/libkpgp/kpgpbase2.cpp	2006/04/15 12:39:26	530112
-@@ -863,9 +863,9 @@
-           validity = KPGP_VALIDITY_FULL;
-       else if( !strncmp( str.data() + index+21, "marginal", 8 ) )
-         validity = KPGP_VALIDITY_MARGINAL;
--      else if( !strncmp( str.data() + index+21, "never", 8 ) )
-+      else if( !strncmp( str.data() + index+21, "never", 5 ) )
-         validity = KPGP_VALIDITY_NEVER;
--      else if( !strncmp( str.data() + index+21, "undefined", 8 ) )
-+      else if( !strncmp( str.data() + index+21, "undefined", 9 ) )
-         validity = KPGP_VALIDITY_UNDEFINED;
- 
-       // determine the user ID
---- kdepim/libkpgp/kpgpbase6.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/libkpgp/kpgpbase6.cpp	2006/04/15 12:39:26	530112
-@@ -634,8 +634,8 @@
-         }
-       }
-       // store the global key capabilities
--      canSign |= sign;
--      canEncr |= encr;
-+      canSign = canSign || sign;
-+      canEncr = canEncr || encr;
-     }
-     else if( !strncmp( output.data() + offset, "Unknown type", 12 ) )
-     { // line contains key data of unknown type (ignored)
---- kdepim/libkpgp/kpgpui.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/libkpgp/kpgpui.cpp	2006/04/15 12:39:26	530112
-@@ -985,7 +985,7 @@
-     kdDebug(5100) << "Selected keys: " << newKeyIdList.toStringList().join(", ") << endl;
-     mKeyIds = newKeyIdList;
-     if( !keysToBeChecked.isEmpty() ) {
--      keysAllowed &= checkKeys( keysToBeChecked );
-+      keysAllowed = keysAllowed && checkKeys( keysToBeChecked );
-     }
-     enableButtonOK( keysAllowed );
- 
-@@ -1016,7 +1016,7 @@
-     pProgressDlg->setLabel( i18n("Checking key 0x%1...")
-                             .arg( getKeyId( *it ) ) );
-     kapp->processEvents();
--    keysAllowed &= ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) );
-+    keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) );
-     pProgressDlg->progressBar()->advance( 1 );
-     kapp->processEvents();
-   }
diff --git a/kde-base/lisa/ChangeLog b/kde-base/lisa/ChangeLog
index 1bb4c4955dd7..c972047fbd2c 100644
--- a/kde-base/lisa/ChangeLog
+++ b/kde-base/lisa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/lisa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/ChangeLog,v 1.64 2007/02/04 03:14:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/ChangeLog,v 1.65 2007/02/05 11:46:13 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/lisa-3.5.0-bindnow.patch, -files/lisa, -files/lisa.conf,
+  -files/reslisa, -files/reslisa.conf:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -lisa-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/lisa/files/lisa b/kde-base/lisa/files/lisa
deleted file mode 100755
index f0da1fa0413f..000000000000
--- a/kde-base/lisa/files/lisa
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/files/lisa,v 1.1 2005/01/15 02:24:41 danarmak Exp $
-
-depend() {
-    use net
-}
-
-start() {
-    ebegin "Starting lisa"
-    start-stop-daemon --start -x _KDEDIR_/bin/lisa -q -- $LISACONF 1>/dev/null
-    eend $? "Failed to start lisa"
-}
-
-stop() {
-    ebegin "Stopping lisa"
-    start-stop-daemon --stop -x _KDEDIR_/bin/lisa -q
-    eend $? "Failed to stop lisa"
-}
diff --git a/kde-base/lisa/files/lisa-3.5.0-bindnow.patch b/kde-base/lisa/files/lisa-3.5.0-bindnow.patch
deleted file mode 100644
index f55c5c6892d1..000000000000
--- a/kde-base/lisa/files/lisa-3.5.0-bindnow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdenetwork-3.5.0/lanbrowsing/lisa/Makefile.am
-===================================================================
---- kdenetwork-3.5.0.orig/lanbrowsing/lisa/Makefile.am
-+++ kdenetwork-3.5.0/lanbrowsing/lisa/Makefile.am
-@@ -33,7 +33,7 @@ lisa_LDADD = $(LIBSOCKET)
- lisa_LDFLAGS = $(KDE_EXTRA_RPATH)
- 
- reslisa_LDADD = $(LIBSOCKET)
--reslisa_LDFLAGS = $(KDE_EXTRA_RPATH)
-+reslisa_LDFLAGS = $(KDE_EXTRA_RPATH) $(BINDNOW_FLAGS)
- 
- misc_DATA = README
- miscdir = $(kde_datadir)/lisa
diff --git a/kde-base/lisa/files/lisa.conf b/kde-base/lisa/files/lisa.conf
deleted file mode 100644
index bad3fa8261fc..000000000000
--- a/kde-base/lisa/files/lisa.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Note: this is NOT the main lisa configuratio file. That is in /etc/lisarc.
-# This merely sets startup options for the gentoo lisa initscript.
-# Add anything you want to $LISACONF.
-
-# config file to use; overrides default
-# note that default checks /etc/lisarc and ~/.lisarc
-# LISACONF="$LISACONF --config=myfile"
-
-# port to use; overrides default of 7741
-# I think all lisas on the network have to use the same port
-# LISACONF="$LISACONF --port 7741"
-\ No newline at end of file
diff --git a/kde-base/lisa/files/reslisa b/kde-base/lisa/files/reslisa
deleted file mode 100755
index c37d8851410a..000000000000
--- a/kde-base/lisa/files/reslisa
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/files/reslisa,v 1.1 2005/01/15 02:24:41 danarmak Exp $
-
-depend() {
-    use net
-}
-
-start() {
-    ebegin "Starting reslisa"
-    start-stop-daemon --start -x _KDEDIR_/bin/reslisa -q -- $RESLISACONF 1>/dev/null
-    eend $? "Failed to start reslisa"
-}
-
-stop() {
-    ebegin "Stopping reslisa"
-    start-stop-daemon --stop -x _KDEDIR_/bin/reslisa -q
-    eend $? "Failed to stop reslisa"
-}
diff --git a/kde-base/lisa/files/reslisa.conf b/kde-base/lisa/files/reslisa.conf
deleted file mode 100644
index 04328058935c..000000000000
--- a/kde-base/lisa/files/reslisa.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Note: this is NOT the main reslisa configuration file.
-# This merely sets startup options for the gentoo lisa initscript.
-# Add anything you want to $RESLISACONF.
-
-# config file to use; overrides default
-# note that default checks /etc/lisarc and ~/.lisarc
-# RESLISACONF="$RESLISACONF --config=myfile"
-
-# port to use; overrides default of 7741
-# I think all reslisas on the network have to use the same port
-# RESLISACONF="$RESLISACONF --port 7741"
-\ No newline at end of file
diff --git a/kde-base/mimelib/ChangeLog b/kde-base/mimelib/ChangeLog
index 67ea0fe12689..ecdcfaefdf6b 100644
--- a/kde-base/mimelib/ChangeLog
+++ b/kde-base/mimelib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/mimelib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/ChangeLog,v 1.59 2007/02/04 03:15:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/ChangeLog,v 1.60 2007/02/05 12:14:14 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/mimelib-3.5.1-memleak-fix.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -mimelib-3.5.1-r1.ebuild:
diff --git a/kde-base/mimelib/files/mimelib-3.5.1-memleak-fix.diff b/kde-base/mimelib/files/mimelib-3.5.1-memleak-fix.diff
deleted file mode 100644
index 81c00c38bfc8..000000000000
--- a/kde-base/mimelib/files/mimelib-3.5.1-memleak-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdepim/mimelib/attach.cpp	2005/07/26 18:54:59	438982
-+++ kdepim/mimelib/attach.cpp	2006/04/16 14:28:03	530387
-@@ -217,7 +217,7 @@
- 
-     FILE* fp = fopen(aFilename, "rb");
-     if (fp == 0) {
--        delete buf;
-+        delete[] buf;
-         str = "";
-         return -1;
-     }
---- kdepim/mimelib/datetime.cpp	2006/01/06 12:12:33	494852
-+++ kdepim/mimelib/datetime.cpp	2006/04/16 14:28:03	530387
-@@ -304,7 +304,7 @@
-         mZone   = 0;
-     }
-     if (mustDelete) {
--        delete str;
-+        delete[] str;
-     }
- }
- 
diff --git a/kde-base/mpeglib/ChangeLog b/kde-base/mpeglib/ChangeLog
index e539ee5ea213..f9018ca3f713 100644
--- a/kde-base/mpeglib/ChangeLog
+++ b/kde-base/mpeglib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/mpeglib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.44 2007/01/20 00:35:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.45 2007/02/05 12:15:24 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdemultimedia-3.4.0-amd64.patch:
+  Remove unneeded patches.
 
   20 Jan 2007; Carsten Lohrke <carlo@gentoo.org> mpeglib-3.5.6.ebuild:
   Correct MAXKDEVER.
diff --git a/kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch b/kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch
deleted file mode 100644
index 7d019d1a575e..000000000000
--- a/kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mpeglib/lib/input/cdromAccess.cpp.org	2005-02-02 14:06:28.000000000 +0100
-+++ mpeglib/lib/input/cdromAccess.cpp	2005-02-02 14:07:30.000000000 +0100
-@@ -27,6 +27,9 @@
-   #include <sys/types.h>
-   #ifndef __u64
-   #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
-+  #ifdef __x86_64__
-+  typedef unsigned long long __u64;
-+  #else
-   #include <bits/wordsize.h>
-   #if __WORDSIZE == 64
-   typedef unsigned long __u64;
-@@ -35,6 +38,7 @@
-   #endif 
-   #endif
-   #endif
-+  #endif
-   #include "cdromAccess_Linux.cpp"
- #endif
- 
diff --git a/kde-base/noatun-plugins/ChangeLog b/kde-base/noatun-plugins/ChangeLog
index 75cd76a9c1d0..007c368e1f9d 100644
--- a/kde-base/noatun-plugins/ChangeLog
+++ b/kde-base/noatun-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/noatun-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/ChangeLog,v 1.64 2007/02/04 03:16:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/ChangeLog,v 1.65 2007/02/05 12:13:49 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/noatun-oblique-db-location-3.4.0_rc1.diff,
+  -files/configure-fix-kdeaddons-db.patch,
+  -files/configure-fix-kdeaddons-sdl.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -noatun-plugins-3.5.2.ebuild:
diff --git a/kde-base/noatun-plugins/files/configure-fix-kdeaddons-db.patch b/kde-base/noatun-plugins/files/configure-fix-kdeaddons-db.patch
deleted file mode 100644
index 19d467ecef80..000000000000
--- a/kde-base/noatun-plugins/files/configure-fix-kdeaddons-db.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: noatun-plugins/oblique/configure.in.in
-===================================================================
---- noatun-plugins/oblique/configure.in.in	(revision 433553)
-+++ noatun-plugins/oblique/configure.in.in	(working copy)
-@@ -1,19 +1,31 @@
-+AC_ARG_WITH(berkeley-db,
-+  [AS_HELP_STRING(--with-berkeley-db,
-+    [enable support for Berkeley DB++ @<:@default=check@:>@])],
-+  [], with_berkeley_db=check)
- 
--AC_MSG_CHECKING(for Berkeley DB++)
-+AC_ARG_WITH(db-lib,
-+  [AS_HELP_STRING([--with-db-lib=NAME],[name of the Berkeley DB++ library @<:@default=db_cxx@:>@])],
-+    [ac_db_name="$withval"], [ac_db_name="db_cxx"])
-+
- berkeley_db=no
--AC_LANG_PUSH(C++)
--AC_TRY_COMPILE([
--		#include <db_cxx.h>
--	],[
--	],[
--		berkeley_db=yes
--	])
--AC_MSG_RESULT($berkeley_db)
--AC_DEFINE(BERKELEY_DB,1,[Define if you have Berkeley DB++ installed])
--BERKELEY_DB_LIBS="-ldb_cxx"
--AC_SUBST(BERKELEY_DB_LIBS)
--AC_LANG_POP(C++)
-+if test "x$with_berkeley_db" != xno; then
-+  berkeley_db=yes
- 
--AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
-+  KDE_CHECK_HEADER([db_cxx.h],
-+    [:], [berkeley_db=no])
- 
-+  AC_CHECK_LIB([$ac_db_name], [main],
-+    [:], [berkeley_db=no])
- 
-+  if test "x$berkeley_db" = xyes; then
-+    AC_DEFINE(BERKELEY_DB, 1, [Define if you have Berkeley DB++ installed])
-+    BERKELEY_DB_LIBS="-l$ac_db_name"
-+    AC_SUBST(BERKELEY_DB_LIBS)
-+  fi
-+
-+  if test "x$with_berkeley_db" != xcheck && test "x$berkeley_db" != xyes; then
-+    AC_MSG_FAILURE([--with-berkeley-db was given, but test for Berkeley DB++ failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
diff --git a/kde-base/noatun-plugins/files/configure-fix-kdeaddons-sdl.patch b/kde-base/noatun-plugins/files/configure-fix-kdeaddons-sdl.patch
deleted file mode 100644
index 044f7c2d7618..000000000000
--- a/kde-base/noatun-plugins/files/configure-fix-kdeaddons-sdl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: noatun-plugins/configure.in.in
-===================================================================
---- noatun-plugins/configure.in.in	(revision 428268)
-+++ noatun-plugins/configure.in.in	(working copy)
-@@ -173,14 +173,20 @@
- noatun_sdl=no
- dnl Check for SDL
- dnl require SDL 1.2 just because it's the new stable version, and it's what I have
--NOATUN_PATH_SDL(
--[1.2.0],
--[
--noatun_sdl=yes
--],
--[
--]
--)
-+
-+AC_ARG_WITH(sdl,
-+  [AS_HELP_STRING(--with-sdl,
-+    [enable SDL Noatun plugins @<:@default=check@:>@])],
-+  [], with_sdl=check)
-+
-+if test "x$with_sdl" != xno; then
-+  NOATUN_PATH_SDL([1.2.0], [noatun_sdl=yes], [])
-+
-+  if test "x$with_sdl" != xcheck && test "x$noatun_sdl" != xyes; then
-+    AC_MSG_FAILURE([--with-sdl was given, but test for SDL failed])
-+  fi
-+fi
-+
- AM_CONDITIONAL(include_SDL, test "$noatun_sdl" = yes)
- 
- AC_CHECK_HEADERS(endian.h)
diff --git a/kde-base/noatun-plugins/files/noatun-oblique-db-location-3.4.0_rc1.diff b/kde-base/noatun-plugins/files/noatun-oblique-db-location-3.4.0_rc1.diff
deleted file mode 100644
index bf3f954f57af..000000000000
--- a/kde-base/noatun-plugins/files/noatun-oblique-db-location-3.4.0_rc1.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- noatun-plugins/oblique/configure.in.in.orig	2004-10-09 11:41:38.000000000 +0200
-+++ noatun-plugins/oblique/configure.in.in	2005-02-11 20:29:38.760533256 +0200
-@@ -1,19 +1,4 @@
--
--AC_MSG_CHECKING(for Berkeley DB++)
--berkeley_db=no
--AC_LANG_PUSH(C++)
--AC_TRY_COMPILE([
--		#include <db_cxx.h>
--	],[
--	],[
--		berkeley_db=yes
--	])
--AC_MSG_RESULT($berkeley_db)
--AC_DEFINE(BERKELEY_DB,1,[Define if you have Berkeley DB++ installed])
--BERKELEY_DB_LIBS="-ldb_cxx"
-+berkeley_db=yes
-+BERKELEY_DB_LIBS="-ldb_cxx-4.2"
- AC_SUBST(BERKELEY_DB_LIBS)
--AC_LANG_POP(C++)
--
- AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
--
--
diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 9d4d35941d08..a92410707256 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.75 2007/02/04 03:17:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.76 2007/02/05 12:12:44 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/nsplugins-3.5.3-applet-redirects.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -nsplugins-3.5.2.ebuild:
diff --git a/kde-base/nsplugins/files/nsplugins-3.5.3-applet-redirects.patch b/kde-base/nsplugins/files/nsplugins-3.5.3-applet-redirects.patch
deleted file mode 100644
index 5f8ded2292e0..000000000000
--- a/kde-base/nsplugins/files/nsplugins-3.5.3-applet-redirects.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: nsplugins/viewer/nsplugin.cpp
-===================================================================
---- nsplugins/viewer/nsplugin.cpp	(revision 565997)
-+++ nsplugins/viewer/nsplugin.cpp	(revision 565998)
-@@ -1602,6 +1602,12 @@
-     return true;
- }
- 
-+void NSPluginStreamBase::updateURL( const KURL& newURL )
-+{
-+    _url = newURL;
-+    free(const_cast<char*>(_stream->url));
-+    _stream->url = strdup(_url.url().ascii());
-+}
- 
- int NSPluginStreamBase::process( const QByteArray &data, int start )
- {
-@@ -1824,6 +1830,8 @@
-                 SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
-         connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
-                 SLOT(mimetype(KIO::Job *, const QString &)));
-+        connect(_job, SIGNAL(redirection(KIO::Job *, const KURL&)),
-+                SLOT(redirection(KIO::Job *, const KURL&)));
-     }
- 
-     return false;
-@@ -1847,6 +1855,8 @@
-                 SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
-         connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
-                 SLOT(mimetype(KIO::Job *, const QString &)));
-+        connect(_job, SIGNAL(redirection(KIO::Job *, const KURL&)),
-+                SLOT(redirection(KIO::Job *, const KURL&)));
-     }
- 
-     return false;
-@@ -1863,6 +1873,11 @@
-     }
- }
- 
-+void NSPluginStream::redirection(KIO::Job * /*job*/, const KURL& url)
-+{
-+    updateURL( url );
-+}
-+
- void NSPluginStream::totalSize(KIO::Job * job, KIO::filesize_t size)
- {
-     kdDebug(1431) << "NSPluginStream::totalSize - job=" << (void*)job << " size=" << KIO::number(size) << endl;
-Index: nsplugins/viewer/nsplugin.h
-===================================================================
---- nsplugins/viewer/nsplugin.h	(revision 565997)
-+++ nsplugins/viewer/nsplugin.h	(revision 565998)
-@@ -85,6 +85,7 @@
-   bool create( const QString& url, const QString& mimeType, void *notify, bool forceNotify = false );
-   int tries() { return _tries; }
-   void inform( );
-+  void updateURL( const KURL& newURL );
- 
-   class NSPluginInstance *_instance;
-   uint16 _streamType;
-@@ -126,6 +127,7 @@
-   void totalSize(KIO::Job *job, KIO::filesize_t size);
-   void mimetype(KIO::Job * job, const QString &mimeType);
-   void result(KIO::Job *job);
-+  void redirection(KIO::Job *job, const KURL& url);
-   void resume();
- 
- protected:
diff --git a/kde-base/qtruby/ChangeLog b/kde-base/qtruby/ChangeLog
index 22f37532e3e1..0299b631f561 100644
--- a/kde-base/qtruby/ChangeLog
+++ b/kde-base/qtruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/qtruby
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.56 2007/02/04 03:17:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.57 2007/02/05 12:26:36 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/qtruby-3.4.1-handlers.diff, -files/qtruby-3.5.4-more.patch,
+  -files/qtruby-3-makeitwork.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -qtruby-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/qtruby/files/qtruby-3-makeitwork.patch b/kde-base/qtruby/files/qtruby-3-makeitwork.patch
deleted file mode 100644
index 4039671d88c8..000000000000
--- a/kde-base/qtruby/files/qtruby-3-makeitwork.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qtruby/rubylib/qtruby/Qt.cpp	(revision 486006)
-+++ qtruby/rubylib/qtruby/Qt.cpp	(revision 486016)
-@@ -1563,10 +1563,7 @@
-     }
- 
-     VALUE result = rb_funcall2(qt_internal_module, rb_intern("try_initialize"), argc+1, temp_stack);
--
--    if (rb_respond_to(result, rb_intern("initialize")) != 0) {
- 	rb_obj_call_init(result, argc, argv);
--    }
- 	
- 	free(temp_stack);
-     return result;
diff --git a/kde-base/qtruby/files/qtruby-3.4.1-handlers.diff b/kde-base/qtruby/files/qtruby-3.4.1-handlers.diff
deleted file mode 100644
index f08de991f4ac..000000000000
--- a/kde-base/qtruby/files/qtruby-3.4.1-handlers.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtruby/rubylib/qtruby/handlers.cpp	2005/05/30 01:00:52	419599
-+++ qtruby/rubylib/qtruby/handlers.cpp	2005/07/09 11:46:54	433005
-@@ -863,7 +863,7 @@
- 	     	} else {
-                *(m->var()) = rstringFromQString(s);
- 	     	}
--	     	if(m->cleanup())
-+	     	if(m->cleanup() || m->type().isStack())
- 	     	delete s;
-          } else {
-                 *(m->var()) = Qnil;
diff --git a/kde-base/qtruby/files/qtruby-3.5.4-more.patch b/kde-base/qtruby/files/qtruby-3.5.4-more.patch
deleted file mode 100644
index 614f495fbaeb..000000000000
--- a/kde-base/qtruby/files/qtruby-3.5.4-more.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-Index: ChangeLog
-===================================================================
---- qtruby/ChangeLog	(revision 565692)
-+++ qtruby/ChangeLog	(revision 578513)
-@@ -1,3 +1,13 @@
-+2006-08-29  Richard Dale  <rdale@foton.es>
-+
-+	* Backported some memory leak fixes from Qt4 QtRuby
-+
-+2006-08-10  Richard Dale  <rdale@foton.es>
-+
-+	* The Ruby VALUE to 'uchar *' marshaller wasn't working correctly if the
-+	  Ruby string contained nulls. Fixed by Dirk Mueller (thanks) and also 
-+	  applied for 'char *' types.
-+
- 2006-07-12  Richard Dale  <rdale@foton.es>
- 
- 	* The Ruby String to 'char *' and String to 'unsigned char *' were using
-Index: rubylib/qtruby/handlers.cpp
-===================================================================
---- qtruby/rubylib/qtruby/handlers.cpp	(revision 565692)
-+++ qtruby/rubylib/qtruby/handlers.cpp	(revision 578513)
-@@ -422,6 +422,7 @@
-     Smoke::Index ccMeth = o->smoke->findMethod(o->classId, ccId);
- 
-     if(!ccMeth) {
-+	delete[] ccArg;
- 	return 0;
-     }
- 	Smoke::Index method = o->smoke->methodMaps[ccMeth].method;
-@@ -747,17 +748,21 @@
- 
- static void marshall_charP(Marshall *m) {
-     switch(m->action()) {
--      case Marshall::FromVALUE:
--	{
--	    VALUE rv = *(m->var());
--	    if(rv == Qnil) {
--                m->item().s_voidp = 0;
--                break;
--	    }
--		
--        m->item().s_voidp = strdup(StringValuePtr(rv));
--	}
--	break;
-+    case Marshall::FromVALUE:
-+    {
-+        VALUE rv = *(m->var());
-+	    if (rv == Qnil) {
-+            m->item().s_voidp = 0;
-+            break;
-+        }
-+	
-+        int len = RSTRING(rv)->len;
-+        char* mem = (char*) malloc(len+1);
-+        memcpy(mem, StringValuePtr(rv), len);
-+        mem[len] ='\0';
-+        m->item().s_voidp = mem;
-+    }
-+        break;
-       case Marshall::ToVALUE:
- 	{
- 	    char *p = (char*)m->item().s_voidp;
-@@ -777,14 +782,18 @@
- 
- void marshall_ucharP(Marshall *m) {
-     switch(m->action()) {
--      case Marshall::FromVALUE:
--	{
--	    VALUE rv = *(m->var());
--	    if(rv == Qnil) {
--		m->item().s_voidp = 0;
--		break;
--	    }
--        m->item().s_voidp = strdup(StringValuePtr(rv));
-+    case Marshall::FromVALUE:
-+    {
-+        VALUE rv = *(m->var());
-+        if (rv == Qnil) {
-+            m->item().s_voidp = 0;
-+            break;
-+        }
-+        int len = RSTRING(rv)->len;
-+        char* mem = (char*) malloc(len+1);
-+        memcpy(mem, StringValuePtr(rv), len);
-+        mem[len] ='\0';
-+        m->item().s_voidp = mem;
- 	}
- 	break;
-       case Marshall::ToVALUE:
-@@ -1836,8 +1845,8 @@
-     }
- }
- 
--#define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace { char ListIdent##STR[] = #Item; };  \
--        Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,ListIdent##STR>;
-+#define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace dummy { char ListIdent##STR[] = #Item; };  \
-+        Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,dummy::ListIdent##STR>;
- 
- DEF_VALUELIST_MARSHALLER( QVariantList, QValueList<QVariant>, QVariant, QValueList<QVariant>::Iterator )
- DEF_VALUELIST_MARSHALLER( QPixmapList, QValueList<QPixmap>, QPixmap, QValueList<QPixmap>::Iterator )
-Index: rubylib/qtruby/Qt.cpp
-===================================================================
---- qtruby/rubylib/qtruby/Qt.cpp	(revision 565692)
-+++ qtruby/rubylib/qtruby/Qt.cpp	(revision 578513)
-@@ -1351,28 +1351,32 @@
- 	return obj;
- }
- 
--static QCString
-+static QCString *
- find_cached_selector(int argc, VALUE * argv, VALUE klass, char * methodName)
- {
-     // Look in the cache
--	QCString mcid(rb_class2name(klass));
--	mcid += ';';
--	mcid += methodName;
-+static QCString * mcid = 0;
-+	if (mcid == 0) {
-+		mcid = new QCString();
-+	}
-+	*mcid = rb_class2name(klass);
-+	*mcid += ';';
-+	*mcid += methodName;
- 	for(int i=3; i<argc ; i++)
- 	{
--		mcid += ';';
--		mcid += get_VALUEtype(argv[i]);
-+		*mcid += ';';
-+		*mcid += get_VALUEtype(argv[i]);
- 	}
- 	
--	Smoke::Index *rcid = methcache.find((const char *)mcid);
-+	Smoke::Index *rcid = methcache.find((const char *)*mcid);
- #ifdef DEBUG
--	if (do_debug & qtdb_calls) qWarning("method_missing mcid: %s", (const char *) mcid);
-+	if (do_debug & qtdb_calls) qWarning("method_missing mcid: %s", (const char *) *mcid);
- #endif
- 	
- 	if (rcid) {
- 		// Got a hit
- #ifdef DEBUG
--		if (do_debug & qtdb_calls) qWarning("method_missing cache hit, mcid: %s", (const char *) mcid);
-+		if (do_debug & qtdb_calls) qWarning("method_missing cache hit, mcid: %s", (const char *) *mcid);
- #endif
- 		_current_method = *rcid;
- 	} else {
-@@ -1389,27 +1393,32 @@
-     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
- 
- 	// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
--	QString pred(rb_id2name(SYM2ID(argv[0])));
--	if (pred.endsWith("?")) {
-+static QString * pred = 0;
-+	if (pred == 0) {
-+		pred = new QString();
-+	}
-+	
-+	*pred = methodName;
-+	if (pred->endsWith("?")) {
- 		smokeruby_object *o = value_obj_info(self);
- 		if(!o || !o->ptr) {
- 			rb_call_super(argc, argv);
- 		}
- 		
- 		// Drop the trailing '?'
--		pred.replace(pred.length() - 1, 1, "");
-+		pred->replace(pred->length() - 1, 1, "");
- 		
--		pred.replace(0, 1, pred.at(0).upper());
--		pred.replace(0, 0, QString("is"));
--		Smoke::Index meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred.latin1());
-+		pred->replace(0, 1, pred->at(0).upper());
-+		pred->replace(0, 0, QString("is"));
-+		Smoke::Index meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred->latin1());
- 		
- 		if (meth == 0) {
--			pred.replace(0, 2, QString("has"));
--			meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred.latin1());
-+			pred->replace(0, 2, QString("has"));
-+			meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred->latin1());
- 		}
- 		
- 		if (meth > 0) {
--			methodName = (char *) pred.latin1();
-+			methodName = (char *) pred->latin1();
- 		}
- 	}
- 		
-@@ -1423,18 +1432,26 @@
-     }
- 
- 	{
--		QCString mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
-+		QCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
- 
- 		if (_current_method == -1) {
- 			// Find the C++ method to call. Do that from Ruby for now
- 
- 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
- 			if (_current_method == -1) {
--				QRegExp rx("^[-+%/|]$");
--				QString op(rb_id2name(SYM2ID(argv[0])));
--				if (rx.search(op) != -1) {
-+				char * op = rb_id2name(SYM2ID(argv[0]));
-+				if (	qstrcmp(op, "-") == 0
-+						|| qstrcmp(op, "+") == 0
-+						|| qstrcmp(op, "/") == 0
-+						|| qstrcmp(op, "%") == 0
-+						|| qstrcmp(op, "|") == 0 )
-+				{
- 					// Look for operator methods of the form 'operator+=', 'operator-=' and so on..
--					temp_stack[1] = rb_str_new2(op.append("=").latin1());
-+					char op1[3];
-+					op1[0] = op[0];
-+					op1[1] = '=';
-+					op1[2] = '\0';
-+					temp_stack[1] = rb_str_new2(op1);
- 					retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
- 				}
- 
-@@ -1448,26 +1465,31 @@
- 							&& isDerivedFrom(o->smoke, o->classId, o->smoke->idClass("QObject")) )
- 					{
- 						QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject"));
--						QString prop(rb_id2name(SYM2ID(argv[0])));
-+static QString * prop = 0;
-+						if (prop == 0) {
-+							prop = new QString();
-+						}
-+						
-+						*prop = rb_id2name(SYM2ID(argv[0]));
- 						QMetaObject * meta = qobject->metaObject();
- 						if (argc == 1) {
--							if (prop.endsWith("?")) {
--								prop.replace(0, 1, pred.at(0).upper());
--								prop.replace(0, 0, QString("is"));
--								if (meta->findProperty(prop.latin1(), true) == -1) {
--									prop.replace(0, 2, QString("has"));
-+							if (prop->endsWith("?")) {
-+								prop->replace(0, 1, pred->at(0).upper());
-+								prop->replace(0, 0, QString("is"));
-+								if (meta->findProperty(prop->latin1(), true) == -1) {
-+									prop->replace(0, 2, QString("has"));
- 								}
- 							}
- 
--							if (meta->findProperty(prop.latin1(), true) != -1) {
--								VALUE qvariant = rb_funcall(self, rb_intern("property"), 1, rb_str_new2(prop.latin1()));
-+							if (meta->findProperty(prop->latin1(), true) != -1) {
-+								VALUE qvariant = rb_funcall(self, rb_intern("property"), 1, rb_str_new2(prop->latin1()));
- 								return rb_funcall(qvariant, rb_intern("to_ruby"), 0);
- 							}
--						} else if (argc == 2 && prop.endsWith("=")) {
--							prop.replace("=", "");
--							if (meta->findProperty(prop.latin1(), true) != -1) {
-+						} else if (argc == 2 && prop->endsWith("=")) {
-+							prop->replace("=", "");
-+							if (meta->findProperty(prop->latin1(), true) != -1) {
- 								VALUE qvariant = rb_funcall(qvariant_class, rb_intern("new"), 1, argv[1]);
--								return rb_funcall(self, rb_intern("setProperty"), 2, rb_str_new2(prop.latin1()), qvariant);
-+								return rb_funcall(self, rb_intern("setProperty"), 2, rb_str_new2(prop->latin1()), qvariant);
- 							}
- 						}
- 					}
-@@ -1476,7 +1498,7 @@
- 				}
- 			}
- 			// Success. Cache result.
--			methcache.insert((const char *)mcid, new Smoke::Index(_current_method));
-+			methcache.insert((const char *)*mcid, new Smoke::Index(_current_method));
- 		}
- 	}
- 	
-@@ -1503,21 +1525,25 @@
-     }
- 
-     {
--		QCString mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
-+		QCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
- 
- 		if (_current_method == -1) {
- 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
-          Q_UNUSED(retval);
- 			if (_current_method != -1) {
- 				// Success. Cache result.
--				methcache.insert((const char *)mcid, new Smoke::Index(_current_method));
-+				methcache.insert((const char *)*mcid, new Smoke::Index(_current_method));
- 			}
- 		}
- 	}
- 
-     if (_current_method == -1) {
--		QRegExp rx("[a-zA-Z]+");
--		if (rx.search(methodName) == -1) {
-+static QRegExp * rx = 0;
-+		if (rx == 0) {
-+			rx = new QRegExp("[a-zA-Z]+");
-+		}
-+
-+		if (rx->search(methodName) == -1) {
- 			// If an operator method hasn't been found as an instance method,
- 			// then look for a class method - after 'op(self,a)' try 'self.op(a)' 
- 	    	VALUE * method_stack = (VALUE *) calloc(argc - 1, sizeof(VALUE));
-@@ -1584,10 +1610,10 @@
- 	if (TYPE(self) == T_DATA) {
- 		// If a ruby block was passed then run that now
- 		if (rb_block_given_p()) {
--		rb_funcall(qt_internal_module, rb_intern("run_initializer_block"), 2, self, rb_block_proc());
-+			rb_funcall(qt_internal_module, rb_intern("run_initializer_block"), 2, self, rb_block_proc());
- 		}
-     
--	return self;
-+		return self;
-     }
- 
-     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
-@@ -1599,19 +1625,19 @@
-     temp_stack[2] = klass;
-     temp_stack[3] = self;
-     for (int count = 0; count < argc; count++) {
--	temp_stack[count+4] = argv[count];
-+		temp_stack[count+4] = argv[count];
-     }
- 
- 	{ 
- 		// Put this in a C block so that the mcid will be de-allocated at the end of the block,
- 		// rather than on f'n exit, to avoid the longjmp problem described below
--		QCString mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
-+		QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
- 
- 		if (_current_method == -1) {
- 			retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack);
- 			if (_current_method != -1) {
- 				// Success. Cache result.
--				methcache.insert((const char *)mcid, new Smoke::Index(_current_method));
-+				methcache.insert((const char *)*mcid, new Smoke::Index(_current_method));
- 			}
- 		}
- 	}
-@@ -1652,7 +1678,7 @@
-     VALUE * temp_stack = (VALUE *) calloc(argc + 1, sizeof(VALUE));
-     temp_stack[0] = rb_obj_alloc(klass);
-     for (int count = 0; count < argc; count++) {
--	temp_stack[count+1] = argv[count];
-+		temp_stack[count+1] = argv[count];
-     }
- 
-     VALUE result = rb_funcall2(qt_internal_module, rb_intern("try_initialize"), argc+1, temp_stack);
-@@ -1668,16 +1694,16 @@
-     VALUE result = Qnil;
- 
-     if (argc == 1 && TYPE(argv[0]) == T_ARRAY) {
--	// Convert '(ARGV)' to '(NUM, [$0]+ARGV)'
--	VALUE * local_argv = (VALUE *) calloc(argc + 1, sizeof(VALUE));
--	VALUE temp = rb_ary_dup(argv[0]);
--	rb_ary_unshift(temp, rb_gv_get("$0"));
--	local_argv[0] = INT2NUM(RARRAY(temp)->len);
--	local_argv[1] = temp;
--	result = new_qt(2, local_argv, klass);
--	free(local_argv);
-+		// Convert '(ARGV)' to '(NUM, [$0]+ARGV)'
-+		VALUE * local_argv = (VALUE *) calloc(argc + 1, sizeof(VALUE));
-+		VALUE temp = rb_ary_dup(argv[0]);
-+		rb_ary_unshift(temp, rb_gv_get("$0"));
-+		local_argv[0] = INT2NUM(RARRAY(temp)->len);
-+		local_argv[1] = temp;
-+		result = new_qt(2, local_argv, klass);
-+		free(local_argv);
-     } else {
--	result = new_qt(argc, argv, klass);
-+		result = new_qt(argc, argv, klass);
-     }
- 
-     rb_gv_set("$qApp", result);
-@@ -1735,9 +1761,9 @@
-     if(index < 0) return Qnil;
- 
-     if (isSignal) {
--	member = rb_funcall(qt_internal_module, rb_intern("signalAt"), 2, self, INT2NUM(index));
-+		member = rb_funcall(qt_internal_module, rb_intern("signalAt"), 2, self, INT2NUM(index));
-     } else {
--	member = rb_funcall(qt_internal_module, rb_intern("slotAt"), 2, self, INT2NUM(index));
-+		member = rb_funcall(qt_internal_module, rb_intern("slotAt"), 2, self, INT2NUM(index));
-     }
- 
-     VALUE mocArgs = rb_funcall(qt_internal_module, rb_intern("getMocArguments"), 1, member);
-@@ -1815,7 +1841,12 @@
-     }
- 
-     QString name(slotname);
--    name.replace(QRegExp("\\(.*"), "");
-+static QRegExp * rx = 0;
-+	if (rx == 0) {
-+		rx = new QRegExp("\\(.*");
-+	}
-+	name.replace(*rx, "");
-+
-     InvokeSlot slot(self, rb_intern(name.latin1()), mocArgs, _o);
-     slot.next();
- 
-@@ -2568,7 +2599,10 @@
- {
- 	VALUE klass = Qnil;
- 	QString packageName(package);
--	QRegExp scope_op("^([^:]+)::([^:]+)$");
-+static QRegExp * scope_op = 0;
-+	if (scope_op == 0) {
-+		scope_op = new QRegExp("^([^:]+)::([^:]+)$");
-+	 }
- 
- 	if (packageName.startsWith("KDE::ConfigSkeleton::ItemEnum::")) {
- 		klass = rb_define_class_under(kconfigskeleton_itemenum_class, package+strlen("KDE::ConfigSkeleton::EnumItem::"), base_class);
-@@ -2606,7 +2640,7 @@
- 	} else if (packageName.startsWith("Kontact::")) {
- 		klass = rb_define_class_under(kontact_module, package+strlen("Kontact::"), base_class);
- 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
--	} else if (packageName.startsWith("Ko") && scope_op.search(packageName) == -1) {
-+	} else if (packageName.startsWith("Ko") && scope_op->search(packageName) == -1) {
- 		klass = rb_define_class_under(koffice_module, package+strlen("Ko"), base_class);
- 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
- 	} else if (packageName.startsWith("Kate::")) {
-@@ -2618,11 +2652,11 @@
- 	} else if (packageName.startsWith("KTextEditor::")) {
- 		klass = rb_define_class_under(ktexteditor_module, package+strlen("KTextEditor::"), base_class);
- 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
--	} else if (scope_op.search(packageName) != -1) {
-+	} else if (scope_op->search(packageName) != -1) {
- 		// If an unrecognised classname of the form 'XXXXXX::YYYYYY' is found,
- 		// then create a module XXXXXX to put the class YYYYYY under
--		VALUE module = rb_define_module(scope_op.cap(1).latin1());
--		klass = rb_define_class_under(module, scope_op.cap(2).latin1(), base_class);
-+		VALUE module = rb_define_module(scope_op->cap(1).latin1());
-+		klass = rb_define_class_under(module, scope_op->cap(2).latin1(), base_class);
- 	} else if (	packageName.startsWith("K") 
- 				&& packageName.mid(1, 1).contains(QRegExp("[A-Z]")) == 1 ) 
- 	{
-@@ -2792,6 +2826,7 @@
- 
-     methcache.setAutoDelete(true);
-     classcache.setAutoDelete(true);
-+    classname.setAutoDelete(true);
- 
- 	if (qt_module == Qnil) {
- 		qt_module = rb_define_module("Qt");
diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index 13f8b973a925..a6b34715fc3d 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.45 2007/02/04 03:19:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.46 2007/02/05 12:27:16 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/superkaramba-3.5.0-fbsd.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -superkaramba-3.5.2.ebuild:
diff --git a/kde-base/superkaramba/files/superkaramba-3.5.0-fbsd.patch b/kde-base/superkaramba/files/superkaramba-3.5.0-fbsd.patch
deleted file mode 100644
index 4528b7fa6fe7..000000000000
--- a/kde-base/superkaramba/files/superkaramba-3.5.0-fbsd.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Index: superkaramba/src/memsensor.cpp
-===================================================================
---- superkaramba/src/memsensor.cpp	(revision 487000)
-+++ superkaramba/src/memsensor.cpp	(revision 487001)
-@@ -14,7 +14,7 @@
- #include <qstring.h>
- #include <qregexp.h>
- 
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- #include <sys/time.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-@@ -32,14 +32,14 @@
- #include <sys/swap.h>
- #endif
- 
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
- /* define pagetok in terms of pageshift */
- #define pagetok(size) ((size) << pageshift)
- #endif
- 
- MemSensor::MemSensor(int msec) : Sensor(msec)
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-    /* get the page size with "getpagesize" and calculate pageshift from it */
-     int pagesize = getpagesize();
-     pageshift = 0;
-@@ -51,7 +51,7 @@
- 
-     /* we only need the amount of log(2)1024 for our conversion */
-     pageshift -= 10;
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     connect(&ksp, SIGNAL(receivedStdout(KProcess *, char *, int )),
-             this,SLOT(receivedStdout(KProcess *, char *, int )));
-     connect(&ksp, SIGNAL(processExited(KProcess *)),
-@@ -62,7 +62,7 @@
-     MaxSet = false;
- 
-     readValues();
--# elif defined __FreeBSD__
-+# elif defined Q_OS_FREEBSD
-     kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
- # endif
- #else
-@@ -73,7 +73,7 @@
- MemSensor::~MemSensor()
- {}
- 
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- void MemSensor::receivedStdout(KProcess *, char *buffer, int len )
- {
-     buffer[len] = 0;
-@@ -87,7 +87,7 @@
- 
- void MemSensor::processExited(KProcess *)
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     QStringList stringList = QStringList::split('\n',sensorResult);
-     sensorResult = "";
-     QStringList itemsList = QStringList::split(' ', stringList[1]);
-@@ -99,7 +99,7 @@
- 
- int MemSensor::getMemTotal()
- {
--#if defined __FreeBSD || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -114,7 +114,7 @@
- 
- int MemSensor::getMemFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -138,7 +138,7 @@
- 
- int MemSensor::getBuffers()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -159,7 +159,7 @@
- 
- int MemSensor::getCached()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -179,7 +179,7 @@
- 
- int MemSensor::getSwapTotal()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
-     return(swapTotal);
- # else
-@@ -221,7 +221,7 @@
- 
- int MemSensor::getSwapFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
-     return(swapTotal - swapUsed);
- # else
-@@ -266,8 +266,8 @@
- 
- void MemSensor::readValues()
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     ksp.clearArguments();
-     ksp << "swapinfo";
-     ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
-@@ -291,7 +291,7 @@
-     SensorParams *sp;
-     Meter *meter;
-     QObjectListIt it( *objList );
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     bool set = false;
- #endif
-     int totalMem = getMemTotal();
-@@ -303,7 +303,7 @@
-     while (it != 0)
-     {
-         sp = (SensorParams*)(*it);
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-         if ( (!MaxSet) && (totalSwap > 0) ) {
-            setMaxValue(sp);
-            bool set = true;
-@@ -331,7 +331,7 @@
-         meter->setValue(format);
-         ++it;
-     }
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     if (set)
-         MaxSet = true;
- #endif
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index c6d879fc318b..b3cfe18f79bd 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-base/umbrello/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/umbrello
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.62 2007/02/04 03:19:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.63 2007/02/05 12:31:07 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/umbrello-3.5.1-fork.patch,
+  -files/umbrello-3.5.1-fork-rectangle.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -umbrello-3.5.1-r1.ebuild, -umbrello-3.5.2.ebuild:
diff --git a/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch b/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch
deleted file mode 100644
index 5ce4c8e1672a..000000000000
--- a/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: umbrello/umbrello/umlwidget.cpp
-===================================================================
---- umbrello/umbrello/umlwidget.cpp	(revision 516637)
-+++ umbrello/umbrello/umlwidget.cpp	(revision 516638)
-@@ -1063,7 +1063,7 @@
-     const QSize minSize = calculateSize();
-     const int w = minSize.width();
-     const int h = minSize.height();
--    if (getWidth() >= w && getHeight() >= h)
-+    if (m_Type != Uml::wt_ForkJoin && getWidth() >= w && getHeight() >= h)
-         return;
-     setSize(w, h);
-     adjustAssocs( getX(), getY() );  // adjust assoc lines
diff --git a/kde-base/umbrello/files/umbrello-3.5.1-fork.patch b/kde-base/umbrello/files/umbrello-3.5.1-fork.patch
deleted file mode 100644
index 87888e5ee392..000000000000
--- a/kde-base/umbrello/files/umbrello-3.5.1-fork.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: kdesdk-3.5.1/umbrello/umbrello/assocrules.cpp
-===================================================================
---- kdesdk-3.5.1.orig/umbrello/umbrello/assocrules.cpp
-+++ kdesdk-3.5.1/umbrello/umbrello/assocrules.cpp
-@@ -21,6 +21,7 @@
- #include "associationwidget.h"
- #include "statewidget.h"
- #include "activitywidget.h"
-+#include "forkjoinwidget.h"
- 
- using namespace Uml;
- 
-@@ -197,13 +198,15 @@ bool AssocRules::allowAssociation( Assoc
-                 static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
-                 ActivityWidget::Branch &&
-                 static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
--                ActivityWidget::Fork_DEPRECATED ) {
-+                ActivityWidget::Fork_DEPRECATED &&
-+		dynamic_cast<ForkJoinWidget*>(widgetA) == NULL ) {
-             return false;
-         }
-         // only Forks and Branches can have more than one "outgoing" transition
-         if( static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
-                 ActivityWidget::Fork_DEPRECATED &&
--                static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
-+		dynamic_cast<ForkJoinWidget*>(widgetA) == NULL &&
-+               static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
-                 ActivityWidget::Branch ) {
-             AssociationWidgetList list = widgetA->getAssocList();
-             for (AssociationWidget* assoc = list.first(); assoc; assoc = list.next()) {
author	Diego Elio Pettenò <flameeyes@gentoo.org>	2007-02-05 12:40:14 +0000
committer	Diego Elio Pettenò <flameeyes@gentoo.org>	2007-02-05 12:40:14 +0000
commit	811a7154483119ea9831d8fdfe78190d5f146f40 (patch)
tree	1769dd645f3ad12960ee724355664d952ee01460 /kde-base
parent	Stable on sparc wrt #165335 (diff)
download	historical-811a7154483119ea9831d8fdfe78190d5f146f40.tar.gz historical-811a7154483119ea9831d8fdfe78190d5f146f40.tar.bz2 historical-811a7154483119ea9831d8fdfe78190d5f146f40.zip