Merge branch 'develop' of git.calculate.ru:/calculate/overlay into develop

profiles/templates/2.2/assemble/prepare/etc/portage/make.conf/assemble

@@ -1,15 +1,13 @@
 # Calculate comment=#
 MAKEOPTS="#-os_assemble_makeopts-#"
 #?cl_assemble_buildpkg_set==on#
-FEATURES="${FEATURES} buildpkg -getbinpkg"
+FEATURES="${FEATURES} ccache buildpkg -getbinpkg"
 EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --binpkg-respect-use=n --jobs=1"
+CCACHE_SIZE="20G"
+CCACHE_DIR="/var/calculate/remote/tmp/ccache-#-os_assemble_arch_machine-#-gcc-#-pkg(sys-devel/gcc)-#"
 #cl_assemble_buildpkg_set#
 #?cl_assemble_buildpkg_set!=on#
 FEATURES="${FEATURES} -buildpkg getbinpkg"
 EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --binpkg-respect-use=n --jobs=10"
 #cl_assemble_buildpkg_set#
 PKGDIR="#-cl_assemble_pkgdir-#"
-
-FEATURES="${FEATURES} ccache"
-CCACHE_SIZE="20G"
-CCACHE_DIR="/var/calculate/remote/tmp/ccache-#-os_assemble_arch_machine-#-gcc-#-pkg(sys-devel/gcc)-#"

profiles/templates/2.2/assemble/setup/etc/portage/make.conf/assemble

@@ -1,15 +1,13 @@
 # Calculate comment=#
 MAKEOPTS="#-os_assemble_makeopts-#"
 #?cl_assemble_buildpkg_set==on#
-FEATURES="${FEATURES} buildpkg -getbinpkg"
+FEATURES="${FEATURES} ccache buildpkg -getbinpkg"
 EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --binpkg-respect-use=n --jobs=1"
+CCACHE_SIZE="20G"
+CCACHE_DIR="/var/calculate/remote/tmp/ccache-#-os_assemble_arch_machine-#-gcc-#-pkg(sys-devel/gcc)-#"
 #cl_assemble_buildpkg_set#
 #?cl_assemble_buildpkg_set!=on#
 FEATURES="${FEATURES} -buildpkg getbinpkg"
 EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --binpkg-respect-use=n --jobs=10"
 #cl_assemble_buildpkg_set#
 PKGDIR="#-cl_assemble_pkgdir-#"
-
-FEATURES="${FEATURES} ccache"
-CCACHE_SIZE="20G"
-CCACHE_DIR="/var/calculate/remote/tmp/ccache-#-os_assemble_arch_machine-#-gcc-#-pkg(sys-devel/gcc)-#"