Revision bump adds upstream patch to fix crashes in kmail caused by nepomuk concurrency problems. This is issue is fixed in KDE SC 4.8.2. Patch spotted by Volker Hemmann <volkerarmin@googlemail.com>. Fixes bug #408421.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux i686

4 files changed, 384 insertions, 16 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c9f65b735f17..46eb3d876b49 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.829 2012/03/06 23:35:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.830 2012/03/16 12:23:27 johu Exp $
+
+*kdelibs-4.8.1-r1 (16 Mar 2012)
+
+  16 Mar 2012; Johannes Huber <johu@gentoo.org>
+  +files/kdelibs-4.8.1-nepomuk-kmail.patch, +kdelibs-4.8.1-r1.ebuild:
+  Revision bump adds upstream patch to fix crashes in kmail caused by nepomuk
+  concurrency problems. This is issue is fixed in KDE SC 4.8.2. Patch spotted by
+  Volker Hemmann <volkerarmin@googlemail.com>. Fixes bug #408421.
 
 *kdelibs-4.8.1 (06 Mar 2012)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 5fdea004ef11..86f7f6750d5d 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -17,6 +17,7 @@ AUX kdelibs-4.7.4-klocale.patch 5760 RMD160 aaa289c2cc7bff38cc85eda4846d713ae56b
 AUX kdelibs-4.7.4-xinelib12x.patch 1292 RMD160 99422bd8f4204b6743ed8c662991d5bd7c207654 SHA1 9cb83cb7f6394549354c6837977f9e9529127041 SHA256 25d47c260d674cdbd8354c21bc449fb8c116c9594c04d1db8709abbe59ca8cdd
 AUX kdelibs-4.7.96-mimetypes.patch 1195 RMD160 205abc5f4c62f83658c666e887ab628aa0900e46 SHA1 0a6fe5d4ebb0c6de17a713387626b2b3784b8ef5 SHA256 7d8ea698c29c6de0dbf61ef7c24bf6bf69dfc7f758994edd2cef5b1f660195aa
 AUX kdelibs-4.8.0-xinelib12x.patch 1439 RMD160 7a9bf7bfb6f7d907af2f485719d530f33892741c SHA1 7661c74a7abd157c244049336cdf90d5dd541ba7 SHA256 7cea48778a7dc6512e86205079adb3389170ae86a4eca92a7ca91a6a38e2cad0
+AUX kdelibs-4.8.1-nepomuk-kmail.patch 2527 RMD160 0fd4378eb3f6a2cad767dd3999d80b6c1fe651c7 SHA1 39d4ce9b7f4b6c333ec221fcfefd463de475c393 SHA256 17303269569e2bc7e68cb8e0925587ed69b385fa3d5a088639579f5f3b7d7634
 DIST kdelibs-4.7.4.tar.bz2 12084560 RMD160 5666cacb69ebdbd2d0e9ce9300f35ecf6d6ba48c SHA1 78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8 SHA256 fe1d41ecce95d9ef67a9b81cee55afe5ac98aa937e2c2356bd69f9bb31a2af39
 DIST kdelibs-4.8.0.tar.bz2 13044553 RMD160 b5fd03eec81a390ea74d4713d6459b685352d362 SHA1 5e4744405734e6c3ce572ef7d16054390692b38a SHA256 c7241350c63833936704e54ec704d7af316d0551e6172a12ecc5a95309900a9e
 DIST kdelibs-4.8.1.tar.xz 11664084 RMD160 9d37f0df79ff367a6e4e1ec7f47dc457f5011609 SHA1 da4e13f63ac340619351e9a2f4211cce8ec4fdf8 SHA256 4a2bebec7907af2822dc19878d9470559dc188c8a6ffe90775c2b8658e9c5fec
@@ -25,24 +26,19 @@ EBUILD kdelibs-4.7.4-r11.ebuild 9113 RMD160 330d86132002ddbc3f885a26081f4375a074
 EBUILD kdelibs-4.7.4-r12.ebuild 9154 RMD160 26fc4269ec10544e35feac2d18420fffb2ce3091 SHA1 9121c57b5624c712d25111a656dee40d7ee5175a SHA256 c73196d4d44ecf175f8d4a341b74bd2be75e7dce7b82fe4f4b7eb39981f8815c
 EBUILD kdelibs-4.7.4.ebuild 9055 RMD160 c0df50a72822b67ba19db9817d2cc7332fd91fd6 SHA1 e578d088c7a90e2bc67ff0b705a2845ebe6d0b57 SHA256 a46a1361a5a205de5c960c3a3a8379d43953abc1e494ebb2612c3fd29748a8bc
 EBUILD kdelibs-4.8.0-r1.ebuild 9166 RMD160 60ef4fe60a56a9e04e1674ccfc386e002de494d6 SHA1 e52ebee920959e9532e7b9ea805fbb6e4a12caa3 SHA256 a6ac94a3215100e36a493da61871d367b3cee65ba441a72c827a10d9161755b9
+EBUILD kdelibs-4.8.1-r1.ebuild 9169 RMD160 04fd9c8d4cb72e9994774aa2f42808a52c80173c SHA1 55b9a00a4e60f1bcf6c492077ba662597e7fb475 SHA256 396e015701fda7616306d4f6827671a2e1eca3bbb4d1e1e808ab08b713b1c3f0
 EBUILD kdelibs-4.8.1.ebuild 9124 RMD160 7e907ad279fba5860cc5d13aeeb7471403f23877 SHA1 19f382ce9f1ce991d5d9822cd0d8ad8cbfc1b4fe SHA256 0842d3e22fb74c7185e88784554a6dd88efc8534609197ca9a9c566597271e9b
-MISC ChangeLog 28785 RMD160 bb684c64d4deee3be57eb634694225bcbb54ceb3 SHA1 d45e555221101ae92537668dfa9fe46c6056a29c SHA256 db8845dacfeb6dc0bee753278f39a62b9e600c247cb3cc357bd48cc2c0aa1535
+MISC ChangeLog 29157 RMD160 fa4db56ab6bfb818e09bcf83a326384f8728b26b SHA1 52b57ba97df04bce6943ccb7d6ba59fa3d15e53a SHA256 73329a426a554ee77bd169309ef397b4544e42e7d5026511c0a4ec6f4a45537a
 MISC ChangeLog-2009 110608 RMD160 9dfb93acebe4df4b7bbbca589c1bacd7033ec36c SHA1 c5fbfedfb78a157dd182606b0056b376bd3353d6 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPVp++AAoJEEb+UGWnxTyHs18P/iWWaEXS4Tk2L8ymg0vDFcca
-WycjNO6NlIw8y6pTgb/qg55mDz0hqvxkXPY76X+lmTdMEjNjN3Oer/lWl6hOATzr
-I4zXX4IBW+vxeA0dtSK9vkjEc7Q9z8SrsWZ7z/+T8ei3llA59wf8INtOkdjAxi0w
-0miod4CuMmzYiysf//nd3JDbbolNmY6DPNxv+t/+6KCWhOoVEhC19QagLxvu4qas
-2IOdBcVp9IKB1HS6e52eSk8kQpDQ8sZrhVWWXQjp4xIivYBW8Uy4jTDFoYlZKZ+t
-Q/XV80sTU9B8GBLPTtyNj5rAZatxjYDfPfFgS5MuOUUaePpj4LGjKBoHpC8080M5
-k6sye/5xftUbWc16weXWHFpEAyl43RrLAJY+TYP48IyfHgKot0wdFwA1L7cgcYbD
-N+PLjRzwwEDhTRuFoNjfe/f6g1MEZIX4KgCmEXoI2+tBw4JHxcwjmvZFbvBAXh35
-sFnDanCksA2ySCEn9HYIDOEhYogGUx7f+E0egI/l7kmXiK2xKQmdl+ucEUgHYZ3P
-uvrT9CTxfROjVrk434QcShvuvNnyTJgADTVzHLoUnEcEtLlIdCpCQhKYfuQ7sder
-nqmEGmWhp86iSDrR/p1xqH1YOLcUaGX3dehIhTkjWca7CSAEHMkCRbVFROhSUkvO
-4Vjv27RYvYquJ8mxtpV9
-=Aw6F
+iQEcBAEBCgAGBQJPYzIPAAoJEO+t9ga+3I3auMYIALHvatR7AZtpFnzLSDokDUTx
+h8NvnqZLbfsmtqL3A4qdmm8vYFY5oZK9aZ+vlUeptNStdNCOG170T95Ah5Mi7ZUZ
+lBegt9eAX5FYP6Bj8ZTxwo9A/VY2f2MZjDus8E/F7KItbEAMdTigzpZGFJFgQnhH
+Wk9sFKpONTbDbDWwWoDYYCg+MMleDbBLdSNi8XxGg2IkksdWd8cKCpKmhyEZURNn
+2Pp29I8p4Q1JJSVRwmcA8uVSuYc6DxIVmY+QaD0ws/0DHOJEFJ2TBUIsDz5y5Phy
+RcfJnP4yw3Q34qPAPc4Y5yAou19PYEDm8SHO34W8sbi0hElLRZlvMzc+uAlw+RQ=
+=jig8
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch
new file mode 100644
index 000000000000..145472d17d7b
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch
@@ -0,0 +1,52 @@
+diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
+index abe55ea..e65e66e 100644
+--- a/nepomuk/core/resourcedata.cpp
++++ b/nepomuk/core/resourcedata.cpp
+@@ -175,7 +175,7 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
+     if( !m_uri.isEmpty() ) {
+         m_rm->m_initializedData.remove( m_uri );
+         if( m_rm->m_watcher && m_addedToWatcher ) {
+-            m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
++            QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
+             m_addedToWatcher = false;
+         }
+     }
+@@ -394,15 +394,16 @@ bool Nepomuk::ResourceData::load()
+ 
+         if(!m_rm->m_watcher) {
+             m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
++            m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
+             QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
+                               m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
+             QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
+                               m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
+             m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
+-            m_rm->m_watcher->start();
++            QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
+         }
+         else {
+-            m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
++            QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
+         }
+         m_addedToWatcher = true;
+ 
+diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
+index 06b9622..92b12f5 100644
+--- a/nepomuk/core/resourcewatcher.h
++++ b/nepomuk/core/resourcewatcher.h
+@@ -93,6 +93,7 @@ namespace Nepomuk {
+          */
+         virtual ~ResourceWatcher();
+ 
++    public Q_SLOTS:
+         /**
+          * \brief Add a type to be watched.
+          *
+@@ -204,7 +205,6 @@ namespace Nepomuk {
+          */
+         QList<Types::Property> properties() const;
+ 
+-    public Q_SLOTS:
+         /**
+          * \brief Start the signalling of changes.
+          *
diff --git a/kde-base/kdelibs/kdelibs-4.8.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.8.1-r1.ebuild
new file mode 100644
index 000000000000..1551e21c9aa6
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.8.1-r1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.1-r1.ebuild,v 1.1 2012/03/16 12:23:27 johu Exp $
+
+EAPI=4
+
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_SCM="git"
+inherit kde4-base fdo-mime toolchain-funcs
+
+# The "master" branch is out of date, so use KDE/4.8 per upstream's
+# recommendation.
+EGIT_BRANCH="KDE/4.8"
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
++upower upnp 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.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-libs/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/libXScrnSaver
+		x11-libs/libXtst
+		!kernel_SunOS? ( sys-libs/libutempter )
+	)
+	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 )
+	semantic-desktop? (
+		>=dev-libs/shared-desktop-ontologies-0.8.1
+		>=dev-libs/soprano-2.7.3[dbus,raptor,redland]
+	)
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl )
+	udev? ( sys-fs/udev )
+	upnp? ( media-libs/herqq )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!x11-libs/qt-phonon
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	!aqua? (
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+		udisks? ( sys-fs/udisks )
+		upower? ( sys-power/upower )
+	)
+"
+PDEPEND="
+	$(add_kdebase_dep katepart)
+	|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
+	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) )
+"
+
+# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
+add_blocker plasma-workspace 4.7.1
+
+# file collision, bug 394991
+add_blocker kcontrol 4.4.50
+
+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.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
+	"${FILESDIR}/${PN}-4.8.1-nepomuk-kmail.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
+	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
+
+	# 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
+
+	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)
+		else
+			die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found."
+		fi
+	else
+		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
+	fi
+	mycmakeargs+=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=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 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)
+		$(cmake-utils_use_with upnp HUpnp)
+	)
+	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 '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}/.kde4"
+	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
+}