Обновлены шаблоны для утилит 3.3

Созданы сценарии remerge для утилит и модулей
updateSymlink перемещен на событие merge (из события live)

profiles/templates/3.3/2_ac_install_merge/Depends/calculate-utils

@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!= merge=sys-apps/sysvinit,sys-auth/pambase,x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme

profiles/templates/3.3/2_ac_install_merge/Remerge/client-3.3.0_alpha2

@@ -0,0 +1 @@
+# Calculate merge(sys-apps/calculate-utils[client])!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase

profiles/templates/3.3/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2

@@ -0,0 +1 @@
+# Calculate merge(sys-apps/calculate-utils[client])!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase

profiles/templates/3.3/2_ac_install_merge/Remerge/utils-3.3.0_alpha1

@@ -0,0 +1 @@
+# Calculate path=/etc/local.d name=logout.stop append=remove merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha1

profiles/templates/3.3/2_ac_install_merge/Remerge/utils-3.3.0_alpha2

@@ -0,0 +1 @@
+# Calculate merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha2 merge=sys-process/htop,x11-terms/xterm,sys-process/vixie-cron/media-gfx/calculate-wallpapers,sys-apps/sysvinit,sys-auth/pambase,x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme,app-portage/layman,app-portage/eix

profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=

profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.env

@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate
-
-[update]
-!packages = 

profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-utils/.calculate_directory

@@ -0,0 +1 @@
+# Calculate merge()!=&&pkg()!= path=/etc/runlevels name=default

profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-utils/client.remove

@@ -0,0 +1 @@
+# Calculate append=remove name=client

profiles/templates/3.3/6_ac_update_sync/remerge/00-ini

@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 31
+remerge = 30

profiles/templates/3.3/6_ac_update_sync/remerge/31

@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-process/htop,x11-terms/xterm ini(overlay-calculate.remerge)<31
-
-[overlay-calculate]
-remerge = 31