Исправлен вызов cl-update при emerge --sync

profiles/templates/6_ac_install_patch/sys-apps/portage/calculate_sync_module.patch

@@ -81,7 +81,7 @@ index 0000000..d3152f6
 +
 +		#calculate update
 +		exitcode = portage.process.spawn_bash(
-+                    "/usr/sbin/cl-core --method update --rep %s "
++                    "/usr/sbin/cl-core --method update --repositories %s "
 +                    "--sync-only on --skip-eix-update -T none" % self.repo.name)
 +		if exitcode != os.EX_OK:
 +			msg = "!!! calculate update error; exiting."

profiles/templates/6_ac_update_sync/revision/0-ini

@@ -0,0 +1,5 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)==
+
+[overlay-calculate]
+# Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
+revision = 20221118

profiles/templates/6_ac_update_sync/revision/2022/20220228.1-fix_update_conf

@@ -1,10 +1,11 @@
-# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0)-#
 
-#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+#-ini(overlay-calculate.revision,#-cut(0)-#)-#
 
 for i in $(ls /var/db/pkg/*/*/autodeps 2>/dev/null)
 do
 	sed -i '/media-libs\/ilmbase:0/d' $i
 	sed -i '/media-libs\/openexr:3/d' $i
 done
+
 exit 0

profiles/templates/6_ac_update_sync/revision/2022/20220620-mask_nvidia_conf

@@ -1,10 +1,10 @@
-# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0)-#
 
-#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+#-ini(overlay-calculate.revision,#-cut(0)-#)-#
 
 if [ -e /etc/X11/xorg.conf ]
 then
-	grep nvidia /etc/X11/xorg.conf >/dev/null && cl-setup-video
+	grep -q nvidia /etc/X11/xorg.conf && cl-setup-video
 fi
 
 exit 0

profiles/templates/6_ac_update_sync/revision/2022/20220620.1-fix_alsa_conf

@@ -1,10 +1,10 @@
-# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0)-#
 
-#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+#-ini(overlay-calculate.revision,#-cut(0)-#)-#
 
 if [ -e /etc/asound.conf ]
 then
-	grep defaults.pcm /etc/asound.conf >/dev/null && cl-setup-audio
+	grep -q defaults.pcm /etc/asound.conf && cl-setup-audio
 fi
 
 exit 0

profiles/templates/6_ac_update_sync/revision/2022/20220626-rebuild_gnome-keyring

@@ -1,4 +1,4 @@
-# Calculate name=ini.env format=samba ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# rebuild=gnome-base/gnome-keyring
+# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0)-# rebuild=gnome-base/gnome-keyring
 
 [overlay-calculate]
-revision = #-cut(0,-,#-cl_pass_file-#)-#
+revision = #-cut(0)-#

profiles/templates/6_ac_update_sync/revision/2022/20220712-rm_stmpfiles

@@ -1,6 +1,6 @@
-# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0)-#
 
-#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+#-ini(overlay-calculate.revision,#-cut(0)-#)-#
 
 rm -rf /etc/init.d/stmpfiles-setup
 

profiles/templates/6_ac_update_sync/revision/2022/20220713.1-portage_transfer

@@ -1,6 +1,6 @@
-# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0)-#
 
-#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+#-ini(overlay-calculate.revision,#-cut(0)-#)-#
 
 #if [ ! -e /var/db/repos/gentoo ]
 #then

profiles/templates/6_ac_update_sync/revision/2022/20220825-rm_stmpfiles

@@ -1,6 +1,6 @@
-# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0)-#
 
-#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+#-ini(overlay-calculate.revision,#-cut(0)-#)-#
 
 rm -f /etc/runlevels/*/stmpfiles-setup
 rm -f /etc/runlevels/*/stmpfiles-dev

profiles/templates/6_ac_update_sync/revision/2022/20221020.1-fix_locale

@@ -1,8 +1,10 @@
-# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0)-#
+
+#-ini(overlay-calculate.revision,#-cut(0)-#)-#
 
-#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
 if [[ -e /etc/env.d/02locale ]]
 then
 	sed -i 's/utf8/UTF-8/g' /etc/env.d/02locale
 fi
+
 exit 0

profiles/templates/6_ac_update_sync/revision/2022/20221118-rebuild_portage

@@ -0,0 +1,4 @@
+# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-)-#  rebuild=sys-apps/portage
+
+[overlay-calculate]
+revision = #-cut(0)-#