Изменены правила переноса custom файлов

profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/portage/custom.set

@@ -1 +1 @@
-# Calculate link=#-cl_install_path_from-#/etc/portage/sets/custom.#-case(lower,os_install_linux_shortname)-# path=/etc/portage/sets name=custom.#-case(lower,os_install_linux_shortname)-# protected force mirror
+# Calculate link=#-cl_install_path_from-#/etc/portage/sets/custom path=/etc/portage/sets name=custom protected force mirror

profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/portage/make.conf

@@ -1 +1 @@
-# Calculate link=#-cl_install_path_from-#/etc/portage/make.conf/custom.#-case(lower,os_install_linux_shortname)-# path=/etc/portage/make.conf name=custom.#-case(lower,os_install_linux_shortname)-# protected force mirror
+# Calculate link=#-cl_install_path_from-#/etc/portage/make.conf/custom path=/etc/portage/make.conf name=custom protected force mirror

profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/portage/package.keywords

@@ -1 +1 @@
-# Calculate link=#-cl_install_path_from-#/etc/portage/package.keywords/custom.#-case(lower,os_install_linux_shortname)-# path=/etc/portage/package.keywords name=custom.#-case(lower,os_install_linux_shortname)-# protected force mirror
+# Calculate link=#-cl_install_path_from-#/etc/portage/package.keywords/custom path=/etc/portage/package.keywords name=custom protected force mirror

profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/portage/package.mask

@@ -1 +1 @@
-# Calculate link=#-cl_install_path_from-#/etc/portage/package.mask/custom.#-case(lower,os_install_linux_shortname)-# path=/etc/portage/package.mask name=custom.#-case(lower,os_install_linux_shortname)-# protected force mirror
+# Calculate link=#-cl_install_path_from-#/etc/portage/package.mask/custom path=/etc/portage/package.mask name=custom protected force mirror

profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/portage/package.unmask

@@ -1 +1 @@
-# Calculate link=#-cl_install_path_from-#/etc/portage/package.unmask/custom.#-case(lower,os_install_linux_shortname)-# path=/etc/portage/package.unmask name=custom.#-case(lower,os_install_linux_shortname)-# protected force mirror
+# Calculate link=#-cl_install_path_from-#/etc/portage/package.unmask/custom path=/etc/portage/package.unmask name=custom protected force mirror

profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/portage/package.use

@@ -1 +1 @@
-# Calculate link=#-cl_install_path_from-#/etc/portage/package.use/custom.#-case(lower,os_install_linux_shortname)-# path=/etc/portage/package.use name=custom.#-case(lower,os_install_linux_shortname)-# protected force mirror
+# Calculate link=#-cl_install_path_from-#/etc/portage/package.use/custom path=/etc/portage/package.use name=custom protected force mirror

profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/custom.set

@@ -1,6 +1,6 @@
-# Calculate path=/etc/portage/sets name=custom.#-case(lower,os_install_linux_shortname)-# exists(/etc/portage/sets/custom.#-case(lower,os_install_linux_shortname)-#)== protected 
+# Calculate path=/etc/portage/sets name=custom exists(/etc/portage/sets/custom)== protected 
 #?os_install_locale_lang==ru_RU#
-# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке системы
 #!os_install_locale_lang#
-# This file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new installation
 #os_install_locale_lang#

profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/make.conf

@@ -1,4 +1,4 @@
-# Calculate path=/etc/portage/make.conf name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/make.conf/custom.#-case(lower,os_install_linux_shortname)-#)==
+# Calculate path=/etc/portage/make.conf name=custom protected exists(/etc/portage/make.conf/custom)==
 #?os_install_locale_language!=ru&&os_install_locale_language!=fr#
 #---------------------------
 # Basic build options

profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.keywords

@@ -1,6 +1,6 @@
-# Calculate path=/etc/portage/package.keywords name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/package.keywords/custom.#-case(lower,os_install_linux_shortname)-#)==
+# Calculate path=/etc/portage/package.keywords name=custom protected exists(/etc/portage/package.keywords/custom)==
 #?os_install_locale_lang==ru_RU#
-# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке системы
 #!os_install_locale_lang#
-# This file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new installation
 #os_install_locale_lang#

profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.mask

@@ -1,6 +1,6 @@
-# Calculate path=/etc/portage/package.mask name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/package.mask/custom.#-case(lower,os_install_linux_shortname)-#)==
+# Calculate path=/etc/portage/package.mask name=custom protected exists(/etc/portage/package.mask/custom)==
 #?os_install_locale_lang==ru_RU#
-# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке системы
 #!os_install_locale_lang#
-# This file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new installation
 #os_install_locale_lang#

profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.unmask

@@ -1,6 +1,6 @@
-# Calculate path=/etc/portage/package.unmask name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/package.unmask/custom.#-case(lower,os_install_linux_shortname)-#)==
+# Calculate path=/etc/portage/package.unmask name=custom protected exists(/etc/portage/package.unmask/custom)==
 #?os_install_locale_lang==ru_RU#
-# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке системы
 #!os_install_locale_lang#
-# This file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new installation
 #os_install_locale_lang#

profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.use

@@ -1,6 +1,6 @@
-# Calculate path=/etc/portage/package.use name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/package.use/custom.#-case(lower,os_install_linux_shortname)-#)==
+# Calculate path=/etc/portage/package.use name=custom protected exists(/etc/portage/package.use/custom)==
 #?os_install_locale_lang==ru_RU#
-# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке системы
 #!os_install_locale_lang#
-# This file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new installation
 #os_install_locale_lang#

profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/world_sets.custom

@@ -1,2 +1,2 @@
-# Calculate protected name=world_sets append=after path=/var/lib/portage grep(/var/lib/portage/world_sets,@custom.#-case(lower,os_install_linux_shortname)-#)==
-@custom.#-case(lower,os_install_linux_shortname)-#
+# Calculate protected name=world_sets append=after path=/var/lib/portage grep(/var/lib/portage/world_sets,@custom$)==
+@custom

profiles/templates/3.6/6_ac_update_sync/revision/2019/20191216-custom_migrate

@@ -0,0 +1,41 @@
+# Calculate run=/bin/bash ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# merge=sys-apps/portage
+
+#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+
+#?cl_chroot_status!=on#
+# перенос custom[.short] в custom
+
+#?load(empty,/etc/portage/package.unmask/custom.#-case(lower,os_linux_shortname)-#)!=#
+cat /etc/portage/package.unmask/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/package.unmask/custom
+#load#
+rm -f /etc/portage/package.unmask/custom.#-case(lower,os_linux_shortname)-#
+
+#?load(empty,/etc/portage/package.mask/custom.#-case(lower,os_linux_shortname)-#)!=#
+cat /etc/portage/package.mask/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/package.mask/custom
+#load#
+rm -f /etc/portage/package.mask/custom.#-case(lower,os_linux_shortname)-#
+
+#?load(empty,/etc/portage/package.use/custom.#-case(lower,os_linux_shortname)-#)!=#
+cat /etc/portage/package.use/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/package.use/custom
+#load#
+rm -f /etc/portage/package.use/custom.#-case(lower,os_linux_shortname)-#
+
+#?load(empty,/etc/portage/package.keywords/custom.#-case(lower,os_linux_shortname)-#)!=#
+cat /etc/portage/package.keywords/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/package.keywords/custom
+#load#
+rm -f /etc/portage/package.keywords/custom.#-case(lower,os_linux_shortname)-#
+
+#?load(empty,/etc/portage/make.conf/custom.#-case(lower,os_linux_shortname)-#)!=#
+cat /etc/portage/make.conf/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/make.conf/custom
+#load#
+rm -f /etc/portage/make.conf/custom.#-case(lower,os_linux_shortname)-#
+
+#?load(empty,/etc/portage/sets/custom.#-case(lower,os_linux_shortname)-#)!=#
+cat /etc/portage/sets/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/sets/custom
+#load#
+rm -f /etc/portage/sets/custom.#-case(lower,os_linux_shortname)-#
+
+sed -ri '/^@custom.#-case(lower,os_linux_shortname)-#$/d' /var/lib/portage/world_sets
+#cl_chroot_status#
+
+true