kde-frameworks/kdelibs: 4.14.35 bump w/ USE plasma,qt3support; drop crypt

Add fix for unused HAVE_X86_3DNOW variable.
USE=crypt actually only enabled remote plasmoid support in kdelibs.
USE=-plasma accidentally also fixes file collision w/ sci-libs/plasma.
Migrate from fdo-mime to xdg-utils, relative dosym.

Gentoo-bug: 610668
Package-Manager: Portage-2.3.7, Repoman-2.3.3

6 files changed, 467 insertions, 0 deletions

diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
index 9197337c48c9..bd39f1abd41e 100644
--- a/kde-frameworks/kdelibs/Manifest
+++ b/kde-frameworks/kdelibs/Manifest
@@ -1,2 +1,3 @@
 DIST kdelibs-4.14.32.tar.xz 11640860 SHA256 2133e863b21c197c75bd6a6ac60773422ef026c33acb57b8c7628a09f483bd83 SHA512 06cc64b79758d4dbf676eb6bbf56c1bb2820f3405c61e4d39e4e68a3ecd7db4afcf6fca1fcfe870dba9f8264b56aaee72d0f06da0923d2befd6ea56aa5adba22 WHIRLPOOL 4477c6d60c1df6469e6e1c66d8919c8f6432202b8c864a442226aa220f436971185337cb661b0f8e3e90d3e0dc7bdc0657994198003d6ef5ffb8bc8e604c45b7
 DIST kdelibs-4.14.34.tar.xz 11644736 SHA256 777d3433555b3257fe67167723020bb7f0da7b16daeace9910751e4b9bf9bcfb SHA512 57ba1591e6996af79f03e8a3d4d0c278c027ad65c717fcbdb857df68a3df47ddec6b7c34dfd682d590bfa9ed6800974b53ff29aa7ab73522caebc9897cbd81c0 WHIRLPOOL 7c1f318edadb6625acef33891e8fb751dd0c783a05f0e4bb2b77376791c43fbfee20bf8b72aab719bcfd8d271294263f2fc57912fd09edb38589a37d8a01c968
+DIST kdelibs-4.14.35.tar.xz 11642928 SHA256 9732bd7408de1d063b555ec849d74aa53598efe6b4113258af3270fcab5af303 SHA512 78ec1e34a4683b367b5df93992273b9b7f8d2471000feb0881df933bb3dc1d4b5b27a2343ca57957c20efcc46590a20be7ea763ff6960b004af91c96bac89ae0 WHIRLPOOL 89bc91f2c2c58d7bef99825122afde40cfef1aad734ad84187e09b0b7c189aedfd54480ddd93e2bad440ef978c169e3d8d3de2b397ffed8eb9daec8c533b7a4b
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch
new file mode 100644
index 000000000000..41a7aa874162
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch
@@ -0,0 +1,19 @@
+commit f96d12c9dbc59be09a7f8e29ced43f681e6f3dce
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Jul 23 01:18:26 2017 +0200
+
+    Add missing HAVE_X86_3DNOW cmakedefine
+
+diff --git a/solid/solid/config-processor.h.cmake b/solid/solid/config-processor.h.cmake
+index f7c3d2b4bc..51ac8e18f5 100644
+--- a/solid/solid/config-processor.h.cmake
++++ b/solid/solid/config-processor.h.cmake
+@@ -10,5 +10,7 @@
+ #cmakedefine HAVE_X86_SSE2
+ 
+ /* Defined to 1 if the assembler supports AltiVec instructions. */
+-#cmakedefine HAVE_PPC_ALTIVEC  
++#cmakedefine HAVE_PPC_ALTIVEC
+ 
++/* Defined to 1 if the assembler supports 3DNOW instructions. */
++#cmakedefine HAVE_X86_3DNOW
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch
new file mode 100644
index 000000000000..956b01c80d29
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch
@@ -0,0 +1,90 @@
+commit 8c1dbc358be1f66ba6cf2bcd574aa3739affec57
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Thu Feb 16 19:41:52 2017 +0100
+
+    Make kde3support and Qt3Support optional (default on)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 463919b669..d7caade3cf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,6 +48,9 @@ option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows")
+ ############### Give the user the option to build without qtwebkit dependency  ###############
+ option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" "ON")
+ 
++############### Give the user the option to build without qt3support dependency ###############
++option(WITH_KDE3SUPPORT "Enables the deprecated kde3support" "ON")
++
+ ############### Load the CTest options ###############
+ # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
+ # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
+@@ -324,9 +327,9 @@ endif(NOT WINCE)
+ add_subdirectory( kio )
+ add_subdirectory( solid )
+ add_subdirectory( kded       )
+-if (QT_QT3SUPPORT_FOUND)
++if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
+    add_subdirectory( kde3support  )
+-endif (QT_QT3SUPPORT_FOUND)
++endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
+ add_subdirectory( kfile )
+ add_subdirectory( kconf_update )
+ if(NOT WINCE)
+diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
+index cdf014320e..a303647c76 100644
+--- a/includes/CMakeLists.txt
++++ b/includes/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (QT_QT3SUPPORT_FOUND)
++if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
+ install( FILES
+   K3BookmarkDrag
+   K3ButtonBox
+@@ -50,7 +50,7 @@ install( FILES
+   K3NamedCommand
+   K3RFCDate
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
+-endif (QT_QT3SUPPORT_FOUND)
++endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
+ 
+ install( FILES
+   KACL
+@@ -515,14 +515,14 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
+ endif(NOT KDE_NO_DEPRECATED)
+ 
+ if (UNIX)
+-   if (QT_QT3SUPPORT_FOUND)
++   if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
+       install( FILES
+         K3ProcIO
+         K3Process
+         K3ProcessController
+         K3ShellProcess
+       DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
+-   endif (QT_QT3SUPPORT_FOUND)
++   endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
+ 
+    install( FILES
+      KDEsuClient
+diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
+index ecb6b69a5e..62db88b7c4 100644
+--- a/kdewidgets/CMakeLists.txt
++++ b/kdewidgets/CMakeLists.txt
+@@ -124,7 +124,7 @@ if(QT_QTDESIGNER_FOUND)
+   install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+   endif(WITH_KDEWEBKIT)
+ 
+-  if (QT_QT3SUPPORT_FOUND)
++  if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
+ 
+      include_directories(
+        ${CMAKE_SOURCE_DIR}/kde3support
+@@ -158,7 +158,7 @@ if(QT_QTDESIGNER_FOUND)
+      endif(NOT WIN32)
+ 
+      install(TARGETS kde3supportwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+-  endif (QT_QT3SUPPORT_FOUND)
++  endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
+ endif (QT_QTDESIGNER_FOUND)
+ 
+ ########### install files ###############
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch
new file mode 100644
index 000000000000..977c1a5e5df8
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch
@@ -0,0 +1,54 @@
+commit 8a9ec27390a9df359343d1d3537b52e16f680c25
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Jul 23 01:02:08 2017 +0200
+
+    Make Plasma-4 support optional (default on)
+    
+    This adds a new option WITH_PLASMA4SUPPORT.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d7caade3cf..8e7759ef0d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,6 +51,9 @@ option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" "
+ ############### Give the user the option to build without qt3support dependency ###############
+ option(WITH_KDE3SUPPORT "Enables the deprecated kde3support" "ON")
+ 
++############### Give the user the option to build without Plasma-4 support ###############
++option(WITH_PLASMA4SUPPORT "Enables the deprecated Plasma-4 Workspace support" "ON")
++
+ ############### Load the CTest options ###############
+ # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
+ # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
+@@ -358,9 +361,9 @@ endif(NOT WINCE)
+ add_subdirectory( dnssd )
+ add_subdirectory( kross )
+ add_subdirectory( security )
+-if(NOT WINCE)
++if(NOT WINCE AND WITH_PLASMA4SUPPORT)
+ add_subdirectory( plasma )
+-endif(NOT WINCE)
++endif(NOT WINCE AND WITH_PLASMA4SUPPORT)
+ add_subdirectory( kunitconversion )
+ if(WITH_KDEWEBKIT)
+ add_subdirectory( kdewebkit )
+diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
+index cdf014320e..44f3fdd6e2 100644
+--- a/includes/CMakeLists.txt
++++ b/includes/CMakeLists.txt
+@@ -1051,6 +1051,7 @@ install(FILES
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Nepomuk/Vocabulary COMPONENT Devel)
+ 
+ 
++if(WITH_PLASMA4SUPPORT)
+ install(FILES
+   Plasma/AbstractDialogManager
+   Plasma/AbstractRunner
+@@ -1145,6 +1146,7 @@ install( FILES
+   Plasma/AnimationDriver
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma COMPONENT Devel)
+ endif(NOT KDE_NO_DEPRECATED)
++endif(WITH_PLASMA4SUPPORT)
+ 
+ 
+ install(FILES
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
new file mode 100644
index 000000000000..e6a574ab2126
--- /dev/null
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="optional"
+inherit kde4-base toolchain-funcs flag-o-matic xdg-utils
+
+APPS_VERSION="17.08.0" # Don't forget to bump this
+
+DESCRIPTION="Libraries needed for programs by KDE"
+[[ ${KDE_BUILD_TYPE} != live ]] && \
+SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos
+libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support
+spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+	opengl? ( plasma )
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.4.2
+	dev-libs/libdbusmenu-qt[qt4]
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support?]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	media-libs/phonon[qt4]
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-misc/shared-mime-info
+	acl? ( virtual/acl )
+	!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:=
+	)
+	plasma? (
+		app-crypt/qca:2[qt4]
+		>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support?]
+	)
+	policykit? ( sys-auth/polkit-qt[qt4] )
+	spell? ( app-text/enchant )
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	udev? ( virtual/udev )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-qt/qtphonon
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	kde-frameworks/kdelibs-env:4
+	sys-apps/dbus[X]
+	!aqua? (
+		x11-apps/iceauth
+		x11-apps/rgb
+		x11-misc/xdg-utils
+		udisks? ( sys-fs/udisks:2 )
+		upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	)
+	plasma? ( !sci-libs/plasma )
+	udev? ( app-misc/media-player-info )
+"
+PDEPEND="
+	x11-misc/xdg-utils
+	handbook? ( kde-apps/khelpcenter:* )
+	policykit? ( kde-plasma/polkit-kde-agent )
+"
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
+	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.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.14.20-FindQt4.patch"
+	"${FILESDIR}/${PN}-4.14.22-webkit.patch"
+	"${FILESDIR}/${P}-3dnow.patch"
+	"${FILESDIR}/${P}-kde3support.patch"
+	"${FILESDIR}/${P}-plasma4.patch"
+)
+
+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 opengl; then
+		sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
+			plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
+			|| die "failed to sed out QT_QTOPENGL_FOUND"
+	fi
+
+	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
+		eapply "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DKDE_DEFAULT_HOME=.kde4
+		-DKAUTH_BACKEND=POLKITQT-1
+		-DWITH_Soprano=OFF
+		-DWITH_SharedDesktopOntologies=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON
+		-DBUILD_doc=$(usex handbook)
+		-DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow)
+		-DHAVE_PPC_ALTIVEC=$(usex altivec)
+		-DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx)
+		-DHAVE_X86_SSE=$(usex cpu_flags_x86_sse)
+		-DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2)
+		-DWITH_ACL=$(usex acl)
+		-DWITH_BZip2=$(usex bzip2)
+		-DWITH_FAM=$(usex fam)
+		-DWITH_Jasper=$(usex jpeg2k)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_LibLZMA=$(usex lzma)
+		-DWITH_Libintl=$(usex nls)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_PLASMA4SUPPORT=$(usex plasma)
+		-DWITH_QCA2=$(usex plasma)
+		-DWITH_PolkitQt-1=$(usex policykit)
+		-DWITH_KDE3SUPPORT=$(usex qt3support)
+		-DWITH_ENCHANT=$(usex spell)
+		-DWITH_OpenSSL=$(usex ssl)
+		-DWITH_UDev=$(usex udev)
+		-DWITH_SOLID_UDISKS2=$(usex udisks)
+		-DWITH_KDEWEBKIT=$(usex webkit)
+		-DWITH_Avahi=$(usex zeroconf)
+	)
+
+	use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF )
+
+	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
+
+	# We don't package it, so don't install headers
+	rm -r "${ED}"/usr/include/KDE/Nepomuk || die
+
+	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() {
+	xdg_mimeinfo_database_update
+
+	if use zeroconf; then
+		elog
+		elog "To make zeroconf support available in applications make sure that the avahi daemon"
+		elog "is running."
+		elog
+		elog "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		elog "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		elog "to include 'mdns', e.g.:"
+		elog "	hosts: files mdns dns"
+		elog
+	fi
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+
+	kde4-base_pkg_postrm
+}
diff --git a/kde-frameworks/kdelibs/metadata.xml b/kde-frameworks/kdelibs/metadata.xml
index 63ad9f4ad419..0c83fe5f7802 100644
--- a/kde-frameworks/kdelibs/metadata.xml
+++ b/kde-frameworks/kdelibs/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
+		<flag name="qt3support">Enable kde3support/qt3support for very old applications</flag>
 	</use>
 </pkgmetadata>