builder: include also injected_packages in overlays detection

move up the adjustment of emerge/equo arguments, avoid to copy artifacts when PRETEND mode is on

.gitignore

@@ -0,0 +1 @@
+*.bak

builder

@@ -3,6 +3,7 @@
 use Getopt::Long;
 use v5.10;
 no feature "say";
+use Storable 'dclone';
 
 my $profile           = $ENV{BUILDER_PROFILE}   // 3;
 my $jobs              = $ENV{BUILDER_JOBS}      // 1;
@@ -41,6 +42,8 @@ my $qualityassurance_checks   = $ENV{QA_CHECKS} // 0;
 my $remote_conf_portdir       = $ENV{REMOTE_CONF_PORTDIR};
 my $remote_portdir            = $ENV{REMOTE_PORTDIR};
 my $pretend                   = $ENV{PRETEND} // 0;
+my $obsoleted                 = $ENV{DETECT_OBSOLETE} // 0;
+my $target_overlay            = $ENV{TARGET_OVERLAY};
 
 my $make_conf = $ENV{MAKE_CONF};
 
@@ -89,6 +92,8 @@ sub append_to_file {
     close $fh_a;
 }
 
+sub parse_overlays { map{ $_ =~ s/.*?\:\://g; $_ } @{ dclone(\@_) }; }
+
 sub add_portage_repository {
     my $repo = $_[0];
     my $reponame;
@@ -236,8 +241,9 @@ sub uniq {
     keys %{ { map { $_ => 1 } @_ } };
 }
 
-sub detect_useflags
-{ # Detect useflags defined as [-alsa,avahi] in atom, and fill $hash within the $target sub-hash
+# Detect useflags defined as [-alsa,avahi] in atom,
+# and fill $hash within the $target sub-hash
+sub detect_useflags {
     my ( $target, $packages ) = @_;
     my @packs = @{$packages};
     for my $i ( 0 .. $#packs ) {
@@ -259,9 +265,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 +282,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
@@ -306,6 +309,15 @@ sub help {
 
 say "****************************************************";
 
+my $per_package_useflags;
+my @packages          = @ARGV;
+my @injected_packages = $build_injected_args ? split( / /, $build_injected_args ) : ();
+my @parsed_overlays = grep { $_ !~ /gentoo/i } parse_overlays(@packages,@injected_packages);
+
+say "Detected overlays: @parsed_overlays" if @parsed_overlays;
+
+@overlays = uniq(@overlays,@parsed_overlays);
+
 if ( @overlays > 0 ) {
     say "Overlay(s) to add";
     foreach my $overlay (@overlays) {
@@ -319,6 +331,14 @@ say "\t* " . $_ for @ARGV;
 
 say "[*] Syncing configurations files, Layman and Portage";
 
+if ($pretend) {
+    say "[*] PRETEND enabled, no real action will be performed.";
+    say "    Bear in mind that in such way the list of packages";
+    say "    that emerge will try to compile will be bigger";
+    $equo_install_args    .= " -p";
+    $emerge_defaults_args .= " -p";
+}
+
 # Syncronizing portage configuration and adding overlays
 system("echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen");    #be sure about that.
 
@@ -458,15 +478,9 @@ if ($use_equo) {
 
 system("cp -rf $make_conf /etc/portage/make.conf") if $make_conf;
 
-my $per_package_useflags;
-my @packages          = @ARGV;
-my @injected_packages = ();
-if ($build_injected_args) {
-    @injected_packages = split( / /, $build_injected_args );
-    say "[*] Injected installs:";
-
-    say "\t* " . $_ for @injected_packages;
-
+if( @injected_packages ) {
+  say "[*] Injected installs:";
+  say "\t* " . $_ for @injected_packages;
 }
 
 # Allow users to specify atoms as: media-tv/kodi[-alsa,avahi]
@@ -523,36 +537,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";
-    }
-}
-
-if ( $qualityassurance_checks == 1 ) {
-    say "*** Repoman checks ***";
-    for ( @packages, @injected_packages ) {
-        say "*** QA checks for $_";
-        system(
-            "pushd \$(dirname \$(equery which $_ 2>/dev/null)); repoman; popd"
-        );
     }
 }
 
@@ -564,6 +563,7 @@ system("emerge --info")
 my $rt;
 
 if ( $emerge_remove and $emerge_remove ne "" ) {
+    say "Removing with emerge: $emerge_remove";
     system("emerge -C $_") for split( / /, $emerge_remove );
 }
 
@@ -571,11 +571,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 +580,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");
@@ -591,17 +588,27 @@ if ($preserved_rebuild) {
 }
 
 if ( $qualityassurance_checks == 1 ) {
-    say "*** Missing dependencies checks ***";
-    for (@packages) {
-        say "*** DEPEND for $_";
-        system("dynlink-scanner $_");
-        system("depcheck $_");
+    say "*** Quality assurance ***";
+    foreach my $pn ( @packages, @injected_packages ) {
+        say ">> Running repoman on $pn";
+        system(
+            "pushd \$(dirname \$(equery which $pn 2>/dev/null)); repoman; popd"
+        );
+        $pn =~ s/\:\:.*//g;
+        say ">> Detecting missing dependencies for $pn";
+        system("dynlink-scanner $pn");
+        system("depcheck $pn");
     }
 }
 
+if ( $obsoleted and $target_overlay ) {
+    say "*** Detecting obsoletes ***";
+    system("sabayon-detectobsolete --overlay ${target_overlay}");
+}
+
 # Copy files to artifacts folder
 system(
     "mkdir -p $artifacts_folder;cp -rfv /usr/portage/packages $artifacts_folder"
-) if ( $artifacts_folder and !$return );
+) if ( $artifacts_folder and !$return and !$pretend );
 
 exit($return);

sabayon-buildpackages

@@ -57,6 +57,8 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -z "$REMOTE_PORTDIR" ] || docker_env+=(-e "REMOTE_PORTDIR=$REMOTE_PORTDIR")
 [ -z "$ETP_NOCACHE" ] || docker_env+=(-e "ETP_NOCACHE=$ETP_NOCACHE")
 [ -z "$PRETEND" ] || docker_env+=(-e "PRETEND=$PRETEND")
+[ -z "$DETECT_OBSOLETE" ] || docker_env+=(-e "DETECT_OBSOLETE=$DETECT_OBSOLETE")
+[ -z "$TARGET_OVERLAY" ] || docker_env+=(-e "TARGET_OVERLAY=$TARGET_OVERLAY")
 [ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
 
 if [ -e $MAKE_CONF ]; then

sabayon-detectobsolete

@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+# mudler <mudler@sabayon.org>
+# this tool requires querypkg
+use Getopt::Long;
+use strict;
+use warnings;
+my $arch;
+my $verbose;
+my $overlay;
+GetOptions(
+    "arch=s"    => \$arch,
+    "overlay=s" => \$overlay,
+    "verbose"   => \$verbose
+) or die("Error in command line arguments\n");
+
+die("You should at least supply an overlay with --overlay") if !$overlay;
+
+# Input: Overlay absolute path
+# Output: array with package names (category/name)
+sub get_packages {
+    keys %{
+        {   map {
+                s/$overlay\/|\.ebuild//g;
+                $_ = join( '/', ( split( /\//, $_ ) )[ 0, 1 ] );
+                $_ => 1
+            } glob( $_[0] . "/*/*/*.ebuild" )
+        }
+    };
+}
+
+# Input: package (category/name)
+# Output: returns 1 if obsolete and can be removed
+sub obsolete_package($$) {
+    my $package = $_[0];
+    my $arch    = $_[1];
+    my $l_arch  = ( defined $arch and $arch ne "" ? "--arch $arch" : "" );
+    print "querypkg -q $l_arch $package --show spm_repo\n" if $verbose;
+    my @out = `querypkg -q $l_arch $package --show spm_repo`;
+    chomp(@out);
+    return 1 if "@out" eq "";
+    foreach my $l (@out) {
+        print " >> $l\n" if $verbose;
+        return 1 if ( $l =~ /$package.*\{spm_repo\:gent.*/ );
+    }
+    return 0;
+}
+
+my @packages = get_packages($overlay);
+my @obsoletes;
+
+foreach my $p (@packages) {
+    print "[$p] Checking if there is a version in the repositories.... ";
+    print "\n" if $verbose;
+    if ( obsolete_package( $p, $arch ) ) {
+        print " OBSOLETE! \n";
+        push( @obsoletes, $p );
+    }
+    else {
+        print " ok  \n";
+    }
+}
+
+print "\n";
+print "Obsoletes found:\n\n";
+print "$_\n" for @obsoletes;