6 files changed, 70 insertions, 285 deletions

diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index d00c301ed99b..bba1ebb12428 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	2.1.0
-PORTREVISION=	5
+PORTVERSION=	${KOFFICE2_VERSION}
+PORTREVISION?=	0
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/
@@ -19,23 +19,23 @@ COMMENT=	Office suite for KDE
 
 BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2 \
 		gmm++>=3.0.4:${PORTSDIR}/math/gmm++
-LIB_DEPENDS=	GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
+LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
+		qca.2:${PORTSDIR}/devel/qca \
+		GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
+		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		exiv2.7:${PORTSDIR}/graphics/exiv2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		freetype.9:${PORTSDIR}/print/freetype2 \
+		jpeg.11:${PORTSDIR}/graphics/jpeg \
+		kipi.7:${PORTSDIR}/graphics/kdegraphics4 \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
-		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+		wpg-0.1:${PORTSDIR}/graphics/libwpg \
 		png.6:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
+		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		wpg-0.1:${PORTSDIR}/graphics/libwpg \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		qca.2:${PORTSDIR}/devel/qca \
 		gsl:${PORTSDIR}/math/gsl \
 		wv2.4:${PORTSDIR}/textproc/wv2 \
-		kipi.6:${PORTSDIR}/graphics/kdegraphics4
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
@@ -51,11 +51,13 @@ USE_LDCONFIG=	yes
 CMAKE_VERBOSE=	yes
 CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include"
 
-OPTIONS=	GTL	"Color transformations in Krita (currently broken)" off
+OPTIONS=	GTL	"Color transformations in Krita (broken with llvm-2.7)" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
+# GTL support is broken with llvm-2.7
 WITHOUT_GTL=	yes
+
 .if !defined(WITHOUT_GTL) || exists (${LOCALBASE}/lib/libQtShiva.so)
 LIB_DEPENDS+=	OpenCTL.0:${PORTSDIR}/graphics/opengtl \
 		QtShiva.0:${PORTSDIR}/graphics/qtgtl
@@ -76,14 +78,16 @@ post-patch:
 # prevent updating mime during build/install
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
 		${PATCH_WRKSRC}/krita/plugins/formats/ora/CMakeLists.txt
-	${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
-		${PATCH_WRKSRC}/cmake/modules/FindWPD.cmake
 	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' \
 		${PATCH_WRKSRC}/cmake/modules/FindGLEW.cmake
 	${REINPLACE_CMD} -e 's|/opt/local|${LOCALBASE}|' \
 		${PATCH_WRKSRC}/cmake/modules/FindImageMagick.cmake
+	${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
+		${PATCH_WRKSRC}/cmake/modules/FindWPD.cmake
+	${REINPLACE_CMD} -e 's|/libwpg-0.1||' \
+		${PATCH_WRKSRC}/filters/karbon/wpg/import/CMakeLists.txt
 
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index fe54f5c8bbe8..7165c9b94de4 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/koffice/koffice-2.1.0.tar.bz2) = e7a9c554fa2a206ec5a8898fe360bdd7
-SHA256 (KDE/koffice/koffice-2.1.0.tar.bz2) = 96ea36d1e7e2495f0076805eacf29a84607dc597f58b129a310df7227716acc9
-SIZE (KDE/koffice/koffice-2.1.0.tar.bz2) = 76150485
+MD5 (KDE/koffice/koffice-2.1.2.tar.bz2) = 8bd87b20e2a134cfd2f7db5f4fee4330
+SHA256 (KDE/koffice/koffice-2.1.2.tar.bz2) = 64233bb7b5b18813a9da46ab0c347170904611b59480b91297db4c3deb14b7da
+SIZE (KDE/koffice/koffice-2.1.2.tar.bz2) = 50359739
diff --git a/editors/koffice-kde4/files/patch-cmake__modules__FindWPD.cmake b/editors/koffice-kde4/files/patch-cmake__modules__FindWPD.cmake
new file mode 100644
index 000000000000..2d61de1342dd
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-cmake__modules__FindWPD.cmake
@@ -0,0 +1,16 @@
+--- ./cmake/modules/FindWPD.cmake.orig	2010-03-30 13:10:16.507260418 +1100
++++ ./cmake/modules/FindWPD.cmake	2010-03-30 13:09:54.253774780 +1100
+@@ -25,9 +25,10 @@
+ endif(NOT WIN32)
+ 
+   FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
+-    ${_WPDIncDir}
+-    /usr/include/libwpd-0.8
+-  )
++     PATHS
++   ${_WPDIncDir}
++     PATH_SUFFIXES libwpd-0.8
++ )
+ 
+   FIND_LIBRARY(WPD_LIBRARIES NAMES wpd-0.8
+     PATHS
diff --git a/editors/koffice-kde4/files/patch-cmake__modules__FindWPG.cmake b/editors/koffice-kde4/files/patch-cmake__modules__FindWPG.cmake
new file mode 100644
index 000000000000..6fea1669f8d5
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-cmake__modules__FindWPG.cmake
@@ -0,0 +1,15 @@
+--- ./cmake/modules/FindWPG.cmake.orig	2010-03-30 00:05:52.000000000 +1100
++++ ./cmake/modules/FindWPG.cmake	2010-03-30 13:07:46.392743489 +1100
+@@ -22,10 +22,10 @@
+     SET(LIBWPG_DEFINITIONS ${_LibWpgCflags})
+   ENDIF (NOT WIN32)
+   
+-  FIND_PATH(LIBWPG_INCLUDE_DIR libwpg-0.1/libwpg/libwpg.h
++  FIND_PATH(LIBWPG_INCLUDE_DIR libwpg/libwpg.h
+     PATHS
+     ${_LibWpgIncDir}
+-    PATH_SUFFIXES libwpg
++    PATH_SUFFIXES libwpg-0.1
+     )
+ 
+   FIND_LIBRARY(LIBWPG_LIBRARIES NAMES wpg-0.1 libwpg-0.1
diff --git a/editors/koffice-kde4/files/patch-krita_ui_kis_png_converter.cpp b/editors/koffice-kde4/files/patch-krita_ui_kis_png_converter.cpp
index fb2ec70cf2bc..494d4e335ff8 100644
--- a/editors/koffice-kde4/files/patch-krita_ui_kis_png_converter.cpp
+++ b/editors/koffice-kde4/files/patch-krita_ui_kis_png_converter.cpp
@@ -1,6 +1,5 @@
-
---- krita/ui/kis_png_converter.cpp.orig	2009-11-20 22:45:35.000000000 +0200
-+++ krita/ui/kis_png_converter.cpp	2010-03-29 08:23:02.980338247 +0300
+--- ./krita/ui/kis_png_converter.cpp.orig	2009-11-20 22:45:35.000000000 +0200
++++ ./krita/ui/kis_png_converter.cpp	2010-03-29 08:23:02.980338247 +0300
 @@ -404,7 +404,7 @@
  
      png_byte signature[8];
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index d4b34db43c2e..5b7170e0bfb8 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -1,5 +1,4 @@
 bin/karbon
-bin/kformula
 bin/koconverter
 bin/kplato
 bin/kplatowork
@@ -545,7 +544,6 @@ lib/libkdeinit4_krita.so
 lib/libkdeinit4_kspread.so
 lib/libkdeinit4_kthesaurus.so
 lib/libkdeinit4_kword.so
-lib/libkdeinit_kformula.so
 lib/libkformulalib.so
 lib/libkformulalib.so.6
 lib/libkformulalib.so.6.0.0
@@ -1153,30 +1151,30 @@ share/apps/kplato/icons/hicolor/22x22/actions/accounts.png
 share/apps/kplato/icons/hicolor/22x22/actions/add_milestone.png
 share/apps/kplato/icons/hicolor/22x22/actions/gantt_chart.png
 share/apps/kplato/icons/hicolor/22x22/actions/pert_chart.png
+share/apps/kplato/icons/hicolor/22x22/actions/resource-calendar-child-insert.png
+share/apps/kplato/icons/hicolor/22x22/actions/resource-calendar-insert.png
 share/apps/kplato/icons/hicolor/22x22/actions/resource-group-new.png
 share/apps/kplato/icons/hicolor/22x22/actions/resources.png
+share/apps/kplato/icons/hicolor/22x22/actions/view-milestone-add.png
 share/apps/kplato/icons/hicolor/22x22/actions/view-task-add.png
-share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-insert.png
-share/apps/kplato/icons/hicolor/22x22/actions/resource-calendar-child-insert.png
 share/apps/kplato/icons/hicolor/22x22/actions/view-task-child-add.png
-share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-baselined-add.png
-share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-baselined.png
 share/apps/kplato/icons/hicolor/22x22/actions/view-task-child.png
-share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-edit.png
+share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-baselined-add.png
 share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-baselined-remove.png
-share/apps/kplato/icons/hicolor/22x22/actions/view-milestone-add.png
-share/apps/kplato/icons/hicolor/22x22/actions/resource-calendar-insert.png
-share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-child-insert.png
+share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-baselined.png
 share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-calculus.png
+share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-child-insert.png
+share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-edit.png
+share/apps/kplato/icons/hicolor/22x22/actions/view-time-schedule-insert.png
 share/apps/kplato/icons/hicolor/32x32/actions/view-task.png
 share/apps/kplato/icons/hicolor/48x48/actions/template_timechart.png
 share/apps/kplato/icons/hicolor/scalable/actions/template_timechart.svgz
-share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-insert.png
-share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-calculus.png
-share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-baselined-add.png
-share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-baselined.png
 share/apps/kplato/icons/oxygen/22x22/actions/resource-calendar-child-insert.png
+share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-baselined-add.png
 share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-baselined-remove.png
+share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-baselined.png
+share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-calculus.png
+share/apps/kplato/icons/oxygen/22x22/actions/view-time-schedule-insert.png
 share/apps/kplato/kpartplugins/scripting.rc
 share/apps/kplato/kplato.rc
 share/apps/kplato/kplato_readonly.rc
@@ -2160,251 +2158,6 @@ share/doc/HTML/en/kpresenter/tut25.png
 share/doc/HTML/en/kpresenter/tut26.png
 share/doc/HTML/en/kpresenter/tutorial.docbook
 share/doc/HTML/en/kpresenter/zoomfactor.png
-share/doc/HTML/en/krita/commands-dialogs.docbook
-share/doc/HTML/en/krita/commands-menus.docbook
-share/doc/HTML/en/krita/commands-palettes.docbook
-share/doc/HTML/en/krita/commands-toolbars.docbook
-share/doc/HTML/en/krita/commands.docbook
-share/doc/HTML/en/krita/common
-share/doc/HTML/en/krita/createdocument.png
-share/doc/HTML/en/krita/credits.docbook
-share/doc/HTML/en/krita/crocusses-autocontrast.png
-share/doc/HTML/en/krita/crocusses-blur.png
-share/doc/HTML/en/krita/crocusses-brightnesscontrast.png
-share/doc/HTML/en/krita/crocusses-bumpmap.png
-share/doc/HTML/en/krita/crocusses-coloradjustment.png
-share/doc/HTML/en/krita/crocusses-colortoalpha.png
-share/doc/HTML/en/krita/crocusses-colortransfer.png
-share/doc/HTML/en/krita/crocusses-customconvolution.png
-share/doc/HTML/en/krita/crocusses-desaturate.png
-share/doc/HTML/en/krita/crocusses-edgebottom.png
-share/doc/HTML/en/krita/crocusses-edgeleft.png
-share/doc/HTML/en/krita/crocusses-edgeright.png
-share/doc/HTML/en/krita/crocusses-embossall.png
-share/doc/HTML/en/krita/crocusses-embosshorvert.png
-share/doc/HTML/en/krita/crocusses-embossvariable.png
-share/doc/HTML/en/krita/crocusses-gaussianblur.png
-share/doc/HTML/en/krita/crocusses-gaussiannoise.png
-share/doc/HTML/en/krita/crocusses-invert.png
-share/doc/HTML/en/krita/crocusses-lenscorrection.png
-share/doc/HTML/en/krita/crocusses-maximizechannel.png
-share/doc/HTML/en/krita/crocusses-meanremoval.png
-share/doc/HTML/en/krita/crocusses-minimizechannel.png
-share/doc/HTML/en/krita/crocusses-oilpaint.png
-share/doc/HTML/en/krita/crocusses-pixelize.png
-share/doc/HTML/en/krita/crocusses-raindrops.png
-share/doc/HTML/en/krita/crocusses-randomnoise.png
-share/doc/HTML/en/krita/crocusses-randompick.png
-share/doc/HTML/en/krita/crocusses-roundcorners.png
-share/doc/HTML/en/krita/crocusses-sharpen.png
-share/doc/HTML/en/krita/crocusses-smalltiles.png
-share/doc/HTML/en/krita/crocusses-sobel.png
-share/doc/HTML/en/krita/crocusses-topedge.png
-share/doc/HTML/en/krita/crocusses-unsharpmask.png
-share/doc/HTML/en/krita/crocusses-wave.png
-share/doc/HTML/en/krita/crocusses-waveletnoise.png
-share/doc/HTML/en/krita/crocusses.png
-share/doc/HTML/en/krita/developers-plugins.docbook
-share/doc/HTML/en/krita/developers-scripting.docbook
-share/doc/HTML/en/krita/developers.docbook
-share/doc/HTML/en/krita/dialogs-addpalette.png
-share/doc/HTML/en/krita/dialogs-blur.png
-share/doc/HTML/en/krita/dialogs-brightnesscontrast.png
-share/doc/HTML/en/krita/dialogs-bumpmap.png
-share/doc/HTML/en/krita/dialogs-coloradjustment.png
-share/doc/HTML/en/krita/dialogs-colorrange.png
-share/doc/HTML/en/krita/dialogs-colortoalpha.png
-share/doc/HTML/en/krita/dialogs-colortransfer.png
-share/doc/HTML/en/krita/dialogs-convertimagetype.png
-share/doc/HTML/en/krita/dialogs-convertlayertype.png
-share/doc/HTML/en/krita/dialogs-cubism.png
-share/doc/HTML/en/krita/dialogs-customconvolution.png
-share/doc/HTML/en/krita/dialogs-documentinformation.png
-share/doc/HTML/en/krita/dialogs-dropshadow.png
-share/doc/HTML/en/krita/dialogs-emboss.png
-share/doc/HTML/en/krita/dialogs-filtersgallery.png
-share/doc/HTML/en/krita/dialogs-gaussiannoise.png
-share/doc/HTML/en/krita/dialogs-histogram.png
-share/doc/HTML/en/krita/dialogs-imageproperties.png
-share/doc/HTML/en/krita/dialogs-imagerestoration.png
-share/doc/HTML/en/krita/dialogs-imagesize.png
-share/doc/HTML/en/krita/dialogs-layerproperties.png
-share/doc/HTML/en/krita/dialogs-layersize.png
-share/doc/HTML/en/krita/dialogs-lenscorrection.png
-share/doc/HTML/en/krita/dialogs-newadjustmentlayer.png
-share/doc/HTML/en/krita/dialogs-newlayer.png
-share/doc/HTML/en/krita/dialogs-oilpaint.png
-share/doc/HTML/en/krita/dialogs-pixelize.png
-share/doc/HTML/en/krita/dialogs-raindrops.png
-share/doc/HTML/en/krita/dialogs-randomnoise.png
-share/doc/HTML/en/krita/dialogs-randompick.png
-share/doc/HTML/en/krita/dialogs-rotateimage.png
-share/doc/HTML/en/krita/dialogs-rotatelayer.png
-share/doc/HTML/en/krita/dialogs-roundcorners.png
-share/doc/HTML/en/krita/dialogs-separateimage.png
-share/doc/HTML/en/krita/dialogs-shearimage.png
-share/doc/HTML/en/krita/dialogs-shearlayer.png
-share/doc/HTML/en/krita/dialogs-smalltiles.png
-share/doc/HTML/en/krita/dialogs-sobel.png
-share/doc/HTML/en/krita/dialogs-substrate.png
-share/doc/HTML/en/krita/dialogs-unsharpmask.png
-share/doc/HTML/en/krita/dialogs-wave.png
-share/doc/HTML/en/krita/dialogs-waveletnoise.png
-share/doc/HTML/en/krita/faq.docbook
-share/doc/HTML/en/krita/index.cache.bz2
-share/doc/HTML/en/krita/index.docbook
-share/doc/HTML/en/krita/installation.docbook
-share/doc/HTML/en/krita/introduction.docbook
-share/doc/HTML/en/krita/mainscreen.png
-share/doc/HTML/en/krita/mountains-burn.png
-share/doc/HTML/en/krita/mountains-color.png
-share/doc/HTML/en/krita/mountains-darken.png
-share/doc/HTML/en/krita/mountains-divide.png
-share/doc/HTML/en/krita/mountains-dodge.png
-share/doc/HTML/en/krita/mountains-hue.png
-share/doc/HTML/en/krita/mountains-lighten.png
-share/doc/HTML/en/krita/mountains-multiply.png
-share/doc/HTML/en/krita/mountains-normal.png
-share/doc/HTML/en/krita/mountains-original.png
-share/doc/HTML/en/krita/mountains-overlay.png
-share/doc/HTML/en/krita/mountains-saturation.png
-share/doc/HTML/en/krita/mountains-screen.png
-share/doc/HTML/en/krita/mountains-value.png
-share/doc/HTML/en/krita/mountains.png
-share/doc/HTML/en/krita/newimage.png
-share/doc/HTML/en/krita/palettes-colors-gray.png
-share/doc/HTML/en/krita/palettes-colors-hsv.png
-share/doc/HTML/en/krita/palettes-colors-palettes.png
-share/doc/HTML/en/krita/palettes-colors-rgb.png
-share/doc/HTML/en/krita/palettes-colors-watercolors.png
-share/doc/HTML/en/krita/palettes-controlbox-bezier.png
-share/doc/HTML/en/krita/palettes-controlbox-brush.png
-share/doc/HTML/en/krita/palettes-controlbox-colorpicker.png
-share/doc/HTML/en/krita/palettes-controlbox-contiguousfill.png
-share/doc/HTML/en/krita/palettes-controlbox-crop.png
-share/doc/HTML/en/krita/palettes-controlbox-duplicate.png
-share/doc/HTML/en/krita/palettes-controlbox-ellipse.png
-share/doc/HTML/en/krita/palettes-controlbox-fill.png
-share/doc/HTML/en/krita/palettes-controlbox-gradient.png
-share/doc/HTML/en/krita/palettes-controlbox-histogram.png
-share/doc/HTML/en/krita/palettes-controlbox-line.png
-share/doc/HTML/en/krita/palettes-controlbox-overview.png
-share/doc/HTML/en/krita/palettes-controlbox-paintwithfilters.png
-share/doc/HTML/en/krita/palettes-controlbox-polygon.png
-share/doc/HTML/en/krita/palettes-controlbox-polyline.png
-share/doc/HTML/en/krita/palettes-controlbox-rectangle.png
-share/doc/HTML/en/krita/palettes-controlbox-select.png
-share/doc/HTML/en/krita/palettes-controlbox-selectcontiguous.png
-share/doc/HTML/en/krita/palettes-controlbox-selectmagnetic.png
-share/doc/HTML/en/krita/palettes-controlbox-selectsimilar.png
-share/doc/HTML/en/krita/palettes-controlbox-star.png
-share/doc/HTML/en/krita/palettes-controlbox-text.png
-share/doc/HTML/en/krita/palettes-controlbox-transform.png
-share/doc/HTML/en/krita/palettes-layers-layers.png
-share/doc/HTML/en/krita/palettes-layers-scriptsmanager.png
-share/doc/HTML/en/krita/preferences-color.png
-share/doc/HTML/en/krita/preferences-display.png
-share/doc/HTML/en/krita/preferences-general.png
-share/doc/HTML/en/krita/preferences-grid.png
-share/doc/HTML/en/krita/preferences-performance.png
-share/doc/HTML/en/krita/preferences-sidebar.png
-share/doc/HTML/en/krita/preferences-tablet.png
-share/doc/HTML/en/krita/settings.docbook
-share/doc/HTML/en/krita/tool-bezier-example.png
-share/doc/HTML/en/krita/tool-bezier-example2.png
-share/doc/HTML/en/krita/tool-bezier-example3.png
-share/doc/HTML/en/krita/tool-bezier.png
-share/doc/HTML/en/krita/tool-brush.png
-share/doc/HTML/en/krita/tool-colorpicker.png
-share/doc/HTML/en/krita/tool-contiguousfill.png
-share/doc/HTML/en/krita/tool-crop.png
-share/doc/HTML/en/krita/tool-duplicate.png
-share/doc/HTML/en/krita/tool-ellipse.png
-share/doc/HTML/en/krita/tool-eraseselection.png
-share/doc/HTML/en/krita/tool-gradient.png
-share/doc/HTML/en/krita/tool-line.png
-share/doc/HTML/en/krita/tool-move.png
-share/doc/HTML/en/krita/tool-paintselection.png
-share/doc/HTML/en/krita/tool-paintwithfilters-example.png
-share/doc/HTML/en/krita/tool-paintwithfilters.png
-share/doc/HTML/en/krita/tool-pan.png
-share/doc/HTML/en/krita/tool-perspectivegrid.png
-share/doc/HTML/en/krita/tool-perspectivetransform.png
-share/doc/HTML/en/krita/tool-polygon.png
-share/doc/HTML/en/krita/tool-polyline.png
-share/doc/HTML/en/krita/tool-rectangle.png
-share/doc/HTML/en/krita/tool-selectbezier.png
-share/doc/HTML/en/krita/tool-selectcontiguous.png
-share/doc/HTML/en/krita/tool-selectelliptical.png
-share/doc/HTML/en/krita/tool-selectmagnetic.png
-share/doc/HTML/en/krita/tool-selectoutline.png
-share/doc/HTML/en/krita/tool-selectpolygonal.png
-share/doc/HTML/en/krita/tool-selectrectangular.png
-share/doc/HTML/en/krita/tool-selectsimilar.png
-share/doc/HTML/en/krita/tool-star.png
-share/doc/HTML/en/krita/tool-text.png
-share/doc/HTML/en/krita/tool-transform.png
-share/doc/HTML/en/krita/tool-zoom.png
-share/doc/HTML/en/krita/toolbar-brushes-brushshapes-autobrush.png
-share/doc/HTML/en/krita/toolbar-brushes-brushshapes-custombrush.png
-share/doc/HTML/en/krita/toolbar-brushes-brushshapes-predefined.png
-share/doc/HTML/en/krita/toolbar-brushes-gradients.png
-share/doc/HTML/en/krita/toolbar-brushes-patterns-custompattern.png
-share/doc/HTML/en/krita/toolbar-brushes-patterns.png
-share/doc/HTML/en/krita/toolbar-brushesandstuff.png
-share/doc/HTML/en/krita/toolbar-edit.png
-share/doc/HTML/en/krita/toolbar-file.png
-share/doc/HTML/en/krita/toolbar-krita.png
-share/doc/HTML/en/krita/toolbar-navigation.png
-share/doc/HTML/en/krita/toolbar-transformationtools.png
-share/doc/HTML/en/krita/toolbars-button-zoomin.png
-share/doc/HTML/en/krita/toolbars-button-zoomout.png
-share/doc/HTML/en/krita/tutorial-quick-starts.docbook
-share/doc/HTML/en/krita/tutorial-quick-starts1.png
-share/doc/HTML/en/krita/tutorial-quick-starts10.png
-share/doc/HTML/en/krita/tutorial-quick-starts11.png
-share/doc/HTML/en/krita/tutorial-quick-starts12.png
-share/doc/HTML/en/krita/tutorial-quick-starts2.png
-share/doc/HTML/en/krita/tutorial-quick-starts3.png
-share/doc/HTML/en/krita/tutorial-quick-starts4.png
-share/doc/HTML/en/krita/tutorial-quick-starts5.png
-share/doc/HTML/en/krita/tutorial-quick-starts6.png
-share/doc/HTML/en/krita/tutorial-quick-starts7.png
-share/doc/HTML/en/krita/tutorial-quick-starts8.png
-share/doc/HTML/en/krita/tutorial-quick-starts9.png
-share/doc/HTML/en/krita/tutorial-select-layer-1.png
-share/doc/HTML/en/krita/tutorial-select-layer-10.png
-share/doc/HTML/en/krita/tutorial-select-layer-11.png
-share/doc/HTML/en/krita/tutorial-select-layer-12.png
-share/doc/HTML/en/krita/tutorial-select-layer-13.png
-share/doc/HTML/en/krita/tutorial-select-layer-2.png
-share/doc/HTML/en/krita/tutorial-select-layer-3.png
-share/doc/HTML/en/krita/tutorial-select-layer-4.png
-share/doc/HTML/en/krita/tutorial-select-layer-5.png
-share/doc/HTML/en/krita/tutorial-select-layer-6.png
-share/doc/HTML/en/krita/tutorial-select-layer-7.png
-share/doc/HTML/en/krita/tutorial-select-layer-8.png
-share/doc/HTML/en/krita/tutorial-select-layer-9.png
-share/doc/HTML/en/krita/tutorial-select-layer-sample.png
-share/doc/HTML/en/krita/tutorial-select-layer.docbook
-share/doc/HTML/en/krita/tutorial-starting.docbook
-share/doc/HTML/en/krita/tutorial-tablet-1.png
-share/doc/HTML/en/krita/tutorial-tablet-2.png
-share/doc/HTML/en/krita/tutorial-tablet-3.png
-share/doc/HTML/en/krita/tutorial-tablet.docbook
-share/doc/HTML/en/krita/tutorial.docbook
-share/doc/HTML/en/krita/using-colorspaces.docbook
-share/doc/HTML/en/krita/using-filters.docbook
-share/doc/HTML/en/krita/using-images.docbook
-share/doc/HTML/en/krita/using-layers.docbook
-share/doc/HTML/en/krita/using-selections-1.png
-share/doc/HTML/en/krita/using-selections-2.png
-share/doc/HTML/en/krita/using-selections-3.png
-share/doc/HTML/en/krita/using-selections-4.png
-share/doc/HTML/en/krita/using-selections-5.png
-share/doc/HTML/en/krita/using-selections-6.png
-share/doc/HTML/en/krita/using-selections.docbook
-share/doc/HTML/en/krita/using-views.docbook
 share/doc/HTML/en/kspread/a11y.docbook
 share/doc/HTML/en/kspread/advanced.docbook
 share/doc/HTML/en/kspread/basics.docbook
@@ -2802,11 +2555,9 @@ share/templates/TextDocument.desktop
 @dirrmtry share/icons/hicolor/45x45
 @dirrm share/doc/HTML/en/thesaurus
 @dirrm share/doc/HTML/en/kspread
-@dirrm share/doc/HTML/en/krita
 @dirrm share/doc/HTML/en/kpresenter
 @dirrm share/doc/HTML/en/kplato
 @dirrm share/doc/HTML/en/koffice
-@dirrm share/doc/HTML/en/kivio
 @dirrm share/doc/HTML/en/kformula
 @dirrm share/doc/HTML/en/kchart
 @dirrm share/doc/HTML/en/karbon