Добавлена ревизия миграции парамтеров ini.env

profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip

profiles/templates/3.2/6_ac_update_sync/revision/01-migrate-ini.env

@@ -0,0 +1,9 @@
+# Calculate path=/etc/calculate name=ini.env format=samba ini(distros-calculate.revision)<1
+
+[distros-calculate]
+revision = 1
+world = #-ini(update.world)-#
+
+[update-distros]
+!world =
+!revision =

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

@@ -1,4 +1,4 @@
-# Calculate path=/etc/calculate name=ini.env format=samba cl_update_world!=update||ini(update-distros.world)==
+# Calculate path=/etc/calculate name=ini.env format=samba cl_update_world!=update||ini(overlay-distros.world)==
 
-[update-distros]
+[overlay-distros]
 world = 12

profiles/templates/3.2/6_ac_update_sync/world/create/0-world

@@ -1,3 +0,0 @@
-# Calculate append=skip cl_update_world==rebuild name=world
-
-# world is removed and filled in the core packages from the calculate overlay

profiles/templates/3.2/6_ac_update_sync/world/update/02

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<2
+# Calculate format=world name=world ini(overlay-distros.world)<2
 
-#-ini(update-distros.world,2)-#
+#-ini(overlay-distros.world,2)-#
 
 #?in(os_linux_pkglist, base)!=#
 !sys-kernel/calckernel

profiles/templates/3.2/6_ac_update_sync/world/update/03

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<3
+# Calculate format=world name=world ini(overlay-distros.world)<3
 
-#-ini(update-distros.world,3)-#
+#-ini(overlay-distros.world,3)-#
 
 # пакет теперь входит в зависимости к calculate-sources
 #?in(os_linux_pkglist, CLD, CLDX, CMC, CLS)!=#

profiles/templates/3.2/6_ac_update_sync/world/update/04

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<4
+# Calculate format=world name=world ini(overlay-distros.world)<4
 
-#-ini(update-distros.world,4)-#
+#-ini(overlay-distros.world,4)-#
 
 # смена dhcp для поддержки PXE загрузки
 #?in(os_linux_pkglist, CLD, CLDX, CMC, CLS)!=#

profiles/templates/3.2/6_ac_update_sync/world/update/05

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<5
+# Calculate format=world name=world ini(overlay-distros.world)<5
 
-#-ini(update-distros.world,5)-#
+#-ini(overlay-distros.world,5)-#
 
 # Не поддерживаются, начиная с claws-mail 3.10
 #?in(os_linux_pkglist, CLDX)!=#

profiles/templates/3.2/6_ac_update_sync/world/update/06

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<6
+# Calculate format=world name=world ini(overlay-distros.world)<6
 
-#-ini(update-distros.world,6)-#
+#-ini(overlay-distros.world,6)-#
 
 # отсутствует в KDE 4.14
 #?in(os_linux_pkglist, CLD)!=#

profiles/templates/3.2/6_ac_update_sync/world/update/07

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<7
+# Calculate format=world name=world ini(overlay-distros.world)<7
 
-#-ini(update-distros.world,7)-#
+#-ini(overlay-distros.world,7)-#
 
 !media-gfx/splash-themes-calculate
 !media-gfx/splashutils

profiles/templates/3.2/6_ac_update_sync/world/update/08

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<8
+# Calculate format=world name=world ini(overlay-distros.world)<8
 
-#-ini(update-distros.world,8)-#
+#-ini(overlay-distros.world,8)-#
 
 #?in(os_linux_pkglist, CLD, CLDX, CMC)!=#
 !sys-power/cpufrequtils

profiles/templates/3.2/6_ac_update_sync/world/update/09

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<9
+# Calculate format=world name=world ini(overlay-distros.world)<9
 
-#-ini(update-distros.world,9)-#
+#-ini(overlay-distros.world,9)-#
 
 #?in(os_linux_pkglist, CLD, CLDX)!=#
 !sys-auth/thinkfinger

profiles/templates/3.2/6_ac_update_sync/world/update/10

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<10
+# Calculate format=world name=world ini(overlay-distros.world)<10
 
-#-ini(update-distros.world,10)-#
+#-ini(overlay-distros.world,10)-#
 
 #?in(os_linux_pkglist, base)!=#
 !app-i18n/man-pages-de

profiles/templates/3.2/6_ac_update_sync/world/update/11

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<11
+# Calculate format=world name=world ini(overlay-distros.world)<11
 
-#-ini(update-distros.world,11)-#
+#-ini(overlay-distros.world,11)-#
 
 #?in(os_linux_pkglist, CLDX)!=#
 !media-gfx/eog

profiles/templates/3.2/6_ac_update_sync/world/update/12

@@ -1,6 +1,6 @@
-# Calculate format=world name=world ini(update-distros.world)<12
+# Calculate format=world name=world ini(overlay-distros.world)<12
 
-#-ini(update-distros.world,12)-#
+#-ini(overlay-distros.world,12)-#
 
 #?in(os_linux_pkglist, CLDX)!=#
 !media-gfx/shotwell