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

profiles/templates/3.2/6_ac_update_sync/world/0-ini

@@ -1,4 +1,4 @@
 # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)==
 
 [overlay-distros]
-world = 52
+world = 53

profiles/templates/3.2/6_ac_update_sync/world/create/tools

@@ -54,6 +54,7 @@ sys-power/powertop
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDX)!=#
+app-arch/p7zip
 app-arch/rar
 app-arch/unzip
 app-misc/mc

profiles/templates/3.2/6_ac_update_sync/world/update/33

@@ -3,14 +3,14 @@
 #-ini(overlay-distros.world,33)-#
 
 #?in(os_linux_pkglist, CLD)!=#
-!kde-base/kate
-!kde-base/kcolorchooser
-!kde-base/kolourpaint
-!kde-base/konqueror
+!kde-apps/kate
+!kde-apps/kcolorchooser
+!kde-apps/kolourpaint
+!kde-apps/konqueror
+!kde-apps/kruler
+!kde-apps/ksystemlog
+!kde-apps/sweeper
 !kde-base/kleopatra
-!kde-base/kruler
-!kde-base/ksystemlog
-!kde-base/sweeper
 !media-video/kdenlive
 !net-im/choqok
 #in#

profiles/templates/3.2/6_ac_update_sync/world/update/40

@@ -4,7 +4,6 @@
 
 #?in(os_linux_pkglist, CLD, CLDX)!=#
 !app-arch/arj
-!app-arch/p7zip
 !app-arch/unace
 !app-arch/unarj
 !app-arch/zip

profiles/templates/3.2/6_ac_update_sync/world/update/43

@@ -3,22 +3,22 @@
 #-ini(overlay-distros.world,43)-#
 
 #?in(os_linux_pkglist, CLD)!=#
-!kde-base/kdf
-!kde-base/knotes
-!kde-base/filelight
-!kde-base/kdebase-runtime-meta
+!kde-apps/filelight
+!kde-apps/kcharselect
+!kde-apps/kdeartwork-colorschemes
+!kde-apps/kdeartwork-emoticons
+!kde-apps/kdeartwork-iconthemes
+!kde-apps/kdeartwork-styles
+!kde-apps/kdebase-runtime-meta
+!kde-apps/kde-wallpapers
+!kde-apps/kdf
+!kde-apps/kgpg
+!kde-apps/kremotecontrol
+!kde-apps/kscd
 !kde-base/kalarm
-!kde-base/kcharselect
-!kde-base/kgpg
-!kde-base/kjots
-!kde-base/kremotecontrol
-!kde-base/kscd
-!kde-base/kdeartwork-emoticons
-!kde-base/kdeartwork-iconthemes
 !kde-base/kdebase-cursors
-!kde-base/kdeartwork-styles
-!kde-base/kdeartwork-colorschemes
-!kde-base/kde-wallpapers
+!kde-base/kjots
+!kde-base/knotes
 
-kde-base/kcontrol
+kde-apps/kcontrol
 #in#

profiles/templates/3.2/6_ac_update_sync/world/update/49

@@ -3,6 +3,6 @@
 #-ini(overlay-distros.world,49)-#
 
 #?in(os_linux_pkglist, CLD)!=#
-kde-base/print-manager
+kde-apps/print-manager
 #in#
 

profiles/templates/3.2/6_ac_update_sync/world/update/53

@@ -0,0 +1,8 @@
+# Calculate format=world name=world ini(overlay-distros.world)<53
+
+#-ini(overlay-distros.world,53)-#
+
+#?in(os_linux_pkglist, CLD, CLDX)!=#
+app-arch/p7zip
+#in#
+