6 files changed, 217 insertions, 641 deletions

diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index ea718ae2ec7a..62ce2227f6ce 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -1,50 +1,34 @@
-# New ports collection makefile for:	kdeutils3
-# Date created:				3 November 2001
-# Whom:					will@cvs.kde.org
+# New ports collection Makefile for:	kdeutils
+# Date created:				2008-01-31
+# Whom:					Martin Wilke <miwi@FreeBSD.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	kdeutils
-PORTVERSION=	${KDE_VERSION}
-CATEGORIES?=	misc kde
-MASTER_SITES=		${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	misc kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
-MAINTAINER?=	kde@FreeBSD.org
-COMMENT=	Utilities for the KDE integrated X11 desktop
-
-LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
-		netsnmp:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
-CONFLICTS=	kgpg-[0-9]* superkaramba-[0-9]*
+LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
+		netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		zip.1:${PORTSDIR}/archivers/libzip
+RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
 
-USE_KDELIBS_VER=3
-USE_KDEBASE_VER=3
-PREFIX=		${KDE_PREFIX}
+LATEST_LINK=	${PORTNAME}4
 
-USE_PYTHON=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=  libtool:15
-DO_NOT_COMPILE+=klaptopdaemon kmilo
-CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE}
-
-USE_LDCONFIG=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
+USE_QT_VER=	4
+KDE4_BUILDENV= yes
+USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+QT_COMPONENTS=	network gui moc rcc uic porting xml
 
-.if ${OSVERSION} > 501102
-.	if ${OSVERSION} > 600021
-RUN_DEPENDS+=   gtar:${PORTSDIR}/archivers/gtar
-.	endif
-post-patch:
-	${REINPLACE_CMD} -e 's|>tar<|>gtar<|g' ${WRKSRC}/ark/ark.kcfg
-.endif
+post-extract:
+	${MKDIR} ${WRKSRC}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo
index 5c3d382e1973..c7f2e82aa4b3 100644
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.8.tar.bz2) = d1a0fcc83f35428a76cf7523a04ba19c
-SHA256 (KDE/kdeutils-3.5.8.tar.bz2) = 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
-SIZE (KDE/kdeutils-3.5.8.tar.bz2) = 3059172
+MD5 (KDE/kdeutils-4.1.0.tar.bz2) = 456d811618e5417e224476089df9a3b3
+SHA256 (KDE/kdeutils-4.1.0.tar.bz2) = e004cc66372156a70be2291f68400fe0caa4ae821d70cd5ded5a861e4e7e8cab
+SIZE (KDE/kdeutils-4.1.0.tar.bz2) = 2279856
diff --git a/comms/kremotecontrol/files/patch-configure b/comms/kremotecontrol/files/patch-configure
deleted file mode 100644
index dcf82d156eec..000000000000
--- a/comms/kremotecontrol/files/patch-configure
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.orig	2007-10-08 14:31:38.000000000 +0000
-+++ configure	2008-05-30 00:26:52.000000000 +0000
-@@ -35789,89 +35789,6 @@
-   fi
- 
- 
--have_l_funcs=yes
--
--{ echo "$as_me:$LINENO: checking for sqrtl in -lm" >&5
--echo $ECHO_N "checking for sqrtl in -lm... $ECHO_C" >&6; }
--if test "${ac_cv_lib_m_sqrtl+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lm  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char sqrtl ();
--int
--main ()
--{
--return sqrtl ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  ac_cv_lib_m_sqrtl=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_m_sqrtl=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrtl" >&5
--echo "${ECHO_T}$ac_cv_lib_m_sqrtl" >&6; }
--if test $ac_cv_lib_m_sqrtl = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBM 1
--_ACEOF
--
--  LIBS="-lm $LIBS"
--
--else
--  have_l_funcs=no
--fi
--
--
--if test "xyes" = "x$have_l_funcs" ; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_L_FUNCS 1
--_ACEOF
--
--fi
--
- LIBGMP=
- 
-    kde_safe_cppflags=$CPPFLAGS
diff --git a/comms/kremotecontrol/files/patch-kdelirc_irkick-klircclient.cpp b/comms/kremotecontrol/files/patch-kdelirc_irkick-klircclient.cpp
deleted file mode 100644
index 76174cb1ed0d..000000000000
--- a/comms/kremotecontrol/files/patch-kdelirc_irkick-klircclient.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdelirc/irkick/klircclient.cpp.orig	Sat Sep 10 10:21:34 2005
-+++ kdelirc/irkick/klircclient.cpp	Mon Jun  5 16:16:51 2006
-@@ -55,15 +55,10 @@
- 
- 	sockaddr_un addr;
- 	addr.sun_family = AF_UNIX;
--	strcpy(addr.sun_path, "/dev/lircd");
-+	strcpy(addr.sun_path, "/var/run/lirc/lircd");
- 	if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
- 	{	::close(sock);
--		// in case of mandrake...
--		strcpy(addr.sun_path, "/tmp/.lircd");
--		if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
--		{	::close(sock);
--			return false;
--		}
-+		return false;
- 	}
- 
- 	theSocket = new QSocket;
diff --git a/comms/kremotecontrol/files/patch-ksim_monitors_filesystem-filesystemstats.cpp b/comms/kremotecontrol/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
deleted file mode 100644
index 7a29e570a1b7..000000000000
--- a/comms/kremotecontrol/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- ksim/monitors/filesystem/filesystemstats.cpp.orig	2007-10-08 11:49:45.000000000 +0200
-+++ ksim/monitors/filesystem/filesystemstats.cpp	2007-10-26 19:32:09.000000000 +0200
-@@ -30,7 +30,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- 
--#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
-+#ifdef HAVE_SYS_STATVFS_H
- #include <sys/statvfs.h>
- #elif defined( HAVE_SYS_STATFS_H )
- #include <sys/statfs.h>
-@@ -59,12 +59,10 @@
- #include <stdio.h>
- #include <unistd.h>
- 
--#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
-+#ifdef HAVE_STATVFS
- typedef struct statvfs ksim_statfs;
--#define ksim_getfsstat getvfsstat
- #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
- typedef struct statfs ksim_statfs;
--#define ksim_getfsstat getfsstat
- #else
- typedef struct // fall back for (possibly) non-supported systems
- {
-@@ -75,7 +73,7 @@
- 
- int fsystemStats( const char * file, ksim_statfs & stats )
- {
--#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
-+#ifdef HAVE_STATVFS
-   return statvfs( file, &stats );
- #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
-   return statfs( file, &stats );
-@@ -164,9 +162,9 @@
- #endif
- 
- #ifdef USE_FSSTAT
--  ksim_statfs sfs[32];
-+  struct statfs sfs[32];
-   int fs_count;
--  if ( ( fs_count = ksim_getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
-+  if ( ( fs_count = getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
-   {
-     for ( int i = 0; i < fs_count; i++ )
-     {
diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist
index 782d19b830c1..7d5239c2aaab 100644
--- a/comms/kremotecontrol/pkg-plist
+++ b/comms/kremotecontrol/pkg-plist
@@ -1,343 +1,132 @@
 bin/ark
-bin/irkick
 bin/kcalc
 bin/kcharselect
 bin/kdessh
 bin/kdf
-bin/kedit
 bin/kfloppy
 bin/kgpg
-bin/khexedit
-bin/kjots
-bin/kregexpeditor
 bin/ktimer
 bin/kwalletmanager
 bin/kwikdisk
+bin/okteta
 bin/superkaramba
-include/kmultiformlistbox.h
-include/kmultiformlistboxentry.h
-include/kmultiformlistboxfactory.h
-include/ksim/chart.h
-include/ksim/common.h
-include/ksim/ksimconfig.h
-include/ksim/label.h
-include/ksim/led.h
-include/ksim/pluginglobal.h
-include/ksim/pluginloader.h
-include/ksim/pluginmodule.h
-include/ksim/progress.h
-include/ksim/themeloader.h
-include/ksim/themetypes.h
-include/kwidgetstreamer.h
-lib/kde3/ark.a
-lib/kde3/ark.la
-lib/kde3/ark.so
-lib/kde3/irkick.a
-lib/kde3/irkick.la
-lib/kde3/irkick.so
-lib/kde3/kcalc.a
-lib/kde3/kcalc.la
-lib/kde3/kcalc.so
-lib/kde3/kcharselect_panelapplet.a
-lib/kde3/kcharselect_panelapplet.la
-lib/kde3/kcharselect_panelapplet.so
-lib/kde3/kcm_kcmlirc.a
-lib/kde3/kcm_kcmlirc.la
-lib/kde3/kcm_kcmlirc.so
-lib/kde3/kcm_kdf.a
-lib/kde3/kcm_kdf.la
-lib/kde3/kcm_kdf.so
-lib/kde3/kcm_kwallet.a
-lib/kde3/kcm_kwallet.la
-lib/kde3/kcm_kwallet.so
-lib/kde3/kedit.a
-lib/kde3/kedit.la
-lib/kde3/kedit.so
-lib/kde3/ksim_cpu.a
-lib/kde3/ksim_cpu.la
-lib/kde3/ksim_cpu.so
-lib/kde3/ksim_disk.a
-lib/kde3/ksim_disk.la
-lib/kde3/ksim_disk.so
-lib/kde3/ksim_filesystem.a
-lib/kde3/ksim_filesystem.la
-lib/kde3/ksim_filesystem.so
-lib/kde3/ksim_net.a
-lib/kde3/ksim_net.la
-lib/kde3/ksim_net.so
-lib/kde3/ksim_panelextension.a
-lib/kde3/ksim_panelextension.la
-lib/kde3/ksim_panelextension.so
-lib/kde3/ksim_sensors.a
-lib/kde3/ksim_sensors.la
-lib/kde3/ksim_sensors.so
-lib/kde3/ksim_snmp.a
-lib/kde3/ksim_snmp.la
-lib/kde3/ksim_snmp.so
-lib/kde3/libarkpart.a
-lib/kde3/libarkpart.la
-lib/kde3/libarkpart.so
-lib/kde3/libkbyteseditwidget.a
-lib/kde3/libkbyteseditwidget.la
-lib/kde3/libkbyteseditwidget.so
-lib/kde3/libkhexedit2part.a
-lib/kde3/libkhexedit2part.la
-lib/kde3/libkhexedit2part.so
-lib/kde3/libkregexpeditorgui.a
-lib/kde3/libkregexpeditorgui.la
-lib/kde3/libkregexpeditorgui.so
-lib/libkdeinit_ark.a
-lib/libkdeinit_ark.la
-lib/libkdeinit_ark.so
-lib/libkdeinit_irkick.a
-lib/libkdeinit_irkick.la
-lib/libkdeinit_irkick.so
-lib/libkdeinit_kcalc.a
-lib/libkdeinit_kcalc.la
-lib/libkdeinit_kcalc.so
-lib/libkdeinit_kedit.a
-lib/libkdeinit_kedit.la
-lib/libkdeinit_kedit.so
-lib/libkhexeditcommon.a
-lib/libkhexeditcommon.la
-lib/libkhexeditcommon.so
-lib/libkhexeditcommon.so.0
-lib/libkregexpeditorcommon.a
-lib/libkregexpeditorcommon.la
-lib/libkregexpeditorcommon.so
-lib/libkregexpeditorcommon.so.1
-lib/libksimcore.a
-lib/libksimcore.la
-lib/libksimcore.so
-lib/libksimcore.so.1
-share/applications/kde/KCharSelect.desktop
-share/applications/kde/KEdit.desktop
-share/applications/kde/KFloppy.desktop
-share/applications/kde/Kjots.desktop
-share/applications/kde/ark.desktop
-share/applications/kde/irkick.desktop
-share/applications/kde/kcalc.desktop
-share/applications/kde/kcmdf.desktop
-share/applications/kde/kcmlirc.desktop
-share/applications/kde/kdf.desktop
-share/applications/kde/kgpg.desktop
-share/applications/kde/khexedit.desktop
-share/applications/kde/kregexpeditor.desktop
-share/applications/kde/ktimer.desktop
-share/applications/kde/kwalletconfig.desktop
-share/applications/kde/kwalletmanager-kwalletd.desktop
-share/applications/kde/kwalletmanager.desktop
-share/applications/kde/kwikdisk.desktop
-share/applnk/Utilities/superkaramba.desktop
+bin/sweeper
+lib/kde4/kcm_kdf.so
+lib/kde4/kcm_kwallet.so
+lib/kde4/kerfuffle_bk.so
+lib/kde4/kerfuffle_libarchive.so
+lib/kde4/kerfuffle_libzip.so
+lib/kde4/kerfuffle_rar.so
+lib/kde4/libarkpart.so
+lib/kde4/libkbytearrayedit.so
+lib/kde4/liboktetapart.so
+lib/kde4/plasma_package_superkaramba.so
+lib/kde4/plasma_scriptengine_superkaramba.so
+lib/libkdeinit4_kcalc.so
+lib/libkerfuffle.so
+lib/libkerfuffle.so.5
+lib/libkerfuffle.so.5.0.0
+lib/liboktetacore.so
+lib/liboktetacore.so.5
+lib/liboktetacore.so.5.0.0
+lib/liboktetagui.so
+lib/liboktetagui.so.5
+lib/liboktetagui.so.5.0.0
+lib/libsuperkaramba.so
+lib/libsuperkaramba.so.5
+lib/libsuperkaramba.so.5.0.0
+share/applications/kde4/KCharSelect.desktop
+share/applications/kde4/KFloppy.desktop
+share/applications/kde4/ark.desktop
+share/applications/kde4/kcalc.desktop
+share/applications/kde4/kdf.desktop
+share/applications/kde4/kgpg.desktop
+share/applications/kde4/ktimer.desktop
+share/applications/kde4/kwalletmanager-kwalletd.desktop
+share/applications/kde4/kwalletmanager.desktop
+share/applications/kde4/kwikdisk.desktop
+share/applications/kde4/okteta.desktop
+share/applications/kde4/superkaramba.desktop
+share/applications/kde4/sweeper.desktop
 share/apps/ark/ark_part.rc
-share/apps/ark/ark_part_readonly.rc
 share/apps/ark/arkui.rc
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_adddir.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_addfile.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_delete.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_extract.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_view.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledblue.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledorange.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledred.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledblue.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledorange.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledred.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
 share/apps/kcalc/kcalcui.rc
+share/apps/kcalc/scienceconstants.xml
 share/apps/kcharselect/kcharselectui.rc
 share/apps/kconf_update/kcalcrc.upd
 share/apps/kconf_update/kcharselect.upd
 share/apps/kdf/kdfui.rc
 share/apps/kdf/pics/delete.png
 share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key4.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_edit.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_export.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_gen.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_identity.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_import.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_info.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_photo.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_show.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_sign.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_term.png
+share/apps/kgpg/icons/oxygen/16x16/actions/document-export-key.png
+share/apps/kgpg/icons/oxygen/16x16/actions/document-import-key.png
+share/apps/kgpg/icons/oxygen/16x16/actions/document-properties-key.png
+share/apps/kgpg/icons/oxygen/16x16/status/key-group.png
+share/apps/kgpg/icons/oxygen/16x16/status/key-orphan.png
+share/apps/kgpg/icons/oxygen/16x16/status/key-pair.png
+share/apps/kgpg/icons/oxygen/16x16/status/key-single.png
+share/apps/kgpg/icons/oxygen/22x22/actions/document-export-key.png
+share/apps/kgpg/icons/oxygen/22x22/actions/document-import-key.png
+share/apps/kgpg/icons/oxygen/22x22/actions/document-properties-key.png
+share/apps/kgpg/icons/oxygen/22x22/actions/key-generate-pair.png
+share/apps/kgpg/icons/oxygen/22x22/actions/view-key-secret.png
+share/apps/kgpg/icons/oxygen/22x22/status/key-group.png
+share/apps/kgpg/icons/oxygen/22x22/status/key-pair.png
+share/apps/kgpg/icons/oxygen/22x22/status/key-single.png
+share/apps/kgpg/icons/oxygen/32x32/actions/document-export-key.png
+share/apps/kgpg/icons/oxygen/32x32/actions/document-import-key.png
+share/apps/kgpg/icons/oxygen/32x32/actions/document-properties-key.png
+share/apps/kgpg/icons/oxygen/32x32/status/key-group.png
+share/apps/kgpg/icons/oxygen/32x32/status/key-pair.png
+share/apps/kgpg/icons/oxygen/32x32/status/key-single.png
+share/apps/kgpg/icons/oxygen/48x48/actions/document-export-key.png
+share/apps/kgpg/icons/oxygen/48x48/actions/document-import-key.png
+share/apps/kgpg/icons/oxygen/48x48/actions/document-properties-key.png
+share/apps/kgpg/icons/oxygen/48x48/status/key-group.png
+share/apps/kgpg/icons/oxygen/48x48/status/key-pair.png
+share/apps/kgpg/icons/oxygen/48x48/status/key-single.png
+share/apps/kgpg/icons/oxygen/scalable/actions/document-export-key.svgz
+share/apps/kgpg/icons/oxygen/scalable/actions/document-import-key.svgz
+share/apps/kgpg/icons/oxygen/scalable/actions/document-properties-key.svgz
+share/apps/kgpg/icons/oxygen/scalable/status/key-group.svgz
+share/apps/kgpg/icons/oxygen/scalable/status/key-pair.svgz
+share/apps/kgpg/icons/oxygen/scalable/status/key-single.svgz
+share/apps/kgpg/keysmanager.rc
 share/apps/kgpg/kgpg.rc
-share/apps/kgpg/listkeys.rc
 share/apps/kgpg/pics/kgpg_anim.gif
-share/apps/kgpg/pics/kgpg_blank.png
-share/apps/kgpg/pics/kgpg_docked.gif
-share/apps/kgpg/pics/kgpg_docked.png
-share/apps/kgpg/pics/kgpg_fill.png
 share/apps/kgpg/tips
-share/apps/khexedit/khexeditui.rc
-share/apps/khexedit/pics/hexdrag.png
-share/apps/khexedit/pics/hexmask.png
-share/apps/khexedit/pics/hexwrite.png
-share/apps/khexedit2part/khexedit2partui.rc
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kicker/extensions/ksim.desktop
-share/apps/kjots/kjotsui.rc
-share/apps/kjots/pics/filedel.png
-share/apps/konqueror/servicemenus/encryptfile.desktop
-share/apps/konqueror/servicemenus/encryptfolder.desktop
-share/apps/konqueror/servicemenus/floppy_format.desktop
-share/apps/kregexpeditor/pics/altn.png
-share/apps/kregexpeditor/pics/anychar.png
-share/apps/kregexpeditor/pics/autoverify.png
-share/apps/kregexpeditor/pics/begline.png
-share/apps/kregexpeditor/pics/characters.png
-share/apps/kregexpeditor/pics/compound.png
-share/apps/kregexpeditor/pics/endline.png
-share/apps/kregexpeditor/pics/error.png
-share/apps/kregexpeditor/pics/neglookahead.png
-share/apps/kregexpeditor/pics/nonwordboundary.png
-share/apps/kregexpeditor/pics/poslookahead.png
-share/apps/kregexpeditor/pics/repeat.png
-share/apps/kregexpeditor/pics/select.png
-share/apps/kregexpeditor/pics/text.png
-share/apps/kregexpeditor/pics/verify.png
-share/apps/kregexpeditor/pics/wordboundary.png
-share/apps/kregexpeditor/predefined/general/anything.regexp
-share/apps/kregexpeditor/predefined/general/spaces.regexp
-share/apps/ksim/monitors/DFree.desktop
-share/apps/ksim/monitors/Lm_sensors.desktop
-share/apps/ksim/monitors/Net.desktop
-share/apps/ksim/monitors/Snmp.desktop
-share/apps/ksim/monitors/cpu.desktop
-share/apps/ksim/monitors/disk.desktop
-share/apps/ksim/pics/clock.png
-share/apps/ksim/pics/uptime.png
-share/apps/ksim/themes/ksim/bg_chart.png
-share/apps/ksim/themes/ksim/bg_grid.png
-share/apps/ksim/themes/ksim/bg_meter.png
-share/apps/ksim/themes/ksim/bg_panel.png
-share/apps/ksim/themes/ksim/frame_bottom.png
-share/apps/ksim/themes/ksim/frame_left.png
-share/apps/ksim/themes/ksim/frame_right.png
-share/apps/ksim/themes/ksim/frame_top.png
-share/apps/ksim/themes/ksim/gkrellmrc
-share/apps/ksim/themes/ksim/gkrellmrc_ksim
-share/apps/ksim/themes/ksim/host/bg_meter.png
-share/apps/ksim/themes/ksim/krell_meter.png
-share/apps/ksim/themes/ksim/krell_panel.png
-share/apps/ksim/themes/ksim/krell_slider.png
-share/apps/ksim/themes/ksim/mail/decal_mail.png
-share/apps/ksim/themes/ksim/mail/krell_mail.png
-share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
-share/apps/ksim/themes/ksim/net/decal_net_leds.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
+share/apps/kwalletmanager/icons/oxygen/22x22/actions/folder_closed.png
+share/apps/kwalletmanager/icons/oxygen/22x22/actions/folder_open.png
 share/apps/kwalletmanager/kwalleteditor.rc
 share/apps/kwalletmanager/kwalletmanager.rc
-share/apps/profiles/klauncher.profile.xml
-share/apps/profiles/konqueror.profile.xml
-share/apps/profiles/noatun.profile.xml
-share/apps/profiles/profile.dtd
-share/apps/remotes/RM-0010.remote.xml
-share/apps/remotes/cimr100.remote.xml
-share/apps/remotes/hauppauge.remote.xml
-share/apps/remotes/remote.dtd
-share/apps/remotes/sherwood.remote.xml
-share/apps/remotes/sonytv.remote.xml
+share/apps/okteta/oktetaui.rc
+share/apps/oktetapart/oktetapartui.rc
 share/apps/superkaramba/superkarambaui.rc
-share/autostart/irkick.desktop
+share/apps/sweeper/sweeperui.rc
 share/autostart/kgpg.desktop
 share/config.kcfg/ark.kcfg
 share/config.kcfg/kcalc.kcfg
-share/config.kcfg/kedit.kcfg
 share/config.kcfg/kgpg.kcfg
-share/config.kcfg/kjots.kcfg
-share/config/ksim_panelextensionrc
-share/doc/HTML/en/KRegExpEditor/altn.png
-share/doc/HTML/en/KRegExpEditor/altntool.png
-share/doc/HTML/en/KRegExpEditor/anychar.png
-share/doc/HTML/en/KRegExpEditor/anychartool.png
-share/doc/HTML/en/KRegExpEditor/begline.png
-share/doc/HTML/en/KRegExpEditor/boundarytools.png
-share/doc/HTML/en/KRegExpEditor/characters.png
-share/doc/HTML/en/KRegExpEditor/charactertool.png
-share/doc/HTML/en/KRegExpEditor/common
-share/doc/HTML/en/KRegExpEditor/compound.png
-share/doc/HTML/en/KRegExpEditor/compoundtool.png
-share/doc/HTML/en/KRegExpEditor/endline.png
-share/doc/HTML/en/KRegExpEditor/index.cache.bz2
-share/doc/HTML/en/KRegExpEditor/index.docbook
-share/doc/HTML/en/KRegExpEditor/linestartendtool.png
-share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
-share/doc/HTML/en/KRegExpEditor/neglookahead.png
-share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
-share/doc/HTML/en/KRegExpEditor/poslookahead.png
-share/doc/HTML/en/KRegExpEditor/repeat.png
-share/doc/HTML/en/KRegExpEditor/repeattool.png
-share/doc/HTML/en/KRegExpEditor/select.png
-share/doc/HTML/en/KRegExpEditor/text.png
-share/doc/HTML/en/KRegExpEditor/texttool.png
-share/doc/HTML/en/KRegExpEditor/theEditor.png
-share/doc/HTML/en/KRegExpEditor/wordboundary.png
+share/config/superkaramba.knsrc
+share/dbus-1/interfaces/org.kde.kgpg.Key.xml
+share/dbus-1/interfaces/org.kde.superkaramba.xml
+share/dbus-1/interfaces/org.kde.sweeper.xml
 share/doc/HTML/en/ark/common
 share/doc/HTML/en/ark/index.cache.bz2
 share/doc/HTML/en/ark/index.docbook
 share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/irkick/common
-share/doc/HTML/en/irkick/index.cache.bz2
-share/doc/HTML/en/irkick/index.docbook
 share/doc/HTML/en/kcalc/commands.docbook
 share/doc/HTML/en/kcalc/common
 share/doc/HTML/en/kcalc/index.cache.bz2
 share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
 share/doc/HTML/en/kcharselect/common
 share/doc/HTML/en/kcharselect/index.cache.bz2
 share/doc/HTML/en/kcharselect/index.docbook
-share/doc/HTML/en/kcmlirc/common
-share/doc/HTML/en/kcmlirc/index.cache.bz2
-share/doc/HTML/en/kcmlirc/index.docbook
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/common
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/common
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
-share/doc/HTML/en/kcontrol/laptop/common
-share/doc/HTML/en/kcontrol/laptop/index.cache.bz2
-share/doc/HTML/en/kcontrol/laptop/index.docbook
-share/doc/HTML/en/kcontrol/powerctrl/common
-share/doc/HTML/en/kcontrol/powerctrl/index.cache.bz2
-share/doc/HTML/en/kcontrol/powerctrl/index.docbook
 share/doc/HTML/en/kdf/common
 share/doc/HTML/en/kdf/index.cache.bz2
 share/doc/HTML/en/kdf/index.docbook
 share/doc/HTML/en/kdf/kdf.png
 share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
 share/doc/HTML/en/kfloppy/common
 share/doc/HTML/en/kfloppy/index.cache.bz2
 share/doc/HTML/en/kfloppy/index.docbook
@@ -347,226 +136,187 @@ share/doc/HTML/en/kgpg/index.cache.bz2
 share/doc/HTML/en/kgpg/index.docbook
 share/doc/HTML/en/kgpg/keygen.png
 share/doc/HTML/en/kgpg/keymanage.png
+share/doc/HTML/en/kgpg/keyprop.png
 share/doc/HTML/en/kgpg/keys.png
+share/doc/HTML/en/kgpg/keyserver.png
 share/doc/HTML/en/kgpg/kicker.png
 share/doc/HTML/en/kgpg/options.png
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kinfocenter/blockdevices/common
-share/doc/HTML/en/kinfocenter/blockdevices/index.cache.bz2
-share/doc/HTML/en/kinfocenter/blockdevices/index.docbook
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/ksim/common
-share/doc/HTML/en/ksim/index.cache.bz2
-share/doc/HTML/en/ksim/index.docbook
 share/doc/HTML/en/ktimer/common
 share/doc/HTML/en/ktimer/index.cache.bz2
 share/doc/HTML/en/ktimer/index.docbook
 share/doc/HTML/en/kwallet/common
-share/doc/HTML/en/kwallet/cr22-action-wallet_closed.png
-share/doc/HTML/en/kwallet/cr22-action-wallet_open.png
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
 share/doc/HTML/en/kwallet/edit3.png
 share/doc/HTML/en/kwallet/index.cache.bz2
 share/doc/HTML/en/kwallet/index.docbook
 share/doc/HTML/en/kwallet/kwalletmanager.png
+share/doc/HTML/en/kwallet/ox22-action-wallet_closed.png
+share/doc/HTML/en/kwallet/ox22-action-wallet_open.png
 share/doc/HTML/en/kwallet/password1.png
 share/doc/HTML/en/kwallet/password2.png
+share/doc/HTML/en/okteta/basics.docbook
+share/doc/HTML/en/okteta/common
+share/doc/HTML/en/okteta/credits.docbook
+share/doc/HTML/en/okteta/index.cache.bz2
+share/doc/HTML/en/okteta/index.docbook
+share/doc/HTML/en/okteta/introduction.docbook
+share/doc/HTML/en/okteta/menu.docbook
+share/doc/HTML/en/okteta/tools.docbook
 share/doc/HTML/en/superkaramba/common
 share/doc/HTML/en/superkaramba/index.cache.bz2
 share/doc/HTML/en/superkaramba/index.docbook
-share/icons/crystalsvg/128x128/apps/superkaramba.png
-share/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/16x16/apps/kcmdf.png
-share/icons/crystalsvg/16x16/apps/ksim.png
-share/icons/crystalsvg/16x16/apps/superkaramba.png
-share/icons/crystalsvg/16x16/devices/ksim_cpu.png
-share/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/22x22/apps/kcmdf.png
-share/icons/crystalsvg/22x22/apps/superkaramba.png
-share/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/32x32/apps/kcmdf.png
-share/icons/crystalsvg/32x32/apps/ksim.png
-share/icons/crystalsvg/32x32/apps/superkaramba.png
-share/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/48x48/apps/ksim.png
-share/icons/crystalsvg/48x48/apps/superkaramba.png
-share/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/64x64/apps/superkaramba.png
-share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/scalable/apps/superkaramba.svgz
-share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-share/icons/hicolor/128x128/apps/ark.png
 share/icons/hicolor/128x128/apps/kdf.png
 share/icons/hicolor/128x128/apps/kfloppy.png
-share/icons/hicolor/128x128/apps/kregexpeditor.png
 share/icons/hicolor/128x128/apps/ktimer.png
 share/icons/hicolor/128x128/apps/kwalletmanager.png
+share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/128x128/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/irkick.png
+share/icons/hicolor/128x128/apps/superkaramba.png
 share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
 share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
 share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-share/icons/hicolor/16x16/apps/kregexpeditor.png
 share/icons/hicolor/16x16/apps/ktimer.png
 share/icons/hicolor/16x16/apps/kwalletmanager.png
+share/icons/hicolor/16x16/apps/kwalletmanager2.png
 share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/22x22/apps/ark.png
-share/icons/hicolor/22x22/apps/irkick.png
+share/icons/hicolor/16x16/apps/okteta.png
+share/icons/hicolor/16x16/apps/superkaramba.png
 share/icons/hicolor/22x22/apps/kcalc.png
 share/icons/hicolor/22x22/apps/kdf.png
-share/icons/hicolor/22x22/apps/kedit.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
-share/icons/hicolor/22x22/apps/kjots.png
-share/icons/hicolor/22x22/apps/kregexpeditor.png
 share/icons/hicolor/22x22/apps/kwalletmanager.png
 share/icons/hicolor/22x22/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/irkick.png
+share/icons/hicolor/22x22/apps/superkaramba.png
 share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcharselect.png
 share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kregexpeditor.png
 share/icons/hicolor/32x32/apps/ktimer.png
 share/icons/hicolor/32x32/apps/kwalletmanager.png
+share/icons/hicolor/32x32/apps/kwalletmanager2.png
 share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/48x48/apps/ark.png
+share/icons/hicolor/32x32/apps/okteta.png
+share/icons/hicolor/32x32/apps/superkaramba.png
 share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
 share/icons/hicolor/48x48/apps/kdf.png
-share/icons/hicolor/48x48/apps/kedit.png
 share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kregexpeditor.png
 share/icons/hicolor/48x48/apps/ktimer.png
 share/icons/hicolor/48x48/apps/kwalletmanager.png
+share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
-share/icons/hicolor/64x64/apps/ark.png
+share/icons/hicolor/48x48/apps/okteta.png
+share/icons/hicolor/48x48/apps/superkaramba.png
 share/icons/hicolor/64x64/apps/kcalc.png
 share/icons/hicolor/64x64/apps/kdf.png
-share/icons/hicolor/64x64/apps/kedit.png
 share/icons/hicolor/64x64/apps/kfloppy.png
-share/icons/hicolor/64x64/apps/kjots.png
-share/icons/hicolor/64x64/apps/kregexpeditor.png
 share/icons/hicolor/64x64/apps/kwalletmanager.png
+share/icons/hicolor/64x64/apps/kwalletmanager2.png
 share/icons/hicolor/64x64/apps/kwikdisk.png
-share/icons/hicolor/scalable/apps/ark.svgz
+share/icons/hicolor/64x64/apps/superkaramba.png
 share/icons/hicolor/scalable/apps/kcalc.svgz
-share/icons/locolor/16x16/apps/irkick.png
-share/icons/locolor/32x32/apps/irkick.png
-share/mimelnk/application/x-superkaramba.desktop
-share/services/ark_part.desktop
-share/services/kbyteseditwidget.desktop
-share/services/khexedit2part.desktop
-share/services/kregexpeditorgui.desktop
-share/services/kwallet_config.desktop
-share/services/kwalletmanager_show.desktop
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
+share/icons/hicolor/scalable/apps/superkaramba.svgz
+share/icons/oxygen/16x16/apps/kcmdf.png
+share/icons/oxygen/22x22/apps/kcmdf.png
+share/icons/oxygen/32x32/apps/kcmdf.png
+share/kde4/services/ServiceMenus/encryptfile.desktop
+share/kde4/services/ServiceMenus/encryptfolder.desktop
+share/kde4/services/ServiceMenus/floppy_format.desktop
+share/kde4/services/ark_part.desktop
+share/kde4/services/kbytearrayedit.desktop
+share/kde4/services/kcmdf.desktop
+share/kde4/services/kerfuffle_bk.desktop
+share/kde4/services/kerfuffle_libarchive.desktop
+share/kde4/services/kerfuffle_libzip.desktop
+share/kde4/services/kerfuffle_rar.desktop
+share/kde4/services/kwalletconfig.desktop
+share/kde4/services/kwalletmanager_show.desktop
+share/kde4/services/oktetapart.desktop
+share/kde4/services/plasma-package-superkaramba.desktop
+share/kde4/services/plasma-scriptengine-superkaramba.desktop
+share/kde4/servicetypes/kerfufflePlugin.desktop
+@dirrmtry share/kde4/servicetypes
+@dirrmtry share/kde4/services/ServiceMenus
+@dirrmtry share/kde4/services
+@dirrmtry share/kde4
+@dirrmtry share/icons/oxygen/32x32/apps
+@dirrmtry share/icons/oxygen/32x32
+@dirrmtry share/icons/oxygen/22x22/apps
+@dirrmtry share/icons/oxygen/22x22
+@dirrmtry share/icons/oxygen/16x16/apps
+@dirrmtry share/icons/oxygen/16x16
+@dirrmtry share/icons/oxygen
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/superkaramba
+@dirrm share/doc/HTML/en/okteta
 @dirrm share/doc/HTML/en/kwallet
 @dirrm share/doc/HTML/en/ktimer
-@dirrm share/doc/HTML/en/ksim
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/kinfocenter/blockdevices
-@dirrm share/doc/HTML/en/khexedit
 @dirrm share/doc/HTML/en/kgpg
 @dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kedit
 @dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/superkaramba
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc
-@dirrm share/doc/HTML/en/kdeutils-apidocs
-@dirrm share/doc/HTML/en/kcontrol/powerctrl
-@dirrm share/doc/HTML/en/kcontrol/laptop
-@dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
-@dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
-@dirrm share/doc/HTML/en/kcmlirc
 @dirrm share/doc/HTML/en/kcharselect
 @dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/irkick
 @dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/en/KRegExpEditor
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/dbus-1/interfaces
+@dirrmtry share/dbus-1
+@dirrmtry share/config.kcfg
+@dirrmtry share/config
+@dirrmtry share/autostart
+@dirrm share/apps/sweeper
 @dirrm share/apps/superkaramba
-@dirrm share/apps/remotes
-@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22
-@dirrm share/apps/kwalletmanager/icons/crystalsvg
+@dirrm share/apps/oktetapart
+@dirrm share/apps/okteta
+@dirrm share/apps/kwalletmanager/icons/oxygen/22x22/actions
+@dirrm share/apps/kwalletmanager/icons/oxygen/22x22
+@dirrm share/apps/kwalletmanager/icons/oxygen
 @dirrm share/apps/kwalletmanager/icons
 @dirrm share/apps/kwalletmanager
-@dirrm share/apps/ksim/themes/ksim/net
-@dirrm share/apps/ksim/themes/ksim/mail
-@dirrm share/apps/ksim/themes/ksim/host
-@dirrm share/apps/ksim/themes/ksim
-@dirrm share/apps/ksim/themes
-@dirrm share/apps/ksim/pics
-@dirrm share/apps/ksim/monitors
-@dirrm share/apps/ksim
-@dirrm share/apps/kregexpeditor/predefined/general
-@dirrm share/apps/kregexpeditor/predefined
-@dirrm share/apps/kregexpeditor/pics
-@dirrm share/apps/kregexpeditor
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/khexedit2part
-@dirrm share/apps/khexedit/pics
-@dirrm share/apps/khexedit
 @dirrm share/apps/kgpg/pics
-@dirrm share/apps/kgpg/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kgpg/icons/crystalsvg/22x22
-@dirrm share/apps/kgpg/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kgpg/icons/crystalsvg/16x16
-@dirrm share/apps/kgpg/icons/crystalsvg
+@dirrm share/apps/kgpg/icons/oxygen/scalable/status
+@dirrm share/apps/kgpg/icons/oxygen/scalable/actions
+@dirrm share/apps/kgpg/icons/oxygen/scalable
+@dirrm share/apps/kgpg/icons/oxygen/48x48/status
+@dirrm share/apps/kgpg/icons/oxygen/48x48/actions
+@dirrm share/apps/kgpg/icons/oxygen/48x48
+@dirrm share/apps/kgpg/icons/oxygen/32x32/status
+@dirrm share/apps/kgpg/icons/oxygen/32x32/actions
+@dirrm share/apps/kgpg/icons/oxygen/32x32
+@dirrm share/apps/kgpg/icons/oxygen/22x22/status
+@dirrm share/apps/kgpg/icons/oxygen/22x22/actions
+@dirrm share/apps/kgpg/icons/oxygen/22x22
+@dirrm share/apps/kgpg/icons/oxygen/16x16/status
+@dirrm share/apps/kgpg/icons/oxygen/16x16/actions
+@dirrm share/apps/kgpg/icons/oxygen/16x16
+@dirrm share/apps/kgpg/icons/oxygen
 @dirrm share/apps/kgpg/icons
 @dirrm share/apps/kgpg
-@dirrm share/apps/kedit
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
-@dirrm share/apps/kcharselect
+@dirrmtry share/apps/kconf_update
+@dirrmtry share/apps/kcharselect
 @dirrm share/apps/kcalc
-@dirrm share/apps/irkick/icons/hicolor/32x32/actions
-@dirrm share/apps/irkick/icons/hicolor/32x32
-@dirrm share/apps/irkick/icons/hicolor/16x16/actions
-@dirrm share/apps/irkick/icons/hicolor/16x16
-@dirrm share/apps/irkick/icons/hicolor
-@dirrm share/apps/irkick/icons
-@dirrm share/apps/irkick
-@dirrm share/apps/ark/icons/crystalsvg/32x32/actions
-@dirrm share/apps/ark/icons/crystalsvg/32x32
-@dirrm share/apps/ark/icons/crystalsvg/22x22/actions
-@dirrm share/apps/ark/icons/crystalsvg/22x22
-@dirrm share/apps/ark/icons/crystalsvg
-@dirrm share/apps/ark/icons
 @dirrm share/apps/ark
-@dirrm include/ksim
+@dirrmtry share/apps
+@dirrmtry share/applications/kde4
+@dirrmtry share/applications
+@dirrmtry lib/kde4