Исправление шаблонов 3.4

profiles/templates/3.3/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.3&&cl_ver<3.4&&pkg(sys-apps/calculate-utils)>=3.3.0_alpha1
+# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.3&&pkg(sys-apps/calculate-utils)>=3.3.0_alpha1

profiles/templates/3.4/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip pkg()!=
+# Calculate path=/ name=etc pkg()!=&&merge()!=

profiles/templates/3.4/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip
+# Calculate path=/ name=etc pkg()!=&&merge()!=

profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/.calculate_directory

@@ -1 +1 @@
-# Calculate path=/etc/portage name=make.conf pkg()!=
+# Calculate path=/etc/portage name=make.conf pkg()!=&&merge()!=

profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/assemble

@@ -3,11 +3,11 @@ MAKEOPTS="#-os_builder_makeopts-#"
 EMERGE_DEFAULT_OPTS="--jobs=1"
 #?cl_builder_buildpkg_set==on#
 FEATURES="${FEATURES} buildpkg -getbinpkg"
-#cl_assemble_buildpkg_set#
-#?cl_assemble_buildpkg_set!=on#
+#cl_builder_buildpkg_set#
+#?cl_builder_buildpkg_set!=on#
 FEATURES="${FEATURES} -buildpkg -getbinpkg"
-#cl_assemble_buildpkg_set#
-PKGDIR="#-cl_build_pkgdir-#"
+#cl_builder_buildpkg_set#
+PKGDIR="#-cl_builder_pkgdir-#"
 
 FEATURES="${FEATURES} ccache"
 CCACHE_SIZE="20G"

profiles/templates/3.4/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory

@@ -1 +1 @@
-# Calculate path=/var/cache name=revdep-rebuild append=clear pkg()!=
+# Calculate path=/var/cache name=revdep-rebuild append=clear pkg()!=&&merge()!=

profiles/templates/3.4/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory

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

profiles/templates/3.4/6_ac_builder_setup/sys-apps/portage/.calculate_directory

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

profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/.calculate_directory

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

profiles/templates/deprecated/3.1/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.1.1&&cl_ver<3.3||cl_name==calculate-core&&cl_ver>=3.1.1&&pkg(sys-apps/calculate-utils)<3.3.0_alpha1&&cl_ver<3.4
+# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.1.1&&cl_ver<3.3||cl_name==calculate-core&&cl_ver>=3.1.1&&pkg(sys-apps/calculate-utils)<3.3.0_alpha1