Added support sets.

Change.log

@@ -2,6 +2,7 @@ CHANGE LOG
 
 1.3.13
 * The use of man-db when building systems.
+* Added support sets.
 
 1.3.12
 * Fix creating format a digest file.

install/calculate

@@ -4519,7 +4519,7 @@ sub emerge_pretend{
 	push @check, `$data{emergerun1} -p --color n @packages $data{emergerun2} $softly 2>&1`;
 	if(!defined $data{arg}{'unmask'}){
 		#вторая проверка на случай сборки на базе CLS
-		push @check, `$data{emergerun1} -p --color n -uD world $data{emergerun2} $softly 2>&1`;
+		push @check, `$data{emergerun1} -p --color n -uD \@world $data{emergerun2} $softly 2>&1`;
 	}
 	foreach(@check){
 		if(m/Error: The above package list contains packages which cannot be/ ||
@@ -4581,27 +4581,26 @@ sub make{
 	#отобразим выполненные действия
 	if(getini("run.make.step.system", "chroot")){
 		foreach(my $i = 0; $i < getini("run.make.step.system", "chroot"); $i ++){
-			printmes("  ".gettext('Execute')); printmes(" emerge -e system...");
+			printmes("  ".gettext('Execute')); printmes(" emerge -e \@system...");
 			printmes("  ".gettext('done')); printmes(".\n");
 	}	}
 	if(getini("run.make.step.newuse", "chroot")){
-			printmes("  ".gettext('Execute')); printmes(" emerge --newuse -D world...");
+			printmes("  ".gettext('Execute')); printmes(" emerge --newuse -D \@world...");
 			printmes("  ".gettext('done')); printmes(".\n");
 	}
 	if(getini("run.make.step.update", "chroot")){
-			printmes("  ".gettext('Execute')); printmes(" emerge -upD world...");
+			printmes("  ".gettext('Execute')); printmes(" emerge -upD \@world...");
 			printmes("  ".gettext('done')); printmes(".\n");
 	}
 
 	#получим список пакетов world = ""
 	my @world = packages();
-
 	my $finish = '';
 	while(!$finish){
 		if($data{stage} !~m/iso$/ && getini("run.make.step.system", "chroot") < 2){
-			printmes("  ".gettext('Execute')); printmes(" emerge -e system...\n");
+			printmes("  ".gettext('Execute')); printmes(" emerge -e \@system...\n");
 			putini("run.make" => "system", "chroot"); #сохраним выполняемое действие
-			if(system "$data{emergerun1} -e system $data{emergerun2} --nodie"){
+			if(system "$data{emergerun1} -e \@system $data{emergerun2} --nodie"){
 				beep();
 				printmes(" ".gettext('error')."!\n"); return '';
 			}else{
@@ -4614,8 +4613,8 @@ sub make{
 				printmes(" ".gettext('done').".\n");
 			}
 		}elsif($data{stage} =~m/iso$/ && !getini("run.make.step.newuse", "chroot")){
-			printmes("  ".gettext('Execute')); printmes(" emerge --newuse -D world...\n");
-			if(system "$data{emergerun1} --newuse -D world $data{emergerun2} --nodie"){
+			printmes("  ".gettext('Execute')); printmes(" emerge --newuse -D \@world...\n");
+			if(system "$data{emergerun1} --newuse -D \@world $data{emergerun2} --nodie"){
 				beep(); printmes(" ".gettext('error')."!\n"); return '';
 			}else{
 				#отметим успешное выполнение
@@ -4623,8 +4622,8 @@ sub make{
 				printmes(" ".gettext('done').".\n");
 			}
 		}elsif($data{stage} =~m/iso$/ && !getini("run.make.step.update", "chroot")){
-			printmes("  ".gettext('Execute')); printmes(" emerge -uD world...\n");
-			if(system "$data{emergerun1} -uD world $data{emergerun2} --nodie"){
+			printmes("  ".gettext('Execute')); printmes(" emerge -uD \@world...\n");
+			if(system "$data{emergerun1} -uD \@world $data{emergerun2} --nodie"){
 				beep(); printmes(" ".gettext('error')."!\n"); return '';
 			}else{
 				#отметим успешное выполнение
@@ -4641,7 +4640,7 @@ sub make{
 
 				#The end check USE flags
 				printmes("  ".gettext('Execute')); printmes(" emerge --newuse -D world...\n");
-				if(system "$data{emergerun1} --newuse -D world $data{emergerun2} --nodie"){
+				if(system "$data{emergerun1} --newuse -D \@world $data{emergerun2} --nodie"){
 					beep(); printmes(" ".gettext('error')."!\n"); return '';
 				}else{
 					printmes(" ".gettext('done').".\n");
@@ -7136,9 +7135,9 @@ sub clearlog{
 	}
 
         #Заново сформируем world
-	foreach(packages()){
-		system "echo '$_' >> $chroot/var/lib/portage/world";
-	}
+	#foreach(packages()){
+	#	system "echo '$_' >> $chroot/var/lib/portage/world";
+	#}
 
 	printmes(" ".gettext('done')); printmes(".\n");
 }