sys-apps/calculate-utils: доработана настройка пакетов

Пакеты, настройка которых происходит с ошибкой, перенастраиваются во
время переустановки calculate-utils.

profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package

@@ -8,13 +8,35 @@
 #  You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
-
 CL_UPDATE_PROG=/usr/sbin/cl-core
 RUN_CORE="/usr/bin/python2 ${CL_UPDATE_PROG}"
 CORE_METHOD="--method core_setup"
 
 post_setup_package() {
 	local remove_dir_list=""
+	if [ -f ${CL_UPDATE_PROG} ] && [[ $PN == "calculate-utils" ]] && [[ -f /var/lib/calculate/calculate-core/setup-failed.list ]]
+	then
+		while read category pkgname mypvr myslot;do
+			if [[ -n $category ]]
+			then
+				pkg_lockfile_dir=/var/calculate/tmp/portage/$category
+				pkg_lockfile="$pkg_lockfile_dir"/.${pkgname}.calculate_lockfile
+				if ! [[ -d $pkg_lockfile_dir ]]
+				then
+					mkdir -p $pkg_lockfile_dir
+					remove_dir_list="$remove_dir_list $pkg_lockfile_dir"
+				fi
+				(
+					flock -x -w 1 73 || exit 1;
+					fuser /var/db/pkg/$category/.${pkgname}*.portage_lockfile &>/dev/null || CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${RUN_CORE} ${CORE_METHOD} --no-progress --pkg-name $pkgname --pkg-category $category --pkg-slot $myslot --pkg-version $mypvr --pkg-path "/";
+					rm -f /var/lib/calculate/-runlevels-$pkgname
+					rm $pkg_lockfile
+				) 73>$pkg_lockfile
+			fi
+		done </var/lib/calculate/calculate-core/setup-failed.list
+		rm -f /var/lib/calculate/calculate-core/setup-failed.list
+	fi
+
 	if [ -f ${CL_UPDATE_PROG} ] && [[ -f  /var/lib/calculate/-postmerge ]] && check_skip
 	then
 		OLDIFS=$IFS

profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package

@@ -20,7 +20,14 @@ setup_merge_package() {
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
 		grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
 	then
-		[ -f ${CL_UPDATE_PROG} ] && check_skip && CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${RUN_CORE} ${CORE_METHOD} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT/\/*} --pkg-category ${CATEGORY} --pkg-path "/" --pkg-name ${PN}
+		if [ -f ${CL_UPDATE_PROG} ] && check_skip
+		then
+			if ! CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${RUN_CORE} ${CORE_METHOD} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT/\/*} --pkg-category ${CATEGORY} --pkg-path "/" --pkg-name ${PN}
+			then
+				echo $CATEGORY $PN $PVR ${SLOT/\/*} >>/var/lib/calculate/calculate-core/setup-failed.list
+				return 1
+			fi
+		fi
 	fi
 	rm -f /var/lib/calculate/-runlevels-$PN
 }

profiles/templates/3.6/6_ac_update_sync/remerge/0-ini

@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20201123
+remerge = 20201124

profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201124

@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/calculate-utils
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#