Correct assembly given that calculate within the meta-package.

Change.log

@@ -1,5 +1,8 @@
 CHANGE LOG
 
+1.3.2
+* Correct assembly given that calculate within the meta-package
+
 1.3.1
 * Change slimd daemon to slim for CLDX.
 * Fix select video driver in CLS/CLSG, if system installing from other distributives.

install/calculate

@@ -106,8 +106,8 @@ if(defined $data{arg}{'vars'}){
 			beep();
 		}elsif(!makepkg()){
 			beep();
-		}elsif(!makecalculate()){
-			beet();
+		#}elsif(!makecalculate()){
+		#	beet();
 		}
 	}elsif(defined $data{arg}{pack}){
 		if(!packsystem()){
@@ -3949,13 +3949,13 @@ sub configure{
 	my $mask = substr($data{unmask}, 1);
 	system "$data{path} cd $data{chroot}/etc; rm make.profile; ln -sf ../usr/local/portage/layman/calculate/profiles/calculate/$data{system}/$data{calculate}/$mask make.profile";
 
-	#Подмонтируем /usr/calculate/install
-	printmes("  ".gettext('Mount')); printmes(" /usr/calculate/install...");
-	if(system "$data{path} mount -o bind /usr/calculate/install $data{chroot}/usr/calculate/install &>/dev/null"){
-		printmes(" ".gettext('error')."!\n");
-		umountbuild(); return '';
-	}
-	printmes(" ".gettext('done').".\n");
+	##Подмонтируем /usr/calculate/install
+	#printmes("  ".gettext('Mount')); printmes(" /usr/calculate/install...");
+	#if(system "$data{path} mount -o bind /usr/calculate/install $data{chroot}/usr/calculate/install &>/dev/null"){
+	#	printmes(" ".gettext('error')."!\n");
+	#	umountbuild(); return '';
+	#}
+	#printmes(" ".gettext('done').".\n");
 
 	#Подмонтируем /usr/calculate/share
 	printmes("  ".gettext('Mount')); printmes(" /usr/calculate/share...");
@@ -6884,28 +6884,28 @@ sub makepkg{
 #------------------------------------------------------------------------------
 # Соберем стабильную версию calculate
 #------------------------------------------------------------------------------
-sub makecalculate{
-	if(`mount | grep $data{chroot}/usr/calculate/install`){
-		#Отмонтируем /usr/calculate/install
-		printmes("  ".gettext('Umount')); printmes(" /usr/calculate/install...");
-		if(system "$data{path} umount $data{chroot}/usr/calculate/install &>/dev/null"){
-			printmes(" ".gettext('error')."!\n");
-			return '';
-		}else{
-			printmes(" ".gettext('done').".\n");
-		}
-
-		#Установим calculate
-		printmes("  ".gettext('Execute')); printmes(" emerge sys-apps/calculate...");
-		if(system "$data{path} chroot $data{chroot} emerge sys-apps/calculate &>/dev/null"){
-			printmes(" ".gettext('error')."!\n");
-			return '';
-		}else{
-			printmes(" ".gettext('done').".\n");
-		}
-	}
-	return 1;
-}
+#sub makecalculate{
+#	if(`mount | grep $data{chroot}/usr/calculate/install`){
+#		#Отмонтируем /usr/calculate/install
+#		printmes("  ".gettext('Umount')); printmes(" /usr/calculate/install...");
+#		if(system "$data{path} umount $data{chroot}/usr/calculate/install &>/dev/null"){
+#			printmes(" ".gettext('error')."!\n");
+#			return '';
+#		}else{
+#			printmes(" ".gettext('done').".\n");
+#		}
+#
+#		#Установим calculate
+#		printmes("  ".gettext('Execute')); printmes(" emerge sys-apps/calculate...");
+#		if(system "$data{path} chroot $data{chroot} emerge sys-apps/calculate &>/dev/null"){
+#			printmes(" ".gettext('error')."!\n");
+#			return '';
+#		}else{
+#			printmes(" ".gettext('done').".\n");
+#		}
+#	}
+#	return 1;
+#}
 
 #------------------------------------------------------------------------------
 # Подключим своп