Merge branch 'develop' of git.calculate-linux.org:/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 = 20200521
+world = 20200604

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

@@ -10,7 +10,6 @@ lxqt-base/lxqt-openssh-askpass
 lxqt-base/lxqt-powermanagement
 lxqt-base/lxqt-sudo
 net-irc/kvirc
-net-p2p/qbittorrent
 x11-misc/qlipper
 x11-misc/screengrab
 x11-terms/qterminal

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

@@ -21,13 +21,10 @@ www-plugins/chrome-ublock
 #?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
 net-im/gajim
 net-misc/remmina
+net-p2p/qbittorrent
 x11-misc/x11vnc
 #in#
 
-#?in(os_linux_pkglist, CLDC, CLDM, CLDX, CLDXS)!=#
-net-p2p/deluge
-#in#
-
 #?in(os_linux_pkglist, CLDL, CLDM, CLDX, CLDXS)!=#
 mail-client/claws-mail
 #in#

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

@@ -16,6 +16,7 @@ xfce-extra/xfce4-datetime-plugin
 xfce-extra/xfce4-notifyd
 xfce-extra/xfce4-power-manager
 xfce-extra/xfce4-screenshooter
+xfce-extra/xfce4-statusnotifier-plugin
 xfce-extra/xfce4-taskmanager
 xfce-extra/xfce4-xkb-plugin
 #in#

profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200604

@@ -0,0 +1,8 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLDX, CLDXS)!=#
+!x11-misc/snixembed
+xfce-extra/xfce4-statusnotifier-plugin
+#in#