workstation: Reoder lists to avoid conflicts

conf.d/basealt.mk

 ifeq (distro,$(IMAGE_CLASS))
 
 distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
-	3rdparty clamav cloud-clients freecad \
-	gtk-dictionary kvm smartcard voip-clients vlc)
+	3rdparty kvm clamav cloud-clients freecad \
+	gtk-dictionary smartcard voip-clients vlc)
 
 distro/alt-workstation: distro/.base +vmguest +wireless +efi \
 	mixin/desktop-installer mixin/alt-workstation \

conf.d/mixin-basealt.mk

@@ -2,8 +2,8 @@
 
 mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\
 	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
-	agents emulators ganttproject gnome-peer-to-peer graphics-editing \
-	libreoffice mate-usershare pidgin raccess scanning scribus \
+	raccess agents emulators ganttproject gnome-peer-to-peer graphics-editing \
+	libreoffice mate-usershare pidgin scanning scribus \
 	sound-editing thunderbird freeipa-client admc)
 
 mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \

pkg.in/lists/workstation/extras

 # GOST encryption
 openssl-engines
 
-# gostcrypo repo component is needed
-openssh-gostcrypto
-openssh-clients-gostcrypto openssh-askpass-common-gostcrypto
-openssh-server-gostcrypto openssh-server-control-gostcrypto
-openssh-common-gostcrypto
-openvpn-gostcrypto openvpn-plugins-gostcrypto
-alterator-openvpn-server
-
 # for AltHa
 alterator-secsetup
 
@@ -30,3 +22,14 @@ kernel-headers-un-def
 chromium
 
 chromium-gost
+
+# gostcrypo repo component is needed
+openvpn-gostcrypto openvpn-plugins-gostcrypto
+alterator-openvpn-server
+
+openssh-gostcrypto
+openssh-common-gostcrypto
+openssh-askpass-common-gostcrypto
+openssh-clients-gostcrypto
+openssh-server-control-gostcrypto
+openssh-server-gostcrypto

pkg.in/lists/workstation/raccess

+openuds-client
 remmina
 remmina-plugins
 rdesktop
 connector
 ansible
-openuds-client