11 files changed, 174 insertions, 89 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 39f520c83557..04fac5d2f209 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,9 +16,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Base set of libraries needed by KDE programs
 
-LIB_DEPENDS=	searchclient.0:${PORTSDIR}/deskutils/strigi \
-		soprano.4:${PORTSDIR}/textproc/soprano \
-		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		aspell.16:${PORTSDIR}/textproc/aspell \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		pcre.1:${PORTSDIR}/devel/pcre \
@@ -31,18 +28,15 @@ LIB_DEPENDS=	searchclient.0:${PORTSDIR}/deskutils/strigi \
 		hal.1:${PORTSDIR}/sysutils/hal \
 		qca.2:${PORTSDIR}/devel/qca \
 		HUpnp.1:${PORTSDIR}/net/hupnp \
-		attica.0:${PORTSDIR}/x11-toolkits/attica \
 		polkit-qt-core-1.1:${PORTSDIR}/sysutils/polkit-qt \
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
 		dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \
-		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \
 		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \
 		xauth:${PORTSDIR}/x11/xauth \
 		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
@@ -51,11 +45,12 @@ CONFLICTS=	kdebase-runtime-4.5.[0-5]
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_FAM=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	libxml2 libxslt
-USE_KDE4=	automoc4 kdehier kdeprefix oxygen sharedmime
+USE_KDE4=	kdehier kdeprefix oxygen \
+		attica automoc4 ontologies sharedmime soprano strigi
 KDE4_BUILDENV=	yes
 USE_OPENSSL=	yes
 USE_PERL5=	yes
@@ -70,15 +65,18 @@ MAKE_JOBS_SAFE=	yes
 CMAKE_ARGS+=	-DWITH_ACL:BOOL=Off \
 		-DWITH_FAM:BOOL=On \
 		-DHUPNP_INCLUDE_PATH:PATH="${LOCALBASE}/include" \
-		-D_KDE_DEFAULT_HOME_POSTFIX:STRING="4"
+		-DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \
+		-DKDE_DEFAULT_HOME:STRING=".kde4"
 
 MAN1=	checkXML.1 \
+	kconfig_compiler.1 \
 	kde4-config.1 \
 	kdecmake.1 \
 	kjs.1 \
 	kjscmd.1 \
 	kross.1 \
-	makekdewidgets.1
+	makekdewidgets.1 \
+	preparetips.1
 MAN7=	kdeoptions.7 \
 	qtoptions.7
 MAN8=	kbuildsycoca4.8 \
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 961092665ba6..29615fd7dc4d 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdelibs-4.7.4.tar.bz2) = fe1d41ecce95d9ef67a9b81cee55afe5ac98aa937e2c2356bd69f9bb31a2af39
-SIZE (KDE/kdelibs-4.7.4.tar.bz2) = 12084560
+SHA256 (KDE/kdelibs-4.8.3.tar.xz) = ce3756788dd1b2cf0b8160d1dba870a92b421c81236dff923171d429c4728b58
+SIZE (KDE/kdelibs-4.8.3.tar.xz) = 12208780
diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
index 3e9468a8ea52..e53d2e53da57 100644
--- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake
+++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
@@ -4,13 +4,13 @@
  # define the generic version of the libraries here
  # this makes it easy to advance it when the next KDE release comes
  # Use this version number for libraries which are at version n in KDE version n
--set(GENERIC_LIB_VERSION "4.7.0")
+-set(GENERIC_LIB_VERSION "4.8.0")
 -set(GENERIC_LIB_SOVERSION "4")
 +set(GENERIC_LIB_VERSION "5.0.1")
 +set(GENERIC_LIB_SOVERSION "5")
  
  # Use this version number for libraries which are already at version n+1 in KDE version n
--set(KDE_NON_GENERIC_LIB_VERSION "5.7.0")
+-set(KDE_NON_GENERIC_LIB_VERSION "5.8.0")
 -set(KDE_NON_GENERIC_LIB_SOVERSION "5")
 +set(KDE_NON_GENERIC_LIB_VERSION "7.0.1")
 +set(KDE_NON_GENERIC_LIB_SOVERSION "7")
diff --git a/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake b/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake
deleted file mode 100644
index 1942c75267f1..000000000000
--- a/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/modules/FindXine.cmake	2011-09-26 06:34:51.000000000 -0300
-+++ cmake/modules/FindXine.cmake	2012-01-25 20:37:43.000000000 -0200
-@@ -42,7 +42,7 @@
- )
- 
- if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
--   exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-+   execute_process(COMMAND ${XINECONFIG_EXECUTABLE} --version OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-    if("${XINE_VERSION}" VERSION_GREATER "1.1.0")   #if (... VERSION_GREATER) is new since cmake 2.6.2
-       set(XINE_VERSION_OK TRUE)
-       string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake
new file mode 100644
index 000000000000..515e221eb028
--- /dev/null
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake
@@ -0,0 +1,28 @@
+--- ./cmake/modules/FindQt4.cmake.orig	2011-07-28 05:34:31.000000000 +1100
++++ ./cmake/modules/FindQt4.cmake	2012-05-18 00:28:12.000000000 +1100
+@@ -627,23 +627,12 @@
+   # ask qmake for the imports directory
+   IF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
+     _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
+-    if(qt_imports_dir)
+-      SET(QT_IMPORTS_DIR NOTFOUND)
+-      foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
+-        set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports")
+-      endforeach(qt_cross_path)
+-      FIND_PATH(QT_IMPORTS_DIR NAMES Qt
+-        HINTS ${qt_cross_paths} ${qt_imports_dir}
+-        DOC "The location of the Qt imports"
+-        NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
+-        NO_CMAKE_SYSTEM_PATH)
+-      mark_as_advanced(QT_IMPORTS_DIR)
+-    endif(qt_imports_dir)
++    SET(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE)
+   ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR  OR  QT_QMAKE_CHANGED)
+ 
+   # Make variables changeble to the advanced user
+   MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_DOC_DIR QT_MKSPECS_DIR
+-                    QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
++                    QT_PLUGINS_DIR QT_TRANSLATIONS_DIR QT_IMPORTS_DIR)
+ 
+ 
+   #############################################
diff --git a/x11/kdelibs4/files/patch-kjs__lookup.h b/x11/kdelibs4/files/patch-kjs__lookup.h
deleted file mode 100644
index 900d4c33b35e..000000000000
--- a/x11/kdelibs4/files/patch-kjs__lookup.h
+++ /dev/null
@@ -1,21 +0,0 @@
-commit d1fe2074b4fbc8253a4533a7e6be24b4f5b20b8b
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Fri Dec 30 23:25:16 2011 -0200
-
-    Add missing include.
-    
-    Casting from KJS::JSGlobalObject* to KJS::JSObject* failed with clang
-    because it missed the definition of JSGlobalObject.
-
-diff --git a/kjs/lookup.h b/kjs/lookup.h
-index 6fabc8f..00622d0 100644
---- ./kjs/lookup.h
-+++ ./kjs/lookup.h
-@@ -23,6 +23,7 @@
- #ifndef _KJSLOOKUP_H_
- #define _KJSLOOKUP_H_
- 
-+#include "JSVariableObject.h"
- #include "interpreter.h"
- #include "identifier.h"
- #include "object.h"
diff --git a/x11/kdelibs4/files/patch-kjs__wtf__RefPtr.h b/x11/kdelibs4/files/patch-kjs__wtf__RefPtr.h
deleted file mode 100644
index bf54d3f120f8..000000000000
--- a/x11/kdelibs4/files/patch-kjs__wtf__RefPtr.h
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 01b0c1a8051f372e400d213ac125311c398e4b17
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Fri Dec 30 23:27:31 2011 -0200
-
-    Add missing include.
-    
-    RefPtr::release() needs PassRefPtr.h for adoptRef(). The include is also
-    present in WebKit's wtf.
-    
-    This should fix another build failure with clang.
-
-diff --git a/kjs/wtf/RefPtr.h b/kjs/wtf/RefPtr.h
-index c16397e..493ab05 100644
---- ./kjs/wtf/RefPtr.h
-+++ ./kjs/wtf/RefPtr.h
-@@ -24,6 +24,7 @@
- 
- #include <algorithm>
- #include "AlwaysInline.h"
-+#include "PassRefPtr.h"
- 
- namespace WTF {
- 
diff --git a/x11/kdelibs4/files/patch-mimetypes_kde.xml b/x11/kdelibs4/files/patch-mimetypes_kde.xml
new file mode 100644
index 000000000000..d89a761cb0b4
--- /dev/null
+++ b/x11/kdelibs4/files/patch-mimetypes_kde.xml
@@ -0,0 +1,94 @@
+--- ./mimetypes/kde.xml.orig	2012-01-11 01:17:51.000000000 +1100
++++ ./mimetypes/kde.xml	2012-05-14 20:50:05.000000000 +1100
+@@ -13,11 +13,6 @@
+   the mime type there.
+ -->
+ <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+-  <mime-type type="application/metalink+xml">
+-    <sub-class-of type="application/xml"/>
+-    <comment>Metalink download</comment>
+-    <glob pattern="*.metalink"/>
+-  </mime-type>
+   <mime-type type="application/relaxng">
+     <sub-class-of type="application/xml"/>
+     <comment>RELAX NG</comment>
+@@ -66,14 +61,6 @@
+     <glob pattern="*.mhtml"/>
+     <glob pattern="*.mht"/>
+   </mime-type>
+-  <mime-type type="application/x-nzb"> <!-- fdo #10029 -->
+-    <comment>NewzBin usenet index</comment>
+-    <sub-class-of type="application/xml"/>
+-    <magic priority="80">
+-      <match type="string" value="&lt;nzb" offset="0:256"/>
+-    </magic>
+-    <glob pattern="*.nzb"/>
+-  </mime-type>
+   <mime-type type="application/x-plasma">
+     <sub-class-of type="application/zip"/>
+     <comment>plasmoid</comment>
+@@ -152,9 +139,6 @@
+     <glob pattern="*.pnx"/>
+     <glob pattern="*.rdc"/>
+   </mime-type>
+-  <mime-type type="text/plain"> <!-- As discussed on xdg list, *.doc is needed here for disambiguation -->
+-    <glob pattern="*.doc"/>
+-  </mime-type>
+   <mime-type type="text/x-hex">
+     <sub-class-of type="text/plain"/>
+     <comment>Intel® hexadecimal object file</comment>
+@@ -355,28 +339,10 @@
+     <glob pattern="*.wmp"/>
+   </mime-type>
+ 
+-  <mime-type type="application/x-kexiproject-shortcut"> <!-- FIXED 0.70 -->
+-    <comment>shortcut to Kexi project on database server</comment>
+-    <glob pattern="*.kexis"/>
+-  </mime-type>
+   <mime-type type="application/x-kexiproject-sqlite"> <!-- FIXED 0.70 -->
+     <comment>Kexi database file-based project</comment>
+     <glob pattern="*.kexi"/>
+   </mime-type>
+-  <mime-type type="application/x-kexiproject-sqlite2"> <!-- FIXED 0.70 -->
+-    <sub-class-of type="application/x-sqlite2"/>
+-    <comment>Kexi database file-based project</comment>
+-    <glob pattern="*.kexi"/>
+-  </mime-type>
+-  <mime-type type="application/x-kexiproject-sqlite3"> <!-- FIXED 0.70 -->
+-    <sub-class-of type="application/x-sqlite3"/>
+-    <comment>Kexi database file-based project</comment>
+-    <glob pattern="*.kexi"/>
+-  </mime-type>
+-  <mime-type type="application/x-kexi-connectiondata"> <!-- FIXED 0.70 -->
+-    <comment>data for database server connection</comment>
+-    <glob pattern="*.kexic"/>
+-  </mime-type>
+ 
+   <!-- http://www4.wiwiss.fu-berlin.de/bizer/TriG/ -->
+   <!-- Used in Nepomuk to encode almost all ontologies -->
+@@ -398,25 +364,4 @@
+     </magic>
+     <glob pattern="*.pic"/>
+   </mime-type>
+-  <mime-type type="text/x-qml"> <!-- in fdo smi > 0.90 -->
+-    <comment>Qt Markup Language file</comment>
+-    <magic priority="80">
+-      <match type="string" value="import Qt " offset="0:256"/>
+-    </magic>
+-    <glob pattern="*.qml"/>
+-  </mime-type>
+-  <mime-type type="application/x-mobipocket-ebook">
+-    <comment>Mobipocket e-book</comment>
+-    <sub-class-of type="application/x-palm-database"/>
+-    <generic-icon name="x-office-document"/>
+-    <glob pattern="*.mobi"/>
+-    <glob pattern="*.prc" />
+-    <magic priority="30">
+-      <!-- This also matches AportisDoc, so lower the priority and prefer extension -->
+-      <match type="string" offset="60" value="TEXtREAd" />
+-    </magic>
+-    <magic priority="80">
+-      <match type="string" offset="60" value="BOOKMOBI" />
+-    </magic>
+-  </mime-type>
+ </mime-info>
diff --git a/x11/kdelibs4/files/patch-solid__solid__managerbase.cpp b/x11/kdelibs4/files/patch-solid__solid__managerbase.cpp
new file mode 100644
index 000000000000..35094d8f082b
--- /dev/null
+++ b/x11/kdelibs4/files/patch-solid__solid__managerbase.cpp
@@ -0,0 +1,15 @@
+--- ./solid/solid/managerbase.cpp.orig	2012-04-17 23:58:05.745260976 +0200
++++ ./solid/solid/managerbase.cpp	2012-04-18 00:00:48.605183174 +0200
+@@ -90,7 +90,11 @@
+ #        endif
+ 
+ #        if defined (HUPNP_FOUND)
+-            m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
++            bool solidUPnPEnabled
++                = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
++            if (solidUPnPEnabled) {
++                m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
++            }
+ #        endif
+     }
+ }
diff --git a/x11/kdelibs4/pkg-message b/x11/kdelibs4/pkg-message
new file mode 100644
index 000000000000..c884bc59d618
--- /dev/null
+++ b/x11/kdelibs4/pkg-message
@@ -0,0 +1,14 @@
+======================================================================
+
+Due to severe instability, the Solid UPnP backend was disabled. Thus,
+you will not get notifications about networked shares in the device
+notifier. The UPnP functionality can be reenabled by setting the
+SOLID_UPNP environment variable:
+
+$ cat > ~/.kde4/env/upnp.sh << EOF
+SOLID_UPNP=1
+export SOLID_UPNP
+EOF
+$ chmod +x ~/.kde4/env/upnp.sh
+
+======================================================================
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 4d0b69cb3e1c..4fe3015ae3dd 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -222,6 +222,7 @@ include/KDE/KArchiveDirectory
 include/KDE/KArchiveEntry
 include/KDE/KArchiveFile
 include/KDE/KArrowButton
+include/KDE/KAscii
 include/KDE/KAssistantDialog
 include/KDE/KAuth/Action
 include/KDE/KAuth/ActionReply
@@ -312,6 +313,7 @@ include/KDE/KDateTimeWidget
 include/KDE/KDateValidator
 include/KDE/KDateWidget
 include/KDE/KDebug
+include/KDE/KDescendantsProxyModel
 include/KDE/KDesktopFile
 include/KDE/KDialog
 include/KDE/KDialogButtonBox
@@ -602,6 +604,7 @@ include/KDE/KRandomSequence
 include/KDE/KRatingWidget
 include/KDE/KRecentDocument
 include/KDE/KRecentFilesAction
+include/KDE/KRecursiveFilterProxyModel
 include/KDE/KRemoteEncoding
 include/KDE/KReplace
 include/KDE/KReplaceDialog
@@ -1103,9 +1106,6 @@ include/kactioncollection.h
 include/kactionmenu.h
 include/kactionselector.h
 include/kactivelabel.h
-include/kactivityconsumer.h
-include/kactivitycontroller.h
-include/kactivityinfo.h
 include/kallocator.h
 include/kanimatedbutton.h
 include/kapplication.h
@@ -1907,6 +1907,10 @@ include/threadweaver/ThreadWeaver.h
 include/threadweaver/WeaverInterface.h
 include/threadweaver/WeaverObserver.h
 include/threadweaver/threadweaver_export.h
+lib/cmake/KDeclarative/KDeclarativeConfig.cmake
+lib/cmake/KDeclarative/KDeclarativeConfigVersion.cmake
+lib/cmake/KDeclarative/KDeclarativeLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KDeclarative/KDeclarativeLibraryTargets.cmake
 lib/kde4/emoticonstheme_adium.so
 lib/kde4/emoticonstheme_kde.so
 lib/kde4/emoticonstheme_pidgin.so
@@ -1974,9 +1978,6 @@ lib/kde4/plugins/script/libkrossqtsplugin.so
 lib/kde4/plugins/script/libkrossqtsplugin.so.5
 lib/kde4/plugins/script/libkrossqtsplugin.so.5.0.1
 lib/kde4/spellcheckplugin.so
-lib/libkactivities.so
-lib/libkactivities.so.7
-lib/libkactivities.so.7.0.1
 lib/libkcmutils.so
 lib/libkcmutils.so.5
 lib/libkcmutils.so.5.0.1
@@ -2267,8 +2268,6 @@ share/apps/kconf_update/kioslave.upd
 share/apps/kconf_update/ksslcertificatemanager.upd
 share/apps/kconf_update/ksslcertificatemanager.upd.sh
 share/apps/kconf_update/move_kio_help_cache.sh
-share/apps/kconf_update/plasma_popupapplet_fix_groups.pl
-share/apps/kconf_update/plasma_popupapplet_fix_groups.upd
 share/apps/kconf_update/proxytype.pl
 share/apps/kconf_update/useragent.pl
 share/apps/kdeui/about/bar-bottom-left.png
@@ -2936,6 +2935,7 @@ share/apps/ksgmltools2/customization/ru/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/ru/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/ru/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/ru/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/ru/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/ru/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/ru/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/ru/lang.entities
@@ -3471,7 +3471,6 @@ share/locale/all_languages
 share/locale/en_US/entry.desktop
 share/mime/all/all.xml
 share/mime/all/allfiles.xml
-share/mime/application/metalink+xml.xml
 share/mime/application/relaxng.xml
 share/mime/application/vnd.kde.fontspackage.xml
 share/mime/application/vnd.kde.kphotoalbum-import.xml
@@ -3484,11 +3483,6 @@ share/mime/application/x-icq.xml
 share/mime/application/x-java-applet.xml
 share/mime/application/x-kcachegrind.xml
 share/mime/application/x-kcsrc.xml
-share/mime/application/x-kexi-connectiondata.xml
-share/mime/application/x-kexiproject-shortcut.xml
-share/mime/application/x-kexiproject-sqlite.xml
-share/mime/application/x-kexiproject-sqlite2.xml
-share/mime/application/x-kexiproject-sqlite3.xml
 share/mime/application/x-kgeo.xml
 share/mime/application/x-kgetlist.xml
 share/mime/application/x-khtml-adaptor.xml
@@ -3508,8 +3502,7 @@ share/mime/application/x-kvtml.xml
 share/mime/application/x-kwallet.xml
 share/mime/application/x-kwordquiz.xml
 share/mime/application/x-mimearchive.xml
-share/mime/application/x-mobipocket-ebook.xml
-share/mime/application/x-nzb.xml
+share/mime/application/x-ms-shortcut.xml
 share/mime/application/x-plasma.xml
 share/mime/application/x-quanta.xml
 share/mime/application/x-smb-server.xml
@@ -3532,9 +3525,7 @@ share/mime/audio/x-pn-realaudio-plugin.xml
 share/mime/image/x-hdr.xml
 share/mime/image/x-kde-raw.xml
 share/mime/image/x-pic.xml
-share/mime/interface/x-winamp-skin.xml
 share/mime/packages/kde.xml
-share/mime/text/plain.xml
 share/mime/text/vnd.abc.xml
 share/mime/text/x-hex.xml
 share/mime/text/x-katefilelist.xml
@@ -3547,7 +3538,6 @@ share/mime/uri/rtspt.xml
 share/mime/uri/rtspu.xml
 share/mime/video/x-ms-wmp.xml
 @dirrmtry share/mime/uri
-@dirrmtry share/mime/interface
 @dirrmtry share/mime/all
 @dirrm share/kde4/services/qimageioplugins
 @dirrm share/doc/HTML/en/sonnet
@@ -3680,6 +3670,7 @@ share/mime/video/x-ms-wmp.xml
 @dirrm lib/kde4/plugins/kauth/backend
 @dirrm lib/kde4/plugins/kauth
 @dirrm lib/kde4/plugins/imageformats
+@dirrm lib/cmake/KDeclarative
 @dirrm include/threadweaver
 @dirrm include/sonnet
 @dirrmtry include/solid