Backport patch from upstream fixing a crash.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 362 insertions, 18 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 27b62fb623ea..7487a374a711 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.948 2013/08/14 20:23:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.949 2013/08/25 15:05:56 kensington Exp $
+
+*kdelibs-4.11.0-r1 (25 Aug 2013)
+
+  25 Aug 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kdelibs-4.11.0-themecrash.patch, +kdelibs-4.11.0-r1.ebuild:
+  Backport patch from upstream fixing a crash.
 
 *kdelibs-4.11.0 (14 Aug 2013)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index ceef6a24842d..31f1974d2026 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -7,6 +7,7 @@ AUX kdelibs-4.10.0-udisks.patch 2012 SHA256 a856a103831162da416ea07ab9f18db5d5eb
 AUX kdelibs-4.10.2-security-url-dont-show-password.patch 1284 SHA256 c6feac6a69840fcd91d82dd448000295bba0c113306e4abf71d8222e8ab020cb SHA512 7e6a238406d5e1e770255199b82dd337845427b93906fddaeccbbf86d91bb825f379818304bfbc91d5e8df942e48cd71aa872e0ad5102b7e1ece2484c60ec337 WHIRLPOOL 68e2a4e62b911d4dccd7df77a9343a20b750356a424436c7469d46e09c760535047363a8d36b06d865c39b40fcf3aff71fcdcac8a9686b599de154bcd56523e1
 AUX kdelibs-4.10.3-dialog-quit-crash.patch 729 SHA256 08574995956ff96593d8bc4aa931b6e4a71e5c841217d6acbfe19703d5d16a80 SHA512 f4f9db3aa4a75a668cb9982aec41ac2ea4887b9a1d381f2993f0a3e045a38dd509b0c9c9c0c94f24d127973701386a62b8266eca1c09302ceaf8b590d8101cc7 WHIRLPOOL 74872525e6c0da5799311d4533eb4597393fa9f1b1b073d87194006f849221a97380772e8ac317e4587fba2ee61e9b7ab011a1d8a55be82e0cbbbc1dcbfe8bac
 AUX kdelibs-4.10.5-home.patch 1453 SHA256 1f194854ff93bc3ae6f1a6d1624ae4ed3893a3524aa3d583f3dcfebd32243ae9 SHA512 1e247299c562e4d68c2655cb66315cabe1b7dc464d7da700b2bd9992ec8cb58f8fea44d02296699523e2570039784a167eb5b95294beeef0f50e344fdd2d971b WHIRLPOOL 7d50ececb98fc7f9672478e4b8e3b63092dbfb0dc8a61cd676ee84159d47d40d81b2582e53ceb723b7b99f07f35d7eab82a2ec47300ef95f4f0ff20e0099f2c2
+AUX kdelibs-4.11.0-themecrash.patch 2176 SHA256 cd5121d090b3d6ead27f027c734b96244cca22f06eda9c049b8351df77e169f9 SHA512 65436c7935bcb88da49c57471d5ab4977feabd6c1af98fe1c591d13546cfa4ee4e5d6b91742006d94192250d31846adb5168c2855c2e69c2fccef3b36df55099 WHIRLPOOL cd11a92bb541032f2935c96a70d2ff8d259036ff0f7121d3c7824ef56b39e9ae52d28ef357ec047063a6e893bf4157e99881529e31fddc8b10de645d2b7a634f
 AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a SHA512 9207f2ab33e757d3d8ed3279350ea4326339129f232bb67bcce7b3806480fe551c9ba03a93d289df311e913055c343c925f957eb0b0b24bec6a7ef59017090a2 WHIRLPOOL f63b26fc0657f7e72856b493fc469af1cfaa68bb18b1dd4078f9dae44c37a3bdec9114c6a2c92c55b2cdde4d7cbc2ea072df1157b26e43f844dccf16ec8b1f8d
 AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46
 AUX kdelibs-4.6.2-armlinking.patch 1129 SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6 SHA512 d0208e095e751d4064e3f9b7d836135bce8c7f1cb7b4f1a20ef4d86d2fd5a08523c563c72ab86a871929000f26e4d50fa58fd81f7996edc57066984ce508ff1d WHIRLPOOL 81535f48c1ab14e37fd0dae7751317e72c53f4c55d4c28be67db8c6782af9a0a5e1ee3aba48680b8d367c9b6dda4d0e481392826b5eb597e1965bfbff70aaf38
@@ -17,26 +18,19 @@ AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf36
 DIST kdelibs-4.10.5.tar.xz 12023036 SHA256 b6d404950bbe21657bf6362b2dd624d2e3cd22f23c1e6e20fa1ce71c41faf2d1 SHA512 be16f15a38dbd63c1ba077ff383e8dcbd3bf7505ef910b77dd2f8b85f80e2afee3c2d23d8e17450fe632f9739f524a145746b201271b41a0bd46fd3d6a71ddd5 WHIRLPOOL 68aa0aec62b3d634ea6312209698d2a906228ecf5ef45b2da6fd3f2822e6955450d9a1030263a6c3e143278d1354acbb451a416029b4c09806d66c09a93b028a
 DIST kdelibs-4.11.0.tar.xz 11802180 SHA256 35da8e804b7ce08f272d2cdf14ab107db4b1623a78f6b34d891bf936bffbef60 SHA512 ea780f5be7ad46d6c5e84a69c4aaeaa15104b767f8fb8903e1c75502a9424c66f0307ac998be884276f0edae4a7a0e45ee45e667cd3f61a6ae1331ffc497ab4b WHIRLPOOL bf1764faba34b14d2649af18a7bd30611133545d6484b15a02bdf8d0d3cfdca4cab50e86e4ab2c0e50e4ee632451ce5aa670a3798b647e371d7c4c6518b265db
 EBUILD kdelibs-4.10.5-r1.ebuild 8700 SHA256 0dd5ef1630a11cf163ef3fb519fd2d33301eb6d16d45d3f29c230af43ff52fb3 SHA512 6a56d76281f7d7c918fb2d4fb5de13304ceefbf6e685495b0207a3b6de07f7322f8eeff0b6fc95eec8cc68c3dacd139f11d4e75a1f4cbd7897501d0e696c8276 WHIRLPOOL 98a98931eeb9caaad24a61600b02e0bdbc2a8dd551337864c7c58377172ce21a2d0e7eae7417001fb9ad8b796fc3e5ffdacb803f8d4d5cd288964a9ad5c7c346
+EBUILD kdelibs-4.11.0-r1.ebuild 8406 SHA256 87e947951fd4baa914662cb13eceb5b126c2c9f020b8321f9cf838314999d9cc SHA512 de5ff4b30b6b5ff03d223227bb91e0b386bb02f56db024961f04aec32613b4d377fead96d6851c95f49384ee55ad4e83d4fe8b6c9eeef524a48c6af4cf50cee2 WHIRLPOOL 3eb05ffc31d49502bbfcf2a4ce1ed604994a7b818b191abc5aa458ccae9aa39a70b8d77bc384a5e4e3215c4e387770116844086fce98523d44cbbf9657c8c076
 EBUILD kdelibs-4.11.0.ebuild 8357 SHA256 00f86023ad4aa54ba608f48ef951fe8dbdb34f0e19a88549901fa877ad32cb49 SHA512 1f264cbe29276f860e2e2cfd9f8b158182dc69740b831b721f832f420a5b1e1e54657f9ac89a4b49efd755b5b41857a593780872b03c67287fd6ee22a0543bd1 WHIRLPOOL 39592da6bba4a196cd6da3e19496fd624e467c6a1cfe5d51924a503de09bb7f32699cb6875bb5a8148d6f9c9ff0ab27a8dd0c5a5c02ba3d0fe68b482e49a12a1
-MISC ChangeLog 45848 SHA256 493dfaf9d06324c9904d251c2eb325d5961c4afc3f3cddd1da4e489cf13d87ff SHA512 21552bc46d1623ef2b356719617490e8c99a1c12092517808827970c37b5196eb6200f0485cd7720cd2e4bf0966c47307177b925bdd3c068402503c5cc845399 WHIRLPOOL 94b33cfd0acb726a391c643ec5af83c30bc2a508149aa323a2cc57bb67bfc520a8574077ef2e58d4f1d47c718e6a5c0cd5e009f14f5f476aa01d49f6bfbb8c9a
+MISC ChangeLog 46056 SHA256 474b6487e754ff94ae287aa274f12774c97e45439fcbd5472919840d6f7aa289 SHA512 18da15584241a04cf227caccf61dd7c9be35df8761b5c345ce9384ad0fe105931f696391c782b9993f6ce1df20e8b97238aae8642e6c11e01b7f3d92174651c2 WHIRLPOOL e6dfe79d3af57ca066107fd76bec5b342c2240fa97741db5c3d942bcb51dda8d98978a3eb5b74487c5dd7bbef97eef483774a55778d15b9e31a8d747dc8b153b
 MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
 MISC metadata.xml 391 SHA256 fc53374fd33574da578cb1d31e89f7cbdee57aff3cbf5d7284e778edbce2acc0 SHA512 6c6a2d72311cd226b6f8b4b971bcf3547c43b54148b7286849f37ed1d586984aa39642e83f69034d942c4e478fa41ba7d815a13a0eb01f8ed5b74b3552270c69 WHIRLPOOL 9313efac3ba14c2b1b75703071bde802b41027e46d511bc8cf3efa055cf6967758aac541d60bf10a10e24c96b6f2109e848d12950cf802398d6563290c8c2039
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSC+hkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcy+wP/jMQ8AAW51BPUiENaMs20brQ
-p3p+XQ9mPiOzU8rbRGUbB2y5nORKHxJR/kun3z4UD2wARXnfMWoW9TEJAFTlocc+
-TYKgY2yQ3kKT/BVZKBG+Z/TW7neamq8Ezr4tNq/xWz4SK9LLWq324e+Bl05JmHY6
-Fb9nalzF88s94oF+O5YJowma1iLO2r6p+dH34AIUER0hX7HAC5LZ2sFrm/M56W3S
-ejcuVaCjBiRn4/P9w5QGiAYhlUvT5KdJgPhkREQfvjgZl45J1cbwkcSz0IKsfywC
-FYN10BysJXUwSLnDpi94+unDwNQgGarWdofwRSxDVOsDVVKFGgKdGlYNypdTZXiw
-4dYPITcgkBJB0mlzI251y7+vkEZd0H0ZcpftmRt1P6e0Q8pVOHP8GzDeASHM5WOm
-rL1r0+3g1wN7qcvcBPeR8eEWfeOPDjhWvlv8KAG71gKWZfFZgAUZEicxYMb0RI59
-K7vr7Lk92GKAuhkYGq0mJVl3419EfxStxWEwSZtQf7VO6eOy6GHWwn3iXgdEb7y5
-Lz5c6LAUB15DooYF8OjDS3u/Rd2h5mwuVg4Bf9ipkKq2KTBQGg3EF+dIHLjz8fbf
-JEusgQuUqIsd2WYHIrQmD3dJhYLyFwX2hwZxGppcAd5WB2wyJ2o4ZqBFuqNNiXEy
-S+dMj0G5thxY8TLbEN9D
-=40ia
+iQEcBAEBCAAGBQJSGhzFAAoJEMbwO6tnXQ0skq0IAIv0Eo/oEhHXsBaHwyf4aLOy
+bQ4Ha7sUP/ftfpD8ouvZP2UciDndG+W9e8SeHymq0YBm9hhiGGVjBnkml86o3S1I
+m6UGNYrjb1+NSFL/HgYE17OAqwEq8qIGcpITbJWXpK0oxY7ieZjOYu4TFYi47BCd
+kGRnY10NTImaeIM0TQiHCrPcjlui5Rg2Y2Ekf8nG00UMM6GgPrEzupB/AzHKN42P
+uVpHs5u8QesK7t3fVEhnNPgBNcHbpMi+TwGjWu170g710JiT1D4vZN0fk4OtrJDg
+Hw/cK2CKIOqzNV73evBtNZxDcKJTd9uIbBZUx7KB3bdw4FoaF2qCqTIGIP+ixnQ=
+=N8QR
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.11.0-themecrash.patch b/kde-base/kdelibs/files/kdelibs-4.11.0-themecrash.patch
new file mode 100644
index 000000000000..971d00b32815
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.11.0-themecrash.patch
@@ -0,0 +1,51 @@
+From 59e88c777b92935cc95f28e52f84fe97563dec9d Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Wed, 14 Aug 2013 12:52:52 +0200
+Subject: [PATCH] when the request theme does not exist, delete all old caches
+ for it and don't crash
+
+BUG:320855
+---
+ plasma/theme.cpp | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/plasma/theme.cpp b/plasma/theme.cpp
+index 4554de7..cb44878 100644
+--- a/plasma/theme.cpp
++++ b/plasma/theme.cpp
+@@ -222,18 +222,25 @@ bool ThemePrivate::useCache()
+ {
+     if (cacheTheme && !pixmapCache) {
+         const bool isRegularTheme = themeName != systemColorsTheme;
+-        QString cacheFile = "plasma_theme_" + themeName;
++        const QString cacheFile = "plasma_theme_" + themeName;
+ 
+         if (isRegularTheme) {
++            const QString cacheFileBase = cacheFile + "*.kcache";
++
+             const QString path = KStandardDirs::locate("data", "desktoptheme/" + themeName + "/metadata.desktop");
+-            const KPluginInfo pluginInfo(path);
++            // if the path is empty, then we haven't found the theme and so
++            // we will leave currentCacheFileName empty, resulting in the deletion of
++            // *all* matching cache files
++            QString currentCacheFileName;
++            if (!path.isEmpty()) {
++                const KPluginInfo pluginInfo(path);
++                currentCacheFileName = cacheFile + "_v" + pluginInfo.version() + ".kcache";
++            }
+ 
+-            // now we check for, and remove if necessary, old caches
+-            const QString cacheFileBase = cacheFile + "*.kcache";
+-            cacheFile += "_v" + pluginInfo.version();
+-            const QString currentCacheFileName = cacheFile + ".kcache";
++            // now we check for (and remove) old caches
+             foreach (const QString &file, KGlobal::dirs()->findAllResources("cache", cacheFileBase)) {
+-                if (!file.endsWith(currentCacheFileName)) {
++                if (currentCacheFileName.isEmpty() ||
++                    !file.endsWith(currentCacheFileName)) {
+                     QFile::remove(file);
+                 }
+             }
+-- 
+1.8.3.2
+
diff --git a/kde-base/kdelibs/kdelibs-4.11.0-r1.ebuild b/kde-base/kdelibs/kdelibs-4.11.0-r1.ebuild
new file mode 100644
index 000000000000..1916cd56ab84
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.11.0-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.0-r1.ebuild,v 1.1 2013/08/25 15:05:56 kensington Exp $
+
+EAPI=5
+
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+EGIT_BRANCH="KDE/4.11"
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma
+mmx nls openexr +policykit spell sse sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.7.7
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.4.2
+	>=dev-libs/libdbusmenu-qt-0.3.2
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/shared-desktop-ontologies-0.11.0
+	>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	media-libs/libpng:0=
+	>=media-libs/phonon-4.4.3
+	sys-libs/zlib
+	virtual/jpeg:0
+	>=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/libXScrnSaver
+		x11-libs/libXtst
+		!kernel_SunOS? (
+			|| (
+				sys-libs/libutempter
+				>=sys-freebsd/freebsd-lib-9.0
+			)
+		)
+	)
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	openexr? (
+		media-libs/openexr:=
+		media-libs/ilmbase:=
+	)
+	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl )
+	udev? ( virtual/udev )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-qt/qtphonon
+	!<=kde-base/plasma-workspace-4.7.1:4
+	!<=kde-base/kcontrol-4.4.50:4
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	sys-apps/dbus[X]
+	!aqua? (
+		udisks? ( sys-fs/udisks:2 )
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+		upower? ( sys-power/upower )
+	)
+	udev? ( app-misc/media-player-info )
+"
+PDEPEND="
+	$(add_kdebase_dep katepart)
+	$(add_kdebase_dep nepomuk-core)
+	$(add_kdebase_dep nepomuk-widgets)
+	|| (
+		$(add_kdebase_dep kfmclient)
+		x11-misc/xdg-utils
+	)
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	policykit? (
+		>=sys-auth/polkit-kde-agent-0.99
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.7.96-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.2-armlinking.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
+	"${FILESDIR}/${PN}-4.9.3-werror.patch"
+	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
+	"${FILESDIR}/${PN}-4.11.0-themecrash.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
+	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu 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
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DWITH_DNSSD=OFF
+		-DKDE_DEFAULT_HOME=.kde4
+		-DKAUTH_BACKEND=POLKITQT-1
+		-DBUILD_libkactivities=OFF
+		$(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 spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with udev UDev)
+		$(cmake-utils_use_with udisks SOLID_UDISKS2)
+		$(cmake-utils_use_with zeroconf Avahi)
+	)
+	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}"/usr/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
+
+	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/*
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EPREFIX}/usr/$(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}"/usr/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+
+	einfo Installing environment file.
+	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
+	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
+	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
+	doenvd "${T}/77kde"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the avahi 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
+
+	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
+}