sabayon-buildpackages: add support for DETECT_OBSOLETE and TARGET_OVERLAY

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

Makefile

@@ -23,10 +23,10 @@ install:
 
 	install -d $(DESTDIR)/$(USBINDIR)
 	install -m 0755 builder $(DESTDIR)/$(USBINDIR)/
+
+	install -d $(DESTDIR)/$(UBINDIR)
 	install -m 0755 depcheck $(DESTDIR)/$(UBINDIR)/
 	install -m 0755 dynlink-scanner $(DESTDIR)/$(UBINDIR)/
 	gcc try_dlopen.c -o try_dlopen -ldl
 	install -m 0755 try_dlopen $(DESTDIR)/$(UBINDIR)/
-
-	install -d $(DESTDIR)/$(UBINDIR)
 	install -m 0755 sabayon-* $(DESTDIR)/$(UBINDIR)/

builder

@@ -9,16 +9,16 @@ my $jobs              = $ENV{BUILDER_JOBS}      // 1;
 my $use_equo          = $ENV{USE_EQUO}          // 1;
 my $preserved_rebuild = $ENV{PRESERVED_REBUILD} // 0;
 my $emerge_defaults_args = $ENV{EMERGE_DEFAULTS_ARGS}
-  // "--accept-properties=-interactive --verbose --oneshot --complete-graph --buildpkg";
+    // "--accept-properties=-interactive --verbose --oneshot --complete-graph --buildpkg";
 $ENV{FEATURES} = $ENV{FEATURES}
-  // "parallel-fetch protect-owned compressdebug splitdebug -userpriv";
+    // "parallel-fetch protect-owned compressdebug splitdebug -userpriv";
 
 my $equo_install_atoms   = $ENV{EQUO_INSTALL_ATOMS}   // 1;
 my $equo_install_version = $ENV{EQUO_INSTALL_VERSION} // 0;
-my $equo_split_install   = $ENV{EQUO_SPLIT_INSTALL}   // 1;
+my $equo_split_install   = $ENV{EQUO_SPLIT_INSTALL}   // 0;
 my $equo_mirrorsort      = $ENV{EQUO_MIRRORSORT}      // 1;
 my $entropy_repository   = $ENV{ENTROPY_REPOSITORY}
-  // "main";    # Can be weekly, main, testing
+    // "main";    # Can be weekly, main, testing
 my $artifacts_folder          = $ENV{ARTIFACTS_DIR};
 my $dep_scan_depth            = $ENV{DEPENDENCY_SCAN_DEPTH} // 2;
 my $skip_portage_sync         = $ENV{SKIP_PORTAGE_SYNC} // 0;
@@ -37,9 +37,12 @@ my $equo_masks                = $ENV{EQUO_MASKS};
 my $equo_unmasks              = $ENV{EQUO_UNMASKS};
 my $equo_install_args         = $ENV{EQUO_INSTALL_ARGS} // "--multifetch=10";
 my $remote_overlay            = $ENV{REMOTE_OVERLAY};
-my $repoman_check             = $ENV{QA_CHECKS} // 0;
+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};
 
@@ -75,7 +78,7 @@ sub append_to_file {
 
         # Check that the package was not already there
         open my $fh_ro, '<:encoding(UTF-8)', $file_name
-          or die("Cannot open: $file_name");
+            or die("Cannot open: $file_name");
         while ( my $line = <$fh_ro> ) {
             return if $line eq $package . "\n";
         }
@@ -83,7 +86,7 @@ sub append_to_file {
     }
 
     open( my $fh_a, '>>', $file_name )
-      or die "Could not open file '$filename' $!";
+        or die "Could not open file '$filename' $!";
     print $fh_a $package . "\n";
     close $fh_a;
 }
@@ -100,15 +103,15 @@ sub add_portage_repository {
     if ( !$sync_type ) {
         $sync_type = ( split( /\:/, $repo ) )[0];
         $sync_type = "git"
-          if $repo =~ /github|bitbucket/
-          or $sync_type eq "https"
-          or $sync_type eq "http";
+            if $repo =~ /github|bitbucket/
+            or $sync_type eq "https"
+            or $sync_type eq "http";
         $sync_type = "svn" if $repo =~ /\/svn\//;
     }
     $reponame = ( split( /\//, $repo ) )[-1] if !$reponame;
     $reponame =~ s/\.|//g;    #clean
     system("mkdir -p /etc/portage/repos.conf/")
-      if ( !-d "/etc/portage/repos.conf/" );
+        if ( !-d "/etc/portage/repos.conf/" );
 
     say "==== Adding $reponame ====";
     qx{
@@ -123,18 +126,19 @@ auto-sync = yes' > /etc/portage/repos.conf/$reponame.conf
 }
 
 # Input: package, depth, and atom. Package: sys-fs/foobarfs, Depth: 1 (depth of the package tree) , Atom: 1/0 (enable disable atom output)
+my %package_dep_cache;
+
 sub package_deps {
     my $package = shift;
-    my $depth   = shift // 1;    # defaults to 1 level of depthness of the tree
+    my $depth   = shift // 1;   # defaults to 1 level of depthness of the tree
     my $atom    = shift // 0;
 
 # Since we expect this sub to be called multiple times with the same arguments, cache the results
-    state %cache;
     $cache_key = "${package}:${depth}:${atom}";
 
-    if ( !exists $cache{$cache_key} ) {
-        @dependencies =
-          qx/equery -C -q g --depth=$depth $package/;    #depth=0 it's all
+    if ( !exists $package_dep_cache{$cache_key} ) {
+        my @dependencies =
+            qx/equery -C -q g --depth=$depth $package/;    #depth=0 it's all
         chomp @dependencies;
 
 # If an unversioned atom is given, equery returns results for all versions in the portage tree
@@ -143,15 +147,15 @@ sub package_deps {
 # accurate results, pass in a versioned atom.
         @dependencies = uniq(
             sort
-              grep { $_ }
-              map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
-              @dependencies
+                grep {$_}
+                map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
+                @dependencies
         );
 
-        $cache{$cache_key} = \@dependencies;
+        $package_dep_cache{$cache_key} = \@dependencies;
     }
 
-    return @{ $cache{$cache_key} };
+    return @{ $package_dep_cache{$cache_key} };
 }
 
 #Input: nothing
@@ -178,33 +182,45 @@ sub calculate_missing {
     my @dependencies = package_deps( $package, $depth, 1 );
 
     if ($prune_virtuals) {
-        say "[$package] Pruning dependencies of virtual packages";
         my %install_dependencies = map { $_ => 1 } @dependencies;
 
         # Look for any virtuals and remove its immediate dependencies to avoid
         # installing multiple conflicting packages one by one
-        my @virtual_deps;
+        my @virtual_deps = ();
         for my $dep (@dependencies) {
-            push( @virtual_deps, package_deps( $dep, 1, 1 ) )
-              if ( $dep =~ /^virtual\// );
+            if ( $dep =~ /^virtual\// ) {
+                my @child_deps = package_deps( $dep, 1, 1 );
+                push( @virtual_deps, @child_deps );
+            }
         }
+
+        # Deduplicate the list
+        @virtual_deps = uniq(@virtual_deps);
+
+   # Prune the dependencies of the virtual packages from the dependencies list
         for my $dep (@virtual_deps) {
-            $install_dependencies{$dep} = 0 if ( $dep !~ /^virtual\// );
+            if ( $dep !~ /^virtual\// ) {
+                $install_dependencies{$dep} = 0;
+            }
         }
         @dependencies = grep { $install_dependencies{$_} } @dependencies;
     }
 
     #taking only the 4th column of output as key of the hashmap
     my %installed_packs =
-      map { $_ => 1 } @Installed_Packages;
+        map { $_ => 1 } @Installed_Packages;
     my %available_packs = map { $_ => 1 } @Available_Packages;
 
 # removing from packages the one that are already installed and keeping only the available in the entropy repositories
     my @to_install = grep( defined $available_packs{$_},
         uniq( grep( !defined $installed_packs{$_}, @dependencies ) ) );
-    @to_install = grep { length } @to_install;
+    @to_install = grep {length} @to_install;
+
+    # Strip out the target package from the dependency list
+    @to_install = grep { to_atom($_) ne to_atom($package) } @to_install;
+
     say "[$package] packages that will be installed with equo: @to_install"
-      if @to_install > 0;
+        if @to_install > 0;
 
     return @to_install;
 }
@@ -213,21 +229,26 @@ sub calculate_missing {
 # Output: atom form (sys-fs/foobarfs)
 sub atom { s/-[0-9]{1,}.*$//; }
 
+# Same again as a function
+sub to_atom { my $p = shift; $p =~ s/-[0-9]{1,}.*$//; return $p; }
+
 # Input: Array
 # Output: array with unique elements
 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 ) {
         if ( $packages->[$i] =~ /\[(.*?)\]/ ) {
             my $flags = $1;
             $packages->[$i] =~ s/\[.*?\]//g;
-            $per_package_useflags->{$target}->[$i] = [ +split( /,/, $flags ) ];
+            $per_package_useflags->{$target}->[$i] =
+                [ +split( /,/, $flags ) ];
         }
     }
 }
@@ -242,39 +263,44 @@ sub compile_packs {
         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 @{ $per_package_useflags->{$target}->[$package_counter] }
+            > 0 )
         {
             say "USEFLAGS: "
-              . join( " ",
+                . join( " ",
                 @{ $per_package_useflags->{$target}->[$package_counter] } );
             $tmp_rt = system(
                 "USE=\""
-                  . join( " ",
-                    @{ $per_package_useflags->{$target}->[$package_counter] } )
-                  . "\" emerge $emerge_defaults_args -j $jobs $extra_arg $pack"
+                    . join(
+                    " ",
+                    @{  $per_package_useflags->{$target}->[$package_counter]
+                    }
+                    )
+                    . "\" emerge $emerge_defaults_args -j $jobs $extra_arg $pack"
             );
         }
         else {
             $tmp_rt =
-              system("emerge $emerge_defaults_args -j $jobs $extra_arg $pack");
+                system(
+                "emerge $emerge_defaults_args -j $jobs $extra_arg $pack");
         }
         $package_counter++;
 
         $return = $tmp_rt
-          if ( $? == -1 or $? & 127 or !$rt )
-          ;    # if one fails, the build should be considered failed!
+            if ( $? == -1 or $? & 127 or !$rt )
+            ;    # if one fails, the build should be considered failed!
     }
     return $return;
 }
 
 sub help {
     say "-> You should feed me with something", "", "Examples:", "",
-      "\t$0 app-text/tree", "\t$0 plasma-meta --layman kde", "",
-"\t$0 app-foo/foobar --equo foo-misc/foobar --equo net-foo/foobar --layman foo --layman bar foo",
-      "**************************", "",
-"You can supply multiple overlays as well: $0 plasma-meta --layman kde plab",
-      "The documentation is available at https://github.com/Sabayon/devkit",
-      "";
+        "\t$0 app-text/tree", "\t$0 plasma-meta --layman kde", "",
+        "\t$0 app-foo/foobar --equo foo-misc/foobar --equo net-foo/foobar --layman foo --layman bar foo",
+        "**************************", "",
+        "You can supply multiple overlays as well: $0 plasma-meta --layman kde plab",
+        "The documentation is available at https://github.com/Sabayon/devkit",
+        "";
     exit 0;
 }
 
@@ -293,6 +319,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.
 
@@ -314,6 +348,9 @@ if ( $remote_portdir ne "" ) {
     system("chown -R portage:portage /usr/portage");
     system("chmod -R ug+w,a+rX /usr/portage");
 }
+system("mkdir /var/lib/layman") if ( !-d "/var/lib/layman" );
+system("touch /var/lib/layman/make.conf && layman-updater -R")
+    if ( !-e "/var/lib/layman/make.conf" );
 
 system("echo 'y' | layman -f -a $_") for @overlays;
 
@@ -321,13 +358,14 @@ my $reponame = "LocalOverlay";
 
 # Setting up a local overlay if doesn't exists
 system(
-"rm -rf /usr/local/portage;cp -rf /usr/local/local_portage /usr/local/portage"
+    "rm -rf /usr/local/portage;cp -rf /usr/local/local_portage /usr/local/portage"
 ) if ( -d "/usr/local/local_portage" );
 
 if ( !-f "/usr/local/portage/profiles/repo_name" ) {
     system("mkdir -p /usr/local/portage/{metadata,profiles}");
     system("echo 'LocalOverlay' > /usr/local/portage/profiles/repo_name");
-    system("echo 'masters = gentoo' > /usr/local/portage/metadata/layout.conf");
+    system(
+        "echo 'masters = gentoo' > /usr/local/portage/metadata/layout.conf");
 }
 else {
     open FILE, "</usr/local/portage/profiles/repo_name";
@@ -359,7 +397,7 @@ if ( $remove_layman_overlay and $remove_layman_overlay ne "" ) {
 if ( $remove_remote_overlay and $remove_remote_overlay ne "" ) {
     say "===== Removing overlays: $remove_remote_overlay =====";
     system( "rm -rfv /etc/portage/" . $_ . ".conf" )
-      for ( split( / /, $remote_overlay ) );
+        for ( split( / /, $remote_overlay ) );
 }
 
 system("mkdir -p /usr/portage/distfiles/git3-src");
@@ -377,7 +415,9 @@ unless ( $skip_portage_sync == 1 ) {
 }
 
 # preparing for MOAR automation
-qx|eselect profile set $profile|;
+say "Setting new profile to $profile" if defined $profile;
+qx|eselect profile set $profile|      if defined $profile;
+system("eselect profile list")        if defined $profile;
 
 if ( $use_equo && $entropy_repository eq "weekly" ) {
     qx|equo repo disable sabayonlinux.org|;
@@ -394,18 +434,32 @@ if ($use_equo) {
     say "Devkit version:";
     system("equo s -vq app-misc/sabayon-devkit");
 
+    my $enman_list_output = qx|enman list --installed -q|;
+    chomp($enman_list_output);
+    my @installed_enman_repos = split( /\n/, $enman_list_output );
+
     if ( $enman_repositories and $enman_repositories ne "" ) {
         my @enman_toadd = split( / /, $enman_repositories );
-        safe_call("enman add $_") for @enman_toadd;
+        for my $enman_add (@enman_toadd) {
+            if ( !grep ( $enman_add, @installed_enman_repos ) ) {
+                safe_call("enman add $_");
+            }
+        }
     }
 
     if ( $remove_enman_repositories and $remove_enman_repositories ne "" ) {
         my @enman_toremove = split( / /, $remove_enman_repositories );
-        system("enman remove $_") for @enman_toremove;
+        for my $enman_remove (@enman_toremove) {
+            if ( grep ( $enman_remove, @installed_enman_repos ) ) {
+                safe_call("enman remove $_");
+            }
+        }
     }
 
     system("enman add $repository_name")
-      if ( $enman_add_self and $repository_name and $repository_name ne "" );
+        if ($enman_add_self
+        and $repository_name
+        and $repository_name ne "" );
     system("equo repo mirrorsort sabayonlinux.org") if $equo_mirrorsort;
     system("equo up && equo u");
 }
@@ -430,8 +484,8 @@ if ($emerge_split_install)
 }
 else {
     map { $_ =~ s/\[.*?\]//g; $_; }
-      @packages
-      ; # Clean up [] if user didn't specified split_install, but specified a useflag combination
+        @packages
+        ; # Clean up [] if user didn't specified split_install, but specified a useflag combination
 }
 detect_useflags( "injected_targets", \@injected_packages );
 
@@ -440,13 +494,13 @@ if ($use_equo) {
     # best effort mask
     if ($equo_masks) {
         append_to_file( "/etc/entropy/packages/package.mask", $_ )
-          for ( split( / /, $equo_masks ) );
+            for ( split( / /, $equo_masks ) );
     }
 
     # best effort unmask
     if ($equo_unmasks) {
         append_to_file( "/etc/entropy/packages/package.unmask", $_ )
-          for ( split( / /, $equo_unmasks ) );
+            for ( split( / /, $equo_unmasks ) );
     }
 
     my @packages_deps;
@@ -455,14 +509,14 @@ if ($use_equo) {
     chomp(@Installed_Packages);
 
     my %installed_packs =
-      map { $_ => 1 } @Installed_Packages;
+        map { $_ => 1 } @Installed_Packages;
 
 # Remove any already installed packages from the list of entropy packages to install in the build spec
     @equo_install = grep { !exists $installed_packs{$_} } @equo_install;
 
     foreach my $p (@packages) {
         say
-"[$p] Getting the package dependencies which aren't already installed on the system.. ";
+            "[$p] Getting the package dependencies which aren't already installed on the system.. ";
         push(
             @packages_deps,
             calculate_missing(
@@ -472,45 +526,48 @@ if ($use_equo) {
             )
         ) if $equo_install_atoms;
         push( @packages_deps, package_deps( $p, $dep_scan_depth, 0 ) )
-          if $equo_install_version;
+            if $equo_install_version;
     }
-    @packages_deps = grep { defined() and length() } @packages_deps;   #cleaning
+    @packages_deps = grep { defined() and length() } @packages_deps; #cleaning
     say "", "[install] Those dependencies will be installed with equo :",
-      @packages_deps, "";
+        @packages_deps, "";
     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 ) {
+            for ( @packages_deps, @equo_install )
+            ; ## bail out here, if installs fails. emerge will compile a LOT of stuff
+        if ( @equo_remove > 0 and !$pretend ) {
+            say "Removing with equo: @equo_remove";
             system("equo rm --nodeps $_") for (@equo_remove);
         }
     }
     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
+            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 );
     }
 }
 
-if ( $repoman_check == 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");
+            "pushd \$(dirname \$(equery which $_ 2>/dev/null)); repoman; popd"
+        );
     }
 }
 
 say "*** Ready to compile, finger crossed ***";
 
 system("emerge --info")
-  ; #always give detailed information about the building environment, helpful to debug
+    ; #always give detailed information about the building environment, helpful to debug
 
 my $rt;
 
 if ( $emerge_remove and $emerge_remove ne "" ) {
+    say "Removing with emerge: $emerge_remove";
     system("emerge -C $_") for split( / /, $emerge_remove );
 }
 
@@ -527,16 +584,30 @@ 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");
 
 }
 
+if ( $qualityassurance_checks == 1 ) {
+    say "*** Missing dependencies checks ***";
+    for (@packages) {
+        say "*** DEPEND for $_";
+        system("dynlink-scanner $_");
+        system("depcheck $_");
+    }
+}
+
+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

@@ -8,7 +8,7 @@ MAKE_CONF="${MAKE_CONF:-$SAB_WORKSPACE/specs/make.conf}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/portage_artifacts/}"
 LOCAL_OVERLAY="${LOCAL_OVERLAY:-$SAB_WORKSPACE/local_overlay}"
 ENTROPY_REPOSITORY="${ENTROPY_REPOSITORY:-main}" # Can be weekly, main, testing
-DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm --cap-add=SYS_PTRACE}"
 
 . /sbin/sabayondevkit-functions.sh
 
@@ -56,6 +56,9 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -z "$REMOTE_CONF_PORTDIR" ] || docker_env+=(-e "REMOTE_CONF_PORTDIR=$REMOTE_CONF_PORTDIR")
 [ -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
@@ -76,11 +79,12 @@ if [ -d "$SAB_WORKSPACE"/specs ]; then
   [ -e "$SAB_WORKSPACE"/specs/custom.env ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.env:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.env")
   [ -e "$SAB_WORKSPACE"/specs/custom.keywords ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.keywords:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.keywords/99-custom.keywords")
   [ -d "$SAB_WORKSPACE"/specs/env ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/env/:/opt/sabayon-build/conf/$SAB_ARCH/portage/env/")
+  [ -d "/vagrant" ] && docker_volumes+=(-v "/vagrant:/vagrant")
 
 fi
 
 echo "Spawning the package builder container for '$@'."
 echo ""
-#echo "docker run $DOCKER_OPTS ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE $@"
+echo "docker run $DOCKER_OPTS \"${docker_env[@]}\" \"${docker_volumes[@]}\" $DOCKER_IMAGE $@"
 
 docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE $@

sabayon-createrepo

@@ -88,8 +88,8 @@ database-format = bz2
 # disabled-eapis = 1,2
 # expiration-based-scope = disable
 # nonfree-packages-directory-support = disable
-rss-feed = disable
-changelog = disable
+rss-feed = enable
+changelog = enable
 rss-name = packages.rss
 rss-base-url = http://packages.sabayon.org/?quicksearch=
 rss-website-url = http://www.sabayon.org/

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;

sabayon-maint-helper

@@ -0,0 +1,94 @@
+#!/bin/bash
+set -e
+. /sbin/sabayondevkit-functions.sh
+
+help_msg() {
+
+   echo "
+ sabayon-maint-helper:
+
+Script for builder boxes maintenance.
+
+-h|--help        This message.
+--installed      Upgrades all the packages installed in the box.
+--obsolete       Upgrades ONLY the packages that are listed obsolete in eix-test-obsolete.
+--all            Tries to upgrade all package without any euristics
+--category       Tries to upgrade/install all the packages in the specified category
+                 e.g. sabayon-maint-helper 'app-office'
+
+Some options could be set also as environment variables:
+EMERGE_DEFAULT_ARGS     Default emerge options
+
+NOTE: This script MUST be execute as root.
+"
+}
+
+
+parse_args() {
+
+   local short_opts="h"
+   local long_opts="help arch: host-arch: unprivileged stagingdir: image-descr: image:"
+
+   $(set -- $(getopt -u -q -a -o "$short_opts" -l "$long_opts" -- "$@"))
+
+   while [ $# -gt 0 ] ; do
+      case "$1" in
+
+         -h|--help)
+            help_msg
+            exit 1
+            ;;
+         --installed)
+            echo "Trying to upgrade all the installed packages"
+            rebuild_all
+            ;;
+         --obsolete)
+            echo "Upgrading the packages that are marked as obsolete"
+            build_obsolete
+            ;;
+         --all)
+            echo "Upgrading/Installing everything available to install"
+            build_all_availables
+            ;;
+         --category)
+            echo "Upgrading/Installing everything inside the '$2' category"
+            build_category_installed "$2"
+            shift
+            ;;
+         --)
+            help_msg
+            exit 1
+            ;;
+         *)
+            echo "Invalid parameter $1."
+            exit 1
+            ;;
+
+      esac
+
+      shift
+   done
+
+   return 0
+}
+
+main() {
+
+  if [ "$(id -u)" != "0" ]; then
+     echo "This script must be run as root" 1>&2
+     exit 1
+  fi
+
+  [ -z "$@" ] && help_msg && exit 1
+
+  (
+    echo "Acquiring lock"
+    flock -x -w 10 200 || ( echo "Failed acquiring lock in 10 seconds" && exit 1 )
+
+    parse_args "$@"
+
+  ) 200>/var/lock/.repomaint
+
+}
+
+main "$@"

sabayondevkit-functions.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 check_docker_requirements(){
   if [ "$(id -u)" != "0" ]; then
     groups | grep -q docker || echo "--> If you are not running the script as root, your user should be in the docker group to use it. (sudo gpasswd -a $USER docker)"
@@ -9,51 +11,76 @@ check_docker_requirements(){
 
 die() { echo "$@" 1>&2 ; exit 1; }
 
-build() {
-local SEARCH=$1
-local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --verbose --oneshot --nospinner --noreplace --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg}
-for i in $(EIX_LIMIT=0 eix --only-names --pure-packages "$SEARCH/" | xargs echo | uniq);
-  do
-    echo "Building $i"
-    emerge $EMERGE_DEFAULT_ARGS -o $i && \
-    emerge $EMERGE_DEFAULT_ARGS $i
-  done
+build_sync() {
+  layman -S
+  emerge --sync
+  eix-update
+  pushd /opt/sabayon-build/
+    git stash
+    git fetch --all || true
+    git checkout master || true
+    git reset --hard origin/master || true
+  popd
 }
 
-build_installed() {
+build_category() {
   local SEARCH=$1
-  local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --newuse --noreplace --changed-use --update --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg}
+  build_sync
+  for i in $(EIX_LIMIT=0 eix --only-names --pure-packages "$SEARCH/" | xargs echo | uniq);
+    do
+      echo "Building $i"
+      emerge ${EMERGE_DEFAULT_ARGS:---accept-properties=-interactive --verbose --oneshot --nospinner --noreplace --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg} $i || true
+    done
+}
 
+build_obsolete() {
+  build_sync
+  for i in $(EIX_LIMIT=0 eix-test-obsolete | grep '\[U\]' | awk '{ print $2 }' | xargs echo | uniq);
+    do
+     echo "Build $i"
+     emerge ${EMERGE_DEFAULT_ARGS:---accept-properties=-interactive -u --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg --noreplace} $i || true
+    done
+}
+
+build_category_installed() {
+  local SEARCH=$1
+  build_sync
   for i in $(EIX_LIMIT=0 eix -I --only-names --pure-packages "$SEARCH/" | xargs echo | uniq);
     do
       echo "Building $i"
-      emerge $EMERGE_DEFAULT_ARGS $i
+      emerge ${EMERGE_DEFAULT_ARGS:---accept-properties=-interactive -u --newuse --noreplace --changed-use --update --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg} $i || true
     done
 }
 
 build_all_availables() {
-for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
-  do
-    build "$i/"
-  done
+  for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
+    do
+      build_category "$i/"
+    done
 }
 
 rebuild_all() {
 for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
   do
-    build_installed "$i/"
+    build_category_installed "$i/"
   done
 }
 
-build_sync() {
-  emerge-webrsync || exit 1
-  emerge --sync
-  layman -S
-  eix-update || exit 1
-  pushd /opt/sabayon-build/
-    git stash
-    git fetch --all
-    git checkout master
-    git reset --heard origin/master
-  popd
+get_category() {
+  local CATEGORY=$1
+  local PACKS
+  for i in $(EIX_LIMIT=0 eix --only-names --pure-packages "$CATEGORY/" | xargs echo | uniq);
+    do
+      PACKS+="$i "
+    done
+    echo $PACKS
+}
+
+get_all_availables() {
+  local RES
+  for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
+    do
+        RES+="$(get_category $i) "
+    done
+  echo $RES
 }