[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/, kde-base/kdelibs/files/dist/

[Tomas Chvatal]

commit:     cbe74f84eaecff78ffa169e7deda18ef76f2c9c8
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 22:05:41 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May  1 22:05:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cbe74f84

[kde-base/kdelibs] consolidate patches

---
 .../dist/02_gentoo_append_xdg_config_dirs.patch    |   30 -----
 .../files/dist/23_solid_no_double_build.patch      |   19 ---
 .../files/kdelibs-4.3.1-macos-unbundle.patch       |  118 --------------------
 .../files/kdelibs-4.3.2-solaris-fileunix.patch     |   40 -------
 .../files/kdelibs-4.3.2-solaris-getgrouplist.patch |  109 ------------------
 .../files/kdelibs-4.3.2-solaris-ksyscoca.patch     |   16 ---
 .../files/kdelibs-4.3.3-klauncher_kdeinit.patch    |   31 -----
 .../files/kdelibs-4.3.3-klauncher_kioslave.patch   |   77 -------------
 .../files/kdelibs-4.3.3-klauncher_mac.patch        |   33 ------
 .../kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch |   46 --------
 .../files/kdelibs-4.3.80-module-suffix.patch       |  105 -----------------
 .../files/kdelibs-4.4.80-icon-name-qt47.patch      |   18 ---
 .../files/kdelibs-4.4.90-icon-name-qt47.patch      |   23 ----
 .../files/kdelibs-4.5.0-kfilemetadatawidget.patch  |   55 ---------
 .../files/kdelibs-4.5.73-module-suffix.patch       |  106 ------------------
 .../files/kdelibs-4.5.74-klauncher_mac.patch       |   26 -----
 kde-base/kdelibs/kdelibs-4.6.3.ebuild              |    5 +-
 kde-base/kdelibs/kdelibs-4.6.9999.ebuild           |    5 +-
 kde-base/kdelibs/kdelibs-9999.ebuild               |    5 +-
 19 files changed, 3 insertions(+), 864 deletions(-)

diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch
deleted file mode 100644
index 072f0ff..0000000
--- a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Set up XDG_CONFIG_DIRS lookup in order:
-1. custom XDG_CONFIG_DIRS from env
-2. kdeprefix xdg config dirs
-3. /etc/xdg
-
-Index: kdecore/kernel/kstandarddirs.cpp
-===================================================================
---- kdecore/kernel/kstandarddirs.cpp	(revision 1014759)
-+++ kdecore/kernel/kstandarddirs.cpp	(working copy)
-@@ -1664,16 +1664,13 @@
-     {
-         tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR)));
-     }
--    else
--    {
--        xdgdirList.clear();
--        xdgdirList.append("/etc/xdg");
-+
- #ifdef Q_WS_WIN
--        xdgdirList.append(installPath("kdedir") + "etc/xdg");
-+    xdgdirList.append(installPath("kdedir") + "etc/xdg");
- #else
--        xdgdirList.append(KDESYSCONFDIR "/xdg");
-+    xdgdirList.append(KDESYSCONFDIR "/xdg");
- #endif
--    }
-+    xdgdirList.append("/etc/xdg");
- 
-     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
-     if (!localXdgDir.isEmpty())

diff --git a/kde-base/kdelibs/files/dist/23_solid_no_double_build.patch b/kde-base/kdelibs/files/dist/23_solid_no_double_build.patch
deleted file mode 100644
index fa71eb9..0000000
--- a/kde-base/kdelibs/files/dist/23_solid_no_double_build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
---- a/solid/solid/CMakeLists.txt
-+++ b/solid/solid/CMakeLists.txt
-@@ -194,7 +194,14 @@
- install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
- 
- ########### static lib for tests  ###############
-+macro(AUTOMOC_COPY _from_target _to_target)
-+    set(_srcfile ${CMAKE_CURRENT_BINARY_DIR}/${_from_target}_automoc.cpp)
-+    set(_dstfile ${CMAKE_CURRENT_BINARY_DIR}/${_to_target}_automoc.cpp)
-+    add_custom_command(OUTPUT ${_dstfile} COMMAND ${CMAKE_COMMAND} -E copy
-+        ${_srcfile} ${_dstfile} MAIN_DEPENDENCY ${_srcfile})
-+endmacro(AUTOMOC_COPY _from_target _to_target)
- 
-+automoc_copy(solid solid_static)
- kde4_add_library(solid_static STATIC ${solid_LIB_SRCS})
- 
- target_link_libraries(solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY})
-

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-macos-unbundle.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-macos-unbundle.patch
deleted file mode 100644
index 4551e27..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.1-macos-unbundle.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-KDE is smart, too smart. We don't want application bundles. And since our Qt is
-configured to not build application bundles, since wouldn't even work. So this
-patch disables KDE's smartness regarding application bundles.
-
-Author: Heiko Przybyl <zuxez@××××××××××××.de>
-
---- kdelibs-4.3.1/kdecore/kernel/kstandarddirs.cpp.orig	2009-09-28 02:05:37 +0200
-+++ kdelibs-4.3.1/kdecore/kernel/kstandarddirs.cpp	2009-09-28 02:22:20 +0200
-@@ -1207,32 +1207,8 @@ QStringList KStandardDirs::systemPaths( 
-     return exePaths;
- }
- 
--#ifdef Q_WS_MAC
--static QString getBundle( const QString& path, bool ignore )
--{
--    kDebug(180) << "getBundle(" << path << ", " << ignore << ") called";
--    QFileInfo info;
--    QString bundle = path;
--    bundle += ".app/Contents/MacOS/" + bundle.section('/', -1);
--    info.setFile( bundle );
--    if ( info.exists() && ( ignore || info.isExecutable() )
--         && ( info.isFile() || info.isSymLink() ) ) {
--        kDebug(180) << "getBundle(): returning " << bundle;
--        return bundle;
--    }
--    return QString();
--}
--#endif
--
- static QString checkExecutable( const QString& path, bool ignoreExecBit )
- {
--#ifdef Q_WS_MAC
--    QString bundle = getBundle( path, ignoreExecBit );
--    if ( !bundle.isEmpty() ) {
--        //kDebug(180) << "findExe(): returning " << bundle;
--        return bundle;
--    }
--#endif
-     QFileInfo info( path );
-     QFileInfo orig = info;
-     if( info.exists() && info.isSymLink() )
-@@ -1327,14 +1303,6 @@ int KStandardDirs::findAllExe( QStringLi
-         p = (*it) + '/';
-         p += real_appname;
- 
--#ifdef Q_WS_MAC
--        QString bundle = getBundle( p, (options & IgnoreExecBit) );
--        if ( !bundle.isEmpty() ) {
--            //kDebug(180) << "findExe(): returning " << bundle;
--            list.append( bundle );
--        }
--#endif
--
-         info.setFile( p );
- 
-         if( info.exists() && ( ( options & IgnoreExecBit ) || info.isExecutable())
-@@ -1636,18 +1604,6 @@ void KStandardDirs::addKDEDefaults()
-         addPrefix(localKdeDir);
-     }
- 
--#ifdef Q_WS_MACX
--    // Adds the "Contents" directory of the current application bundle to
--    // the search path. This way bundled resources can be found.
--    QDir bundleDir(mac_app_filename());
--    if (bundleDir.dirName() == "MacOS") { // just to be sure we're in a bundle
--        bundleDir.cdUp();
--        // now dirName should be "Contents". In there we can find our normal
--        // dir-structure, beginning with "share"
--        addPrefix(bundleDir.absolutePath());
--    }
--#endif
--
-     QStringList::ConstIterator end(kdedirList.end());
-     for (QStringList::ConstIterator it = kdedirList.constBegin();
-          it != kdedirList.constEnd(); ++it)
-@@ -1680,11 +1636,7 @@ void KStandardDirs::addKDEDefaults()
-     }
-     else
-     {
--#ifdef Q_WS_MACX
--        localXdgDir =  QDir::homePath() + "/Library/Preferences/XDG/";
--#else
-         localXdgDir =  QDir::homePath() + "/.config/";
--#endif
-     }
- 
-     localXdgDir = KShell::tildeExpand(localXdgDir);
---- ./kinit/kinit.cpp.orig	2009-09-28 12:38:02 +0200
-+++ ./kinit/kinit.cpp	2009-09-28 12:40:02 +0200
-@@ -551,14 +551,7 @@ static pid_t launch(int argc, const char
-        QByteArray procTitle;
-        d.argv = (char **) malloc(sizeof(char *) * (argc+1));
-        d.argv[0] = (char *) _name;
--#ifdef Q_WS_MAC
--       QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0]));
--       if (!argvexe.isEmpty()) {
--          QByteArray cstr = argvexe.toLocal8Bit();
--          kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();
--          d.argv[0] = strdup(cstr.data());
--       }
--#endif
-+
-        for (int i = 1;  i < argc; i++)
-        {
-           d.argv[i] = (char *) args;
-@@ -627,12 +620,6 @@ static pid_t launch(int argc, const char
-         setup_tty( tty );
- 
-         QByteArray executable = execpath;
--#ifdef Q_WS_MAC
--        QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(executable));
--        if (!bundlepath.isEmpty())
--           executable = QFile::encodeName(bundlepath);
--#endif
--
-         if (!executable.isEmpty())
-            execvp(executable, d.argv);
- 

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch
deleted file mode 100644
index c036206..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Solaris has no d_type element in dir_ent.
-
-Please refer to
-  https://solaris.bionicmutton.org/hg/kde4-specs-432/rev/be96f7fc958a
-
---- kioslave/file/file_unix.cpp.orig	2009-03-10 13:26:04.000000000 +0100
-+++ kioslave/file/file_unix.cpp	2009-05-04 03:27:15.231305077 +0200
-@@ -42,7 +42,7 @@
- #include <grp.h>
- #include <utime.h>
- #include <pwd.h>
--
-+#include <sys/stat.h>
- #if defined(HAVE_LIMITS_H)
- #include <limits.h>  // PATH_MAX
- #endif
-@@ -338,15 +338,20 @@
-     // files where QFile::encodeName(QFile::decodeName(a)) != a.
-     QList<QByteArray> entryNames;
-     KDE_struct_dirent *ep;
-+    KDE_struct_stat hajmaep;
-     if (details == 0) {
-         // Fast path (for recursive deletion, mostly)
-         // Simply emit the name and file type, nothing else.
-         while ( ( ep = KDE_readdir( dp ) ) != 0 ) {
-             entry.clear();
-             entry.insert(KIO::UDSEntry::UDS_NAME, QFile::decodeName(ep->d_name));
--            entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,
--                         (ep->d_type & DT_DIR) ? S_IFDIR : S_IFREG );
--            if (ep->d_type & DT_LNK) {
-+//            entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,
-+//                         (ep->d_type & DT_DIR) ? S_IFDIR : S_IFREG );
-+KDE_lstat(  ep->d_name, &hajmaep );
-+entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,
-+(S_ISDIR(hajmaep.st_mode)) ? S_IFDIR : S_IFREG );
-+//            if (ep->d_type & DT_LNK) {
-+if (S_ISLNK(hajmaep.st_mode)) {
-                 // for symlinks obey the UDSEntry contract and provide UDS_LINK_DEST
-                 // even if we don't know the link dest (and DeleteJob doesn't care...)
-                 entry.insert(KIO::UDSEntry::UDS_LINK_DEST, QLatin1String("Dummy Link Target"));

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch
deleted file mode 100644
index 59ab862..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Solaris does not provide getgrouplist().
-
-Please refer to
-  https://solaris.bionicmutton.org/hg/kde4-specs-432/file/539d9ed6c7b5/specs/patches/kdelibs-getgrouplist.diff
-
---- ./kio/kfile/kpropertiesdialog.cpp.orig	Tue Apr 14 23:40:16 2009
-+++ ./kio/kfile/kpropertiesdialog.cpp	Tue Apr 14 23:40:29 2009
-@@ -141,6 +141,101 @@
- #endif
- #endif
- 
-+/*-
-+ * Copyright (c) 1991, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by the University of
-+ *	California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#if 0
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
-+#endif /* LIBC_SCCS and not lint */
-+#include <sys/cdefs.h>
-+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.14 2005/05/03 16:20:03 delphij Exp $");
-+#endif
-+
-+/*
-+ * get credential
-+ */
-+#include <sys/types.h>
-+
-+#include <grp.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+int
-+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-+{
-+	const struct group *grp;
-+	int i, maxgroups, ngroups, ret;
-+
-+	ret = 0;
-+	ngroups = 0;
-+	maxgroups = *grpcnt;
-+	/*
-+	 * When installing primary group, duplicate it;
-+	 * the first element of groups is the effective gid
-+	 * and will be overwritten when a setgid file is executed.
-+	 */
-+	groups ? groups[ngroups++] = agroup : ngroups++;
-+	if (maxgroups > 1)
-+		groups ? groups[ngroups++] = agroup : ngroups++;
-+	/*
-+	 * Scan the group file to find additional groups.
-+	 */
-+	setgrent();
-+	while ((grp = getgrent()) != NULL) {
-+		if (groups) {
-+			for (i = 0; i < ngroups; i++) {
-+				if (grp->gr_gid == groups[i])
-+					goto skip;
-+			}
-+		}
-+		for (i = 0; grp->gr_mem[i]; i++) {
-+			if (!strcmp(grp->gr_mem[i], uname)) {
-+				if (ngroups >= maxgroups) {
-+					ret = -1;
-+					break;
-+				}
-+				groups ? groups[ngroups++] = grp->gr_gid : ngroups++;
-+				break;
-+			}
-+		}
-+skip:
-+		;
-+	}
-+	endgrent();
-+	*grpcnt = ngroups;
-+	return (ret);
-+}
- using namespace KDEPrivate;
- 
- static QString nameFromFileName(QString nameStr)

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch
deleted file mode 100644
index 64da2e6..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Desc:	Add needed include for mmap() on Solaris.
-Author:	Daniel Vergien
-
---- kdelibs-4.3.2/kdecore/sycoca/ksycoca.cpp.orig	2009-10-14 12:12:45.697358506 +0200
-+++ kdelibs-4.3.2/kdecore/sycoca/ksycoca.cpp	2009-10-14 12:13:16.082152232 +0200
-@@ -46,6 +46,10 @@
- 
- #include "ksycocadevices_p.h"
- 
-+/* needed on solaris 10 for mmap */
-+
-+#include <sys/mman.h>
-+
- // TODO: remove mmap() from kdewin32 and use QFile::mmap() when needed
- #ifdef Q_WS_WIN
- #undef HAVE_MMAP

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kdeinit.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kdeinit.patch
deleted file mode 100644
index 24d6f16..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kdeinit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Please refer to
-  https://bugs.kde.org/show_bug.cgi?id=209903
-
-  http://bugsfiles.kde.org/attachment.cgi?id=37552
-
-Index: kdelibs-4.3.2/kinit/kinit.cpp
-===================================================================
---- kdelibs-4.3.2.orig/kinit/kinit.cpp	2009-10-13 07:31:16.000000000 +0200
-+++ kdelibs-4.3.2/kinit/kinit.cpp	2009-10-13 07:31:52.000000000 +0200
-@@ -489,6 +489,13 @@
-       init_startup_info( startup_id, name, envc, envs );
- #endif
- 
-+  // Don't run this inside the child process, it crashes on OS/X 10.6
-+  const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
-+#ifdef Q_WS_MAC
-+  QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(execpath));
-+  QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(_name));
-+#endif
-+
-   d.errorMsg = 0;
-   d.fork = fork();
-   switch(d.fork) {
-@@ -513,7 +520,6 @@
-      if (cwd && *cwd) {
-          (void)chdir(cwd);
-      } else {
--         const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
-          (void)chdir(docPath.constData());
-      }
- 

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kioslave.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kioslave.patch
deleted file mode 100644
index 788e802..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kioslave.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Please refer to
-  https://bugs.kde.org/show_bug.cgi?id=209903
-
-  http://www.davidfaure.fr/2009/klauncher_kioslave.diff
-
-Index: klauncher.cpp
-===================================================================
---- kdelibs-4.3.3/kinit/klauncher.cpp	(revision 1034932)
-+++ kdelibs-4.3.3/kinit/klauncher.cpp	(working copy)
-@@ -621,7 +621,7 @@
- void
- KLauncher::requestStart(KLaunchRequest *request)
- {
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
-    requestList.append( request );
-    lastRequest = request;
- 
-@@ -1126,12 +1126,15 @@
-     }
- 
-     QStringList arg_list;
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
-     arg_list << name;
-     arg_list << protocol;
-     arg_list << mConnectionServer.address();
-     arg_list << app_socket;
-     name = KStandardDirs::findExe(QLatin1String("kioslave"));
-+#ifdef Q_OS_UNIX
-+    QString arg1 = protocol;
-+#endif
- #else
-     QString arg1 = protocol;
-     QString arg2 = mConnectionServer.address();
-@@ -1268,7 +1268,7 @@
-       slave->reparseConfiguration();
- }
- 
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
- void
- KLauncher::slotGotOutput()
- {
-Index: klauncher.h
-===================================================================
---- kdelibs-4.3.3/kinit/klauncher.h	(revision 1034932)
-+++ kdelibs-4.3.3/kinit/klauncher.h	(working copy)
-@@ -31,6 +31,10 @@
- #include <fixx11h.h>
- #endif
- 
-+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-+#define USE_KPROCESS_FOR_KIOSLAVES
-+#endif
-+
- #include <QtCore/QString>
- #include <QtCore/QSocketNotifier>
- #include <QtCore/QTimer>
-@@ -105,7 +105,7 @@ public:
- #endif
-    QStringList envs; // env. variables to be app's environment
-    QString cwd;
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
- protected:
-    KProcess *process;
-    friend class KLauncher;
-@@ -286,7 +290,7 @@
-    void processRequestReturn(int status, const QByteArray &requestData);
- 
- protected Q_SLOTS:
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
-     void slotGotOutput();
-     void slotFinished(int exitCode, QProcess::ExitStatus exitStatus);
- #endif

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_mac.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_mac.patch
deleted file mode 100644
index 83d4157..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_mac.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Please refer to
-  https://bugs.kde.org/show_bug.cgi?id=209903
-
-  http://www.davidfaure.fr/2009/klauncher_mac.diff
-
-Index: klauncher.cpp
-===================================================================
---- kdelibs-4.3.3/kinit/klauncher.cpp	(revision 1034932)
-+++ kdelibs-4.3.3/kinit/klauncher.cpp	(working copy)
-@@ -1144,6 +1144,12 @@
-     kDebug(7016) << "KLauncher: launching new slave " << name << " with protocol=" << protocol
-      << " args=" << arg_list << endl;
- 
-+#ifdef Q_WS_MAC
-+    arg_list.prepend(KLibLoader::findLibrary(name));
-+    name = KStandardDirs::locate("exe", QString::fromLatin1("kioslave"));
-+    arg_list.prepend(name);
-+#endif
-+
- #ifdef Q_OS_UNIX
-     if (mSlaveDebug == arg1)
-     {
-@@ -1154,8 +1160,10 @@
-     }
-     if (mSlaveValgrind == arg1)
-     {
-+#ifndef Q_WS_MAC
-        arg_list.prepend(KLibLoader::findLibrary(name));
-        arg_list.prepend(KStandardDirs::locate("exe", QString::fromLatin1("kioslave")));
-+#endif
-        name = QString::fromLatin1("valgrind");
-        if (!mSlaveValgrindSkin.isEmpty()) {
-            arg_list.prepend(QLatin1String("--tool=") + mSlaveValgrindSkin);

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
deleted file mode 100644
index 22e6279..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -purN kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp
---- kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:05:26.284881642 -0500
-+++ kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:11:23.393094384 -0500
-@@ -68,7 +68,7 @@ namespace KKeyServer {
- #ifdef QT_MAC_USE_COCOA
-     static TISInputSourceRef lastLayout = 0;
- #else
--    static KeyboardLayoutRef lastLayout = NULL;
-+    static TISInputSourceRef lastLayout = NULL;
- #endif
-     
-     void updateScancodes() {
-@@ -125,16 +125,27 @@ namespace KKeyServer {
- #endif
-             lastLayout = layout;
-             scancodes.clear();
--            void *kchr;
--            if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) {
-+            UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData);
-+            if (uchr == NULL) {
-                 kWarning() << "Couldn't load active keyboard layout";
-             } else {
-                 for (int i = 0; i < 128; i++) {
-                     UInt32 tmpState = 0;
--                    UInt32 chr = KeyTranslate(kchr, i, &tmpState);
--                    if (chr && chr != kFunctionKeyCharCode) {
--                        scancodes.insert(chr, i);
--                    }
-+                    UInt32 deadKeyState = 0;
-+                    UInt32 flags = 0;
-+                    UniCharCount maxStringLength = 255;
-+                    UniCharCount actualStringLength = 0;
-+                    UniChar unicodeString[maxStringLength];
-+                    
-+                    UCKeyTranslate(uchr, i, kUCKeyActionDown,
-+                            flags, LMGetKbdType(),
-+                            1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString);
-+                    fprintf(stderr, "Got key: %s\n", unicodeString);
-+                    fflush(stderr);
-+                    //UInt32 chr = KeyTranslate(kchr, i, &tmpState);
-+                    //if (chr && chr != kFunctionKeyCharCode) {
-+                    //    scancodes.insert(chr, i);
-+                    //}
-                 }
-             }
-         }

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.80-module-suffix.patch b/kde-base/kdelibs/files/kdelibs-4.3.80-module-suffix.patch
deleted file mode 100644
index 395cacb..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.80-module-suffix.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -purN kdelibs-4.3.80.orig/config.h.cmake kdelibs-4.3.80/config.h.cmake
---- kdelibs-4.3.80.orig/config.h.cmake	2009-10-26 05:15:52.000000000 -0400
-+++ kdelibs-4.3.80/config.h.cmake	2009-12-14 16:56:15.667194286 -0500
-@@ -12,6 +12,7 @@
- #define kde_socklen_t socklen_t
- 
- #define KDELIBSUFF "${KDELIBSUFF}"
-+#define KDE_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"
- 
- /****************************/
- 
-diff -purN kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp kdelibs-4.3.80/kdecore/util/klibloader.cpp
---- kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp	2008-05-21 07:09:15.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/klibloader.cpp	2009-12-14 16:56:15.668194094 -0500
-@@ -57,7 +57,7 @@ KLibLoader::~KLibLoader()
- {
- }
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- 
- extern QString findLibrary(const QString &name, const KComponentData &cData);
- 
-diff -purN kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp kdelibs-4.3.80/kdecore/util/klibrary.cpp
---- kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp	2009-10-02 10:55:11.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/klibrary.cpp	2009-12-14 16:57:24.317056608 -0500
-@@ -27,7 +27,7 @@
- #include <kpluginfactory.h>
- #include <kdebug.h>
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- extern QString findLibraryInternal(const QString &name, const KComponentData &cData);
- 
- int kLibraryDebugArea() {
-diff -purN kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp kdelibs-4.3.80/kdecore/util/kpluginloader.cpp
---- kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp	2009-10-15 12:35:55.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/kpluginloader.cpp	2009-12-14 16:57:58.533877037 -0500
-@@ -27,6 +27,8 @@
- #include "klibrary.h"
- #include <kdebug.h>
- 
-+#include <config.h>
-+
- #include <QtCore/QLibrary>
- #include <QtCore/QDir>
- #include <QtCore/QFileInfo>
-@@ -54,25 +56,37 @@ protected:
-     KLibrary *lib;
- };
- 
--inline QString makeLibName( const QString &libname )
-+inline QString makeLibName( const QString &libname, const QString &type )
- {
- #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
-     if (!libname.endsWith(".dll"))
-         return libname + ".dll";
-     return libname;
--#else
-+#else // Q_OS_WIN
-     int pos = libname.lastIndexOf('/');
-     if (pos < 0)
-       pos = 0;
-     if (libname.indexOf('.', pos) < 0) {
--        const char* const extList[] = { ".so", ".dylib", ".bundle", ".sl" };
-+#ifdef Q_OS_MAC
-+		// Libraries are always .dylib
-+		if (type.compare("lib") == 0) {
-+			return libname + ".dylib";
-+		}
-+		// Modules mostly go .bundle but we'll use CMake smartness
-+		else {
-+			return libname + KDE_MODULE_SUFFIX;
-+		}
-+#else // Q_OS_MAC
-+		// Prefer the value specified by cmake for the target, fall back to standard
-+        const char* const extList[] = { KDE_MODULE_SUFFIX, ".so", ".sl" };
-         for (uint i = 0; i < sizeof(extList) / sizeof(*extList); ++i) {
-            if (QLibrary::isLibrary(libname + extList[i]))
-                return libname + extList[i];
-         }
-+#endif // Q_OS_MAC
-     }
-     return libname;
--#endif
-+#endif // Q_OS_WIN
- }
- 
- #ifdef Q_OS_WIN
-@@ -81,12 +95,13 @@ extern QString fixLibPrefix(const QStrin
- 
- QString findLibraryInternal(const QString &name, const KComponentData &cData)
- {
--    // Convert name to a valid platform libname
--    QString libname = makeLibName(name);
-     QFileInfo fileinfo(name);
-     bool hasPrefix = fileinfo.fileName().startsWith("lib");
-     bool kdeinit = fileinfo.fileName().startsWith("libkdeinit4_");
- 
-+    // Convert name to a valid platform libname depending on requested type.
-+    QString libname = makeLibName(name, kdeinit ? "lib" : "module");
-+
-     if (hasPrefix && !kdeinit)
-         kDebug(kLibraryDebugArea()) << "plugins should not have a 'lib' prefix:" << libname;
- #ifdef Q_CC_MSVC

diff --git a/kde-base/kdelibs/files/kdelibs-4.4.80-icon-name-qt47.patch b/kde-base/kdelibs/files/kdelibs-4.4.80-icon-name-qt47.patch
deleted file mode 100644
index 697f36e..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.80-icon-name-qt47.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47 kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp
---- kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47	2010-05-16 22:04:05.000000000 +0200
-+++ kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp	2010-05-21 22:50:44.819211510 +0200
-@@ -65,14 +65,7 @@ protected:
-     virtual QString iconNameForAction(QAction *action)
-     {
-         KIcon icon(action->icon());
--#if QT_VERSION >= 0x040700
--        // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP.
--        // If you get a build error here, you need to update your pre-release
--        // of Qt 4.7.
--        return icon.isNull() ? QString() : icon.name();
--#else
-         return QString();
--#endif
-     }
- };
- 

diff --git a/kde-base/kdelibs/files/kdelibs-4.4.90-icon-name-qt47.patch b/kde-base/kdelibs/files/kdelibs-4.4.90-icon-name-qt47.patch
deleted file mode 100644
index e2d3a3c..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.90-icon-name-qt47.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- kdelibs-4.4.90/work/kdelibs-4.4.90/kdeui/notifications/kstatusnotifieritem.cpp.orig	2010-06-25 02:58:37.000000000 +0400
-+++ kdelibs-4.4.90/work/kdelibs-4.4.90/kdeui/notifications/kstatusnotifieritem.cpp	2010-06-25 02:59:43.000000000 +0400
-@@ -65,12 +65,6 @@
-     virtual QString iconNameForAction(QAction *action)
-     {
-         KIcon icon(action->icon());
--#if QT_VERSION >= 0x040700
--        // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP.
--        // If you get a build error here, you need to update your pre-release
--        // of Qt 4.7.
--        return icon.isNull() ? QString() : icon.name();
--#else
-         // Qt 4.6: If the icon was created by us, via our engine, serializing it
-         // will let us get to the name.
-         if (!icon.isNull()) {
-@@ -94,7 +88,6 @@
-         }
-         
-         return QString();
--#endif
-     }
- };
- 

diff --git a/kde-base/kdelibs/files/kdelibs-4.5.0-kfilemetadatawidget.patch b/kde-base/kdelibs/files/kdelibs-4.5.0-kfilemetadatawidget.patch
deleted file mode 100644
index 7a64f62..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.5.0-kfilemetadatawidget.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: kio/kfile/kfilemetadatawidget.h
-===================================================================
---- kio/kfile/kfilemetadatawidget.h	(revision 1158054)
-+++ kio/kfile/kfilemetadatawidget.h	(revision 1158055)
-@@ -51,6 +51,8 @@
- 
-     /**
-      * Sets the items for which the meta data should be shown.
-+     * The signal metaDataRequestFinished() will be emitted,
-+     * as soon as the meta data for the items has been received.
-      */
-     void setItems(const KFileItemList& items);
-     KFileItemList items() const;
-@@ -72,6 +74,13 @@
-      */
-     void urlActivated(const KUrl& url);
- 
-+    /**
-+     * Is emitted after the meta data has been received for the items
-+     * set by KFileMetaDataWidget::setItems().
-+     * @since 4.6
-+     */
-+    void metaDataRequestFinished();
-+
- protected:
-     virtual bool event(QEvent* event);
- 
-Index: kio/kfile/kfilemetadatawidget.cpp
-===================================================================
---- kio/kfile/kfilemetadatawidget.cpp	(revision 1158054)
-+++ kio/kfile/kfilemetadatawidget.cpp	(revision 1158055)
-@@ -48,7 +48,6 @@
-     #include <QThread>
- #endif
- 
--
- // The default size hint of QLabel tries to return a square size.
- // This does not work well in combination with layouts that use
- // heightForWidth(): In this case it is possible that the content
-@@ -66,6 +65,7 @@
-     QLabel(parent)
- {
- }
-+
- QSize ValueWidget::sizeHint() const
- {
-     QFontMetrics metrics(font());
-@@ -425,6 +425,7 @@
- #endif
- 
-     q->updateGeometry();
-+    emit q->metaDataRequestFinished();
- }
- 
- void KFileMetaDataWidget::Private::removeOutdatedRows()

diff --git a/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch b/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch
deleted file mode 100644
index 1b517d9..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -purN kdelibs-4.3.80.orig/config.h.cmake kdelibs-4.3.80/config.h.cmake
---- kdelibs-4.3.80.orig/config.h.cmake	2009-10-26 05:15:52.000000000 -0400
-+++ kdelibs-4.3.80/config.h.cmake	2009-12-14 16:56:15.667194286 -0500
-@@ -12,6 +12,7 @@
- #define kde_socklen_t socklen_t
- 
- #define KDELIBSUFF "${KDELIBSUFF}"
-+#define KDE_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"
- 
- /****************************/
- 
-diff -purN kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp kdelibs-4.3.80/kdecore/util/klibloader.cpp
---- kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp	2008-05-21 07:09:15.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/klibloader.cpp	2009-12-14 16:56:15.668194094 -0500
-@@ -57,7 +57,7 @@ KLibLoader::~KLibLoader()
- {
- }
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- 
- extern QString findLibrary(const QString &name, const KComponentData &cData);
- 
-diff -purN kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp kdelibs-4.3.80/kdecore/util/klibrary.cpp
---- kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp	2009-10-02 10:55:11.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/klibrary.cpp	2009-12-14 16:57:24.317056608 -0500
-@@ -27,7 +27,7 @@
- #include <kpluginfactory.h>
- #include <kdebug.h>
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- extern QString findLibraryInternal(const QString &name, const KComponentData &cData);
- 
- int kLibraryDebugArea() {
-diff -purN kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp kdelibs-4.3.80/kdecore/util/kpluginloader.cpp
---- kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp	2009-10-15 12:35:55.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/kpluginloader.cpp	2009-12-14 16:57:58.533877037 -0500
-@@ -27,6 +27,8 @@
- #include "klibrary.h"
- #include <kdebug.h>
- 
-+#include <config.h>
-+
- #include <QtCore/QLibrary>
- #include <QtCore/QDir>
- #include <QtCore/QFileInfo>
-@@ -54,26 +54,38 @@
-     KLibrary *lib;
- };
- 
--inline QString makeLibName( const QString &libname )
-+inline QString makeLibName( const QString &libname, const QString &type )
- {
- #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
-     if (!libname.endsWith(".dll"))
-         return libname + ".dll";
-     return libname;
--#else
-+#else // Q_OS_WIN
-     int pos = libname.lastIndexOf(QLatin1Char('/'));
-     if (pos < 0)
-       pos = 0;
-     if (libname.indexOf(QLatin1Char('.'), pos) < 0) {
--        const char* const extList[] = { ".so", ".dylib", ".bundle", ".sl" };
-+#ifdef Q_OS_MAC
-+               // Libraries are always .dylib
-+               if (type.compare("lib") == 0) {
-+                       return libname + ".dylib";
-+               }
-+               // Modules mostly go .bundle but we'll use CMake smartness
-+               else {
-+                       return libname + KDE_MODULE_SUFFIX;
-+               }
-+#else // Q_OS_MAC
-+               // Prefer the value specified by cmake for the target, fall back to standard
-+        const char* const extList[] = { KDE_MODULE_SUFFIX, ".so", ".sl" };
-         for (uint i = 0; i < sizeof(extList) / sizeof(*extList); ++i) {
-             const QString lib = libname + QString::fromLatin1(extList[i]);
-             if (QLibrary::isLibrary(lib))
-                 return lib;
-         }
-+#endif // Q_OS_MAC
-     }
-     return libname;
--#endif
-+#endif // Q_OS_WIN
- }
- 
- #ifdef Q_OS_WIN
-@@ -82,12 +94,13 @@
- 
- QString findLibraryInternal(const QString &name, const KComponentData &cData)
- {
--    // Convert name to a valid platform libname
--    QString libname = makeLibName(name);
-     QFileInfo fileinfo(name);
-     bool hasPrefix = fileinfo.fileName().startsWith(QLatin1String("lib"));
-     bool kdeinit = fileinfo.fileName().startsWith(QLatin1String("libkdeinit4_"));
- 
-+    // Convert name to a valid platform libname depending on requested type.
-+    QString libname = makeLibName(name, kdeinit ? "lib" : "module");
-+
-     if (hasPrefix && !kdeinit)
-         kDebug(kLibraryDebugArea()) << "plugins should not have a 'lib' prefix:" << libname;
- #ifdef Q_CC_MSVC

diff --git a/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch b/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch
deleted file mode 100644
index b9869a8..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- kinit/klauncher.cpp.orig	2010-11-06 23:35:26.000000000 +0300
-+++ kinit/klauncher.cpp	2010-11-07 02:45:19.000000000 +0300
-@@ -1151,6 +1151,12 @@
-     kDebug(7016) << "KLauncher: launching new slave " << name << " with protocol=" << protocol
-      << " args=" << arg_list << endl;
- 
-+#ifdef Q_WS_MAC
-+    arg_list.prepend(KLibLoader::findLibrary(name));
-+    name = KStandardDirs::locate("exe", QString::fromLatin1("kioslave"));
-+    arg_list.prepend(name);
-+#endif
-+
- #ifdef Q_OS_UNIX
-     if (mSlaveDebug == arg1)
-     {
-@@ -1161,8 +1167,10 @@
-     }
-     if (mSlaveValgrind == arg1)
-     {
-+#ifdef Q_WS_MAC
-        arg_list.prepend(::findLibrary(name, KGlobal::mainComponent()));
-        arg_list.prepend(KStandardDirs::locate("exe", QString::fromLatin1("kioslave")));
-+#endif
-        name = QString::fromLatin1("valgrind");
-        if (!mSlaveValgrindSkin.isEmpty()) {
-            arg_list.prepend(QLatin1String("--tool=") + mSlaveValgrindSkin);

diff --git a/kde-base/kdelibs/kdelibs-4.6.3.ebuild b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
index 16068a3..e3922bd 100644
--- a/kde-base/kdelibs/kdelibs-4.6.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
@@ -130,12 +130,9 @@ add_blocker plasma-workspace '<4.3.75'
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-#	"${FILESDIR}/${PN}-4.5.73-module-suffix.patch" - FIXME what is this and why is it needed?
-#	"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch" - FIXME needs to be ported, also see above
-#	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" - FIXME is this really needed? if so, please upstream it
-#	"${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above
 	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
 	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.0-kateacc.patch"
 	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
 )
 

diff --git a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
index 4eed990..124c5b3 100644
--- a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
@@ -130,12 +130,9 @@ add_blocker plasma-workspace '<4.3.75'
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-#	"${FILESDIR}/${PN}-4.5.73-module-suffix.patch" - FIXME what is this and why is it needed?
-#	"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch" - FIXME needs to be ported, also see above
-#	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" - FIXME is this really needed? if so, please upstream it
-#	"${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above
 	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
 	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.0-kateacc.patch"
 	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
 )
 

diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 570f419..b531bea 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -130,12 +130,9 @@ add_blocker plasma-workspace '<4.3.75'
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-#	"${FILESDIR}/${PN}-4.5.73-module-suffix.patch" - FIXME what is this and why is it needed?
-#	"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch" - FIXME needs to be ported, also see above
-#	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" - FIXME is this really needed? if so, please upstream it
-#	"${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above
 	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
 	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.0-kateacc.patch"
 	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
 )