Remove old.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

36 files changed, 66 insertions, 1331 deletions

diff --git a/kde-base/ffmpegthumbs/ChangeLog b/kde-base/ffmpegthumbs/ChangeLog
index 87409a976140..c98b7d04c252 100644
--- a/kde-base/ffmpegthumbs/ChangeLog
+++ b/kde-base/ffmpegthumbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ffmpegthumbs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.43 2012/02/21 12:52:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.44 2012/02/21 15:19:38 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/ffmpegthumbs-4.6.5-libav07.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -ffmpegthumbs-4.6.3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.6.5-libav07.patch b/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.6.5-libav07.patch
deleted file mode 100644
index 931de168e48b..000000000000
--- a/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.6.5-libav07.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- branches/KDE/4.7/kdemultimedia/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp	2011/07/02 08:19:20	1239063
-+++ branches/KDE/4.7/kdemultimedia/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp	2011/07/02 08:23:18	1239064
-@@ -122,7 +122,7 @@
- void MovieDecoder::initializeVideo()
- {
-     for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) {
--        if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) {
-+        if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-             m_pVideoStream = m_pFormatContext->streams[i];
-             m_VideoStream = i;
-             break;
diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index 34264274d7d0..073714704e7d 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.203 2012/02/21 12:52:29 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.204 2012/02/21 15:20:55 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/kcalc-4.6.5-fix-kbd-ui.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -kcalc-4.6.3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/kcalc/files/kcalc-4.6.5-fix-kbd-ui.patch b/kde-base/kcalc/files/kcalc-4.6.5-fix-kbd-ui.patch
deleted file mode 100644
index 05c42a3204f9..000000000000
--- a/kde-base/kcalc/files/kcalc-4.6.5-fix-kbd-ui.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- kdeutils/kcalc/kcalc.ui	2011/07/06 18:27:29	1240129
-+++ kdeutils/kcalc/kcalc.ui	2011/07/06 18:27:58	1240130
-@@ -616,7 +616,7 @@
-              <string>7</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">7</string>
-+             <string>7</string>
-             </property>
-            </widget>
-           </item>
-@@ -632,7 +632,7 @@
-              <string>8</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">8</string>
-+             <string>8</string>
-             </property>
-            </widget>
-           </item>
-@@ -648,7 +648,7 @@
-              <string>9</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">9</string>
-+             <string>9</string>
-             </property>
-            </widget>
-           </item>
-@@ -680,7 +680,7 @@
-              <string>4</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">4</string>
-+             <string>4</string>
-             </property>
-            </widget>
-           </item>
-@@ -696,7 +696,7 @@
-              <string>5</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">5</string>
-+             <string>5</string>
-             </property>
-            </widget>
-           </item>
-@@ -712,7 +712,7 @@
-              <string>6</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">6</string>
-+             <string>6</string>
-             </property>
-            </widget>
-           </item>
-@@ -728,7 +728,7 @@
-              <string>1</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">1</string>
-+             <string>1</string>
-             </property>
-            </widget>
-           </item>
-@@ -744,7 +744,7 @@
-              <string>2</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">2</string>
-+             <string>2</string>
-             </property>
-            </widget>
-           </item>
-@@ -760,7 +760,7 @@
-              <string>3</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">3</string>
-+             <string>3</string>
-             </property>
-            </widget>
-           </item>
-@@ -786,7 +786,7 @@
-              <string>0</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">0</string>
-+             <string>0</string>
-             </property>
-            </widget>
-           </item>
\ No newline at end of file
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 600579bb4407..818eddf4caba 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.249 2012/02/21 12:52:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.250 2012/02/21 15:22:12 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/kdebase-kioslaves-4.6.4-nfs.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org>
   -kdebase-kioslaves-4.6.3.ebuild:
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.6.4-nfs.patch b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.6.4-nfs.patch
deleted file mode 100644
index 2ffa81529cb8..000000000000
--- a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.6.4-nfs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt
-index 379ea2d..f3d5b00 100644
---- a/kioslave/CMakeLists.txt
-+++ b/kioslave/CMakeLists.txt
-@@ -43,7 +43,11 @@ if(NOT WIN32)
-    add_subdirectory( floppy )
-    add_subdirectory( finger )
-    add_subdirectory( man )
--   add_subdirectory( nfs )  
-+   check_include_files(rpc/rpc.h HAVE_RPC_RPC_H)
-+   macro_log_feature(HAVE_RPC_RPC_H "rpc library" "library routines for remote procedure calls" "" FALSE "" "Needed to build the NFS kioslave")
-+   if(HAVE_RPC_RPC_H)
-+     add_subdirectory( nfs )  
-+   endif(HAVE_RPC_RPC_H)
- endif(NOT WIN32)
- 
- if(SAMBA_FOUND OR WIN32 AND NOT WINCE)
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index f54b71318005..b51322396f58 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.263 2012/02/21 12:52:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.264 2012/02/21 15:29:58 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org> -files/gentoo-startkde4-3.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -kdebase-startkde-4.6.3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
deleted file mode 100644
index 36829fd17f4c..000000000000
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- startkde.cmake.old	2011-03-24 13:07:04.919889148 +0100
-+++ startkde.cmake	2011-03-24 13:14:42.033174445 +0100
-@@ -13,6 +13,40 @@
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+_KDEDIR=@GENTOO_PORTAGE_EPREFIX@@REPLACE_PREFIX@
-+if [ "$_KDEDIR" != "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then
-+	export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+	export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+fi
-+@REPLACE_LDPATH@
-+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
-+xdgs=$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+if [ $(echo $xdgs |grep -c -E "(:|^)${_KDEDIR}/share(:|$)") -eq 0 ]; then
-+	xdgs="${_KDEDIR}/share:${xdgs}"
-+fi
-+export XDG_DATA_DIRS=${xdgs}
-+unset xdgs
-+
-+if [ -z "$HOME" ]; then
-+	xmessage "HOME is unset. Your user config seems to be broken. Aborting."
-+	exit 1
-+fi
-+
-+# Gentoo: handle the possible home directory layout for config directory
-+# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT}
-+# for -kdeprefix and +kdeprefix respectively.
-+if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then
-+	# If the directory doesn't exist make it
-+	[ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4"
-+else
-+	# Use multiple directories based upon the KDE directory
-+	[ -e "$HOME/.kde$(basename $_KDEDIR)" ] || mkdir "$HOME/.kde$(basename $_KDEDIR)"
-+	if [ ! -d "$HOME/.kde$(basename $_KDEDIR)" ]; then
-+		xmessage "$HOME/.kde$(basename $_KDEDIR) exists but is not a dir. Aborting."
-+		exit 1
-+	fi
-+fi
-+
- # Check if a KDE session already is running and whether it's possible to connect to X
- kcheckrunning
- kcheckrunning_result=$?
-@@ -187,6 +221,13 @@
-   done
- done
- 
-+# Gentoo part for FHS installs
-+if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then
-+  for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/startup/"*.sh; do
-+    test -r "${file}" && . "${file}"
-+  done
-+fi
-+
- # Set the path for Qt plugins provided by KDE
- if test -n "$QT_PLUGIN_PATH"; then
-   QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
-@@ -400,6 +441,13 @@
-   done
- done
- 
-+# Gentoo part for FHS installs
-+if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then
-+  for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/shutdown/"*.sh; do
-+    test -r "${file}" && . "${file}"
-+  done
-+fi
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog
index 855be3a4f8b3..7f247b47f7ff 100644
--- a/kde-base/krossjava/ChangeLog
+++ b/kde-base/krossjava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/krossjava
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.77 2012/02/21 12:52:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.78 2012/02/21 15:23:46 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/krossjava-4.2.3_includes.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -krossjava-4.6.3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/krossjava/files/krossjava-4.2.3_includes.patch b/kde-base/krossjava/files/krossjava-4.2.3_includes.patch
deleted file mode 100644
index fb395dcf0a5e..000000000000
--- a/kde-base/krossjava/files/krossjava-4.2.3_includes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur krossjava-4.2.3.old/java/krossjava/krossjava/jvmvariant.h krossjava-4.2.3/java/krossjava/krossjava/jvmvariant.h
---- krossjava-4.2.3.old/java/krossjava/krossjava/jvmvariant.h	2009-05-23 15:50:12.000000000 +1200
-+++ krossjava-4.2.3/java/krossjava/krossjava/jvmvariant.h	2009-05-23 15:53:20.000000000 +1200
-@@ -30,9 +30,9 @@
- #include <QStringList>
- #include <QVariant>
- #include <QMetaType>
--//#include <QSize>
--//#include <QPoint>
--//#include <QRect>
-+#include <QSize>
-+#include <QPoint>
-+#include <QRect>
- #include <QUrl>
- //#include <QDate>
- //#include <QTime>
diff --git a/kde-base/ksnapshot/ChangeLog b/kde-base/ksnapshot/ChangeLog
index b015d5df12b3..8cf0aec19f1a 100644
--- a/kde-base/ksnapshot/ChangeLog
+++ b/kde-base/ksnapshot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksnapshot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.198 2012/02/21 12:52:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.199 2012/02/21 15:24:58 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/ksnapshot-4.6.2-kipi.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -ksnapshot-4.6.3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch b/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch
deleted file mode 100644
index 02bc2fc367dc..000000000000
--- a/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ruN ksnapshot-4.6.2.orig/ksnapshot/CMakeLists.txt ksnapshot-4.6.2/ksnapshot/CMakeLists.txt
---- ksnapshot-4.6.2.orig/ksnapshot/CMakeLists.txt	2011-04-01 21:38:15.000000000 +0200
-+++ ksnapshot-4.6.2/ksnapshot/CMakeLists.txt	2011-04-10 22:02:39.035066966 +0200
-@@ -1,7 +1,7 @@
- project(ksnapshot)
- 
- find_package(KDE4 REQUIRED)
--find_package(Kipi)
-+
- include(KDE4Defaults)
- include(MacroLibrary)
- include(MacroOptionalAddSubdirectory)
-@@ -17,7 +17,6 @@
- if (KIPI_FOUND)
-         include_directories(${KIPI_INCLUDE_DIR})
- endif (KIPI_FOUND)
--macro_log_feature(KIPI_FOUND "KIPI plugins" "KIPI plugins to export, print, etc" "http://www.kipi-plugins.org/" FALSE "" "Neeed to print, send by e-mail, export to Facebook, Picasa, etc")
- 
- configure_file(config-ksnapshot.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksnapshot.h)
- 
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index e1b7ecfac1e4..3504c402aaa9 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.263 2012/02/21 12:52:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.264 2012/02/21 15:34:52 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/kwin-4.6.3-desktopnames.patch, -files/kwin-4.6.5-mesadri.patch,
+  -files/kwin-4.6.5-performance.patch, -files/kwin-fix-opengl.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -kwin-4.6.3-r1.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/kwin/files/kwin-4.6.3-desktopnames.patch b/kde-base/kwin/files/kwin-4.6.3-desktopnames.patch
deleted file mode 100644
index ec2b3642ac50..000000000000
--- a/kde-base/kwin/files/kwin-4.6.3-desktopnames.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit a2d4c3ebdf7137f3543c88245f0bfd3dba308ebf
-Author: Thomas Lübking <thomas.luebking@gmail.com>
-Date:   Sun May 8 16:27:31 2011 +0200
-
-    Don't store virtual desktop settings while loading them
-    
-    BUG: 272666
-    FIXED-IN: 4.6.4
-
-diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
-index 3033e65..f5df9d9 100644
---- a/kwin/workspace.cpp
-+++ b/kwin/workspace.cpp
-@@ -1229,8 +1229,10 @@ void Workspace::slotReinitCompositing()
-         }
-     }
- 
-+static bool _loading_desktop_settings = false;
- void Workspace::loadDesktopSettings()
-     {
-+    _loading_desktop_settings = true;
-     KSharedConfig::Ptr c = KGlobal::config();
-     QString groupname;
-     if( screen_number == 0 )
-@@ -1246,10 +1248,13 @@ void Workspace::loadDesktopSettings()
-         rootInfo->setDesktopName( i, s.toUtf8().data() );
-         desktop_focus_chain[i-1] = i;
-         }
-+    _loading_desktop_settings = false;
-     }
- 
- void Workspace::saveDesktopSettings()
-     {
-+    if (_loading_desktop_settings)
-+        return;
-     KSharedConfig::Ptr c = KGlobal::config();
-     QString groupname;
-     if (screen_number == 0)
diff --git a/kde-base/kwin/files/kwin-4.6.5-mesadri.patch b/kde-base/kwin/files/kwin-4.6.5-mesadri.patch
deleted file mode 100644
index 41af096feac8..000000000000
--- a/kde-base/kwin/files/kwin-4.6.5-mesadri.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit afe966579d56f85444c432a3a6adf026d2941bd5
-Author: Martin Gräßlin <mgraesslin@kde.org>
-Date:   Sun May 1 11:49:26 2011 +0200
-
-    Enable direct rendering for all Mesa drivers
-    
-    As KWin requires at least Mesa 7.10 for OpenGL we can be sure
-    that all Mesa drivers support DRI2 and can enable direct rendering
-    for it.
-    
-    Parsing the version string to identify if it is a mesa driver.
-    This can cause breakage again in future versions of Mesa.
-    Unfortunately version, vendor and renderer are the only information
-    queryable just with OpenGL API.
-    BUG: 270942
-    FIXED-IN: 4.7.0
-
-diff --git a/kwin/opengltest/opengltest.cpp b/kwin/opengltest/opengltest.cpp
-index d2d8f70..eda7b51 100644
---- a/kwin/opengltest/opengltest.cpp
-+++ b/kwin/opengltest/opengltest.cpp
-@@ -81,16 +81,9 @@ int main(int argc, char *argv[])
-     if ((major == 1 && minor < 3) && !strstr(glxExtensions, "GLX_EXT_texture_from_pixmap"))
-         return 1;
- 
--    // Assume that direct rendering works with DRI2 drivers
--    const GLubyte *renderer = glGetString(GL_RENDERER);
--    if (strstr((const char *)renderer, "DRI2"))
--        return 0;
--
--    // The Intel driver doesn't have DRI2 in the renderer string
--    if (strstr((const char *)renderer, "GEM"))
--        return 0;
--
--    if (strstr((const char *)renderer, "Gallium"))
-+    // Assume that all Mesa drivers support direct rendering
-+    const GLubyte *version = glGetString(GL_VERSION);
-+    if (strstr((const char *)version, "Mesa"))
-         return 0;
- 
-     // Direct contexts also work with the NVidia driver
diff --git a/kde-base/kwin/files/kwin-4.6.5-performance.patch b/kde-base/kwin/files/kwin-4.6.5-performance.patch
deleted file mode 100644
index a706370d9232..000000000000
--- a/kde-base/kwin/files/kwin-4.6.5-performance.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ruN kwin-4.6.5.orig/kwin/effects.cpp kwin-4.6.5/kwin/effects.cpp
---- kwin-4.6.5.orig/kwin/effects.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ kwin-4.6.5/kwin/effects.cpp	2011-09-13 22:25:18.943156120 +0200
-@@ -156,7 +156,7 @@
-     {
-     if( current_paint_screen < loaded_effects.size())
-         {
--        loaded_effects[current_paint_screen++].second->prePaintScreen( data, time );
-+        loaded_effects.at(current_paint_screen++).second->prePaintScreen( data, time );
-         --current_paint_screen;
-         }
-     // no special final code
-@@ -166,7 +166,7 @@
-     {
-     if( current_paint_screen < loaded_effects.size())
-         {
--        loaded_effects[current_paint_screen++].second->paintScreen( mask, region, data );
-+        loaded_effects.at(current_paint_screen++).second->paintScreen( mask, region, data );
-         --current_paint_screen;
-         }
-     else
-@@ -177,7 +177,7 @@
-     {
-     if( current_paint_screen < loaded_effects.size())
-         {
--        loaded_effects[current_paint_screen++].second->postPaintScreen();
-+        loaded_effects.at(current_paint_screen++).second->postPaintScreen();
-         --current_paint_screen;
-         }
-     // no special final code
-@@ -187,7 +187,7 @@
-     {
-     if( current_paint_window < loaded_effects.size())
-         {
--        loaded_effects[current_paint_window++].second->prePaintWindow( w, data, time );
-+        loaded_effects.at(current_paint_window++).second->prePaintWindow( w, data, time );
-         --current_paint_window;
-         }
-     // no special final code
-@@ -197,7 +197,7 @@
-     {
-     if( current_paint_window < loaded_effects.size())
-         {
--        loaded_effects[current_paint_window++].second->paintWindow( w, mask, region, data );
-+        loaded_effects.at(current_paint_window++).second->paintWindow( w, mask, region, data );
-         --current_paint_window;
-         }
-     else
-@@ -208,7 +208,7 @@
-     {
-     if( current_paint_effectframe < loaded_effects.size())
-         {
--        loaded_effects[current_paint_effectframe++].second->paintEffectFrame( frame, region, opacity, frameOpacity );
-+        loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame( frame, region, opacity, frameOpacity );
-         --current_paint_effectframe;
-         }
-     else
-@@ -222,7 +222,7 @@
-     {
-     if( current_paint_window < loaded_effects.size())
-         {
--        loaded_effects[current_paint_window++].second->postPaintWindow( w );
-+        loaded_effects.at(current_paint_window++).second->postPaintWindow( w );
-         --current_paint_window;
-         }
-     // no special final code
-@@ -240,7 +240,7 @@
-     {
-     if( current_draw_window < loaded_effects.size())
-         {
--        loaded_effects[current_draw_window++].second->drawWindow( w, mask, region, data );
-+        loaded_effects.at(current_draw_window++).second->drawWindow( w, mask, region, data );
-         --current_draw_window;
-         }
-     else
-@@ -251,7 +251,7 @@
-     {
-     if( current_build_quads < loaded_effects.size())
-         {
--        loaded_effects[current_build_quads++].second->buildQuads( w, quadList );
-+        loaded_effects.at(current_build_quads++).second->buildQuads( w, quadList );
-         --current_build_quads;
-         }
-     }
diff --git a/kde-base/kwin/files/kwin-fix-opengl.patch b/kde-base/kwin/files/kwin-fix-opengl.patch
deleted file mode 100644
index 245aced289c2..000000000000
--- a/kde-base/kwin/files/kwin-fix-opengl.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN kdebase-workspace-4.6.2/kwin/compositingprefs.cpp kdebase-workspace-4.6.2.new/kwin/compositingprefs.cpp
---- kdebase-workspace-4.6.2/kwin/compositingprefs.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ kdebase-workspace-4.6.2.new/kwin/compositingprefs.cpp	2011-04-07 19:37:28.637388362 +0200
-@@ -241,6 +241,7 @@
- // See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work.
- void CompositingPrefs::applyDriverSpecificOptions()
-     {
-+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
-     // Always recommend
-     mRecommendCompositing = true;
- 
-@@ -248,6 +249,7 @@
-     mStrictBinding = !gl->supports( LooseBinding );
-     if ( gl->driver() == Driver_Intel )
-         mEnableVSync = false;
-+#endif
-     }
- 
- 
-diff -urN kdebase-workspace-4.6.2/kwin/effects/logout/logout.cpp kdebase-workspace-4.6.2.new/kwin/effects/logout/logout.cpp
---- kdebase-workspace-4.6.2/kwin/effects/logout/logout.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ kdebase-workspace-4.6.2.new/kwin/effects/logout/logout.cpp	2011-04-07 19:50:58.355265494 +0200
-@@ -338,7 +338,9 @@
- 
- void LogoutEffect::windowDeleted( EffectWindow* w )
-     {
-+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
-     windows.removeAll( w );
-+#endif
-     ignoredWindows.removeAll( w );
-     if( w == logoutWindow )
-         logoutWindow = NULL;
-diff -urN kdebase-workspace-4.6.2/kwin/options.cpp kdebase-workspace-4.6.2.new/kwin/options.cpp
---- kdebase-workspace-4.6.2/kwin/options.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ kdebase-workspace-4.6.2.new/kwin/options.cpp	2011-04-07 19:43:34.358816214 +0200
-@@ -57,6 +57,7 @@
-     int rate = -1;
-     if( options->refreshRate > 0 ) // use manually configured refresh rate
-         rate = options->refreshRate;
-+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
-     else if ( GLPlatform::instance()->driver() == Driver_NVidia )
-         {
-         QProcess nvidia_settings;
-@@ -73,6 +74,7 @@
-                 rate = qRound(frate);
-             }
-         }
-+#endif
- #ifdef HAVE_XRANDR
-     else if( Extensions::randrAvailable() )
-         {
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index d3c5a127fa8a..bfa1b04a7104 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.127 2012/02/21 12:52:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.128 2012/02/21 15:39:24 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org> -files/marble-4.5.5-gpsd.patch,
+  -files/marble-4.6.2-magic.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -marble-4.6.3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/marble/files/marble-4.5.5-gpsd.patch b/kde-base/marble/files/marble-4.5.5-gpsd.patch
deleted file mode 100644
index ec515e99d88e..000000000000
--- a/kde-base/marble/files/marble-4.5.5-gpsd.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-===================================================================
---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
- 
- GpsdConnection::GpsdConnection( QObject* parent )
-     : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+      m_gpsd("localhost", DEFAULT_GPSD_PORT),
-+#endif
-       m_timer( 0 )
- {
-     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
-     m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+    gps_data_t* data;
-+#else
-     gps_data_t* data = m_gpsd.open();
-+#endif
-     if ( data ) {
-         m_status = PositionProviderStatusAcquiring;
-         emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+    if ( m_gpsd.waiting(0) ) {
-+#else
-     if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+        gps_data_t* data = m_gpsd.read();
-+#else
-         gps_data_t* data = m_gpsd.poll();
-+#endif
-         if ( data && data->set & PACKET_SET ) {
-             emit gpsdInfo( *data );
-         }
diff --git a/kde-base/marble/files/marble-4.6.2-magic.patch b/kde-base/marble/files/marble-4.6.2-magic.patch
deleted file mode 100644
index dc907958edb6..000000000000
--- a/kde-base/marble/files/marble-4.6.2-magic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ruN marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt
---- marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt	2011-01-19 23:06:11.000000000 +0100
-+++ marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt	2011-04-11 03:56:00.449066967 +0200
-@@ -1,4 +1,4 @@
--find_package(libgps)
-+macro_optional_find_package(libgps)
- if(LIBGPS_FOUND)
-      message( STATUS "Building with gpsd position provider")
-      add_subdirectory( gpsd )
-@@ -6,7 +6,7 @@
-      message( STATUS "Not building with gpsd position provider")
- endif(LIBGPS_FOUND)
- 
--find_package(liblocation)
-+macro_optional_find_package(liblocation)
- if(liblocation_FOUND)
-      message( STATUS "Building with Maemo GPS support")
-      add_subdirectory( maemo )
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index ce366a626e6b..59664590daae 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.149 2012/02/21 12:52:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.150 2012/02/21 15:42:32 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/plasma-workspace-4.6.2-optional_akonadi-server.patch,
+  -files/plasma-workspace-4.6.3-dduplicate.patch,
+  -files/plasma-workspace-4.6.3-gpsdapi.patch,
+  -files/plasma-workspace-4.7.3-calendarcrash.patch,
+  -files/plasma-workspace-4.7.3-deletedwidget.patch,
+  -files/plasma-workspace-4.7.3-layoutcrash.patch,
+  -files/plasma-workspace-4.7.3-taskcrash.patch,
+  -files/plasma-workspace-4.7.3-weathercrash.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org>
   -plasma-workspace-4.6.3-r2.ebuild:
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch
deleted file mode 100644
index aaa8381005a7..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.2/plasma/generic/dataengines/CMakeLists.txt
---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/CMakeLists.txt	2011-02-25 23:10:02.000000000 +0100
-+++ plasma-workspace-4.6.2/plasma/generic/dataengines/CMakeLists.txt	2011-04-02 13:59:01.919795444 +0200
-@@ -25,10 +25,15 @@
- endif (NEPOMUK_FOUND)
- 
- macro_optional_find_package(KdepimLibs 4.5.60)
--macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
-+macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
-+
-+macro_optional_find_package(Akonadi)
-+macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
- 
- if(KDEPIMLIBS_FOUND)
--   add_subdirectory(akonadi)
-+   if(AKONADI_FOUND)
-+      add_subdirectory(akonadi)
-+   endif(AKONADI_FOUND)
-    add_subdirectory(calendar)
-    add_subdirectory(rss)
- endif(KDEPIMLIBS_FOUND)
-diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/CMakeLists.txt plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/CMakeLists.txt
---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/CMakeLists.txt	2011-04-01 12:52:43.000000000 +0200
-+++ plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/CMakeLists.txt	2011-04-02 14:02:09.274795409 +0200
-@@ -1,7 +1,6 @@
- project(calendar_engine)
- 
- find_package(KdepimLibs REQUIRED)
--find_package(Akonadi REQUIRED)
- find_package(Boost REQUIRED)
- 
- include_directories(
-@@ -14,16 +13,22 @@
- 
- set(calendar_engine_srcs
-     calendarengine.cpp
--    eventdatacontainer.cpp
--# taken from kdepim/akonadi/kcal as long as it's not yet exported:
--    akonadi/calendar.cpp
--    akonadi/calendarmodel.cpp
--    akonadi/calfilterproxymodel.cpp
--    akonadi/utils.cpp
--    akonadi/blockalarmsattribute.cpp
--    akonadi/collectionselection.cpp
- )
- 
-+if(AKONADI_FOUND)
-+     ADD_DEFINITIONS(-DAKONADI_FOUND)
-+     set(calendar_engine_srcs ${calendar_engine_srcs}
-+	eventdatacontainer.cpp
-+	# taken from kdepim/akonadi/kcal as long as it's not yet exported:
-+	akonadi/calendar.cpp
-+	akonadi/calendarmodel.cpp
-+	akonadi/calfilterproxymodel.cpp
-+	akonadi/utils.cpp
-+	akonadi/blockalarmsattribute.cpp
-+	akonadi/collectionselection.cpp
-+     )
-+endif(AKONADI_FOUND)
-+
- kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
- 
- target_link_libraries(
-@@ -31,13 +36,19 @@
-     ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
-     ${KDE4_PLASMA_LIBS}
--    ${KDE4_AKONADI_LIBS}
-     ${KDE4_KMIME_LIBS}
-     ${KDE4_KCALCORE_LIBS}
-     ${KDE4_KCALUTILS_LIBS}
--    ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
- )
- 
-+if(AKONADI_FOUND)
-+    target_link_libraries(
-+        plasma_engine_calendar
-+        ${KDE4_AKONADI_LIBS}
-+        ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-+    )
-+endif(AKONADI_FOUND)
-+
- install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- 
-diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/calendarengine.cpp plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/calendarengine.cpp
---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/calendarengine.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/calendarengine.cpp	2011-04-02 13:59:01.920795444 +0200
-@@ -32,6 +32,7 @@
- #include <KCalCore/Todo>
- #include <KCalCore/Journal>
- 
-+#ifdef AKONADI_FOUND
- #include <Akonadi/ChangeRecorder>
- #include <Akonadi/Session>
- #include <Akonadi/Collection>
-@@ -41,6 +42,7 @@
- #include "akonadi/calendar.h"
- #include "akonadi/calendarmodel.h"
- #include "eventdatacontainer.h"
-+#endif
- 
- CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
-               : Plasma::DataEngine(parent),
-@@ -74,9 +76,11 @@
-         return holidayCalendarSourceRequest(requestKey, requestTokens, request);
-     }
- 
-+#ifdef AKONADI_FOUND
-     if (requestKey == "events" || requestKey == "eventsInMonth") {
-         return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
-     }
-+#endif
- 
-     return false;
- }
-@@ -272,6 +276,7 @@
-     return false;
- }
- 
-+#ifdef AKONADI_FOUND
- bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
- {
-     // figure out what time range was requested from the source string
-@@ -339,5 +344,6 @@
-     calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
-     m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
- }
-+#endif
- 
- #include "calendarengine.moc"
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-dduplicate.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-dduplicate.patch
deleted file mode 100644
index fec66766319a..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-dduplicate.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0
-Author: Aaron Seigo <aseigo@kde.org>
-Date:   Fri May 6 22:51:50 2011 +0200
-
-    get rid of duplicate connect
-    
-    patch contributed by Luc Menut
-    BUG:262614
-    REVIEW:101284
-
-diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp
-index cbc7175..bef53e5 100644
---- a/plasma/generic/containmentactions/applauncher/launch.cpp
-+++ b/plasma/generic/containmentactions/applauncher/launch.cpp
-@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList &args)
- {
-     m_menu = new KMenu();
-     connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*)));
--    connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*)));
- 
-     m_action->setMenu(m_menu);
- }
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch
deleted file mode 100644
index f24aded13a93..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Rafael Fernández López <ereslibre@kde.org>
-Date: Thu, 28 Apr 2011 11:35:53 +0000
-Subject: gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a3009dd96e8519bcc205d75c29e18bbbb81fce03
----
-gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are
-some calls that are slightly different. Make the dataengine compile
-against this version and previous one by adding conditional code.
-
-REVIEW: 101247
----
-
-
---- a/plasma/generic/dataengines/geolocation/location_gps.cpp
-+++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
-@@ -51,7 +51,11 @@ void Gpsd::run()
-     while (!m_abort) {
-         Plasma::DataEngine::Data d;
- 
-+#if GPSD_API_MAJOR_VERSION >= 5
-+	if (gps_read(m_gpsdata) != -1) {
-+#else
-         if (gps_poll(m_gpsdata) != -1) {
-+#endif
-             //kDebug() << "poll ok";
-             if (m_gpsdata->online) {
-                 //kDebug() << "online";
-@@ -73,11 +77,19 @@ void Gpsd::run()
- Gps::Gps(QObject* parent, const QVariantList& args)
-     : GeolocationProvider(parent, args),
-       m_gpsd(0)
-+#if GPSD_API_MAJOR_VERSION >= 5
-+    , m_gpsdata(0)
-+#endif
- {
--    gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
--    if (gpsdata) {
-+#if GPSD_API_MAJOR_VERSION >= 5
-+    m_gpsdata = new gps_data_t;
-+    gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
-+#else
-+    gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
-+#endif
-+    if (m_gpsdata) {
-         kDebug() << "gpsd found.";
--        m_gpsd = new Gpsd(gpsdata);
-+        m_gpsd = new Gpsd(m_gpsdata);
-         connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
-                 this, SIGNAL(setData(const Plasma::DataEngine::Data&)));
-     } else {
-@@ -90,6 +102,9 @@ Gps::Gps(QObject* parent, const QVariant
- Gps::~Gps()
- {
-     delete m_gpsd;
-+#if GPSD_API_MAJOR_VERSION >= 5
-+    delete m_gpsdata;
-+#endif
- }
- 
- void Gps::update()
-
---- a/plasma/generic/dataengines/geolocation/location_gps.h
-+++ b/plasma/generic/dataengines/geolocation/location_gps.h
-@@ -58,6 +58,9 @@ public:
- 
- private:
-     Gpsd* m_gpsd;
-+#if GPSD_API_MAJOR_VERSION >= 5
-+    gps_data_t* m_gpsdata;
-+#endif
- };
- 
- #endif
-
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch
deleted file mode 100644
index 705daf65b4b3..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit 44a9c26b9eb27df8297618764f988972d476dc84
-Author: David E. Narváez <david.narvaez@computer.org>
-Date:   Sun Nov 20 16:31:15 2011 -0500
-
-    Drop InvisibleCollectionFetch in Favor of KDescendantsProxyModel
-    
-    As the InvisibleCollectionFetch fetch strategy is currently broken, I
-    implemented a suggestion by Christian Mollekopf of working around the
-    issues by flatting the model through a KDescendantsProxyModel to fix
-    crashes in Plasma related to calendars.
-    
-    BUG: 279322
-    FIXED-IN: 4.7.4
-    
-    CCMAIL: chrigi_1@fastmail.fm
-    REVIEW: 103088
-
-diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp
-index 53f98c0..f8b3a90 100644
---- a/plasma/generic/dataengines/calendar/calendarengine.cpp
-+++ b/plasma/generic/dataengines/calendar/calendarengine.cpp
-@@ -31,6 +31,7 @@
- #include <KCalCore/Event>
- #include <KCalCore/Todo>
- #include <KCalCore/Journal>
-+#include <kdescendantsproxymodel.h>
- 
- #ifdef AKONADI_FOUND
- #include <Akonadi/ChangeRecorder>
-@@ -38,6 +39,7 @@
- #include <Akonadi/Collection>
- #include <Akonadi/ItemFetchScope>
- #include <Akonadi/EntityDisplayAttribute>
-+#include <Akonadi/EntityMimeTypeFilterModel>
- 
- #include "akonadi/calendar.h"
- #include "akonadi/calendarmodel.h"
-@@ -341,8 +343,12 @@ void CalendarEngine::initAkonadiCalendar()
- 
-     // create the models that contain the data. they will be updated automatically from akonadi.
-     CalendarSupport::CalendarModel *calendarModel = new CalendarSupport::CalendarModel(monitor, this);
--    calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
--    m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
-+    KDescendantsProxyModel *flatModel = new KDescendantsProxyModel(this);
-+    flatModel->setSourceModel(calendarModel);
-+    Akonadi::EntityMimeTypeFilterModel *mimeFilteredModel = new Akonadi::EntityMimeTypeFilterModel(this);
-+    mimeFilteredModel->addMimeTypeExclusionFilter(Akonadi::Collection::mimeType());
-+    mimeFilteredModel->setSourceModel(flatModel);
-+    m_calendar = new CalendarSupport::Calendar(mimeFilteredModel, mimeFilteredModel, KSystemTimeZones::local());
- }
- #endif
- 
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch
deleted file mode 100644
index 70f73675345e..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 2d1deb4234aa3d43e2a7cc48fc1f6936bd2ff97c
-Author: Aaron Seigo <aseigo@kde.org>
-Date:   Wed Nov 9 17:11:50 2011 +0100
-
-    since the widget is being deleted, remove it from the collection
-    
-    BUG:286197
-    BUG:286195
-    BUG:264750
-    BUG:277367
-    BUG:280326
-    BUG:280072
-    BUG:282552
-    BUG:283061
-    BUG:284603
-    BUG:286177
-    BUG:286181
-
-diff --git a/plasma/generic/applets/systemtray/core/task.cpp b/plasma/generic/applets/systemtray/core/task.cpp
-index 5793102..1a02c24 100644
---- a/plasma/generic/applets/systemtray/core/task.cpp
-+++ b/plasma/generic/applets/systemtray/core/task.cpp
-@@ -101,7 +101,7 @@ QHash<Plasma::Applet *, QGraphicsWidget *> Task::widgetsByHost() const
- 
- void Task::abandon(Plasma::Applet *host)
- {
--    QGraphicsWidget *widget = d->widgetsByHost.value(host);
-+    QGraphicsWidget *widget = d->widgetsByHost.take(host);
-     if (widget) {
-         widget->deleteLater();
-     }
-@@ -116,7 +116,7 @@ void Task::widgetDeleted()
- {
-     bool wasEmbeddable = isEmbeddable();
- 
--    QGraphicsWidget * w = static_cast<QGraphicsWidget*>(sender());
-+    QGraphicsWidget *w = static_cast<QGraphicsWidget*>(sender());
-     QMutableHashIterator<Plasma::Applet *, QGraphicsWidget *> it(d->widgetsByHost);
-     while (it.hasNext()) {
-         it.next();
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-layoutcrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-layoutcrash.patch
deleted file mode 100644
index 4697a1fde8ba..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-layoutcrash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 77b1374b99ee91d23d8802dd1dec9a5f630e919a
-Author: Aaron Seigo <aseigo@kde.org>
-Date:   Wed Nov 9 20:15:50 2011 +0100
-
-    only delete the layout when it isn't assigned to another layout
-    
-    based on the patch by Raul Fernandes
-    BUG:275286
-
-diff --git a/plasma/desktop/applets/tasks/taskgroupitem.cpp b/plasma/desktop/applets/tasks/taskgroupitem.cpp
-index 6b23b71..d7816d3 100644
---- a/plasma/desktop/applets/tasks/taskgroupitem.cpp
-+++ b/plasma/desktop/applets/tasks/taskgroupitem.cpp
-@@ -79,8 +79,11 @@ TaskGroupItem::TaskGroupItem(QGraphicsWidget *parent, Tasks *applet)
- 
- TaskGroupItem::~TaskGroupItem()
- {
--    delete m_tasksLayout;
--    m_tasksLayout = 0;
-+    if (!m_offscreenLayout && !m_mainLayout) {
-+        // only delete this if we have neither an offscreen layout or a mainlayout
-+        // if we do, then they will delete the layout for us.
-+        delete m_tasksLayout;
-+    }
- }
- 
- bool TaskGroupItem::isSplit()
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-taskcrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-taskcrash.patch
deleted file mode 100644
index 3f45277f836e..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-taskcrash.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-commit 639155a5493a28ca9460d60fa0c078ec65c3bb96
-Author: Aaron Seigo <aseigo@kde.org>
-Date:   Thu Nov 10 13:01:37 2011 +0100
-
-    use a QWeakPointer to track the lifespan of the task
-    
-    the itemRemoved signal from TaskGroup has dangling pointers, apparently
-    by design (the next thing on my list to investigate), and the signal is
-    delayed. so between the actual deletion of the task and the signal, there
-    pointer is a dangler. easy solution is to just track it in the WindowTaskItem
-    itself with a cheap QWeakPointer.
-    
-    BUG:272495
-
-diff --git a/plasma/desktop/applets/tasks/abstracttaskitem.cpp b/plasma/desktop/applets/tasks/abstracttaskitem.cpp
-index 00140ef..48ba172 100644
---- a/plasma/desktop/applets/tasks/abstracttaskitem.cpp
-+++ b/plasma/desktop/applets/tasks/abstracttaskitem.cpp
-@@ -203,6 +203,10 @@ QIcon AbstractTaskItem::icon() const
-     return QIcon();
- }
- 
-+void AbstractTaskItem::close()
-+{
-+}
-+
- void AbstractTaskItem::setTaskFlags(const TaskFlags flags)
- {
-     if (((m_flags & TaskWantsAttention) != 0) != ((flags & TaskWantsAttention) != 0)) {
-diff --git a/plasma/desktop/applets/tasks/abstracttaskitem.h b/plasma/desktop/applets/tasks/abstracttaskitem.h
-index 9520e1f..a527881 100644
---- a/plasma/desktop/applets/tasks/abstracttaskitem.h
-+++ b/plasma/desktop/applets/tasks/abstracttaskitem.h
-@@ -103,7 +103,7 @@ public:
-     /** Returns the current icon for this task. */
-     QIcon icon() const;
- 
--    virtual void close() = 0;
-+    virtual void close();
- 
-     /** Tells the window manager the minimized task's geometry. */
-     virtual void publishIconGeometry() const;
-diff --git a/plasma/desktop/applets/tasks/windowtaskitem.cpp b/plasma/desktop/applets/tasks/windowtaskitem.cpp
-index 1ddca2c..1c33476 100644
---- a/plasma/desktop/applets/tasks/windowtaskitem.cpp
-+++ b/plasma/desktop/applets/tasks/windowtaskitem.cpp
-@@ -56,7 +56,6 @@
- 
- WindowTaskItem::WindowTaskItem(QGraphicsWidget *parent, Tasks *applet)
-     : AbstractTaskItem(parent, applet),
--      m_task(0),
-       m_busyWidget(0)
- {
- }
-@@ -77,8 +76,8 @@ void WindowTaskItem::activate()
-     // in a widget such as a line edit which does accept the focus)
-     // this needs to be implemented for Plasma's own panels.
-     //kDebug();
--    if (m_task && m_task->task()) {
--        m_task->task()->activateRaiseOrIconify();
-+    if (m_task && m_task.data()->task()) {
-+        m_task.data()->task()->activateRaiseOrIconify();
-        // emit windowSelected(this);
-     }
- }
-@@ -108,27 +107,20 @@ void WindowTaskItem::keyPressEvent(QKeyEvent *event)
-     }
- }
- 
--//destroy this item
--void WindowTaskItem::close()
--{
--    //kDebug();
--    m_task = 0;
--}
--
- void WindowTaskItem::publishIconGeometry() const
- {
--    if (!m_task || !m_task->task()) {
-+    if (!m_task || !m_task.data()->task()) {
-         return;
-     }
- 
-     QRect rect = iconGeometry();
--    m_task->task()->publishIconGeometry(rect);
-+    m_task.data()->task()->publishIconGeometry(rect);
- }
- 
- void WindowTaskItem::publishIconGeometry(const QRect &rect) const
- {
--    if (m_task && m_task->task()) {
--        m_task->task()->publishIconGeometry(rect);
-+    if (m_task && m_task.data()->task()) {
-+        m_task.data()->task()->publishIconGeometry(rect);
-     }
- }
- 
-@@ -142,7 +134,7 @@ void WindowTaskItem::updateTask(::TaskManager::TaskChanges changes)
-     TaskFlags flags = m_flags;
- 
-     if (changes & TaskManager::StateChanged) {
--        if (m_task->isActive()) {
-+        if (m_task.data()->isActive()) {
-             flags |= TaskHasFocus;
-             if (!(m_flags & TaskHasFocus)) {
-                 emit activated(this);
-@@ -151,7 +143,7 @@ void WindowTaskItem::updateTask(::TaskManager::TaskChanges changes)
-             flags &= ~TaskHasFocus;
-         }
- 
--        if (m_task->isMinimized()) {
-+        if (m_task.data()->isMinimized()) {
-             flags |= TaskIsMinimized;
-         } else {
-             flags &= ~TaskIsMinimized;
-@@ -160,7 +152,7 @@ void WindowTaskItem::updateTask(::TaskManager::TaskChanges changes)
-     }
- 
-     if (changes & TaskManager::AttentionChanged) {
--        if (m_task->demandsAttention()) {
-+        if (m_task.data()->demandsAttention()) {
-             flags |= TaskWantsAttention;
-         } else {
-             flags &= ~TaskWantsAttention;
-@@ -191,14 +183,14 @@ void WindowTaskItem::updateTask(::TaskManager::TaskChanges changes)
- 
-     if (needsUpdate) {
-         //redraw
--        //kDebug() << m_task->name();
-+        //kDebug() << m_task.data()->name();
-         queueUpdate();
-     }
- }
- 
- void WindowTaskItem::updateToolTip()
- {
--    if (!m_task || !m_task->task()) {
-+    if (!m_task || !m_task.data()->task()) {
-         return;
-     }
- 
-@@ -219,19 +211,19 @@ void WindowTaskItem::updateToolTip()
-     }
- 
-     if (showToolTip) {
--        QPixmap p = m_task->task()->icon(KIconLoader::SizeLarge, KIconLoader::SizeLarge, false);
-+        QPixmap p = m_task.data()->task()->icon(KIconLoader::SizeLarge, KIconLoader::SizeLarge, false);
-         if (p.height() > KIconLoader::SizeLarge) {
-             p = p.scaled(QSize(KIconLoader::SizeLarge, KIconLoader::SizeLarge),
-                                 Qt::KeepAspectRatio, Qt::SmoothTransformation);
-         }
- 
--        Plasma::ToolTipContent data(Qt::escape(m_task->name()), QString(), p);
--        if (m_task->desktop() != 0 && 
--            (!m_applet->groupManager().showOnlyCurrentDesktop() || !m_task->isOnCurrentDesktop())) {
-+        Plasma::ToolTipContent data(Qt::escape(m_task.data()->name()), QString(), p);
-+        if (m_task.data()->desktop() != 0 && 
-+            (!m_applet->groupManager().showOnlyCurrentDesktop() || !m_task.data()->isOnCurrentDesktop())) {
-             data.setSubText(i18nc("Which virtual desktop a window is currently on", "On %1",
--                                  KWindowSystem::desktopName(m_task->desktop())));
-+                                  KWindowSystem::desktopName(m_task.data()->desktop())));
-         }
--        data.setWindowToPreview(m_task->task()->window());
-+        data.setWindowsToPreview(QList<WId>() << m_task.data()->task()->window());
-         data.setClickable(true);
-         data.setInstantPopup(true);
-         data.setHighlightWindows(m_applet->highlightWindows());
-@@ -285,8 +277,9 @@ void WindowTaskItem::gotTaskPointer()
- void WindowTaskItem::setWindowTask(TaskManager::TaskItem* taskItem)
- {
-     if (m_task) {
--        disconnect(m_task->task().constData(), 0, this, 0);
-+        disconnect(m_task.data()->task().constData(), 0, this, 0);
-     }
-+
-     m_task = taskItem;
-     m_abstractItem = qobject_cast<TaskManager::AbstractGroupableItem *>(taskItem);
- 
-@@ -294,8 +287,10 @@ void WindowTaskItem::setWindowTask(TaskManager::TaskItem* taskItem)
-         connect(m_abstractItem, SIGNAL(destroyed(QObject*)), this, SLOT(clearAbstractItem()));
-     }
- 
--    connect(m_task, SIGNAL(changed(::TaskManager::TaskChanges)),
--            this, SLOT(updateTask(::TaskManager::TaskChanges)));
-+    if (m_task) {
-+        connect(m_task.data(), SIGNAL(changed(::TaskManager::TaskChanges)),
-+                this, SLOT(updateTask(::TaskManager::TaskChanges)));
-+    }
- 
-     updateTask(::TaskManager::EverythingChanged);
-     publishIconGeometry();
-@@ -319,7 +314,7 @@ void WindowTaskItem::setTask(TaskManager::TaskItem* taskItem)
- 
- TaskManager::TaskPtr WindowTaskItem::windowTask() const
- {
--    return m_task ? m_task->task() : TaskManager::TaskPtr();
-+    return m_task ? m_task.data()->task() : TaskManager::TaskPtr();
- }
- 
- void WindowTaskItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
-@@ -331,10 +326,10 @@ void WindowTaskItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
- 
-     QList <QAction*> actionList;
-     QAction *a(0);
--    if (m_task->isGrouped()) {
-+    if (m_task.data()->isGrouped()) {
-         a = new QAction(i18n("Collapse Parent Group"), 0);
-         actionList.append(a);
--        TaskGroupItem *group = qobject_cast<TaskGroupItem*>(m_applet->rootGroupItem()->abstractTaskItem(m_task->parentGroup()));
-+        TaskGroupItem *group = qobject_cast<TaskGroupItem*>(m_applet->rootGroupItem()->abstractTaskItem(m_task.data()->parentGroup()));
-         connect(a, SIGNAL(triggered()), group, SLOT(collapse()));
-     }
- 
-@@ -343,7 +338,7 @@ void WindowTaskItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
-         actionList.append(configAction);
-     }
- 
--    TaskManager::BasicMenu menu(0, m_task, &m_applet->groupManager(), actionList);
-+    TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList);
-     menu.adjustSize();
- 
-     if (m_applet->formFactor() != Plasma::Vertical) {
-@@ -364,18 +359,13 @@ bool WindowTaskItem::isWindowItem() const
- 
- bool WindowTaskItem::isActive() const
- {
--    if (!m_task) {
--        //kDebug() << "no task set";
--        return false;
--    }
--
--    return m_task->isActive();
-+    return m_task ? m_task.data()->isActive() : false;
- }
- 
- void WindowTaskItem::setAdditionalMimeData(QMimeData* mimeData)
- {
-     if (m_task) {
--        m_task->addMimeData(mimeData);
-+        m_task.data()->addMimeData(mimeData);
-     }
- }
- 
-diff --git a/plasma/desktop/applets/tasks/windowtaskitem.h b/plasma/desktop/applets/tasks/windowtaskitem.h
-index a5b698a..4db9d43 100644
---- a/plasma/desktop/applets/tasks/windowtaskitem.h
-+++ b/plasma/desktop/applets/tasks/windowtaskitem.h
-@@ -63,7 +63,6 @@ signals:
- 
- public slots:
-     void activate();
--    void close();
- 
- protected:
-     void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
-@@ -82,7 +81,7 @@ private:
-     /** Sets the window represented by this task. */
-     void setWindowTask(TaskManager::TaskItem* taskItem);
- 
--    TaskManager::TaskItem *m_task;
-+    QWeakPointer<TaskManager::TaskItem> m_task;
-     Plasma::BusyWidget *m_busyWidget;
- };
- 
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch
deleted file mode 100644
index a9daa5004ea7..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 92b1e7cc6766023050aaaae41390bb5cfcc07ec5
-Author: Max Lin <max7442@gmail.com>
-Date:   Thu Nov 3 11:48:32 2011 +0800
-
-    Used the gps_open() return value as condition instead of checking m_gpsdata
-    
-    Checking the return value of gps_open() as condition instead of checking
-    m_gpsdata for GPSD_API_MAJOR_VERSION >=5, there should be prevent crash
-    occurred when no gpsd running.
-    
-    BUG: 277036
-    REVIEW: 103035
-
-diff --git a/plasma/generic/dataengines/geolocation/location_gps.cpp b/plasma/generic/dataengines/geolocation/location_gps.cpp
-index 709321b..551aec2 100644
---- a/plasma/generic/dataengines/geolocation/location_gps.cpp
-+++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
-@@ -83,11 +83,11 @@ Gps::Gps(QObject* parent, const QVariantList& args)
- {
- #if GPSD_API_MAJOR_VERSION >= 5
-     m_gpsdata = new gps_data_t;
--    gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
-+    if (gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata) != -1) {
- #else
-     gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
--#endif
-     if (m_gpsdata) {
-+#endif
-         kDebug() << "gpsd found.";
-         m_gpsd = new Gpsd(m_gpsdata);
-         connect(m_gpsd, SIGNAL(dataReady(Plasma::DataEngine::Data)),
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index a94fd36a367e..6d029cd8629e 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.148 2012/02/21 12:52:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.149 2012/02/21 15:37:28 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/pykde4-4.6.3-pyqt475.patch, -files/pykde4-4.6.4-pyqt475.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -pykde4-4.6.3.ebuild,
   -pykde4-4.6.3-r1.ebuild:
diff --git a/kde-base/pykde4/files/pykde4-4.6.3-pyqt475.patch b/kde-base/pykde4/files/pykde4-4.6.3-pyqt475.patch
deleted file mode 100644
index f5774942d38f..000000000000
--- a/kde-base/pykde4/files/pykde4-4.6.3-pyqt475.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ruN pykde4-4.6.3.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py pykde4-4.6.3/python/pykde4/tools/pykdeuic4/pykdeuic4.py
---- pykde4-4.6.3.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py	2011-04-28 15:29:23.000000000 +0200
-+++ pykde4-4.6.3/python/pykde4/tools/pykdeuic4/pykdeuic4.py	2011-06-21 21:54:52.992764623 +0200
-@@ -45,7 +45,7 @@
-     def __init__(self,string, disambig=None):
-         original_i18n_string.__init__(self,string, disambig)
-     def __str__(self):
--        return "kdecore.i18n(\"%s\")" % (qtproxies.escape(self.string),)
-+        return "kdecore.i18n(%s)" % (qtproxies.escape(self.string),)
- 
- qtproxies.i18n_string = kde_i18n_string
- 
-@@ -78,7 +78,7 @@
-     indenter.indentwidth = indent
-     comp = compiler.UICompiler()
-     comp.factory._cwFilters.append(kdeFilter())
--    winfo = comp.compileUi(uifile, output)
-+    winfo = comp.compileUi(uifile, output, None)
- 
-     if exe:
-         output.write("""
-@@ -111,7 +111,7 @@
-     app = kdeui.KApplication()
-     mainWindow = MainWin(None, "main window")
-     mainWindow.show()
--    app.connect (app, QtCore.SIGNAL ("lastWindowClosed ()"), app.quit)
-+    app.lastWindowClosed.connect(app.quit)
-     app.exec_ ()
- """)
- 
diff --git a/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch b/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch
deleted file mode 100644
index 55f61f0c872a..000000000000
--- a/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN pykde4-4.6.4.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py pykde4-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py
---- pykde4-4.6.4.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py	2011-06-02 12:03:32.000000000 +0200
-+++ pykde4-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py	2011-06-21 21:59:16.310764723 +0200
-@@ -78,7 +78,7 @@
-     indenter.indentwidth = indent
-     comp = compiler.UICompiler()
-     comp.factory._cwFilters.append(kdeFilter())
--    winfo = comp.compileUi(uifile, output)
-+    winfo = comp.compileUi(uifile, output, None)
- 
-     if exe:
-         output.write("""
-@@ -111,7 +111,7 @@
-     app = kdeui.KApplication()
-     mainWindow = MainWin(None, "main window")
-     mainWindow.show()
--    app.connect (app, QtCore.SIGNAL ("lastWindowClosed ()"), app.quit)
-+    app.lastWindowClosed.connect(app.quit)
-     app.exec_ ()
- """)
- 
diff --git a/kde-base/rocs/ChangeLog b/kde-base/rocs/ChangeLog
index 00d11a6b6442..36f856fb32fa 100644
--- a/kde-base/rocs/ChangeLog
+++ b/kde-base/rocs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/rocs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.63 2012/02/21 12:52:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.64 2012/02/21 15:26:02 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org> -files/rocs-4.7.3-boost.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -rocs-4.6.3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/rocs/files/rocs-4.7.3-boost.patch b/kde-base/rocs/files/rocs-4.7.3-boost.patch
deleted file mode 100644
index 9671e41b7d50..000000000000
--- a/kde-base/rocs/files/rocs-4.7.3-boost.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 43b6ccf22174629ebec0a0579365c4269cf0fb58
-Author: Andreas Cord-Landwehr <cola@uni-paderborn.de>
-Date:   Sat Oct 22 22:50:26 2011 +0200
-
-    Build Rocs by default with Boost Exceptions.
-    
-    This solves the common build issues with many Boost releases.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b47ef0a..c636fd5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,8 @@ find_package(KDE4 REQUIRED)
- include(KDE4Defaults)
- remove_definitions(-DQT_NO_STL)
- 
-+set (CMAKE_CXX_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" )
-+
- include_directories(
-   ${KDE4_INCLUDES}
-   ${QT_INCLUDES}
-@@ -15,7 +17,6 @@ include_directories(
- 
- if(${CMAKE_BUILD_TYPE} MATCHES coverage)
-   set (CMAKE_CXX_COMPILER cov++)
--  set (CMAKE_CXX_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" )
- endif()
- 
- find_package(Boost "1.39" REQUIRED)
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index cd2853dcca77..ff40244bba5e 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.135 2012/02/21 12:52:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.136 2012/02/21 15:27:37 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/systemsettings-4.7.3-fix-keyboard-layout-switch.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -systemsettings-4.6.3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/systemsettings/files/systemsettings-4.7.3-fix-keyboard-layout-switch.patch b/kde-base/systemsettings/files/systemsettings-4.7.3-fix-keyboard-layout-switch.patch
deleted file mode 100644
index 6a0015536482..000000000000
--- a/kde-base/systemsettings/files/systemsettings-4.7.3-fix-keyboard-layout-switch.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-commit 1ac5ebe482f633295fb4a79eb1c5236561e9ca70
-Author: Andriy Rysin <arysin@gmail.com>
-Date:   Fri Nov 18 23:12:14 2011 -0500
-
-    Fix keyboard layout global shortcuts
-    BUG: 286302
-
-diff --git a/kcontrol/keyboard/bindings.cpp b/kcontrol/keyboard/bindings.cpp
-index 6f5af7b..ac20dd9 100644
---- a/kcontrol/keyboard/bindings.cpp
-+++ b/kcontrol/keyboard/bindings.cpp
-@@ -103,8 +103,11 @@ void KeyboardLayoutActionCollection::setLayoutShortcuts(QList<LayoutUnit>& layou
- {
- 	for (QList<LayoutUnit>::iterator i = layoutUnits.begin(); i != layoutUnits.end(); ++i) {
- 		LayoutUnit& layoutUnit = *i;
--		createLayoutShortcutActon(layoutUnit, rules, false);
-+		if( ! layoutUnit.getShortcut().isEmpty() ) {
-+			createLayoutShortcutActon(layoutUnit, rules, false);
-+		}
- 	}
-+	kDebug() << "Cleaning component shortcuts on save" << KGlobalAccel::cleanComponent(COMPONENT_NAME);
- }
- 
- void KeyboardLayoutActionCollection::loadLayoutShortcuts(QList<LayoutUnit>& layoutUnits, const Rules* rules)
-@@ -112,19 +115,27 @@ void KeyboardLayoutActionCollection::loadLayoutShortcuts(QList<LayoutUnit>& layo
- 	for (QList<LayoutUnit>::iterator i = layoutUnits.begin(); i != layoutUnits.end(); ++i) {
- 		LayoutUnit& layoutUnit = *i;
- 		KAction* action = createLayoutShortcutActon(layoutUnit, rules, true);
--		layoutUnit.setShortcut(action->globalShortcut(KAction::ActiveShortcut).primary());	// shortcut was restored
-+		QKeySequence shortcut = action->globalShortcut(KAction::ActiveShortcut).primary();	// shortcut was restored
-+		if( ! shortcut.isEmpty() ) {
-+			kDebug() << "Restored shortcut for" << layoutUnit.toString() << shortcut;
-+			layoutUnit.setShortcut(shortcut);
-+		}
-+		else {
-+			kDebug() << "Skipping empty shortcut for" << layoutUnit.toString();
-+			removeAction(action);
-+		}
- 	}
- 	kDebug() << "Cleaning component shortcuts on load" << KGlobalAccel::cleanComponent(COMPONENT_NAME);
- }
- 
--KAction* KeyboardLayoutActionCollection::getAction(const LayoutUnit& layoutUnit)
--{
--	for(int i=1; i<actions().size(); i++) {
--		if( action(i)->data() == layoutUnit.toString() )
--			return static_cast<KAction*>(action(i));
--	}
--	return NULL;
--}
-+//KAction* KeyboardLayoutActionCollection::getAction(const LayoutUnit& layoutUnit)
-+//{
-+//	for(int i=1; i<actions().size(); i++) {
-+//		if( action(i)->data() == layoutUnit.toString() )
-+//			return static_cast<KAction*>(action(i));
-+//	}
-+//	return NULL;
-+//}
- 
- void KeyboardLayoutActionCollection::resetLayoutShortcuts()
- {
-diff --git a/kcontrol/keyboard/bindings.h b/kcontrol/keyboard/bindings.h
-index f60656b..09a9bdc 100644
---- a/kcontrol/keyboard/bindings.h
-+++ b/kcontrol/keyboard/bindings.h
-@@ -36,7 +36,7 @@ public:
- 	virtual ~KeyboardLayoutActionCollection();
- 
- 	KAction* getToggeAction();
--	KAction* getAction(const LayoutUnit& layoutUnit);
-+//	KAction* getAction(const LayoutUnit& layoutUnit);
- 	KAction* createLayoutShortcutActon(const LayoutUnit& layoutUnit, const Rules* rules, bool autoload);
- //	KAction* setShortcut(LayoutUnit& layoutUnit, const QKeySequence& keySequence, const Rules* rules);
- 	void setLayoutShortcuts(QList<LayoutUnit>& layoutUnits, const Rules* rules);
-diff --git a/kcontrol/keyboard/keyboard_daemon.cpp b/kcontrol/keyboard/keyboard_daemon.cpp
-index 1618d2a..7126268 100644
---- a/kcontrol/keyboard/keyboard_daemon.cpp
-+++ b/kcontrol/keyboard/keyboard_daemon.cpp
-@@ -214,12 +214,16 @@ void KeyboardDaemon::layoutMapChanged()
- 
- void KeyboardDaemon::switchToNextLayout()
- {
-+	kDebug() << "Toggling layout";
- 	X11Helper::switchToNextLayout();
- }
- 
- bool KeyboardDaemon::setLayout(QAction* action)
- {
--	LayoutUnit layoutUnit(LayoutUnit(action->data().toString()));
-+	if( action == actionCollection->getToggeAction() )
-+		return false;
-+
-+	LayoutUnit layoutUnit(action->data().toString());
- 	return LayoutsMenu::switchToLayout(layoutUnit, keyboardConfig);	// need this to be able to switch to spare layouts
- //	return X11Helper::setLayout(LayoutUnit(action->data().toString()));
- }