Merge branch 'develop' of git.calculate.ru:calculate/overlay into develop

profiles/calculate/desktop/CLD/package.keywords/default

@@ -9,13 +9,13 @@
 #for KDE 4.5.4
 ~media-gfx/exiv2-0.21.1 amd64 x86
 
-~media-gfx/digikam-2.5.0 amd64 x86
-~media-plugins/kipi-plugins-2.5.0 amd64 x86
-~media-libs/libkgeomap-2.5.0 amd64 x86
-~media-libs/libkface-2.5.0 amd64 x86
-~net-libs/libkvkontakte-2.5.0 amd64 x86
+~media-gfx/digikam-2.6.0 amd64 x86
+~media-plugins/kipi-plugins-2.6.0 amd64 x86
+~media-libs/libkgeomap-2.6.0 amd64 x86
+~media-libs/libkface-2.6.0 amd64 x86
+~net-libs/libkvkontakte-2.6.0 amd64 x86
 
-~media-video/kdenlive-0.8.2.1 amd64 x86
+~media-video/kdenlive-0.9.2 amd64 x86
 
 ~dev-db/virtuoso-odbc-6.1.4 amd64 x86
 

profiles/calculate/desktop/CLD/package.use

@@ -1,7 +1,5 @@
 app-arch/p7zip -kde
 app-office/calligra kdepim
-=kde-base/kde-l10n-4.4.5 -handbook
->=app-office/openoffice-3.2.0 -gtk kde
 app-text/fbreader -gtk -qt3 qt4
 dev-python/PyQt4 sql
 dev-libs/soprano redland
@@ -19,6 +17,9 @@ net-p2p/ktorrent -infowidget
 net-print/gutenprint gimp
 sys-auth/polkit -gtk
 
+#requires "dev-libs/libxml2 -icu" that causes conflict with chromium
+x11-libs/qt-webkit -gstreamer
+
 dev-lang/lua deprecated
 net-p2p/eiskaltdcpp -gtk
 

profiles/calculate/package.keywords/defaults

@@ -55,5 +55,5 @@
 
 ~app-text/wgetpaste-2.20 amd64 x86
 
-~sys-fs/btrfs-progs-0.19_p120221 amd64 x86
+~sys-fs/btrfs-progs-0.19.11 amd64 x86