Remove old.

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

11 files changed, 11 insertions, 508 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 655d0f285648..b17c199aaa42 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.866 2012/09/03 13:29:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.867 2012/09/03 14:10:23 johu Exp $
+
+  03 Sep 2012; Johannes Huber <johu@gentoo.org>
+  -files/kdelibs-4.5.90-mimetypes.patch, -files/kdelibs-4.6.3-bytecode.patch,
+  -files/kdelibs-4.7.4-klocale.patch, -files/kdelibs-4.7.4-xinelib12x.patch,
+  -files/kdelibs-4.8.0-xinelib12x.patch,
+  -files/kdelibs-4.8.1-nepomuk-kmail.patch,
+  -files/kdelibs-4.8.1-sonnet-highlighter.patch,
+  -files/kdelibs-4.8.4-power.patch, -files/kdelibs-4.8.4-sopranorevert1.patch,
+  -files/kdelibs-4.8.4-sopranorevert2.patch:
+  Remove old.
 
   03 Sep 2012; Johannes Huber <johu@gentoo.org> -kdelibs-4.7.4.ebuild,
   -kdelibs-4.7.4-r12.ebuild:
diff --git a/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch
deleted file mode 100644
index 508812306a8f..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ur kdelibs-4.5.90.orig/mimetypes/kde.xml kdelibs-4.5.90/mimetypes/kde.xml
---- kdelibs-4.5.90.orig/mimetypes/kde.xml	2010-12-22 10:56:01.000000000 +0100
-+++ kdelibs-4.5.90/mimetypes/kde.xml	2010-12-23 11:31:53.000000000 +0100
-@@ -178,34 +178,6 @@
-     <glob pattern="*.abc"/>
-   </mime-type>
- 
--  <!-- all/ fake mime types -->
--  <mime-type type="all/all">
--    <comment>all files and folders</comment>
--  </mime-type>
--  <mime-type type="all/allfiles">
--    <comment>all files</comment>
--  </mime-type>
--
--  <!-- uri/ fake mime types -->
--  <mime-type type="uri/mms">
--    <comment>mms: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/mmst">
--    <comment>mmst: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/mmsu">
--    <comment>mmsu: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/pnm">
--    <comment>pnm: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/rtspt">
--    <comment>rtspt: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/rtspu">
--    <comment>rtspu: URIs</comment>
--  </mime-type>
--
-   <mime-type type="application/vnd.kde.fontspackage">
-     <sub-class-of type="application/zip"/>
-     <comment>fonts package</comment>
-@@ -346,12 +318,6 @@
-     <glob pattern="*.icq"/>
-   </mime-type>
- 
--  <mime-type type="interface/x-winamp-skin">
--    <sub-class-of type="application/zip"/>
--    <comment>compressed Winamp skin</comment>
--    <glob pattern="*.wsz"/>
--  </mime-type>
--
-   <mime-type type="video/x-ms-wmp"> <!-- fdo #19671, rejected because "not a file type, only a plugin type" -->
-     <comment>Microsoft Media Format</comment>
-     <sub-class-of type="video/x-ms-wmv"/>
\ No newline at end of file
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch
deleted file mode 100644
index 736e2ae782b7..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ruN kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake kdelibs-4.6.3/cmake/modules/PythonMacros.cmake
---- kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake	2011-04-01 15:55:50.000000000 +0200
-+++ kdelibs-4.6.3/cmake/modules/PythonMacros.cmake	2011-06-21 22:30:18.957765437 +0200
-@@ -23,40 +23,42 @@
-   # Install the source file.
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
- 
--  # Byte compile and install the .pyc file.        
--  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
--  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
--  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
--  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
--  if(WIN32)
--    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
--  endif(WIN32)
--
--  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
--
--  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
--  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
--
--  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
--  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${message}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ELSE(_abs_bin_py STREQUAL ${_absfilename})
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${message} 
--      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+  # Byte compile and install the .pyc file.
-+  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+
-+    if(WIN32)
-+      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+    endif(WIN32)
-+
-+    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+
-+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+
-+    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
-+
-+    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-+    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
-+      ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${message}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+      )
-+    ELSE(_abs_bin_py STREQUAL ${_absfilename})
-+      ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${message}
-+        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+      )
-+    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
- 
--  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
-+    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
-+  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
- ENDMACRO(PYTHON_INSTALL)
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch b/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch
deleted file mode 100644
index 4045279bedda..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 2993b24bc21a340695ad35b4f014a684f4d0c651 Mon Sep 17 00:00:00 2001
-From: John Layt <jlayt@kde.org>
-Date: Sat, 17 Dec 2011 16:27:51 +0000
-Subject: [PATCH] KLocale: Fix readNumber() and readMoney() for lenient group parsing
-
-Restore the old pre-4.7 behaviour of accepting as valid any numbers
-that do not contain any group separators but strictly enforce group
-rules when the number contains 1 or more group separators.
-
-Distro's will really want to backport this fix to all versions of 4.7
-as previously number entry for all KDE apps would have been seriously
-broken.
-
-I'm amazed I wasn't beaten up for this earlier!
-
-BUG: 288963
-FIXED-IN: 4.7.5
-CCMAIL: kde-packager@kde.org
----
- kdecore/localization/klocale_kde.cpp |   10 ++++++++--
- kdecore/tests/klocaletest.cpp        |   34 +++++++++++++++++++++++++++++-----
- 2 files changed, 37 insertions(+), 7 deletions(-)
-
-diff --git a/kdecore/localization/klocale_kde.cpp b/kdecore/localization/klocale_kde.cpp
-index 6cf85f9..6690f4a 100644
---- a/kdecore/localization/klocale_kde.cpp
-+++ b/kdecore/localization/klocale_kde.cpp
-@@ -1894,7 +1894,10 @@ double KLocalePrivate::readNumber(const QString &_str, bool * ok) const
- 
-     // Remove group separators
-     bool groupOk = true;
--    str = parseDigitGroup(str, thousandsSeparator(), decimalSymbol(), numericDigitGrouping(), &groupOk);
-+    if(str.contains(thousandsSeparator())) {
-+        str = parseDigitGroup(str, thousandsSeparator(), decimalSymbol(),
-+                              numericDigitGrouping(), &groupOk);
-+    }
- 
-     if (!groupOk) {
-         if (ok) {
-@@ -2013,7 +2016,10 @@ double KLocalePrivate::readMoney(const QString &_str, bool *ok) const
- 
-     // Remove group separators
-     bool groupOk = true;
--    str = parseDigitGroup(str, monetaryThousandsSeparator(), monetaryDecimalSymbol(), monetaryDigitGrouping(), &groupOk);
-+    if(str.contains(monetaryThousandsSeparator())) {
-+        str = parseDigitGroup(str, monetaryThousandsSeparator(), monetaryDecimalSymbol(),
-+                              monetaryDigitGrouping(), &groupOk);
-+    }
- 
-     if (!groupOk) {
-         if (ok) {
-diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp
-index 97a3bce..f80de85 100644
---- a/kdecore/tests/klocaletest.cpp
-+++ b/kdecore/tests/klocaletest.cpp
-@@ -180,9 +180,13 @@ KLocaleTest::readNumber()
-     QVERIFY(!ok);
-     QCOMPARE(locale.readNumber(QString("123,456,789.01"), &ok), 0.0);
-     QVERIFY(!ok);
--    QCOMPARE(locale.readNumber(QString("123456789"), &ok), 0.0);
-+    QCOMPARE(locale.readNumber(QString("123456789"), &ok), 123456789.0);
-+    QVERIFY(ok);
-+    QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 123456789.01);
-+    QVERIFY(ok);
-+    QCOMPARE(locale.readNumber(QString("123456,789"), &ok), 0.0);
-     QVERIFY(!ok);
--    QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 0.0);
-+    QCOMPARE(locale.readNumber(QString("123456,789.01"), &ok), 0.0);
-     QVERIFY(!ok);
- 
-     //Test it parses correctly with an empty separator.
-@@ -204,6 +208,14 @@ KLocaleTest::readNumber()
-     QVERIFY(ok);
-     QCOMPARE(locale.readNumber(QString("123 456 789.01"), &ok), 123456789.01);
-     QVERIFY(ok);
-+    QCOMPARE(locale.readNumber(QString("123456789"), &ok), 123456789.0);
-+    QVERIFY(ok);
-+    QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 123456789.01);
-+    QVERIFY(ok);
-+    QCOMPARE(locale.readNumber(QString("123456 789"), &ok), 0.0);
-+    QVERIFY(!ok);
-+    QCOMPARE(locale.readNumber(QString("123456 789.01"), &ok), 0.0);
-+    QVERIFY(!ok);
-     QCOMPARE(locale.readNumber(QString("123,456,789"), &ok), 0.0);
-     QVERIFY(!ok);
-     QCOMPARE(locale.readNumber(QString("123,456,789.01"), &ok), 0.0);
-@@ -479,6 +491,10 @@ void KLocaleTest::readMoney()
-     QVERIFY(ok);
-     QCOMPARE(locale.readMoney("$ 987,654,321.12", &ok), 987654321.12);
-     QVERIFY(ok);
-+    QCOMPARE(locale.readMoney("$ 987654321.12", &ok), 987654321.12);
-+    QVERIFY(ok);
-+    QCOMPARE(locale.readMoney("$ 987654,321.12", &ok), 0.0);
-+    QVERIFY(!ok);
- 
-     QCOMPARE(locale.readMoney(          "$ -1.12", &ok),         -1.12);
-     QVERIFY(ok);
-@@ -498,6 +514,10 @@ void KLocaleTest::readMoney()
-     QVERIFY(ok);
-     QCOMPARE(locale.readMoney("$ -987,654,321.12", &ok), -987654321.12);
-     QVERIFY(ok);
-+    QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12);
-+    QVERIFY(ok);
-+    QCOMPARE(locale.readMoney("$ -987654,321.12", &ok), 0.0);
-+    QVERIFY(!ok);
- 
-     // Test incomplete formats
-     QCOMPARE(locale.readMoney(          "$ 1", &ok),         1.00);
-@@ -521,17 +541,21 @@ void KLocaleTest::readMoney()
- 
-     // Test Grouping
-     locale.d->setMonetaryDigitGrouping(QList<int>());
--    QCOMPARE(locale.readMoney( "$ 987654321.12", &ok),  987654321.12);
-+    QCOMPARE(locale.readMoney("$ 987654321.12", &ok),  987654321.12);
-     QVERIFY(ok);
-     QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12);
-     QVERIFY(ok);
-     locale.d->setMonetaryDigitGrouping(QList<int>() << 3 << 2);
--    QCOMPARE(locale.readMoney( "$ 98,76,54,321.12", &ok),  987654321.12);
-+    QCOMPARE(locale.readMoney("$ 98,76,54,321.12", &ok),  987654321.12);
-     QVERIFY(ok);
-     QCOMPARE(locale.readMoney("$ -98,76,54,321.12", &ok), -987654321.12);
-     QVERIFY(ok);
-+    QCOMPARE(locale.readMoney("$ 987654321.12", &ok),  987654321.12);
-+    QVERIFY(ok);
-+    QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12);
-+    QVERIFY(ok);
-     locale.d->setMonetaryDigitGrouping(QList<int>() << 3 << -1);
--    QCOMPARE(locale.readMoney( "$ 987654,321.12", &ok),  987654321.12);
-+    QCOMPARE(locale.readMoney("$ 987654,321.12", &ok),  987654321.12);
-     QVERIFY(ok);
-     QCOMPARE(locale.readMoney("$ -987654,321.12", &ok), -987654321.12);
-     QVERIFY(ok);
--- 
-1.7.3.4
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch b/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch
deleted file mode 100644
index bdcd39a6c974..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Thu, 5 Jan 2012 10:06:05 +0100
-Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
-
----
- cmake/modules/FindXine.cmake |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
-index 37c58c6..d71969a 100644
---- a/cmake/modules/FindXine.cmake
-+++ b/cmake/modules/FindXine.cmake
-@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
-   ${PC_LIBXINE_LIBRARY_DIRS}
-  )
- 
--find_program(XINECONFIG_EXECUTABLE NAMES xine-config 
-+find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
-    HINTS
-    ${PC_LIBXINE_PREFIX}/bin
- )
- 
- if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
--   exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-+   exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-    if("${XINE_VERSION}" VERSION_GREATER "1.1.0")   #if (... VERSION_GREATER) is new since cmake 2.6.2
-       set(XINE_VERSION_OK TRUE)
-       string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
--- 
-1.7.8.2
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch b/kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch
deleted file mode 100644
index 68da6a75d92d..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 568222416da483e81513cd5e28634a829e1aea23
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Wed Jan 25 20:49:04 2012 -0200
-
-    FindXine: Make version detection work with xine >= 1.2.0.
-    
-    Starting with the recently released version 1.2.0, xine has its version
-    number macros in xine/version.h instead of xine.h itself.
-    
-    Account for this case by checking if xine/version.h exists and falling
-    back to xine.h if it doesn't when reading the version numbers.
-    
-    Reviewed-by: Alexander Neundorf
-
-diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
-index 0319b7d..7dd08be 100644
---- a/cmake/modules/FindXine.cmake
-+++ b/cmake/modules/FindXine.cmake
-@@ -47,7 +47,13 @@ FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config
- 
- # Get the version number from xine.h and store it in the cache:
- IF(XINE_INCLUDE_DIR  AND NOT  XINE_VERSION)
--  FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT)
-+  IF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) # xine 1.2.0+
-+    SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine/version.h)
-+  ELSE(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h)
-+    SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine.h)
-+  ENDIF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h)
-+
-+  FILE(READ ${XINE_VERSION_FILE} XINE_VERSION_CONTENT)
-   STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)"  _dummy "${XINE_VERSION_CONTENT}")
-   SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}")
- 
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch
deleted file mode 100644
index 145472d17d7b..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
-index abe55ea..e65e66e 100644
---- a/nepomuk/core/resourcedata.cpp
-+++ b/nepomuk/core/resourcedata.cpp
-@@ -175,7 +175,7 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
-     if( !m_uri.isEmpty() ) {
-         m_rm->m_initializedData.remove( m_uri );
-         if( m_rm->m_watcher && m_addedToWatcher ) {
--            m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
-             m_addedToWatcher = false;
-         }
-     }
-@@ -394,15 +394,16 @@ bool Nepomuk::ResourceData::load()
- 
-         if(!m_rm->m_watcher) {
-             m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
-+            m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
-             QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
-                               m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
-             QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
-                               m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
-             m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
--            m_rm->m_watcher->start();
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
-         }
-         else {
--            m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
-         }
-         m_addedToWatcher = true;
- 
-diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
-index 06b9622..92b12f5 100644
---- a/nepomuk/core/resourcewatcher.h
-+++ b/nepomuk/core/resourcewatcher.h
-@@ -93,6 +93,7 @@ namespace Nepomuk {
-          */
-         virtual ~ResourceWatcher();
- 
-+    public Q_SLOTS:
-         /**
-          * \brief Add a type to be watched.
-          *
-@@ -204,7 +205,6 @@ namespace Nepomuk {
-          */
-         QList<Types::Property> properties() const;
- 
--    public Q_SLOTS:
-         /**
-          * \brief Start the signalling of changes.
-          *
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch
deleted file mode 100644
index 92a1f45c61cb..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 20f73c2150bcd2220fe3604c2ec251b4026a3891
-Author: Montel Laurent <montel@kde.org>
-Date:   Mon Mar 19 12:30:49 2012 +0100
-
-    Fix Bug 295615 - kmail crashes trying to edit subject/message body with
-    
-    some dictionary languages set in identity properties
-    
-    Patch from Matt Whitlock from https://bugs.gentoo.org/show_bug.cgi?id=407709
-    it's right timer can be uninitialize when we change language => it will
-    crash
-    
-    FIXED-IN: 4.8.2
-    BUG: 295615
-
-diff --git a/kdeui/sonnet/highlighter.cpp b/kdeui/sonnet/highlighter.cpp
-index 05f7ed1..b10310a 100644
---- a/kdeui/sonnet/highlighter.cpp
-+++ b/kdeui/sonnet/highlighter.cpp
-@@ -108,6 +108,10 @@ Highlighter::Highlighter(QTextEdit *textEdit,
- 
-     d->dict = new Sonnet::Speller();
-     d->spellCheckerFound = d->dict->isValid();
-+    d->rehighlightRequest = new QTimer(this);
-+    connect( d->rehighlightRequest, SIGNAL(timeout()),
-+             this, SLOT(slotRehighlight()));
-+
-     if(!d->spellCheckerFound)
-         return;
- 
-@@ -121,9 +125,6 @@ Highlighter::Highlighter(QTextEdit *textEdit,
-     for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) {
-         d->dict->addToSession( *it );
-     }
--    d->rehighlightRequest = new QTimer(this);
--    connect( d->rehighlightRequest, SIGNAL(timeout()),
--             this, SLOT(slotRehighlight()));
-     d->completeRehighlightRequired = true;
-     d->rehighlightRequest->setInterval(0);
-     d->rehighlightRequest->setSingleShot(true);
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch
deleted file mode 100644
index 61ea0aa5d7f5..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5926264d13900efec70aaac434b7b67f9d8e6837 Mon Sep 17 00:00:00 2001
-From: Lukas Tinkl <lukas@kde.org>
-Date: Tue, 19 Jun 2012 18:27:04 +0200
-Subject: [PATCH 5/5] correctly report power saving status
-
----
- solid/solid/powermanagement.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/solid/solid/powermanagement.cpp b/solid/solid/powermanagement.cpp
-index 8dc8535..faadea4 100644
---- a/solid/solid/powermanagement.cpp
-+++ b/solid/solid/powermanagement.cpp
-@@ -73,7 +73,7 @@ Solid::PowerManagement::Notifier::Notifier()
- 
- bool Solid::PowerManagement::appShouldConserveResources()
- {
--    return globalPowerManager->powerSaveStatus;
-+    return globalPowerManager->managerIface.GetPowerSaveStatus();
- }
- 
- QSet<Solid::PowerManagement::SleepState> Solid::PowerManagement::supportedSleepStates()
--- 
-1.7.9.2
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch
deleted file mode 100644
index 59c3174710af..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 76e0376d7582cfe5b898c56bf3779ca2279dace8 Mon Sep 17 00:00:00 2001
-From: Vishesh Handa <me@vhanda.in>
-Date: Thu, 14 Jun 2012 02:55:32 +0530
-Subject: [PATCH 1/5] Revert "Disconnect before re-connecting. Soprano does
- not do that for us."
-
-This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf.
-
-This is being done so that KDE 4.8.x works with Soprano 2.7.6
----
- nepomuk/core/nepomukmainmodel.cpp |    1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
-index 8dc0b1f..ff742d7 100644
---- a/nepomuk/core/nepomukmainmodel.cpp
-+++ b/nepomuk/core/nepomukmainmodel.cpp
-@@ -97,7 +97,6 @@ public:
-         if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
-             delete localSocketModel;
-             localSocketModel = 0;
--            localSocketClient.disconnect();
-             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
-             kDebug() << "Connecting to local socket" << socketName;
-             if ( localSocketClient.connect( socketName ) ) {
--- 
-1.7.9.2
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch
deleted file mode 100644
index 206e654fe53a..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bde5aad1e9f7bfb6f8d5c60197797de4a315158d Mon Sep 17 00:00:00 2001
-From: Vishesh Handa <me@vhanda.in>
-Date: Thu, 14 Jun 2012 02:56:31 +0530
-Subject: [PATCH 2/5] Revert "Always rec-connect if forced (ie. when Nepomuk
- server restarts)"
-
-This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91.
-
-This is done so that 4.8.x works with Soprano 2.7.6
----
- nepomuk/core/nepomukmainmodel.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
-index ff742d7..be23b38 100644
---- a/nepomuk/core/nepomukmainmodel.cpp
-+++ b/nepomuk/core/nepomukmainmodel.cpp
-@@ -94,7 +94,7 @@ public:
- 
-         // we may get disconnected from the server but we don't want to try
-         // to connect every time the model is requested
--        if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
-+        if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
-             delete localSocketModel;
-             localSocketModel = 0;
-             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
--- 
-1.7.9.2
-