builder: do not emerge preserved rebuild if PRETEND is set

This reverts commit 575ec04147.

builder

@@ -259,9 +259,9 @@ sub compile_packs {
     for my $pack (@packages) {
         my $tmp_rt;
         say "\n" x 2, "==== Compiling $pack ====", "\n" x 2;
-        if (    defined $per_package_useflags->{$target}->[$package_counter]
-            and @{ $per_package_useflags->{$target}->[$package_counter] } > 0
-            and !$pretend )
+        if ( defined $per_package_useflags->{$target}->[$package_counter]
+            and @{ $per_package_useflags->{$target}->[$package_counter] }
+            > 0 )
         {
             say "USEFLAGS: "
                 . join( " ",
@@ -276,14 +276,11 @@ sub compile_packs {
                     . "\" emerge $emerge_defaults_args -j $jobs $extra_arg $pack"
             );
         }
-        elsif ( !$pretend ) {
+        else {
             $tmp_rt =
                 system(
                 "emerge $emerge_defaults_args -j $jobs $extra_arg $pack");
         }
-        else {
-            say "Skipping, PRETEND=1";
-        }
         $package_counter++;
 
         $return = $tmp_rt
@@ -523,26 +520,21 @@ if ($use_equo) {
     @packages_deps = grep { defined() and length() } @packages_deps; #cleaning
     say "", "[install] Those dependencies will be installed with equo :",
         @packages_deps, "";
-    if ( $equo_split_install and !$pretend ) {
-
+    if ($equo_split_install) {
         safe_call("equo i $equo_install_args --bdeps $_")
             for ( @packages_deps, @equo_install )
             ; ## bail out here, if installs fails. emerge will compile a LOT of stuff
-
-        if ( @equo_remove > 0 ) {
+        if ( @equo_remove > 0 and !$pretend) {
+            say "Removing with equo: @equo_remove";
             system("equo rm --nodeps $_") for (@equo_remove);
         }
     }
-    elsif ( !$pretend ) {
+    else {
         safe_call(
             "equo i $equo_install_args --bdeps @packages_deps @equo_install")
             if ( @packages_deps > 0 or @equo_install > 0 )
             ; ## bail out here, if installs fails. emerge will compile a LOT of stuff
         system("equo rm --nodeps @equo_remove") if ( @equo_remove > 0 );
-
-    }
-    else {
-        say "Skipping, PRETEND=1";
     }
 }
 
@@ -558,12 +550,19 @@ if ( $qualityassurance_checks == 1 ) {
 
 say "*** Ready to compile, finger crossed ***";
 
+if($pretend){
+  say "----> PRETEND mode <----";
+  $equo_install_args.=" -p";
+  $emerge_defaults_args.=" -p"
+}
+
 system("emerge --info")
     ; #always give detailed information about the building environment, helpful to debug
 
 my $rt;
 
-if ( $emerge_remove and $emerge_remove ne "" ) {
+if ( $emerge_remove and $emerge_remove ne "" and !$pretend) {
+    say "Removing with emerge: $emerge_remove";
     system("emerge -C $_") for split( / /, $emerge_remove );
 }
 
@@ -571,11 +570,8 @@ if ($emerge_split_install) {
     compile_packs( "targets", @packages );
     $rt = 0;    #consider the build good anyway, like a "keep-going"
 }
-elsif ( !$pretend ) {
-    $rt = system("emerge $emerge_defaults_args -j $jobs @packages");
-}
 else {
-    say "Skipping, PRETEND=1";
+    $rt = system("emerge $emerge_defaults_args -j $jobs @packages");
 }
 
 my $return = $rt >> 8;
@@ -583,7 +579,7 @@ my $return = $rt >> 8;
 # best effort -B
 compile_packs( "injected_targets", @injected_packages );
 
-if ($preserved_rebuild) {
+if ($preserved_rebuild and !$pretend) {
 
     system("emerge -j $jobs --buildpkg \@preserved-rebuild");
     system("revdep-rebuild");