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

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

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

profiles/templates/3.5/6_ac_update_sync/world/create/decoration

@@ -13,14 +13,14 @@ x11-themes/calculate-icon-theme
 
 #?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXE)!=#
 media-gfx/lightdm-themes-calculate
+x11-themes/adwaita-qt
 #in#
 
 #?in(os_linux_pkglist, CLDC, CLDM, CLDX, CLDXE)!=#
 x11-misc/qt5ct
-x11-themes/adwaita-qt
 #in#
 
-#?in(os_linux_pkglist, CLDM, CLDX, CLDXE)!=#
+#?in(os_linux_pkglist, CLDL, CLDM, CLDX, CLDXE)!=#
 x11-themes/claws-mail-theme-calculate
 #in#
 

profiles/templates/3.5/6_ac_update_sync/world/create/lxqt

@@ -1,6 +1,7 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CLDL)!=#
+app-arch/xarchiver
 lxde-base/lxtask
 lxqt-base/lxqt-admin
 #lxqt-base/lxqt-l10n

profiles/templates/3.5/6_ac_update_sync/world/create/multimedia

@@ -17,7 +17,7 @@ media-sound/qastools
 media-sound/volumeicon
 #in#
 
-#?in(os_linux_pkglist, CLDL, CLDX, CLDXE)!=#
+#?in(os_linux_pkglist, CLDX, CLDXE)!=#
 media-sound/pavucontrol
 #in#
 

profiles/templates/3.5/6_ac_update_sync/world/create/netapps

@@ -27,8 +27,11 @@ x11-misc/x11vnc
 net-p2p/deluge
 #in#
 
-#?in(os_linux_pkglist, CLDM, CLDX, CLDXE)!=#
+#?in(os_linux_pkglist, CLDL, CLDM, CLDX, CLDXE)!=#
 mail-client/claws-mail
+#in#
+
+#?in(os_linux_pkglist, CLDM, CLDX, CLDXE)!=#
 net-irc/hexchat
 #in#
 
@@ -39,10 +42,6 @@ net-irc/konversation
 net-p2p/ktorrent
 #in#
 
-#?in(os_linux_pkglist, CLDL)!=#
-mail-client/trojita
-#in#
-
 #?in(os_linux_pkglist, CDS)!=#
 net-analyzer/fail2ban
 net-analyzer/iptraf-ng

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

@@ -79,10 +79,6 @@ sys-block/gparted
 x11-misc/wmctrl
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDXE)!=#
-x11-libs/gksu
-#in#
-
 #?in(os_linux_pkglist, CLDC, CLDM)!=#
 x11-misc/parcellite
 #in#

profiles/templates/3.5/6_ac_update_sync/world/create/xfce

@@ -3,6 +3,7 @@
 #?in(os_linux_pkglist, CLDX, CLDXE)!=#
 app-arch/xarchiver
 dev-util/catfish
+gnome-extra/polkit-gnome
 x11-misc/sw-notify-send
 x11-terms/xfce4-terminal
 xfce-base/xfce4-meta

profiles/templates/3.5/6_ac_update_sync/world/update/2018/20181113

@@ -0,0 +1,11 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDXE)!=#
+!x11-libs/gksu
+#in#
+
+#?in(os_linux_pkglist, CLDX)!=#
+gnome-extra/polkit-gnome
+#in#