[kde-base/kdelibs] temp kick the ebuild in, testing logout fixes

kde-base/kdelibs/Manifest

@@ -0,0 +1,26 @@
+AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
+AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9
+AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
+AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
+AUX kdelibs-4.3.2-solaris-fileunix.patch 1703 RMD160 6a221210bb0660781dfaa8c0102ae86cc678f97f SHA1 36b525e32c1b86892a9975a69ca8467e595e85d7 SHA256 162cc6e14570f90e69811241ce07a4968e786cbed017fd22a8347371cdd7ffb8
+AUX kdelibs-4.3.2-solaris-getgrouplist.patch 3718 RMD160 881e19f21534b4fbeab50c0628113b569185affd SHA1 04acb8ce4ad92893e76a2fe7b51d5ffcaf9d33fa SHA256 ce5c322f184a60aab3cab40035d654de12c95158ac4d0b474af91e1f77379c28
+AUX kdelibs-4.3.2-solaris-ksyscoca.patch 464 RMD160 d836036ba64201cbc84ff84a833e52a5b63a8f86 SHA1 48ac12ddcafc2253d35780821ce73a1ca079dc54 SHA256 421c1689866d18df49af23bb923a6137ff58d2fa7332cd7f804734ec0006e0da
+AUX kdelibs-4.3.3-klauncher_kdeinit.patch 1084 RMD160 4a4360e4a6f5834a7a0a9ed033659dcdd12a6326 SHA1 46aa4fe91a5e5d21eedbd8687b4266c0c86f22fb SHA256 b3f83270523580aa57fae67b611e270a60614a385499a151fd402cdfb7a1e982
+AUX kdelibs-4.3.3-klauncher_kioslave.patch 2038 RMD160 d31c2fb97a11f3d03a266991fa66749c285ed197 SHA1 db2f8c0eaf2f3226ee2a99d8d4c67a9b536b1fee SHA256 6908f559aeb8299cd45f28b48958cfbb855b8b2ebf79d752e9583713052bfabe
+AUX kdelibs-4.3.3-klauncher_mac.patch 1126 RMD160 073d2ce7fc431257dec40617f7269fd26d6a3ab8 SHA1 fecb5a3d4a31480816748efb58032d3772dd4822 SHA256 91720c55135a97dab5a9a3a9dd433bb7606e67fd27c8bec8dc76aa297da33703
+AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 RMD160 c7f53343cb8713bb2c7d195563d5fe399adb9939 SHA1 03e60a01c7665e9074ddc412c90f157a044ce9ba SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a
+AUX kdelibs-4.3.80-module-suffix.patch 3919 RMD160 ed225d685594d53df9792b1472925a371bbc41da SHA1 efa963a74c60dcc23c3f925a479cf753b6247ccf SHA256 06fedf486f3a459cb3366fe1865583863924b48f78f0d5f6b327a42438c83976
+AUX kdelibs-4.4.3-mimetypes.patch 1887 RMD160 f1f371f6b405ce93b12a7ebc2631142fa1fa20a9 SHA1 64005d1d00ffb1e58572327a8aece9761e8008ab SHA256 4c724b2c3a569661b3b6035b8011293543d6c3cc6d59fe74310d9d1716e0881d
+AUX kdelibs-4.4.5-formpainter.patch 727 RMD160 1c6613f5e5f6ede529b5988252c93fa7e22223c3 SHA1 9db99158c61afe6569c54e32833e22d7e047c625 SHA256 b2e48ad5256c749fc9de455696bbcdc0f67e9cbd0d6d57676c98840bba6e5c33
+AUX kdelibs-4.4.5-qt471.patch 362 RMD160 54ea903b795f65ea21719c9e8bb30af342a783ab SHA1 14a189d9e95ea5c9feebb81c81544ba322a98116 SHA256 6ae79f4880dbf7aa86888d1eefb3e2868ef5eaa2a367696ad44d1566dcf70d41
+AUX kdelibs-4.4.66-macos-unbundle.patch 4618 RMD160 a968d41e3b8c3f05e3b64a7487b0da0ae34fa8cc SHA1 36412cbe6b50b8b3ac5ae598910ac51dd37a48b7 SHA256 3a3b753af670cfadfb67a591c6cca5ed62ceffb97dcb326b9f2e684db1ba596d
+AUX kdelibs-4.4.90-xslt.patch 553 RMD160 b667c3330a2721ab0de237f50af81ec830954c0f SHA1 24faa51f5d3645858ca55c744b9b76952eb383c6 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b
+AUX kdelibs-4.5.2-open-https.patch 436 RMD160 4c4e45df7758d04f93e38071f3fc9839d4205693 SHA1 152353fbf9df9345788da4d58714e1481fdea07c SHA256 849a8e4480062e00255f5a8e0885bf47e8d3741cb1d68ebbdeef495ed1220cb0
+AUX kdelibs-4.5.73-module-suffix.patch 4098 RMD160 e003fcb8a496bcbc1c77f16a1e4ab81d735e9567 SHA1 1e15b7e24cbe41bc3f492b8e862fbd7da7f03212 SHA256 7e4116bf0f475b9ec4a6000830f28e0dcded039f58c2cb73c49c295ef276afd9
+AUX kdelibs-4.5.74-klauncher_mac.patch 952 RMD160 666491525d51ca24c9b4228d97aa368ebd9b2eb8 SHA1 6a0ccd169f910842d27d1cc16f4f0f3e7c671de6 SHA256 8477a100f6c73ced8a8be06ac9025d83434fa6396daea8f86df85d7a3fb6fe84
+AUX kdelibs-4.5.90-mimetypes.patch 1629 RMD160 46289674dd977b2b2289ba935d88c1b0c9de5916 SHA1 78c70127486231e24f464f5cce978e06293510e5 SHA256 0276732204ba9b7a9f119ce26a2b992b1d23c321606efc1a6957914329f33109
+AUX kdelibs-4.6.0-avoid-setCollapsed-when-destroying.patch 769 RMD160 999f0adf323e0adbe6359c0533bfc8f7bd1b5a9f SHA1 270f24d9682c32c9f69b3e6e13696888724c5169 SHA256 0eb003283c6956c989bece7ff64a4e099b291916e674e6947a582b6a32fc2c46
+DIST kdelibs-4.6.0.tar.bz2 12913052 RMD160 acb64c0da9db3381b3f688dc0d5e63422f461459 SHA1 6ea3fc69f98fa91c5159ccd743d4d548e801c7bc SHA256 ed5246fa0c696fe8c857a20677e721872ae9ac147357f7fced9e7f125b6ededd
+EBUILD kdelibs-4.6.0.ebuild 9562 RMD160 71e0c8acca11ab2b12e0f9e9bbda5a79148daa40 SHA1 f5eb56fe979abf606f041b4dd1b5a9cd253b1aa1 SHA256 08ab52663909321d6e236de757a556931aed3ae11b0703bfb1ef9bd189a655e9
+MISC ChangeLog 119301 RMD160 6542d7c3e886f5cb60cf055c547261abbbca5d7d SHA1 493e77d79033b7f7e576bc257ea74e5c19b17073 SHA256 998e5c04c103526c7397e852c55615632a333d55eb6d533fe51231db50694caf
+MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7

kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch

@@ -0,0 +1,18 @@
+Set XDG_MENU_PREFIX to kde4- if not set. This fixes "empty-applications-menu" when running
+KDE4 applications outside of KDE4 environment.
+
+Index: kded/vfolder_menu.cpp
+===================================================================
+--- kded/vfolder_menu.cpp	(revision 1014368)
++++ kded/vfolder_menu.cpp	(working copy)
+@@ -770,7 +770,9 @@
+    QString result;
+ 
+    QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
+-   if (!xdgMenuPrefix.isEmpty())
++   if (xdgMenuPrefix.isEmpty())
++      xdgMenuPrefix = "@REPLACE_MENU_PREFIX@";
++
+    {
+       QFileInfo fileInfo(fileName);
+ 

kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch

@@ -0,0 +1,30 @@
+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(QString::fromLatin1("/etc/xdg"));
++
+ #ifdef Q_WS_WIN
+-        xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
++    xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
+ #else
+-        xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
++    xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
+ #endif
+-    }
++    xdgdirList.append(QString::fromLatin1("/etc/xdg"));
+ 
+     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
+     if (!localXdgDir.isEmpty())

kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch

@@ -0,0 +1,30 @@
+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())

kde-base/kdelibs/files/dist/23_solid_no_double_build.patch

@@ -0,0 +1,19 @@
+
+--- 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})
+

kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch

@@ -0,0 +1,40 @@
+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"));

kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch

@@ -0,0 +1,109 @@
+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)

kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch

@@ -0,0 +1,16 @@
+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

kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kdeinit.patch

@@ -0,0 +1,31 @@
+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());
+      }
+ 

kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kioslave.patch

@@ -0,0 +1,77 @@
+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

kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_mac.patch

@@ -0,0 +1,33 @@
+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);

kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch

@@ -0,0 +1,46 @@
+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);
++                    //}
+                 }
+             }
+         }

kde-base/kdelibs/files/kdelibs-4.3.80-module-suffix.patch

@@ -0,0 +1,105 @@
+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

kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch

@@ -0,0 +1,58 @@
+diff -r -u kdelibs-4.4.3.orig/mimetypes/kde.xml kdelibs-4.4.3/mimetypes/kde.xml
+--- kdelibs-4.4.3.orig/mimetypes/kde.xml	2009-10-06 23:37:48.000000000 +0200
++++ kdelibs-4.4.3/mimetypes/kde.xml	2010-05-28 22:48:51.000000000 +0200
+@@ -180,41 +180,6 @@
+     <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0" localName="FictionBook"/>
+   </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>
+-
+-  <!-- fonts/ fake mime types -->
+-  <mime-type type="fonts/package">
+-    <sub-class-of type="application/zip"/>
+-    <comment>fonts package</comment>
+-    <glob pattern="*.fonts.zip"/>
+-  </mime-type>
+-
+   <mime-type type="application/x-konsole">
+     <comment>file to open a shell</comment>
+     <glob pattern="*.shell"/>
+@@ -349,12 +314,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"/>

kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch

@@ -0,0 +1,22 @@
+Index: kdelibs/khtml/khtmlview.cpp
+===================================================================
+--- kdelibs/khtml/khtmlview.cpp	(Revision 1185321)
++++ kdelibs/khtml/khtmlview.cpp	(Revision 1185322)
+@@ -2135,17 +2135,6 @@
+       case QEvent::DragLeave:
+       case QEvent::Drop:
+         return false;
+-      case QEvent::Paint: {
+-          QRect r = static_cast<QPaintEvent*>(e)->rect();
+-          r = r.intersect( widget()->rect() );
+-          if (r.isValid() && !r.isEmpty()) {
+-              r.setX(r.x() +contentsX());
+-              r.setY(r.y() +contentsY());
+-              QPaintEvent pe(r);
+-              paintEvent(&pe);
+-          }
+-          return true;
+-      }
+       default:
+         break;
+     }

kde-base/kdelibs/files/kdelibs-4.4.5-qt471.patch

@@ -0,0 +1,11 @@
+--- kdelibs-4.4.5/kded/kded.cpp
++++ kdelibs-4.4.5/kded/kded.cpp
+@@ -72,7 +72,7 @@
+ static bool bCheckUpdates;
+ static bool bCheckHostname;
+ 
+-extern QDBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&));
++extern  void qDBusAddSpyHook(void (*)(const QDBusMessage&));
+ 
+ static void runBuildSycoca(QObject *callBackObj=0, const char *callBackSlot=0)
+ {

kde-base/kdelibs/files/kdelibs-4.4.66-macos-unbundle.patch

@@ -0,0 +1,129 @@
+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@cs.tu-berlin.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
+@@ -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);
+ 
+--- kdelibs-9999/kdecore/kernel/kstandarddirs.cpp.orig	2010-03-06 15:47:40.108111613 +0100
++++ kdelibs-9999/kdecore/kernel/kstandarddirs.cpp	2010-03-06 23:17:01.853905357 +0100
+@@ -1207,41 +1207,8 @@
+     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 );
+-    FILE *file;
+-    if (file = fopen(info.absoluteFilePath().toUtf8().constData(), "r")) {
+-        fclose(file);
+-        struct stat _stat;
+-        if ((stat(info.absoluteFilePath().toUtf8().constData(), &_stat)) < 0) {
+-            return QString();
+-        }
+-        if ( ignore || (_stat.st_mode & S_IXUSR) ) {
+-            if ( ((_stat.st_mode & S_IFMT) == S_IFREG) || ((_stat.st_mode & S_IFMT) == S_IFLNK) ) {
+-                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 defined(Q_OS_DARWIN) || defined(Q_OS_MAC)

kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch

@@ -0,0 +1,12 @@
+diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl
+--- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl	2008-05-21 13:07:13.000000000 +0200
++++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl	2010-07-08 23:32:28.184204481 +0200
+@@ -35,7 +35,7 @@
+   </entry>
+ </xsl:template>
+ 
+-<xsl:template match="sect*/title|emphasis">
++<xsl:template match="*[starts-with(local-name(), 'sect')]/title|emphasis">
+   <entry header="2">
+     <xsl:apply-templates/>
+   </entry>

kde-base/kdelibs/files/kdelibs-4.5.2-open-https.patch

@@ -0,0 +1,10 @@
+--- branches/KDE/4.5/kdelibs/kio/kio/krun.cpp	2010/10/06 22:28:05	1183316
++++ branches/KDE/4.5/kdelibs/kio/kio/krun.cpp	2010/10/06 22:33:23	1183317
+@@ -375,6 +375,7 @@
+             }
+             else { // if no KDE app, be a bit over-generic
+                 supportedProtocols.append("http");
++                supportedProtocols.append("https"); // #253294
+                 supportedProtocols.append("ftp");
+             }
+         }

kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch

@@ -0,0 +1,106 @@
+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

kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch

@@ -0,0 +1,26 @@
+--- 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);

kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch

@@ -0,0 +1,51 @@
+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"/>

kde-base/kdelibs/files/kdelibs-4.6.0-avoid-setCollapsed-when-destroying.patch

@@ -0,0 +1,22 @@
+commit 709f75ac353cd735ccac31f87363ea90dde345d3
+Author: Marco Martin <notmart@gmail.com>
+Date:   Tue Feb 1 21:15:49 2011 +0100
+
+    don't collapse when it's destroying
+    try to not crash upon deletion of the extender
+
+diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp
+index bdbc886..3e5809f 100644
+--- a/plasma/extenders/extenderitem.cpp
++++ b/plasma/extenders/extenderitem.cpp
+@@ -596,6 +596,10 @@ void ExtenderItem::destroy()
+ 
+ void ExtenderItem::setCollapsed(bool collapsed)
+ {
++    if (extender()->d->destroying) {
++        return;
++    }
++
+     config().writeEntry("isCollapsed", collapsed);
+     d->collapsed = collapsed;
+     d->collapseIcon->setToolTip(collapsed ? i18n("Expand this widget") : i18n("Collapse this widget"));

kde-base/kdelibs/kdelibs-4.6.0.ebuild

@@ -0,0 +1,312 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.0.ebuild,v 1.1 2011/01/26 20:28:53 alexxy Exp $
+
+EAPI="3"
+
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
+inherit kde4-base fdo-mime
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
+lzma mmx nls openexr policykit semantic-desktop spell sse sse2 ssl +udev zeroconf"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.6.3
+	>=dev-libs/libattica-0.1.90
+	>=dev-libs/libdbusmenu-qt-0.3.2
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	>=media-libs/libpng-1.4
+	>=media-sound/phonon-4.4.3
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXtst
+		!kernel_SunOS? ( sys-libs/libutempter )
+	)
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	lzma? ( app-arch/xz-utils )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	policykit? ( >=sys-auth/polkit-qt-0.99 )
+	semantic-desktop? (
+		>=dev-libs/shared-desktop-ontologies-0.5
+		>=dev-libs/soprano-2.5.63_pre[dbus,raptor,redland]
+	)
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl )
+	udev? ( sys-fs/udev )
+	zeroconf? (
+		|| (
+			net-dns/avahi[mdnsresponder-compat]
+			!bindist? ( net-misc/mDNSResponder )
+		)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-libs/conversion
+	!dev-libs/kunitconversion
+	!x11-libs/qt-phonon
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
+	!<=kde-misc/knetworkmanager-4.4.0_p20100820
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	!aqua? (
+		sys-fs/udisks
+		sys-power/upower
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+	)
+"
+PDEPEND="
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	policykit? (
+		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
+		>=sys-auth/polkit-kde-agent-0.99
+	)
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
+
+# Blockers added due to packages from old versions, removed in the meanwhile
+# as well as for file collisions
+add_blocker libknotificationitem
+add_blocker libkworkspace '<4.3.66'
+add_blocker kcontrol '<4.5.80'
+# @since 4.4 - kpilot is gone (blocker added to help upgrades)
+add_blocker kpilot
+# Block some old versions of KDE-3.5 packages that don't work well with KDE-4
+add_blocker kdebase 0 3.5.9-r4:3.5
+add_blocker kdebase-startkde 0 3.5.10:3.5
+add_blocker kdelibs 0 '<3.5.10:3.5'
+# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75
+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}/${P}-avoid-setCollapsed-when-destroying.patch"
+)
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work)
+	local menu_prefix="kde-${SLOT}-"
+	sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+	sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \
+		-i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
+		# getgrouplist not in solaris libc
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
+		# solaris has no d_type element in dir_ent
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
+	fi
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	else
+		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
+	fi
+	if use kdeprefix; then
+		HME=".kde${SLOT}"
+	else
+		HME=".kde4"
+	fi
+	mycmakeargs+=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DKDE_DEFAULT_HOME=${HME}
+		-DKAUTH_BACKEND=POLKITQT-1
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has mmx X86_MMX)
+		$(cmake-utils_use_has sse X86_SSE)
+		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_with acl)
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with policykit PolkitQt-1)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with udev UDev)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# use system certificates
+	rm -f "${ED}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt \
+	"${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EKDEDIR}/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	elog "Your homedir is set to \${HOME}/${HME}"
+	echo
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}

kde-base/kdelibs/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>kde</herd>
+  <use>
+    <flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
+  </use>
+</pkgmetadata>