The KDE/FreeBSD team is pleased to announce KDE Software Compilation

4.7.2. The official release notes can be found at:
http://kde.org/announcements/announce-4.7.2.php
This release ships with many improvements. Read more about them here:
http://FreeBSD.kde.org/news.php#itemKDESC472availableinports

We'd like to say thanks to all testers and contributors, especially to
lwhsu@ for his effort on hosting our test packages.

PR:		156293 [1]
		159219 [2]
		160164 [3]
Submitted by:	Oleg Sidorkin <osidorkin@gmail.com> [1]
		Alvaro Castillo <gobledb@gmail.com> [2]
		dkeav04@gmail.com [3]
Tested by:	exp-run via pav

10 files changed, 198 insertions, 364 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 3d8ed3af066c..13499f49b891 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -16,34 +16,32 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Base set of libraries needed by KDE programs
 
-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
-LIB_DEPENDS=	searchclient:${PORTSDIR}/deskutils/strigi \
+LIB_DEPENDS=	searchclient.0:${PORTSDIR}/deskutils/strigi \
 		soprano.4:${PORTSDIR}/textproc/soprano \
-		IlmImf:${PORTSDIR}/graphics/OpenEXR \
-		aspell:${PORTSDIR}/textproc/aspell \
-		jasper:${PORTSDIR}/graphics/jasper \
-		pcre:${PORTSDIR}/devel/pcre \
-		avahi-core:${PORTSDIR}/net/avahi-app \
+		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+		aspell.16:${PORTSDIR}/textproc/aspell \
+		jasper.4:${PORTSDIR}/graphics/jasper \
+		pcre.0:${PORTSDIR}/devel/pcre \
+		avahi-core.7:${PORTSDIR}/net/avahi-app \
 		enchant.1:${PORTSDIR}/textproc/enchant \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		png.6:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		idn:${PORTSDIR}/dns/libidn \
+		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		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 \
-		grantlee_gui.0:${PORTSDIR}/devel/grantlee
+		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 \
-		showrgb:${PORTSDIR}/x11/rgb \
-		iceauth:${PORTSDIR}/x11/iceauth \
 		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
@@ -52,25 +50,26 @@ CONFLICTS=	kdebase-runtime-4.5.[0-5]
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_KDE4=	kdeprefix kdehier automoc4 sharedmime oxygen
-KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
+USE_FAM=	yes
 USE_GETTEXT=	yes
-USE_BISON=	build
+USE_GNOME=	libxml2 libxslt
+USE_KDE4=	automoc4 kdehier kdeprefix oxygen sharedmime
+KDE4_BUILDENV=	yes
 USE_OPENSSL=	yes
+USE_PERL5=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib dbus gui network opengl qt3support \
-		qtestlib script sql svg xml designer phonon \
-		assistant svg qdbusviewer makeqpf imageformats \
-		qmake_build moc_build rcc_build uic_build
-USE_GNOME=	libxml2 libxslt
-USE_XORG=	xscrnsaver
-USE_FAM=	yes
+QT_COMPONENTS=	dbus declarative designer gui imageformats_run \
+		network opengl phonon qdbusviewer_run qt3support \
+		qtestlib script sql svg webkit xml \
+		moc_build qmake_build rcc_build uic_build
+USE_XORG=	sm x11 xcursor xext xfixes xrender xtst
 MAKE_JOBS_SAFE=	yes
 
 CMAKE_ARGS+=	-DWITH_ACL:BOOL=Off \
-		-DWITH_FAM:BOOL=On
-CMAKE_ARGS+=	-DHUPNP_INCLUDE_PATH:PATH="${LOCALBASE}/include"
+		-DWITH_FAM:BOOL=On \
+		-DHUPNP_INCLUDE_PATH:PATH="${LOCALBASE}/include" \
+		-D_KDE_DEFAULT_HOME_POSTFIX:STRING="4"
 
 MAN1=	checkXML.1 \
 	kde4-config.1 \
@@ -99,7 +98,7 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-ConfigureChecks.cmake
 .endif
 
 .if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) || defined(WITH_LIBDNS)
-LIB_DEPENDS+=	avahi-qt4:${PORTSDIR}/net/avahi-qt4 \
+LIB_DEPENDS+=	avahi-qt4.1:${PORTSDIR}/net/avahi-qt4 \
 		dns_sd:${PORTSDIR}/net/avahi-libdns
 .else
 LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
@@ -115,7 +114,7 @@ post-patch:
 		${PATCH_WRKSRC}/kio/kssl/kopenssl.cpp \
 		${PATCH_WRKSRC}/kio/kio/ksambashare.cpp \
 		${PATCH_WRKSRC}/kjsembed/qtonly/FindQJSInternal.cmake
-#Fix rgb named colors database path.
+# Fix rgb named colors database path.
 	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/kdeui/colors/kcolordialog.cpp
 # Ports fails to locate pimlibs and workspace when PREFIX!=KDE4_PREFIX.
@@ -140,8 +139,9 @@ pre-configure:
 #	${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \
 #		-e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \
 #		${PATCH_WRKSRC}/cmake/modules/FindBerkeleyDB.cmake
-# default KDEHOME dir
-	${REINPLACE_CMD} -e '/KDE_DEFAULT_HOME/s|.kde|.kde4|' \
+# When XSync (xext) is found, xscreensaver is just used as a fallback,
+# then we can disable it.
+	${REINPLACE_CMD} -e '/macro_bool_to_01/ s|^.*X11_Xscreensaver.*$$|set(HAVE_XSCREENSAVER 0)|' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 
 post-install:
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 765435bbbd10..24c7a546bfdd 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdelibs-4.6.5.tar.bz2) = d7b0de699f6db29a6309053719a523f2516a08e77b951d15610aeb11ea9d5ba0
-SIZE (KDE/kdelibs-4.6.5.tar.bz2) = 12917554
+SHA256 (KDE/kdelibs-4.7.2.tar.bz2) = bfa70b33d2153c209a21735d73ae061772c59696c1715881191da7a3993f8b38
+SIZE (KDE/kdelibs-4.7.2.tar.bz2) = 12066803
diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
index d03cd7efecb5..3e9468a8ea52 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.6.0")
+-set(GENERIC_LIB_VERSION "4.7.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.6.0")
+-set(KDE_NON_GENERIC_LIB_VERSION "5.7.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_FindKdcraw.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
index b706d00de0fe..ebe252b8fcb7 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
@@ -1,54 +1,53 @@
---- ./cmake/modules/FindKdcraw.cmake.orig	2009-05-08 02:16:53.000000000 +0400
-+++ ./cmake/modules/FindKdcraw.cmake	2009-09-23 00:36:17.000000000 +0400
-@@ -45,63 +45,33 @@
+--- cmake/modules/FindKdcraw.cmake.orig	2011-05-20 22:24:53.000000000 +0200
++++ cmake/modules/FindKdcraw.cmake	2011-07-31 04:06:34.029187418 +0200
+@@ -59,63 +59,32 @@
  
    else(KDCRAW_LOCAL_FOUND)
  
 -    message(STATUS "Check Kdcraw library using pkg-config...")
-     if(NOT WIN32)
+     if (NOT WIN32)
 +      message(STATUS "Check Kdcraw library using pkg-config...")
-+
        # use pkg-config to get the directories and then use these values
        # in the FIND_PATH() and FIND_LIBRARY() calls
--      INCLUDE(UsePkgConfig)
+-      include(UsePkgConfig)
 -    
 -      PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags)
 -    
--      if(_KDCRAWLinkFlags)
+-      if (_KDCRAWLinkFlags)
 -        # query pkg-config asking for a libkdcraw >= 0.2.0
--        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
--        if(_return_VALUE STREQUAL "0")
+-        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+-        if (_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkdcraw release >= 0.2.0")
 -            set(KDCRAW_VERSION_GOOD_FOUND TRUE)
--        else(_return_VALUE STREQUAL "0")
+-        else (_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkdcaw release < 0.2.0, too old")
 -            set(KDCRAW_VERSION_GOOD_FOUND FALSE)
 -            set(KDCRAW_FOUND FALSE)
--        endif(_return_VALUE STREQUAL "0")
--      else(_KDCRAWLinkFlags)
+-        endif (_return_VALUE STREQUAL "0")
+-      else (_KDCRAWLinkFlags)
 -        set(KDCRAW_VERSION_GOOD_FOUND FALSE)
 -        set(KDCRAW_FOUND FALSE)
--      endif(_KDCRAWLinkFlags)
--    ELSE(NOT WIN32)
+-      endif (_KDCRAWLinkFlags)
+-    else (NOT WIN32)
 -      set(KDCRAW_VERSION_GOOD_FOUND TRUE)
--    ENDif(NOT WIN32)
+-    endif (NOT WIN32)
 +      include(FindPkgConfig)
 +      pkg_check_modules(PC_LIBKDCRAW libkdcraw-kde4>=0.2.0)
 +      set(KDCRAW_DEFINITIONS ${PC_LIBKDCRAW_CFLAGS_OTHER})
 +    endif(NOT WIN32)
  
--    if(KDCRAW_VERSION_GOOD_FOUND)
+-    if (KDCRAW_VERSION_GOOD_FOUND)
 -        set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
 -    
--        FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h
+-        find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h
 -        ${_KDCRAWIncDir}
 +    find_path(KDCRAW_INCLUDE_DIR NAMES libkdcraw/version.h
 +        HINTS
 +        ${PC_LIBKDCRAW_INCLUDEDIR}
 +        ${PC_LIBKDCRAW_INCLUDE_DIRS}
          )
--    
--        FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw
+     
+-        find_library(KDCRAW_LIBRARIES NAMES kdcraw
 -        PATHS
 -        ${_KDCRAWLinkDir}
 +    find_library(KDCRAW_LIBRARY NAMES kdcraw
@@ -56,11 +55,11 @@
 +        ${PC_LIBKDCRAW_LIBDIR}
 +        ${PC_LIBKDCRAW_LIBRARY_DIRS}
          )
--    
+     
 -        if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
 -            set(KDCRAW_FOUND TRUE)
 -        endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
--     endif(KDCRAW_VERSION_GOOD_FOUND) 
+-     endif (KDCRAW_VERSION_GOOD_FOUND) 
 -     if (KDCRAW_FOUND)
 -         if (NOT Kdcraw_FIND_QUIETLY)
 -             message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
@@ -75,13 +74,11 @@
 -             endif (NOT KDCRAW_LIBRARIES)
 -         endif (Kdcraw_FIND_REQUIRED)
 -     endif (KDCRAW_FOUND)
-+
 +    include(FindPackageHandleStandardArgs)
 +    find_package_handle_standard_args(Kdcraw DEFAULT_MSG KDCRAW_LIBRARY KDCRAW_INCLUDE_DIR)
-+
 +    if(KDCRAW_FOUND)
 +       set(KDCRAW_LIBRARIES ${KDCRAW_LIBRARY})
 +    endif(KDCRAW_FOUND)
      
-     MARK_AS_ADVANCED(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES)
+     mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS)
  
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
index c243accfb041..a34c0668c78f 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
@@ -1,16 +1,16 @@
---- ./cmake/modules/FindKexiv2.cmake.orig	2009-01-06 20:27:37.000000000 +0300
-+++ ./cmake/modules/FindKexiv2.cmake	2009-09-23 00:38:15.000000000 +0400
-@@ -47,60 +47,29 @@
+--- cmake/modules/FindKexiv2.cmake.orig	2011-05-20 22:24:53.000000000 +0200
++++ cmake/modules/FindKexiv2.cmake	2011-07-31 04:11:37.659261791 +0200
+@@ -62,59 +62,28 @@
  
        # use pkg-config to get the directories and then use these values
        # in the FIND_PATH() and FIND_LIBRARY() calls
--      INCLUDE(UsePkgConfig)
+-      include(UsePkgConfig)
 -    
 -      PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags)
 -    
 -      if(_KEXIV2LinkFlags)
 -        # query pkg-config asking for a libkexiv2 >= 0.2.0
--        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+-        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
 -        if(_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkexiv2 release >= 0.2.0")
 -            set(KEXIV2_VERSION_GOOD_FOUND TRUE)
@@ -33,15 +33,15 @@
 -    if(KEXIV2_VERSION_GOOD_FOUND)
 -        set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}")
 -    
--        FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h
+-        find_path(KEXIV2_INCLUDE_DIR libkexiv2/version.h
 -        ${_KEXIV2IncDir}
 +    find_path(KEXIV2_INCLUDE_DIR NAMES libkexiv2/version.h
 +        HINTS
 +        ${PC_LIBKEXIV2_INCLUDEDIR}
 +        ${PC_LIBKEXIV2_INCLUDE_DIRS}
          )
--    
--        FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2
+     
+-        find_library(KEXIV2_LIBRARIES NAMES kexiv2
 -        PATHS
 -        ${_KEXIV2LinkDir}
 +    find_library(KEXIV2_LIBRARY NAMES kexiv2
@@ -49,7 +49,7 @@
 +        ${PC_LIBKEXIV2_LIBDIR}
 +        ${PC_LIBKEXIV2_LIBRARY_DIRS}
          )
--    
+     
 -        if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
 -            set(KEXIV2_FOUND TRUE)
 -        endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
@@ -68,15 +68,11 @@
 -              endif (NOT KEXIV2_LIBRARIES)
 -          endif (Kexiv2_FIND_REQUIRED)
 -      endif (KEXIV2_FOUND)
--    
-+
 +    include(FindPackageHandleStandardArgs)
 +    find_package_handle_standard_args(Kexiv2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR)
-+
 +    if(KEXIV2_FOUND)
 +       set(KEXIV2_LIBRARIES ${KEXIV2_LIBRARY})
 +    endif(KEXIV2_FOUND)
-+
-     MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES)
+     
+     mark_as_advanced(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES KEXIV2_DEFINITIONS)
  
-   endif(KEXIV2_LOCAL_FOUND)
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
index 814d692694fd..f26b75067657 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
@@ -1,54 +1,44 @@
---- ./cmake/modules/FindKipi.cmake.orig	2009-01-06 20:27:37.000000000 +0300
-+++ ./cmake/modules/FindKipi.cmake	2009-09-23 00:39:53.000000000 +0400
-@@ -48,52 +48,28 @@
+--- cmake/modules/FindKipi.cmake.orig	2011-05-20 22:24:53.000000000 +0200
++++ cmake/modules/FindKipi.cmake	2011-07-31 04:14:21.939197375 +0200
+@@ -62,52 +62,26 @@
  
        # use pkg-config to get the directories and then use these values
        # in the FIND_PATH() and FIND_LIBRARY() calls
--      INCLUDE(UsePkgConfig)
+-      include(UsePkgConfig)
 -
 -      PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags)
 -
--      if(_KIPILinkFlags)
+-      if (_KIPILinkFlags)
 -        # query pkg-config asking for a libkipi >= 0.2.0
 -        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
--        if(_return_VALUE STREQUAL "0")
+-        if (_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkipi release >= 0.2.0")
 -            set(KIPI_VERSION_GOOD_FOUND TRUE)
--        else(_return_VALUE STREQUAL "0")
+-        else (_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkipi release < 0.2.0, too old")
 -            set(KIPI_VERSION_GOOD_FOUND FALSE)
 -            set(KIPI_FOUND FALSE)
--        endif(_return_VALUE STREQUAL "0")
--      else(_KIPILinkFlags)
+-        endif (_return_VALUE STREQUAL "0")
+-      else (_KIPILinkFlags)
 -        set(KIPI_VERSION_GOOD_FOUND FALSE)
 -        set(KIPI_FOUND FALSE)
--      endif(_KIPILinkFlags)
--    else(NOT WIN32)
+-      endif (_KIPILinkFlags)
+-    else (NOT WIN32)
 -      set(KIPI_VERSION_GOOD_FOUND TRUE)
 +      include(FindPkgConfig)
-+      pkg_check_modules(PC_LIBKIPI libkexiv2-kde4>=0.2.0)
++      pkg_check_modules(PC_LIBKIPI libkipi-kde4>=0.2.0)
 +      set(KIPI_DEFINITIONS ${PC_LIBKIPI_CFLAGS_OTHER})
-     endif(NOT WIN32)
--    if(KIPI_VERSION_GOOD_FOUND)
+     endif (NOT WIN32)
+-    if (KIPI_VERSION_GOOD_FOUND)
 -        set(KIPI_DEFINITIONS ${_KIPICflags})
- 
+-
 -        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir})
 -        find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir})
-+    find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h
-+        HINTS
-+        ${PC_LIBKIPI_INCLUDEDIR}
-+        ${PC_LIBKIPI_INCLUDE_DIRS}
-+        )
-+    find_library(KIPI_LIBRARY NAMES kipi
-+        HINTS
-+        ${PC_LIBKIPI_LIBDIR}
-+        ${PC_LIBKIPI_LIBRARY_DIRS}
-+        )
- 
+-
 -        if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
 -            set(KIPI_FOUND TRUE)
 -        endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
--      endif(KIPI_VERSION_GOOD_FOUND)
+-      endif (KIPI_VERSION_GOOD_FOUND)
 -      if (KIPI_FOUND)
 -          if (NOT Kipi_FIND_QUIETLY)
 -              message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
@@ -63,12 +53,22 @@
 -              endif (NOT KIPI_LIBRARIES)
 -          endif (Kipi_FIND_REQUIRED)
 -      endif (KIPI_FOUND)
++    find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h
++        HINTS
++        ${PC_LIBKIPI_INCLUDEDIR}
++        ${PC_LIBKIPI_INCLUDE_DIRS}
++        )
++    find_library(KIPI_LIBRARY NAMES kipi
++        HINTS
++        ${PC_LIBKIPI_LIBDIR}
++        ${PC_LIBKIPI_LIBRARY_DIRS}
++        )
++
 +    include(FindPackageHandleStandardArgs)
 +    find_package_handle_standard_args(Kipi DEFAULT_MSG KIPI_LIBRARY KIPI_INCLUDE_DIR)
-+
 +    if(KIPI_FOUND)
 +       set(KIPI_LIBRARIES ${KIPI_LIBRARY})
 +    endif(KIPI_FOUND)
-     
-     MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES)
+ 
+     mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS)
  
diff --git a/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h b/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h
new file mode 100644
index 000000000000..bfe1c2b4bf16
--- /dev/null
+++ b/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h
@@ -0,0 +1,63 @@
+--- ./nepomuk/query/querybuilderdata_p.h
++++ ./nepomuk/query/querybuilderdata_p.h
+@@ -32,6 +32,28 @@
+ #include "query_p.h"
+ #include "groupterm_p.h"
+ 
++namespace {
++/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
++/// utf8 chars which use more than one char, ie. wide chars.
++/// Thus, we simply truncate each term at the first wide char.
++QStringList stripExtendedCharsHack(const QStringList& terms) {
++    QStringList newTerms;
++    foreach(const QString& term, terms) {
++        int i = 0;
++        while(i < term.length()) {
++            if(term[i].unicode() > 0x7f) {
++                break;
++            }
++            ++i;
++        }
++        if(i > 0) {
++            newTerms.append(term.left(i));
++        }
++    }
++    return newTerms;
++}
++}
++
+ namespace Nepomuk {
+     namespace Query {
+         class QueryBuilderData
+@@ -246,16 +268,23 @@ namespace Nepomuk {
+                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
+                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
+                         const QString& varName = it.key();
+-                        const QStringList& terms = it.value();
+-                        // bif:search_excerpt wants a vector of all search terms
+-                        excerptParts
+-                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
+-                            .arg( terms.join(QLatin1String("','")),
+-                                  varName );
++                        const QStringList terms = stripExtendedCharsHack(it.value());
++                        if(terms.count()) {
++                            // bif:search_excerpt wants a vector of all search terms
++                            excerptParts
++                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
++                                       .arg( terms.join(QLatin1String("','")),
++                                             varName );
++                        }
+                     }
+ 
+-                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
+-                        .arg(excerptParts.join(QLatin1String(",")));
++                    if(excerptParts.count()) {
++                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
++                                .arg(excerptParts.join(QLatin1String(",")));
++                    }
++                    else {
++                        return QString();
++                    }
+                 }
+                 else {
+                     return QString();
diff --git a/x11/kdelibs4/files/patch-solid_solid_backends_hal_haldevice.cpp b/x11/kdelibs4/files/patch-solid_solid_backends_hal_haldevice.cpp
deleted file mode 100644
index 2bec2d0b9ca3..000000000000
--- a/x11/kdelibs4/files/patch-solid_solid_backends_hal_haldevice.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./solid/solid/backends/hal/haldevice.cpp.orig	2011-02-25 22:53:32.000000000 +0100
-+++ ./solid/solid/backends/hal/haldevice.cpp	2011-03-14 11:44:20.293518650 +0100
-@@ -199,7 +199,7 @@
-             return "computer";
-         }
- 
--    } else if (category=="storage") {
-+    } else if (category=="storage" || category=="storage.cdrom") {
- 
-         if (prop("storage.drive_type").toString()=="floppy") {
-             return "media-floppy";
-@@ -222,7 +222,7 @@
- 
-         return "drive-harddisk";
- 
--    } else if (category=="volume") {
-+    } else if (category=="volume" || category=="volume.disc") {
- 
-         QStringList capabilities = prop("info.capabilities").toStringList();
- 
-@@ -350,9 +350,9 @@
- {
-     QString category = prop("info.category").toString();
- 
--    if (category=="storage") {
-+    if (category=="storage" || category=="storage.cdrom") {
-         return storageDescription();
--    } else if (category=="volume") {
-+    } else if (category=="volume" || category=="volume.disc") {
-         return volumeDescription();
-     } else if (category=="net.80211") {
-         return QObject::tr("WLAN Interface");
diff --git a/x11/kdelibs4/pkg-descr b/x11/kdelibs4/pkg-descr
index 1813dd4f9d16..c4bf59bb9ce5 100644
--- a/x11/kdelibs4/pkg-descr
+++ b/x11/kdelibs4/pkg-descr
@@ -1,3 +1,3 @@
 This is the base set of libraries needed by KDE programs.
 
-WWW: http://www.kde.org/
+WWW: http://www.kde.org
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index ee80b22e97c0..b0bd253f06fd 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -7,6 +7,7 @@ bin/kded4
 bin/kdeinit4
 bin/kdeinit4_shutdown
 bin/kdeinit4_wrapper
+bin/kfilemetadatareader
 bin/kjs
 bin/kjscmd
 bin/kross
@@ -301,9 +302,11 @@ include/KDE/KDEsuClient
 include/KDE/KDataTool
 include/KDE/KDataToolAction
 include/KDE/KDataToolInfo
+include/KDE/KDateComboBox
 include/KDE/KDatePicker
 include/KDE/KDateTable
 include/KDE/KDateTime
+include/KDE/KDateTimeEdit
 include/KDE/KDateTimeWidget
 include/KDE/KDateValidator
 include/KDE/KDateWidget
@@ -342,6 +345,7 @@ include/KDE/KFileItemActions
 include/KDE/KFileItemDelegate
 include/KDE/KFileItemList
 include/KDE/KFileItemListProperties
+include/KDE/KFileMetaDataWidget
 include/KDE/KFileMetaInfo
 include/KDE/KFileMetaInfoGroup
 include/KDE/KFileMetaInfoItem
@@ -365,6 +369,7 @@ include/KDE/KFontComboBox
 include/KDE/KFontDialog
 include/KDE/KFontRequester
 include/KDE/KFontSizeAction
+include/KDE/KFontUtils
 include/KDE/KGenericFactory
 include/KDE/KGenericFactoryBase
 include/KDE/KGlobal
@@ -400,6 +405,7 @@ include/KDE/KIO/FileCopyJob
 include/KDE/KIO/FileJob
 include/KDE/KIO/ForwardingSlaveBase
 include/KDE/KIO/Job
+include/KDE/KIO/JobClasses
 include/KDE/KIO/JobUiDelegate
 include/KDE/KIO/ListJob
 include/KDE/KIO/MetaData
@@ -466,6 +472,7 @@ include/KDE/KMessage
 include/KDE/KMessageBox
 include/KDE/KMessageBoxMessageHandler
 include/KDE/KMessageHandler
+include/KDE/KMessageWidget
 include/KDE/KMimeType
 include/KDE/KMimeTypeChooser
 include/KDE/KMimeTypeChooserDialog
@@ -514,6 +521,7 @@ include/KDE/KNetwork/KSocketDeviceFactory
 include/KDE/KNetwork/KSocksSocketDevice
 include/KDE/KNetwork/KStreamSocket
 include/KDE/KNetwork/KUnixSocketAddress
+include/KDE/KNewFileMenu
 include/KDE/KNotification
 include/KDE/KNotificationRestrictions
 include/KDE/KNotifyConfigWidget
@@ -590,6 +598,7 @@ include/KDE/KPtyProcess
 include/KDE/KPushButton
 include/KDE/KRandom
 include/KDE/KRandomSequence
+include/KDE/KRatingWidget
 include/KDE/KRecentDocument
 include/KDE/KRecentFilesAction
 include/KDE/KRemoteEncoding
@@ -601,6 +610,7 @@ include/KDE/KRichTextWidget
 include/KDE/KRuler
 include/KDE/KRun
 include/KDE/KSambaShare
+include/KDE/KSambaShareData
 include/KDE/KSaveFile
 include/KDE/KScanDialog
 include/KDE/KSelectAction
@@ -625,6 +635,7 @@ include/KDE/KSharedPtr
 include/KDE/KShell
 include/KDE/KShellCompletion
 include/KDE/KShortcut
+include/KDE/KShortcutWidget
 include/KDE/KShortcutsDialog
 include/KDE/KShortcutsEditor
 include/KDE/KSocks
@@ -699,6 +710,7 @@ include/KDE/KTextEditor/TemplateInterface2
 include/KDE/KTextEditor/TextHintInterface
 include/KDE/KTextEditor/VariableInterface
 include/KDE/KTextEditor/View
+include/KDE/KTimeComboBox
 include/KDE/KTimeZone
 include/KDE/KTimeZoneData
 include/KDE/KTimeZoneSource
@@ -837,6 +849,7 @@ include/KDE/Nepomuk/Variant
 include/KDE/Nepomuk/Vocabulary/NCAL
 include/KDE/Nepomuk/Vocabulary/NCO
 include/KDE/Nepomuk/Vocabulary/NDO
+include/KDE/Nepomuk/Vocabulary/NEXIF
 include/KDE/Nepomuk/Vocabulary/NFO
 include/KDE/Nepomuk/Vocabulary/NIE
 include/KDE/Nepomuk/Vocabulary/NMM
@@ -941,6 +954,7 @@ include/KDE/Solid/DeviceNotifier
 include/KDE/Solid/DvbInterface
 include/KDE/Solid/GenericInterface
 include/KDE/Solid/NetworkInterface
+include/KDE/Solid/NetworkShare
 include/KDE/Solid/Networking
 include/KDE/Solid/OpticalDisc
 include/KDE/Solid/OpticalDrive
@@ -1087,11 +1101,15 @@ 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
 include/kar.h
 include/karchive.h
+include/karchive_export.h
 include/karrowbutton.h
 include/kascii.h
 include/kassistantdialog.h
@@ -1163,9 +1181,11 @@ include/kcrash.h
 include/kcurrencycode.h
 include/kcursor.h
 include/kdatatool.h
+include/kdatecombobox.h
 include/kdatepicker.h
 include/kdatetable.h
 include/kdatetime.h
+include/kdatetimeedit.h
 include/kdatetimewidget.h
 include/kdatewidget.h
 include/kdbusservicestarter.h
@@ -1174,6 +1194,8 @@ include/kde_file.h
 include/kde_terminal_interface.h
 include/kde_terminal_interface_v2.h
 include/kdebug.h
+include/kdeclarative.h
+include/kdeclarative_export.h
 include/kdecore_export.h
 include/kdedmodule.h
 include/kdefakes.h
@@ -1254,6 +1276,7 @@ include/kfontcombobox.h
 include/kfontdialog.h
 include/kfontrequester.h
 include/kfontsizeaction.h
+include/kfontutils.h
 include/kgenericfactory.h
 include/kgenericfactory.tcc
 include/kgesture.h
@@ -1372,6 +1395,7 @@ include/kmenubar.h
 include/kmessage.h
 include/kmessagebox.h
 include/kmessageboxmessagehandler.h
+include/kmessagewidget.h
 include/kmimetype.h
 include/kmimetypechooser.h
 include/kmimetyperesolver.h
@@ -1501,6 +1525,7 @@ include/kross/ui/view.h
 include/kruler.h
 include/krun.h
 include/ksambashare.h
+include/ksambasharedata.h
 include/ksavefile.h
 include/kscan.h
 include/kselectaction.h
@@ -1606,6 +1631,7 @@ include/ktexteditor/templateinterface2.h
 include/ktexteditor/texthintinterface.h
 include/ktexteditor/variableinterface.h
 include/ktexteditor/view.h
+include/ktimecombobox.h
 include/ktimezone.h
 include/ktimezonewidget.h
 include/ktip.h
@@ -1843,6 +1869,7 @@ include/solid/genericinterface.h
 include/solid/internetgateway.h
 include/solid/networking.h
 include/solid/networkinterface.h
+include/solid/networkshare.h
 include/solid/opticaldisc.h
 include/solid/opticaldrive.h
 include/solid/portablemediaplayer.h
@@ -1882,7 +1909,6 @@ lib/kde4/emoticonstheme_adium.so
 lib/kde4/emoticonstheme_kde.so
 lib/kde4/emoticonstheme_pidgin.so
 lib/kde4/emoticonstheme_xmpp.so
-lib/kde4/katepart.so
 lib/kde4/kcm_ssl.so
 lib/kde4/kded_kcookiejar.so
 lib/kde4/kded_kssld.so
@@ -1905,14 +1931,6 @@ lib/kde4/krossqts.so
 lib/kde4/kspell_aspell.so
 lib/kde4/kspell_enchant.so
 lib/kde4/kspell_hspell.so
-lib/kde4/ktexteditor_autobrace.so
-lib/kde4/ktexteditor_exporter.so
-lib/kde4/ktexteditor_hlselection.so
-lib/kde4/ktexteditor_iconinserter.so
-lib/kde4/ktexteditor_insanehtml_le.so
-lib/kde4/ktexteditor_insertfile.so
-lib/kde4/ktexteditor_kdatatool.so
-lib/kde4/ktexteditor_python-encoding.so
 lib/kde4/ktranscript.so
 lib/kde4/libexec/filesharelist
 lib/kde4/libexec/fileshareset
@@ -1954,15 +1972,18 @@ 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/libkatepartinterfaces.so
-lib/libkatepartinterfaces.so.5
-lib/libkatepartinterfaces.so.5.0.1
+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
 lib/libkde3support.so
 lib/libkde3support.so.5
 lib/libkde3support.so.5.0.1
+lib/libkdeclarative.so
+lib/libkdeclarative.so.7
+lib/libkdeclarative.so.7.0.1
 lib/libkdecore.so
 lib/libkdecore.so.7
 lib/libkdecore.so.7.0.1
@@ -2235,192 +2256,6 @@ share/apps/cmake/modules/kde4automoc.files.in
 share/apps/cmake/modules/kde4init_dummy.cpp.in
 share/apps/cmake/modules/kde4init_win32lib_dummy.cpp.in
 share/apps/cmake/modules/kde4uic.cmake
-share/apps/katepart/api/05_cursor.js
-share/apps/katepart/api/10_range.js
-share/apps/katepart/katepartsimpleui.rc
-share/apps/katepart/katepartui.rc
-share/apps/katepart/script/cstyle.js
-share/apps/katepart/script/haskell.js
-share/apps/katepart/script/lilypond.js
-share/apps/katepart/script/lisp.js
-share/apps/katepart/script/lua.js
-share/apps/katepart/script/python.js
-share/apps/katepart/script/ruby.js
-share/apps/katepart/script/utils.js
-share/apps/katepart/script/xml.js
-share/apps/katepart/syntax/abap.xml
-share/apps/katepart/syntax/abc.xml
-share/apps/katepart/syntax/actionscript.xml
-share/apps/katepart/syntax/ada.xml
-share/apps/katepart/syntax/ahdl.xml
-share/apps/katepart/syntax/alert.xml
-share/apps/katepart/syntax/alert_indent.xml
-share/apps/katepart/syntax/ample.xml
-share/apps/katepart/syntax/ansic89.xml
-share/apps/katepart/syntax/ansys.xml
-share/apps/katepart/syntax/apache.xml
-share/apps/katepart/syntax/asm-avr.xml
-share/apps/katepart/syntax/asm-dsp56k.xml
-share/apps/katepart/syntax/asm-m68k.xml
-share/apps/katepart/syntax/asm6502.xml
-share/apps/katepart/syntax/asn1.xml
-share/apps/katepart/syntax/asp.xml
-share/apps/katepart/syntax/asterisk.xml
-share/apps/katepart/syntax/awk.xml
-share/apps/katepart/syntax/bash.xml
-share/apps/katepart/syntax/bibtex.xml
-share/apps/katepart/syntax/bmethod.xml
-share/apps/katepart/syntax/boo.xml
-share/apps/katepart/syntax/c.xml
-share/apps/katepart/syntax/cg.xml
-share/apps/katepart/syntax/cgis.xml
-share/apps/katepart/syntax/changelog.xml
-share/apps/katepart/syntax/cisco.xml
-share/apps/katepart/syntax/clipper.xml
-share/apps/katepart/syntax/cmake.xml
-share/apps/katepart/syntax/coldfusion.xml
-share/apps/katepart/syntax/commonlisp.xml
-share/apps/katepart/syntax/component-pascal.xml
-share/apps/katepart/syntax/cpp.xml
-share/apps/katepart/syntax/cs.xml
-share/apps/katepart/syntax/css-php.xml
-share/apps/katepart/syntax/css.xml
-share/apps/katepart/syntax/cue.xml
-share/apps/katepart/syntax/d.xml
-share/apps/katepart/syntax/debianchangelog.xml
-share/apps/katepart/syntax/debiancontrol.xml
-share/apps/katepart/syntax/desktop.xml
-share/apps/katepart/syntax/diff.xml
-share/apps/katepart/syntax/djangotemplate.xml
-share/apps/katepart/syntax/doxygen.xml
-share/apps/katepart/syntax/doxygenlua.xml
-share/apps/katepart/syntax/dtd.xml
-share/apps/katepart/syntax/e.xml
-share/apps/katepart/syntax/eiffel.xml
-share/apps/katepart/syntax/email.xml
-share/apps/katepart/syntax/erlang.xml
-share/apps/katepart/syntax/euphoria.xml
-share/apps/katepart/syntax/ferite.xml
-share/apps/katepart/syntax/fgl-4gl.xml
-share/apps/katepart/syntax/fgl-per.xml
-share/apps/katepart/syntax/fortran.xml
-share/apps/katepart/syntax/freebasic.xml
-share/apps/katepart/syntax/fstab.xml
-share/apps/katepart/syntax/gap.xml
-share/apps/katepart/syntax/gdb.xml
-share/apps/katepart/syntax/gdl.xml
-share/apps/katepart/syntax/gettext.xml
-share/apps/katepart/syntax/glsl.xml
-share/apps/katepart/syntax/gnuassembler.xml
-share/apps/katepart/syntax/go.xml
-share/apps/katepart/syntax/grammar.xml
-share/apps/katepart/syntax/haskell.xml
-share/apps/katepart/syntax/haxe.xml
-share/apps/katepart/syntax/html-php.xml
-share/apps/katepart/syntax/html.xml
-share/apps/katepart/syntax/idconsole.xml
-share/apps/katepart/syntax/idl.xml
-share/apps/katepart/syntax/ilerpg.xml
-share/apps/katepart/syntax/inform.xml
-share/apps/katepart/syntax/ini.xml
-share/apps/katepart/syntax/java.xml
-share/apps/katepart/syntax/javadoc.xml
-share/apps/katepart/syntax/javascript-php.xml
-share/apps/katepart/syntax/javascript.xml
-share/apps/katepart/syntax/json.xml
-share/apps/katepart/syntax/jsp.xml
-share/apps/katepart/syntax/kbasic.xml
-share/apps/katepart/syntax/language.dtd
-share/apps/katepart/syntax/latex.xml
-share/apps/katepart/syntax/ldif.xml
-share/apps/katepart/syntax/lex.xml
-share/apps/katepart/syntax/lilypond.xml
-share/apps/katepart/syntax/literate-haskell.xml
-share/apps/katepart/syntax/logtalk.xml
-share/apps/katepart/syntax/lpc.xml
-share/apps/katepart/syntax/lsl.xml
-share/apps/katepart/syntax/lua.xml
-share/apps/katepart/syntax/m3u.xml
-share/apps/katepart/syntax/mab.xml
-share/apps/katepart/syntax/makefile.xml
-share/apps/katepart/syntax/mandoc.xml
-share/apps/katepart/syntax/mason.xml
-share/apps/katepart/syntax/matlab.xml
-share/apps/katepart/syntax/maxima.xml
-share/apps/katepart/syntax/mediawiki.xml
-share/apps/katepart/syntax/mergetagtext.xml
-share/apps/katepart/syntax/mips.xml
-share/apps/katepart/syntax/modelica.xml
-share/apps/katepart/syntax/modula-2.xml
-share/apps/katepart/syntax/monobasic.xml
-share/apps/katepart/syntax/mup.xml
-share/apps/katepart/syntax/nasm.xml
-share/apps/katepart/syntax/nemerle.xml
-share/apps/katepart/syntax/noweb.xml
-share/apps/katepart/syntax/objectivec.xml
-share/apps/katepart/syntax/objectivecpp.xml
-share/apps/katepart/syntax/ocaml.xml
-share/apps/katepart/syntax/octave.xml
-share/apps/katepart/syntax/opal.xml
-share/apps/katepart/syntax/pango.xml
-share/apps/katepart/syntax/pascal.xml
-share/apps/katepart/syntax/perl.xml
-share/apps/katepart/syntax/pgn.xml
-share/apps/katepart/syntax/php.xml
-share/apps/katepart/syntax/picsrc.xml
-share/apps/katepart/syntax/pike.xml
-share/apps/katepart/syntax/postscript.xml
-share/apps/katepart/syntax/povray.xml
-share/apps/katepart/syntax/progress.xml
-share/apps/katepart/syntax/prolog.xml
-share/apps/katepart/syntax/purebasic.xml
-share/apps/katepart/syntax/python.xml
-share/apps/katepart/syntax/qml.xml
-share/apps/katepart/syntax/r.xml
-share/apps/katepart/syntax/rapidq.xml
-share/apps/katepart/syntax/rexx.xml
-share/apps/katepart/syntax/rhtml.xml
-share/apps/katepart/syntax/rib.xml
-share/apps/katepart/syntax/roff.xml
-share/apps/katepart/syntax/rpmspec.xml
-share/apps/katepart/syntax/rsiidl.xml
-share/apps/katepart/syntax/ruby.xml
-share/apps/katepart/syntax/sather.xml
-share/apps/katepart/syntax/scala.xml
-share/apps/katepart/syntax/scheme.xml
-share/apps/katepart/syntax/sci.xml
-share/apps/katepart/syntax/sgml.xml
-share/apps/katepart/syntax/sieve.xml
-share/apps/katepart/syntax/sisu.xml
-share/apps/katepart/syntax/sml.xml
-share/apps/katepart/syntax/spice.xml
-share/apps/katepart/syntax/sql-mysql.xml
-share/apps/katepart/syntax/sql-postgresql.xml
-share/apps/katepart/syntax/sql.xml
-share/apps/katepart/syntax/stata.xml
-share/apps/katepart/syntax/syntax.template
-share/apps/katepart/syntax/systemc.xml
-share/apps/katepart/syntax/tcl.xml
-share/apps/katepart/syntax/texinfo.xml
-share/apps/katepart/syntax/tibasic.xml
-share/apps/katepart/syntax/txt2tags.xml
-share/apps/katepart/syntax/uscript.xml
-share/apps/katepart/syntax/velocity.xml
-share/apps/katepart/syntax/verilog.xml
-share/apps/katepart/syntax/vhdl.xml
-share/apps/katepart/syntax/vrml.xml
-share/apps/katepart/syntax/winehq.xml
-share/apps/katepart/syntax/wml.xml
-share/apps/katepart/syntax/xharbour.xml
-share/apps/katepart/syntax/xml.xml
-share/apps/katepart/syntax/xmldebug.xml
-share/apps/katepart/syntax/xorg.xml
-share/apps/katepart/syntax/xslt.xml
-share/apps/katepart/syntax/xul.xml
-share/apps/katepart/syntax/yacas.xml
-share/apps/katepart/syntax/yacc.xml
-share/apps/katepart/syntax/yaml.xml
-share/apps/katepart/syntax/zonnon.xml
 share/apps/kauth/dbus_policy.stub
 share/apps/kauth/dbus_service.stub
 share/apps/kcharselect/kcharselect-data
@@ -3331,7 +3166,6 @@ share/apps/ksgmltools2/customization/xsl/et.xml
 share/apps/ksgmltools2/customization/xsl/fr.xml
 share/apps/ksgmltools2/customization/xsl/gl.xml
 share/apps/ksgmltools2/customization/xsl/it.xml
-share/apps/ksgmltools2/customization/xsl/kde-custom-l10n.xml
 share/apps/ksgmltools2/customization/xsl/lt.xml
 share/apps/ksgmltools2/customization/xsl/nds.xml
 share/apps/ksgmltools2/customization/xsl/nl.xml
@@ -3402,12 +3236,6 @@ share/apps/ksgmltools2/customization/zh-TW/lang.entities
 share/apps/ksgmltools2/customization/zh-TW/strings.entities
 share/apps/ksgmltools2/customization/zh-TW/user.entities
 share/apps/kssl/ca-bundle.crt
-share/apps/ktexteditor_exporter/ktexteditor_exporterui.rc
-share/apps/ktexteditor_iconinserter/ktexteditor_iconinserterui.rc
-share/apps/ktexteditor_insanehtml_le/insanehtml_le_ui.rc
-share/apps/ktexteditor_insanehtml_le/xhtml.cfg
-share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
-share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
 share/apps/plasma/services/dataengineservice.operations
 share/apps/plasma/services/plasmoidservice.operations
 share/apps/plasma/services/storage.operations
@@ -3418,8 +3246,6 @@ share/config/colors/Oxygen.colors
 share/config/colors/Rainbow.colors
 share/config/colors/Royal.colors
 share/config/colors/Web.colors
-share/config/katemoderc
-share/config/katepartpluginsrc
 share/config/kdebug.areas
 share/config/kdebugrc
 share/config/khtmlrc
@@ -3534,7 +3360,6 @@ share/icons/hicolor/32x32/actions/presence_unknown.png
 share/icons/hicolor/48x48/actions/presence_away.png
 share/icons/hicolor/48x48/actions/presence_offline.png
 share/icons/hicolor/48x48/actions/presence_online.png
-share/icons/hicolor/scalable/apps/ktexteditorautobrace.svgz
 share/kde4/services/data.protocol
 share/kde4/services/emoticonstheme_adium.desktop
 share/kde4/services/emoticonstheme_kde.desktop
@@ -3547,7 +3372,6 @@ share/kde4/services/help.protocol
 share/kde4/services/http.protocol
 share/kde4/services/http_cache_cleaner.desktop
 share/kde4/services/https.protocol
-share/kde4/services/katepart.desktop
 share/kde4/services/kcm_ssl.desktop
 share/kde4/services/kded/kcookiejar.desktop
 share/kde4/services/kded/kssld.desktop
@@ -3561,20 +3385,12 @@ share/kde4/services/kmultipart.desktop
 share/kde4/services/kspell_aspell.desktop
 share/kde4/services/kspell_enchant.desktop
 share/kde4/services/kspell_hspell.desktop
-share/kde4/services/ktexteditor_autobrace.desktop
-share/kde4/services/ktexteditor_autobrace_config.desktop
-share/kde4/services/ktexteditor_exporter.desktop
-share/kde4/services/ktexteditor_hlselection.desktop
-share/kde4/services/ktexteditor_iconinserter.desktop
-share/kde4/services/ktexteditor_insanehtml_le.desktop
-share/kde4/services/ktexteditor_insertfile.desktop
-share/kde4/services/ktexteditor_kdatatool.desktop
-share/kde4/services/ktexteditor_python-encoding.desktop
 share/kde4/services/metainfo.protocol
 share/kde4/services/mms.protocol
 share/kde4/services/mmst.protocol
 share/kde4/services/mmsu.protocol
 share/kde4/services/plasma-applet-extenderapplet.desktop
+share/kde4/services/plasma.protocol
 share/kde4/services/pnm.protocol
 share/kde4/services/qimageioplugins/bmp.desktop
 share/kde4/services/qimageioplugins/dds.desktop
@@ -3596,6 +3412,8 @@ share/kde4/services/qimageioplugins/ppm.desktop
 share/kde4/services/qimageioplugins/psd.desktop
 share/kde4/services/qimageioplugins/ras.desktop
 share/kde4/services/qimageioplugins/rgb.desktop
+share/kde4/services/qimageioplugins/svg+xml-compressed.desktop
+share/kde4/services/qimageioplugins/svg+xml.desktop
 share/kde4/services/qimageioplugins/tga.desktop
 share/kde4/services/qimageioplugins/tiff.desktop
 share/kde4/services/qimageioplugins/xbm.desktop
@@ -3709,7 +3527,6 @@ share/mime/application/x-vnd.kde.kugar.mixed.xml
 share/mime/application/x-vnd.kde.plan.work.xml
 share/mime/application/x-vnd.kde.plan.xml
 share/mime/application/x-webarchive.xml
-share/mime/application/x-win-lnk.xml
 share/mime/application/xsd.xml
 share/mime/audio/aac.xml
 share/mime/audio/x-pn-realaudio-plugin.xml
@@ -3748,11 +3565,6 @@ share/mime/video/x-ms-wmp.xml
 @dirrm share/config/ui
 @dirrm share/config/colors
 @dirrm share/apps/proxyscout
-@dirrm share/apps/ktexteditor_kdatatool
-@dirrm share/apps/ktexteditor_insertfile
-@dirrm share/apps/ktexteditor_insanehtml_le
-@dirrm share/apps/ktexteditor_iconinserter
-@dirrm share/apps/ktexteditor_exporter
 @dirrm share/apps/kssl
 @dirrm share/apps/ksgmltools2/customization/zh-TW/entities
 @dirrm share/apps/ksgmltools2/customization/zh-TW
@@ -3863,8 +3675,6 @@ share/mime/video/x-ms-wmp.xml
 @dirrm share/apps/kdeui/about
 @dirrm share/apps/kdeui
 @dirrm share/apps/kauth
-@dirrmtry share/apps/katepart/script
-@dirrmtry share/apps/katepart/api
 @dirrm share/apps/LICENSES
 @dirrm lib/kde4/plugins/script
 @dirrm lib/kde4/plugins/kauth/helper