Merge pull request #24 from Sabayon/develop

New features

.gitignore

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

AUTHORS

@@ -0,0 +1,6 @@
+
+Copyright authors:
+------
+Ettore Di Giacinto <mudler@gentoo.org> ( original author )
+Ben Roberts <optiz0r@sabayon.org>
+Daniele Rondina <geaaru@sabayon.org>

Documentation.md

@@ -0,0 +1,178 @@
+
+# Scripts
+
+Devkit contains a list of scripts used by Sabayon for building process and
+for manage package injection to repositories.
+
+## List of files
+
+
+  * `depcheck`: a tool to report both undeclared and potentially-unused
+     runtime dependencies.
+
+  * `dynlink-scanner`: a tool for retrieve list of linked libraries used
+     by a package. Use try_dlopen execute binary.
+
+  * `sabayon-brokenlibs`: a tool for retrieve list of all dependencies
+     of a binary through equo and equery tools. Print list of dependencies.
+     This script depends on:
+       - equo
+       - equery
+       - sabayondevkit-functions.sh
+
+  * `sabayon-buildpackages`: Script for Spawning the package builder container.
+     This script depends on:
+       - sabayondevkit-functions.sh
+
+  * `sabayon-bz2brokenlibs`: Unpack bz2 tarball and execute sabayon-brokenlibs
+     to every files unpacked.
+     This script depends on:
+       - sabayondevkit-functions.sh
+
+  * `sabayon-createrepo`: Script for spawning container for commit packages to
+     a repository and create it if doesn't exists.
+     This script depends on:
+       - sabayondevkit-functions.sh
+
+  * `sabayon-createrepo-cleanup`: Script for spawning container for cleanup
+     expired packages from a repository.
+     This script depends on:
+       - sabayondevkit-functions.sh
+
+  * `sabayon-createrepo-remove`: Script for spawning container for remove a list
+     of packages from a repository.
+     This script depends on:
+       - sabayondevkit-functions.sh
+
+  * `sabayon-detectobsolete`: Perl script for found obsolete packages in an
+    overlay. Possible options are: --arch, --overlay and --verbose.
+    This script depends on:
+       - querypkg
+
+  * `sabayon-entropypreservedlibs`: Perl script for retrieve list of packages that has
+     dependencies to old libraries.
+     See also [here](https://wiki.sabayon.org/index.php?title=En:Sabayon_Devkit#sabayon-entropypreservedlibs)
+
+  * `sabayon-help-info`: Bash script for grabbing system information and post to
+     sabayon pastebin.
+     This script depends on:
+       - pastebunz
+
+  * `sabayon-maint-helper`: Script for builder boxes maintenance.
+     Possible options are:
+       - `--installed`: For upgrades all the packages installed in the box.
+       - `--obsolete`: Upgrade ONLY the packages that are listed obsolete
+       - `--all`: Tries to upgrade all packages
+       - `--category`: Tries to upgrade/install all packages present in a specified category.
+     This script depends on:
+       - sabayondevkit-functions.sh
+
+  * `sabayon-tbz2extract`: Python script for extract tbz2 package.
+
+  * `sabayon-tbz2truncate`: Python script for truncate tbz2 package
+
+  * `sabayon-xpakextract`: Python script for convert tbz2 in .xpak file
+
+  * `builder`: Perl script for build packages.
+
+## Scripts Variables
+
+### sabayon-createrepo
+
+| Env Variable | Default | Description |
+|--------------|---------|-------------|
+| SAB_WORKSPACE | $PWD | Workspace directory |
+| REPOSITORY_NAME | default | Name of the repository to create. |
+| REPOSITORY_DESCRIPTION | My Sabayon repository | Description of the repository to create. |
+| DOCKER_IMAGE | sabayon/eit-amd64 | Docker image to use on create repository |
+| PORTAGE_ARTIFACTS | $SAB_WORKSPACE/portage_artifacts | Directory of the artifacts to insert on repository |
+| OUTPUT_DIR | $SAB_WORKSPACE/entropy_artifacts | Output directory of the repository |
+| DOCKER_OPTS | --ti --rm | Docker options to pass on run container. |
+| PUBKEY | - | Define file to mount as volume to /etc/entropy/mykeys/key.pub |
+| PRIVATEKEY | - | Define file to mount as volume to /etc/entropy/mykeys/private.key |
+
+### sabayon-createrepo-cleanup
+
+| Env Variable | Default | Description |
+|--------------|---------|-------------|
+| SAB_WORKSPACE | $PWD | Workspace directory |
+| REPOSITORY_NAME | default | Name of the repository to clean. |
+| REPOSITORY_DESCRIPTION | My Sabayon repository | Description of the repository to clean. |
+| DOCKER_IMAGE | sabayon/eit-amd64 | Docker image to use on clean repository |
+| OUTPUT_DIR | $SAB_WORKSPACE/entropy_artifacts | Directory of the repository |
+| DOCKER_OPTS | --ti --rm | Docker options to pass on run container. |
+| PUBKEY | - | Define file to mount as volume to /etc/entropy/mykeys/key.pub |
+| PRIVATEKEY | - | Define file to mount as volume to /etc/entropy/mykeys/private.key |
+
+### sabayon-createrepo-remove
+
+| Env Variable | Default | Description |
+|--------------|---------|-------------|
+| SAB_WORKSPACE | $PWD | Workspace directory |
+| REPOSITORY_NAME | default | Name of the repository where remove packages. |
+| REPOSITORY_DESCRIPTION | My Sabayon repository | Description of the repository. |
+| DOCKER_IMAGE | sabayon/eit-amd64 | Docker image to use on clean repository |
+| OUTPUT_DIR | $SAB_WORKSPACE/entropy_artifacts | Directory of the repository |
+| DOCKER_OPTS | --ti --rm | Docker options to pass on run container. |
+| PUBKEY | - | Define file to mount as volume to /etc/entropy/mykeys/key.pub |
+| PRIVATEKEY | - | Define file to mount as volume to /etc/entropy/mykeys/private.key |
+
+### sabayon-buildpackages
+
+| Env Variable | Default | Description |
+|--------------|---------|-------------|
+| SAB_WORKSPACE | $PWD | Workspace directory |
+| DOCKER_IMAGE | sabayon/builder-amd64 | Docker image to use for compilation |
+| SAB_ARCH | intel | Name of arch to use defined on build Sabayon project |
+| DOCKER_PULL_IMAGE | 0 | If try to pull last image (1) or use local version |
+| MAKE_CONF | $SAB_WORKSPACE/specs/make.conf | Path of make.conf custom to supply on compilation |
+| OUTPUT_DIR | $SAB_WORKSPACE/portage_artifacts/ | Where are written portage artifacts compiled |
+| LOCAL_OVERLAY | $SAB_WORKSPACE/local_overlay/ | Directory to use for supply local overlay as volume of the image on compilation |
+| ENTROPY_REPOSITORY | main | Sabayon repository to use: weekly, main or testing |
+| DOCKER_OPTS | --ti --rm --cap-add=SYS_PTRACE | Options to use on running Docker image |
+| PORTAGE_CACHE | - | If present permit to supply host portage directory to container |
+| BUILDER_PROFILE | - | Permit to choice Gentoo Profile to use |
+| EMERGE_SPLIT_INSTALL | - | Possible values are 0/1. |
+| BUILDER_JOBS | 1 | Define number of jobs for emerge phase. |
+| USE_EQUO | 1 | Use equo for install and align compilation environment. |
+| PRESERVED_REBUILD | 0 | Execute (emerge @preserve-rebuild) |
+| EQUO_INSTALL_ATOMS | 1 | Try to install existing dependencies from equo repositories |
+| DEPENDENCY_SCAN_DEPTH | 2 | Define depth level for dependencies calculation |
+| FEATURES | "parallel-fetch protect-owned compressdebug splitdebug -userpriv" | Override Gentoo FEATURES variable |
+| EMERGE_DEFAULTS_ARGS |  "--accept-properties=-interactive --verbose --oneshot --complete-graph --buildpkg" | Override default emerge options |
+| EQUO_INSTALL_VERSION | 0 | |
+| EQUO_SPLIT_INSTALL | 0 | |
+| ARTIFACTS_DIR | - | Additional directory where copy artifacts |
+| ENTROPY_REPOSITORY | main | Choice repository to use. Values: main, weekly, testing |
+| SKIP_PORTAGE_SYNC | 0 | Skip portage sync before compilation |
+| EQUO_MIRRORSORT | 1 | Execute equo mirrorsort before compilation |
+| WEBRSYNC | 0 | Use webrsync instead of defult rsync |
+| ENMAN_REPOSITORIES | - | Define list of enman repositories to add |
+| REMOVE_ENMAN_REPOSITORIES | - | Define list of enman repositories to remove |
+| DISTFILES | - | Permit to mount volume to /usr/portage/distfiles directory and speedup download phase if packages are already available |
+| INTERNAL_BUILDER | - | Define a host builder to use instead of docker builder binary |
+| ENTROPY_DOWNLOADED_PACKAGES | - | Mount volume to /var/lib/entropy/client/packages to use caching on download equo packages |
+| DISTCC_HOSTS | - | Override Gentoo DISTCC_HOSTS variable to use DISTCC |
+| PRUNE_VIRTUALS | 0 | Prune virtuals packages to avoid conflicts. |
+| REPOSITORY_NAME | - | Add single enman repository (for compilation of scr repository itself) |
+| ENMAN_ADD_SELF | 0 | If add with enman repository define on REPOSITORY_NAME variable |
+| EQUO_MASKS | - | Define a list of packages to mask with equo mask command |
+| EQUO_UNMASKS | - | Define a list of packages to unmask with equo unmask command |
+| EMERGE_REMOVE | - | Define a list of packages to remove with emerge -C command before compilation |
+| REMOTE_OVERLAY | - | Define a list of overlay to add before compilation |
+| REMOVE_LAYMAN_OVERLAY | - | Define a list of overlays to remove before compilation |
+| REMOTE_REMOTE_OVERLAY | - | Define a list of files under /etc/portage to remove |
+| QA_CHECKS | - | Execute quality check on packages. repoman, dynlink-scanner and depcheck |
+| REMOTE_CONF_PORTDIR | - | If defined permit to define a git repository to clone under /etc/portage directory. |
+| REMOTE_PORTDIR | - | If defined permit to define a git repository to clone under /usr/portage directory. |
+| ETP_NOCACHE | - | Define ETP_NOCACHE variable on environment |
+| PRETEND | 0 | If set to 1 append -p option to emerge commands. |
+| BUILDER_VERBOSE | 0 | If set to 1 add verbose to builder program. |
+| DETECT_OBSOLETE | 0 | Execute script sabayon-detectobsolete to target overlay to found obsolete ebuilds. |
+| TARGET_OVERLAY | - | Define overlay where execute sabayon-detectobsolete script. Require DETECT_OBSOLETE variable set to 1. |
+| LOCAL_OVERLAY | - | Define a directory to mount as volume to /usr/local/local_portage |
+| SHARE_WORKSPACE | - | If defined mount volume defined on SAB_WORKSPACE variable to /devkit-workspace |
+| PRE_SCRIPT | - | Mount a custom script to /pre-script execute before compilation |
+| POST_SCRIPT | - | Mount a custom script to /post-script execute after packages compilation |
+| MAKE_CONF | - | If defined mount defined file to /etc/portage/make.conf.custom and define variable MAKE_CONF to bet to mounted path. |
+

builder

@@ -1,29 +1,53 @@
 #!/usr/bin/env perl
 
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+use URI;
 use Getopt::Long;
 use v5.10;
 no feature "say";
+use Storable 'dclone';
+use Sort::Versions;
 
-my $profile           = $ENV{BUILDER_PROFILE}   // 3;
-my $jobs              = $ENV{BUILDER_JOBS}      // 1;
-my $use_equo          = $ENV{USE_EQUO}          // 1;
-my $preserved_rebuild = $ENV{PRESERVED_REBUILD} // 0;
+my $profile              = $ENV{BUILDER_PROFILE} // 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 --quiet --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_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_mirrorsort      = $ENV{EQUO_MIRRORSORT}      // 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 $dep_ignore_versions       = $ENV{DEPENDENCY_IGNORE_VERSIONS} // 0;
 my $skip_portage_sync         = $ENV{SKIP_PORTAGE_SYNC} // 0;
 my $emerge_split_install      = $ENV{EMERGE_SPLIT_INSTALL} // 0;
 my $webrsync                  = $ENV{WEBRSYNC} // 0;
+# Define git tarball url to use instead of webrsync or emerge --sync
+my $portage_git_url           = $ENV{PORTAGE_GIT_URL} // "";
+# Define supported tarball types: github|gitlab
+my $portage_git_service       = $ENV{PORTAGE_GIT_SRV} // "github";
+my $portage_git_branch        = $ENV{PORTAGE_GIT_BRANCH} // "master";
 my $enman_repositories        = $ENV{ENMAN_REPOSITORIES};
 my $emerge_remove             = $ENV{EMERGE_REMOVE};
 my $remove_enman_repositories = $ENV{REMOVE_ENMAN_REPOSITORIES};
@@ -40,6 +64,11 @@ my $remote_overlay            = $ENV{REMOTE_OVERLAY};
 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 $verbose                   = $ENV{BUILDER_VERBOSE} // 0;
+my $keep_going                = $ENV{KEEP_GOING} // 1;
 
 my $make_conf = $ENV{MAKE_CONF};
 
@@ -61,13 +90,28 @@ $ENV{ACCEPT_LICENSE} = "*";    # we can use wildcard since entropy 302
 # A barely print replacement
 sub say { print join( "\n", @_ ) . "\n"; }
 
+sub loud {
+    say;
+    say "===" x 4;
+    say "===" x 4;
+    say @_;
+    say "===" x 4;
+    say "===" x 4;
+    say;
+}
+
 sub safe_call {
     my $cmd    = shift;
-    my $rt     = system($cmd);
+    my $rt     = _system($cmd);
     my $return = $rt >> 8;
     exit($return) if ($rt);
 }
 
+sub _system {
+    say "Executing: @_" if $verbose;
+    return system(@_);
+}
+
 sub append_to_file {
     my ( $file_name, $package ) = @_;
 
@@ -75,7 +119,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,11 +127,20 @@ 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;
 }
 
+sub parse_overlays {
+    map { $_ =~ s/.*?\:\://g; $_ } grep {/\:\:/} @{ dclone( \@_ ) };
+}
+
+sub hook_script {
+    my $s = shift;
+    _system("chmod +x ${s};${s}") if -e $s;
+}
+
 sub add_portage_repository {
     my $repo = $_[0];
     my $reponame;
@@ -100,15 +153,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/" );
+    _system("mkdir -p /etc/portage/repos.conf/")
+        if ( !-d "/etc/portage/repos.conf/" );
 
     say "==== Adding $reponame ====";
     qx{
@@ -119,14 +172,155 @@ sync-uri = $repo
 auto-sync = yes' > /etc/portage/repos.conf/$reponame.conf
 };                            # Declaring the repo and giving priority
 
-    system("emaint sync -r $reponame");
+    _system("emaint sync -r $reponame");
 }
 
 # 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 parse_package_str {
+  my ($pkg, $p, $cat, $v) = @_;
+  my @parts = split '/', $pkg;
+  $p = $parts[1];
+  $cat = $parts[0];
+
+  $regex = '[-]r[\d]$';
+  $regex .= '|_p[\d]+[-]r[\d]$';
+  $regex .= '|_p[\d]+$';
+  $regex .= '|_alpha[\d]*$';
+  $regex .= '|_beta[\d]*$';
+  $regex .= '|_pre[\d]*$';
+  $regex .= '|_pre[\d]*[-]r[\d]$';
+  $regex .= '|_rc[\d]*$';
+
+  # Drop extra version suffix for now.
+  $p =~ s/($regex)//g;
+
+  $v = $p;  # Version regex
+  # 1.1
+  $version_regex = "[0-9]+[.][0-9]+[a-z]*";
+  # 1
+  $version_regex .= "|[0-9]+[a-z]*";
+  # 1.1.1
+  $version_regex .= "|[0-9]+[.][0-9]+[.][0-9]+[a-z]*";
+  # 1.1.1.1
+  $version_regex .= "|[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+[a-z]*";
+  # 1.1.1.1.1
+  $version_regex .= "|[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+[.][0-9]+[a-z]*";
+  # 1.1.1.1.1.1
+  $version_regex .= "|[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+[.][0-9]+[.][0-9]+[a-z]*";
+  $p =~ m/[-]($version_regex)*$/;
+  $v = $&; $v = substr $v, 1 if length($v) > 1;
+
+  $p =~ s/-[\d.]*$//g;
+
+  return $cat, $p, $v;
+}
+
+sub parse_package_version {
+  my ($cat, $p, $v) = parse_package_str(@_);
+  return $v;
+}
+
+sub simplify_package {
+  my ($cat, $p, $v) = parse_package_str(@_);
+  $ans = $cat . "/" . $p ;
+  return $ans;
+}
+
+sub sanitize_deps {
+  my ($pkg, $atom, $dref, $verion) = @_;
+  my @dependencies = @{ $dref };
+  my $prev_key = undef;
+  my %revs = ();
+
+  if ($dep_ignore_versions) {
+    for (@dependencies) {
+      chomp($_);
+      if (length($_) > 0) {
+        if ($_ =~ m/\[\s+\d\]/) {
+          my $pkgs = $revs{$prev_key};
+          push(@$pkgs, $_);
+        } else {
+          $prev_key = substr $_, 0, length($_)-1
+            unless substr($_, -1) cmp ":";
+          my ($pkg, $p, $v) = parse_package_str($prev_key);
+          $revs{$v} = [];
+          $prev_key = $v;
+        }
+      }
+    }
+
+    # revs dictionary contains as keys versions of the package
+    # and as values an array ref with list of dependencies + itself
+    # Ex:
+    # %revs = (
+    #   '1.8.5' => [
+    #      ' [  0]  dev-lang/spidermonkey-1.8.5-r9   ',
+    #      ' [  1]  dev-libs/nspr-4.22   ',
+    #      ' [  1]  sys-libs/readline-7.0_p5   ',
+    #      ' [  1]  dev-libs/jemalloc-3.6.0   ',
+    #      ' [  1]  dev-lang/python-2.7.16   ',
+    #      ' [  1]  app-arch/zip-3.0-r3   ',
+    #      ' [  1]  virtual/pkgconfig-1   ',
+    #      ' [  1]  app-portage/elt-patches-20170815   ',
+    #      ' [  1]  sys-devel/automake-1.16.1-r1   ',
+    #      ' [  1]  sys-devel/automake-1.15.1-r2   ',
+    #      ' [  1]  sys-devel/autoconf-2.13-r1   ',
+    #      ' [  1]  sys-devel/libtool-2.4.6-r3   '
+    #   ],
+    # )
+
+
+    $v = parse_package_version($pkg);
+    if (length($v) > 0 && defined %revs{$v}) {
+      $version = $v;
+    } else {
+      @versions = sort { &Sort::Versions::versioncmp($a,$b) } keys %revs;
+      $version = $versions[scalar(@versions)-1];
+    }
+    $ref = $revs{$version};
+
+    loud("For package $pkg use version $version with deps: ", @$ref)
+    if $verbose;
+
+    @dependencies = uniq(
+        grep {$_}
+        map {
+          $_ =~ s/\[.*\]|\s//g;
+          $_ =~ s/[:]$//g; # drop : at the end
+          &abs_atom($_) if $atom;
+          $_
+        }
+        @$ref
+    );
+  } else {
+    # Merge all versions dependencies as previous implementation.
+    #
+# If an unversioned atom is given, equery returns results for all versions in the portage tree
+# leading to duplicates. The sanest thing to do is dedup the list. This gives the superset of all
+# possible dependencies, which isn't perfectly accurate but should be good enough. For completely
+# accurate results, pass in a versioned atom.
+    @dependencies = uniq(
+        sort
+        grep {$_}
+        map {
+          $_ =~ s/\[.*\]|\s//g;
+          $_ =~ s/[:]$//g; # drop : at the end
+          &abs_atom($_) if $atom;
+          $_
+        }
+        @dependencies
+    );
+
+  }
+
+  return sort(@dependencies);
+}
+
 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
@@ -134,20 +328,11 @@ sub package_deps {
 
     if ( !exists $package_dep_cache{$cache_key} ) {
         my @dependencies =
-          qx/equery -C -q g --depth=$depth $package/;    #depth=0 it's all
+            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
-# leading to duplicates. The sanest thing to do is dedup the list. This gives the superset of all
-# possible dependencies, which isn't perfectly accurate but should be good enough. For completely
-# accurate results, pass in a versioned atom.
-        @dependencies = uniq(
-            sort
-              grep { $_ }
-              map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
-              @dependencies
-        );
-
+        # Get dependencies only of major version
+        @dependencies = sanitize_deps($package, $atom, \@dependencies);
         $package_dep_cache{$cache_key} = \@dependencies;
     }
 
@@ -185,7 +370,7 @@ sub calculate_missing {
         my @virtual_deps = ();
         for my $dep (@dependencies) {
             if ( $dep =~ /^virtual\// ) {
-                my @child_deps = package_deps($dep, 1, 1);
+                my @child_deps = package_deps( $dep, 1, 1 );
                 push( @virtual_deps, @child_deps );
             }
         }
@@ -193,7 +378,7 @@ sub calculate_missing {
         # Deduplicate the list
         @virtual_deps = uniq(@virtual_deps);
 
-        # Prune the dependencies of the virtual packages from the dependencies list
+   # Prune the dependencies of the virtual packages from the dependencies list
         for my $dep (@virtual_deps) {
             if ( $dep !~ /^virtual\// ) {
                 $install_dependencies{$dep} = 0;
@@ -204,38 +389,57 @@ sub calculate_missing {
 
     #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;
 }
 
+sub portage_perms {
+    my $dir = shift;
+    _system("chown -R portage:portage $dir");
+    _system("chmod -R ug+w,a+rX $dir");
+}
+
 # Input : complete gentoo package (sys-fs/foobarfs-1.9.2)
 # Output: atom form (sys-fs/foobarfs)
 sub atom { s/-[0-9]{1,}.*$//; }
 
+sub abs_atom { atom; s/^(\<|\>|=)+// }
+
+# Same again as a function
+sub to_atom { my $p = shift; local $_ = $p; atom; return $_; }
+
+sub to_abs_atom { my $p = shift; local $_ = $p; abs_atom; return $_; }
+
 # 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 ) ];
         }
     }
 }
@@ -243,51 +447,97 @@ sub detect_useflags
 sub compile_packs {
     my ( $target, @packages ) = @_;
     my $extra_arg;
+    my $compiled = {};
     $extra_arg = "-B" if $target eq "injected_targets";
     my $package_counter = 0;
-    my $return;
     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 @{ $per_package_useflags->{$target}->[$package_counter] }
+            > 0 )
         {
             say "USEFLAGS: "
-              . join( " ",
+                . join( " ",
                 @{ $per_package_useflags->{$target}->[$package_counter] } );
-            $tmp_rt = system(
+            $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!
+        $compiled->{$pack} = $tmp_rt;
     }
-    return $return;
+    return $compiled;
+}
+
+sub fetch_portage_from_git {
+
+  my ( $url, $srv, $branch ) = @_;
+
+  $url = substr($url, 0, length($url)-1) unless substr($url, -1) cmp "/";
+  my $uri = URI->new($url);
+  my $base = ( $uri->path_segments )[-1];
+
+  say "==== Fetching $srv Portage for branch $branch ====";
+
+  if ( $srv and $srv eq "gitlab" ) {
+    $url .= "/-/archive/$branch/$base-$branch.tar.gz";
+  } else {
+    $url .= "/archive/$branch.tar.gz";
+  }
+
+  _system( "wget -O /tmp/portage.tar.gz $url" );
+  _system( "mkdir /tmp/portage ; tar xzf /tmp/portage.tar.gz -C /tmp/portage" );
+
+  # Avoid to remove /usr/portage for use case where I have already
+  # files under /usr/portage/distfiles or /usr/portage/packages to use.
+  my @excluded_dirs = (
+    "'distfiles'",
+    "'packages'"
+  );
+  my $rsync_opts = "-a --delete --delete-during --recursive -d -A -H";
+  $rsync_opts .= " --exclude $_" foreach @excluded_dirs;
+
+  _system( "rsync $rsync_opts /tmp/portage/$base-$branch/ /usr/portage/" );
+
+  _system( "rm -rf /tmp/portage " );
 }
 
 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;
 }
 
 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) {
@@ -295,47 +545,57 @@ if ( @overlays > 0 ) {
     }
 }
 
-say "[*] Installing:";
+say "[*] Compiling:";
 
 say "\t* " . $_ for @ARGV;
 
-say "[*] Syncing configurations files, Layman and Portage";
+loud "Setup phase start";
+
+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.
 
 # If defined, fetch a remote /etc/portage
 if ( $remote_conf_portdir ne "" ) {
-    system("rm -rf /etc/portage");
-    system("git clone $remote_conf_portdir /etc/portage");
-    system("chown -R portage:portage /etc/portage");
-    system("chmod -R ug+w,a+rX /etc/portage");
+    _system("rm -rf /etc/portage");
+    _system("git clone $remote_conf_portdir /etc/portage");
+    portage_perms('/etc/portage');
 }
 else {
-    system("cd /etc/portage/;git checkout master; git stash; git pull");
+    _system("cd /etc/portage/;git checkout master; git stash; git pull");
 }
 
 # If defined, fetch a remote /usr/portage
 if ( $remote_portdir ne "" ) {
-    system("rm -rf /usr/portage");
-    system("git clone $remote_portdir /usr/portage");
-    system("chown -R portage:portage /usr/portage");
-    system("chmod -R ug+w,a+rX /usr/portage");
+    _system("rm -rf /usr/portage");
+    _system("git clone $remote_portdir /usr/portage");
 }
 
-system("echo 'y' | layman -f -a $_") for @overlays;
+_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;
 
 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"
+_system(
+    "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("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");
 }
 else {
     open FILE, "</usr/local/portage/profiles/repo_name";
@@ -344,8 +604,7 @@ else {
     chomp(@FILE);
     $reponame = $FILE[0];
 }
-system("chown -R portage:portage /usr/local/portage");
-system("chmod -R 755 /usr/local/portage");
+portage_perms('/usr/local/portage');
 
 qx{
 echo '[$reponame]
@@ -360,75 +619,130 @@ if ( $remote_overlay and $remote_overlay ne "" ) {
 }
 
 if ( $remove_layman_overlay and $remove_layman_overlay ne "" ) {
-    say "===== Removing overlays: $remove_remote_overlay =====";
+    say "===== Removing overlays: $remove_layman_overlay =====";
 
-    system("layman -d $_") for ( split( / /, $remove_layman_overlay ) );
+    _system("layman -d $_") for ( split( / /, $remove_layman_overlay ) );
 }
 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 ) );
+    _system( "rm -rfv /etc/portage/" . $_ . ".conf" )
+        for ( split( / /, $remote_overlay ) );
 }
 
-system("mkdir -p /usr/portage/distfiles/git3-src");
+_system("mkdir -p /usr/portage/distfiles/git3-src");
+portage_perms('/usr/portage');
 
 unless ( $skip_portage_sync == 1 ) {
 
     # sync portage and overlays
-    system("layman -S");
-    if ( $webrsync == 1 ) {
-        system("emerge-webrsync");
+    _system("layman -S");
+    if ( $portage_git_url ne "" and $portage_git_branch ne "" ) {
+      fetch_portage_from_git( $portage_git_url, $portage_git_service,
+        $portage_git_branch );
+    }
+    elsif ( $webrsync == 1 ) {
+        _system("emerge-webrsync");
     }
     else {
-        system("emerge --sync");
+        _system("emerge --sync --quiet");
     }
 }
 
 # preparing for MOAR automation
-qx|eselect profile set $profile|;
+say "Setting new profile to $profile"   if defined $profile;
+_system("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|;
-    qx|equo repo enable sabayon-weekly|;
+    _system("equo repo disable sabayonlinux.org");
+    _system("equo repo enable sabayon-weekly");
 }
 elsif ( $use_equo && $entropy_repository eq "testing" ) {
-    qx|equo repo disable sabayon-weekly|;
-    qx|equo repo enable sabayonlinux.org|;
-    qx|equo repo enable sabayon-limbo|;
+    _system("equo repo disable sabayon-weekly");
+    _system("equo repo enable sabayonlinux.org");
+    _system("equo repo enable sabayon-limbo");
 }
 
 if ($use_equo) {
 
     say "Devkit version:";
-    system("equo s -vq app-misc/sabayon-devkit");
+    _system("equo s -vq app-misc/sabayon-devkit");
+
+    _system("equo repo mirrorsort sabayonlinux.org") if $equo_mirrorsort;
+
+    # Try to use last enman version
+    _system("equo up && equo i enman --relaxed");
+
+    _system("enman list --installed -q");
+    my $enman_list_output = qx|enman list --installed -q|;
+    chomp($enman_list_output);
+    my @installed_enman_repos;
+
+    if ( $enman_list_output eq "No repositories were installed with enman" ) {
+        @installed_enman_repos = ();
+    }
+    else {
+        @installed_enman_repos = split( / /, $enman_list_output );
+    }
 
     if ( $enman_repositories and $enman_repositories ne "" ) {
-        my @enman_toadd = split( / /, $enman_repositories );
-        safe_call("enman add $_") for @enman_toadd;
+        say "==================================";
+        my @enman_toadd;
+        if ( index( $enman_repositories, "\n" ) != -1 ) {
+            @enman_toadd = split( /\n/, $enman_repositories );
+        }
+        else {
+            @enman_toadd = split( / /, $enman_repositories );
+        }
+
+        for my $enman_add (@enman_toadd) {
+            say "Check enman " . $enman_add;
+            if ( !grep ( $enman_add, @installed_enman_repos ) ) {
+                say "Try to install " . $enman_add;
+                _system("enman add $enman_add");
+            }
+            else {
+                say "Already present: " . $enman_add;
+            }
+        }
+        say "==================================";
     }
 
     if ( $remove_enman_repositories and $remove_enman_repositories ne "" ) {
-        my @enman_toremove = split( / /, $remove_enman_repositories );
-        system("enman remove $_") for @enman_toremove;
+        say "==================================";
+        my @enman_toremove;
+        if ( index( $remove_enman_repositories, "\n" ) != -1 ) {
+            @enman_toremove = split( /\n/, $remove_enman_repositories );
+        }
+        else {
+            @enman_toremove = split( / /, $remove_enman_repositories );
+        }
+
+        for my $enman_remove (@enman_toremove) {
+            if ( grep ( $enman_remove, @installed_enman_repos ) ) {
+                say "Try to remove enamn repository " . $enman_remove;
+                _system("enman remove $enman_remove");
+            }
+            else {
+                say "Enman repository $enman_remove is not present.";
+            }
+        }
+        say "==================================";
     }
 
-    system("enman add $repository_name")
-      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");
+    _system("enman add $repository_name")
+        if ($enman_add_self
+        and $repository_name
+        and $repository_name ne "" );
+
+    _system("equo up && equo u");
 }
 
-system("cp -rf $make_conf /etc/portage/make.conf") if $make_conf;
+_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 );
+if (@injected_packages) {
     say "[*] Injected installs:";
-
     say "\t* " . $_ for @injected_packages;
-
 }
 
 # Allow users to specify atoms as: media-tv/kodi[-alsa,avahi]
@@ -438,8 +752,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 );
 
@@ -448,13 +762,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;
@@ -463,14 +777,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(
@@ -480,80 +794,119 @@ 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 ) {
-            system("equo rm --nodeps $_") for (@equo_remove);
+        _system("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 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
-        system("equo rm --nodeps @equo_remove") if ( @equo_remove > 0 );
+        my @p = map {"'$_'"} ( @packages_deps, @equo_install );
+        my @r = map {"'$_'"} @equo_remove;
+        _system("equo i $equo_install_args --bdeps @p")
+            if ( @p > 0 )
+            ; ## bail out here, if installs fails. emerge will compile a LOT of stuff
+        _system("equo rm --nodeps @r") if ( @r > 0 );
     }
 }
 
-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");
-    }
-}
+loud "Pre-compilation phase start";
 
-say "*** Ready to compile, finger crossed ***";
+_system("emerge --info")
+    ; #always give detailed information about the building environment, helpful to debug
 
-system("emerge --info")
-  ; #always give detailed information about the building environment, helpful to debug
-
-my $rt;
+_system("equo repo list")
+    ; #always give list of repo installed to for reproduce conflicts install issues.
 
 if ( $emerge_remove and $emerge_remove ne "" ) {
-    system("emerge -C $_") for split( / /, $emerge_remove );
+    say "Removing with emerge: $emerge_remove";
+    _system("emerge -C '$_'") for split( / /, $emerge_remove );
 }
 
+hook_script("./pre-script");
+hook_script("/pre-script");
+
+loud "Compilation phase start";
+
+my $return = 0;
 if ($emerge_split_install) {
-    compile_packs( "targets", @packages );
-    $rt = 0;    #consider the build good anyway, like a "keep-going"
+    my $res = compile_packs( "targets", @packages );
+    loud "Compilation summary";
+    foreach my $k ( keys %{$res} ) {
+        my $c = $res->{$k} >> 8;
+        if ( $c != 0 ) {
+            say "$k : build failed ( Exit: $c )";
+            $return = 1 unless $keep_going;
+        }
+        else {
+            say "$k : build succeeded";
+        }
+    }
 }
 else {
-    $rt = system("emerge $emerge_defaults_args -j $jobs @packages");
+    my @p = map {"'$_'"} @packages;
+    my $rt = _system("emerge $emerge_defaults_args -j $jobs @p");
+    $return = $rt >> 8;
 }
 
-my $return = $rt >> 8;
+if ( @injected_packages > 0 ) {
+    my $res = compile_packs( "injected_targets", @injected_packages );
+    loud "Compilation summary for injected_targets";
+    foreach my $k ( keys %{$res} ) {
+        my $c = $res->{$k} >> 8;
+        if ( $c != 0 ) {
+            say "$k : build failed ( Exit: $c )";
+            $return = 1 unless $keep_going;
+        }
+        else {
+            say "$k : build succeeded";
+        }
+    }
+}
 
-# best effort -B
-compile_packs( "injected_targets", @injected_packages );
+loud "Compilation phase end (Exit: $return)";
 
-if ($preserved_rebuild) {
+hook_script("./post-script");
+hook_script("/post-script");
 
-    system("emerge -j $jobs --buildpkg \@preserved-rebuild");
-    system("revdep-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 $_");
+    loud "Quality assurance checks";
+    foreach my $pn ( map { abs_atom; $_ } ( @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 ) {
+    loud "Obsoletes detection";
+    _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);

dynlink-scanner

@@ -46,5 +46,5 @@ for cpv in `portageq match $ROOT/ $1`; do
 	# For each file that belongs to package
 	#     run dynlink-scanner --linking-deps <file> to obtain its linking dependencies
 	# Assign all linking deps to packages and print package names
-	qfile -eR $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d' ' | sort -u
+	qfile -vR $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d' ' | sort -u
 done

sabayon-brokenlibs

@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 PACKAGES=()
 bin=$1

sabayon-brokenlinks

@@ -0,0 +1,462 @@
+#!/bin/bash
+# Authors: Sabayon Team 2019
+
+set -e
+
+# Accepted values: x86_64, armv7l
+export SAB_ARCH="${SAB_ARCH:-}"
+export DRY_RUN=${DRY_RUN:-0}
+export DEBUG="${DEBUG:-}"
+export FORCE="${FORCE:-0}"
+export USE_EQUO="${USE_EQUO:-1}"
+
+declare -a MANUALLY_REMOVED_LINKS
+declare -a BROKEN_LINKS2REMOVE
+
+log() {
+  local with_dashes=$1
+  shift || true
+
+  [ "$with_dashes" != 1 ] || \
+    echo "==============================================================="
+  echo "$@"
+  [ "$with_dashes" != 1 ] || \
+    echo "==============================================================="
+}
+
+summary() {
+
+  local msg="SAB_ARCH = ${SAB_ARCH}
+EXAMINED_LIBDIRS = ${EXAMINED_LIBDIRS}
+DRY_RUN = ${DRY_RUN}
+USE_EQUO = ${USE_EQUO}
+FORCE = ${FORCE}"
+
+  log 1 "$msg"
+}
+
+check_arch() {
+  if [ -z "${SAB_ARCH}" ] ; then
+    SAB_ARCH=$(uname -m)
+  fi
+
+  [[ "${SAB_ARCH}" != "x86_64" && "${SAB_ARCH}" != "armv7l" ]] && {
+    log 1 "Unsupported arch ${SAB_ARCH}."
+    exit 1
+  }
+
+  export SAB_ARCH
+}
+
+search_pkg() {
+  local basename=$1
+  # passed by reference
+  local -n p="$2"
+  local -n libdir="$3"
+  local lib="$4"
+  local l=""
+  local ll=""
+
+  # Try to search for package
+  if [ "${USE_EQUO}" = "0" ] ; then
+    p=$(equery -N -q -C belongs ${lib}/$basename --early-out || true)
+  else
+    p=$(equo q belongs ${lib}/${basename} -q || true)
+  fi
+
+  if [ -z "$p" ] ; then
+
+    for l in "/usr/lib64" "/usr/lib32" "/usr/lib" ; do
+      if [ "$lib" = "$l" ] ; then
+        ll="${l/\/usr\///}"
+        break
+      fi
+    done
+
+    if [ -n "${ll}" ] ; then
+      if [ "${USE_EQUO}" = "0" ] ; then
+        p=$(equery -N -q -C belongs ${ll}/$basename --early-out || true)
+      else
+        p=$(equo q belongs ${ll}/${basename} -q || true)
+      fi
+    fi
+
+  fi
+
+  if [ -z "$p" ] ; then
+    libdir=""
+  fi
+}
+
+detect_libs_dir() {
+  local libs=""
+
+  if [ -n "$SCANDIR" ] ; then
+    libs=$SCANDIR
+  else
+    if [ "${SAB_ARCH}" = "x86_64" ] ; then
+      if [ -d "/usr/lib32" ] ; then
+        libs="/usr/lib32 /lib32"
+      fi
+      if [ -d "/usr/lib64" ] ; then
+        libs="$libs /usr/lib64 /lib64"
+      fi
+    else
+      if [ -d "/usr/lib" ] ; then
+        libs="/usr/lib /lib"
+      fi
+    fi
+    if [ -z "$libs" ] ; then
+      log 0 "Error on detect libraries directories."
+      exit 1
+    fi
+  fi
+
+  EXAMINED_LIBDIRS=$libs
+  export EXAMINED_LIBDIRS
+}
+
+examine_libs() {
+  local lib=""
+  local file=""
+  local broken_files=""
+
+  log 1 "The exam could be long sorry for the wait."
+
+  for lib in ${EXAMINED_LIBDIRS} ; do
+    broken_files=""
+
+    log 1 "Checking directory $lib..."
+    broken_files=$(find $lib -type l -and -xtype l -and -name *.so* -or -name *.a -and -type l -and -xtype l 2>/dev/null || true )
+
+    [ -z "$DEBUG" ] || {
+      find $lib -type l -and -xtype l -and -name *.so* -or -name *.a -and -type l -and -xtype l || true
+    }
+
+    for file in ${broken_files} ; do
+      examine_file "${file}" "${lib}"
+    done
+  done
+}
+
+examine_file() {
+  local f=$1
+  local res=""
+  local libdir=$2
+  local is_present_pkg=1
+  local pkg=""
+
+  [ -z "$DEBUG" ] || log 1 "Analyze file $f"
+
+  local base=$(basename $1)
+
+  local targetlink=$(readlink $f)
+  local link2remove=false
+  local link2fix=false
+  local newlibdir=""
+  local tmp=""
+  local current_link=""
+
+  log 1 "Broken link $f => $targetlink"
+
+  # Check if file is without revision (es. libudev.so)
+  res=$(perl -e "if ('$base' =~ /(.so|.a$)/) { print '1' }")
+  if [ -n "$res" ] ; then
+    # 
+    #echo "BASE = $base"
+
+    search_pkg "$base" pkg newlibdir "$lib"
+    if [ -z "$pkg" ] ; then
+      MANUALLY_REMOVED_LINKS+=( "$f" )
+      return
+    else
+
+      if [ -n "$newlibdir" ] ; then
+        log 0 "Link $base available under $newlibdir. I remove it."
+        link2remove=true
+      fi
+    fi
+
+    if [ "${USE_EQUO}" = "0" ] ; then
+      res=$(qlist -IC $pkg 2>/dev/null | grep $f | wc -l)
+    else
+      res=$(equo q files  $pkg -q | grep $f | wc -l)
+    fi
+    if [ "$res" = 1 ] ; then
+      link2fix=true
+      echo "Link $f related to existing package. Try to reinstall $pkg."
+    else
+      MANUALLY_REMOVED_LINKS+=( "$f" )
+    fi
+
+    log 0 "Link $f of the package $pkg"
+
+  else
+
+    # Check if file has only one revision number (es. libudev.so.0)
+    res=$(perl -e "if ('$base' =~ /(.so[.][\d]+$)/) { print '1' }")
+    if [ -n "$res" ] ; then
+
+      search_pkg "$base" pkg newlibdir "$lib"
+      if [ -z "$pkg" ] ; then
+        # Try to search package with .so
+        base=$(echo "$base" | awk 'match($0, /.so/) { print substr($0, 0, RSTART+2) }')
+        search_pkg "$base" pkg newlibdir "$lib"
+        if [ -z "$pkg" ] ; then
+          log 0 "No package found for link $f."
+          MANUALLY_REMOVED_LINKS+=( "$f" )
+          return
+        fi
+
+        if [ -n "$newlibdir" ] ; then
+          log 0 "Link $base available under $newlibdir. I remove it."
+          link2remove=true
+        else
+          # POST: we have a broken link or old link
+
+          current_link=$(readlink $lib/$base)
+          log 0 "Link $f related to package $pkg (with an updated version $current_link). I remove it."
+          link2remove=true
+
+        fi
+
+      else
+
+        log 0 "Link $f of the package $pkg"
+
+        if [ -n "$newlibdir" ] ; then
+          log 0 "Link $base available under $newlibdir. I remove it."
+          link2remove=true
+        else
+
+          # Check new 
+          if [ "${USE_EQUO}" = "0" ] ; then
+            res=$(qlist -IC $pkg 2>/dev/null | grep $f | wc -l)
+          else
+            res=$(equo q files  $pkg -q | grep $f | wc -l)
+          fi
+          if [ "$res" = 1 ] ; then
+            link2fix=true
+            echo "Link $f related to existing package. Try to reinstall $pkg."
+          else
+            MANUALLY_REMOVED_LINKS+=( "$f" )
+          fi
+
+        fi
+
+      fi
+
+    else
+      # Check if file has only one revision number (es. libudev.so.0.63)
+      res=$(perl -e "if ('$base' =~ /(.so[.][\d]+[.][\d]+$)/) { print '1' }")
+      if [ -n "$res" ] ; then
+
+        search_pkg "$base" pkg newlibdir "$lib"
+        if [ -z "$pkg" ] ; then
+
+          base=$(echo "$base" | awk 'match($0, /.so[.][0-9]+/) { print substr($0, 0, RSTART+RLENGTH-1) }')
+          search_pkg "$base" pkg newlibdir "$lib"
+          if [ -z "$pkg" ] ; then
+            log 0 "No package found for link $f."
+            MANUALLY_REMOVED_LINKS+=( "$f" )
+            return
+          fi
+
+          if [ -n "$newlibdir" ] ; then
+            log 0 "Link $base available under $newlibdir. I remove it."
+            link2remove=true
+          else
+
+            current_link=$(readlink $lib/$base)
+            log 0 "Link $f related to package $pkg (with an updated version $current_link). I remove it."
+            link2remove=true
+
+          fi
+
+        else
+
+          log 0 "Link $f of the package $pkg"
+
+          if [ -n "$newlibdir" ] ; then
+            log 0 "Link $base available under $newlibdir. I remove it."
+            link2remove=true
+          else
+
+            # Check new 
+            if [ "${USE_EQUO}" = "0" ] ; then
+              res=$(qlist -IC $pkg 2>/dev/null | grep $f | wc -l)
+            else
+              res=$(equo q files  $pkg -q | grep $f | wc -l)
+            fi
+            if [ "$res" = 1 ] ; then
+              link2fix=true
+              echo "Link $f related to existing package. Try to reinstall $pkg."
+            else
+              MANUALLY_REMOVED_LINKS+=( "$f" )
+            fi
+
+          fi
+
+        fi
+
+      else
+        echo "Link $f not supported".
+        MANUALLY_REMOVED_LINKS+=( "$f" )
+
+      fi
+
+    fi
+
+  fi
+
+  if [ $link2remove = true ] ; then
+    BROKEN_LINKS2REMOVE+=( "$f" )
+  fi
+
+}
+
+rm_broken_links() {
+  for l in ${BROKEN_LINKS2REMOVE[@]} ; do
+    if [ "$DRY_RUN" = 0 ]; then
+      rm -vf ${l}
+    else
+      echo "rm -vf ${l}"
+    fi
+  done
+}
+
+print_links2remove() {
+  for l in ${MANUALLY_REMOVED_LINKS[@]} ; do
+    if [ "$FORCE" = 1 ] ; then
+      if [ "$DRY_RUN" = 0 ] ; then
+        rm -vf ${l}
+      else
+        echo "force: rm -vf ${l}"
+      fi
+    else
+      echo "rm -vf ${l}"
+    fi
+  done
+}
+
+parse_args() {
+
+  help_message() {
+
+    echo "Sabayon Broken Links analyzer.
+Sabayon Team (2019)
+
+$0 [opts]
+
+Available options:
+
+-h|--help         This message.
+--dry-run         Dry run execution.
+--force           Force remove of the links to remove manually.
+--scandir         Define a specific directory to analyze
+--gentoo          Use gentoo tool instead of equo.
+-d|--debug        Enable debug stuff.
+
+Environment variables:
+DRY_RUN           To use instead of --dry-run option. Values: 0 or 1.
+DEBUG             Enable debug output.
+USE_EQUO          To use instead of --gentoo option.
+FORCE             To use instead of --force.
+
+"
+
+  }
+
+  local short_opts="hd"
+  local long_opts="help dry-run force debug scandir: gentoo"
+
+  $(set -- $(getopt -u -q -a -o "$short_opts" -l "$long_opts" -- "$@"))
+
+  while [ $# -gt 0 ] ; do
+    case "$1" in
+
+      -h|--help)
+        help_message
+        exit 1
+        ;;
+      -d|--debug)
+        DEBUG=1
+        ;;
+      --force)
+        FORCE=1
+        ;;
+      --dry-run)
+        DRY_RUN=1
+        ;;
+      --scandir)
+        SCANDIR="$2"
+        shift
+        ;;
+      --gentoo)
+        USE_EQUO=0
+        ;;
+      --)
+        ;;
+      *)
+        echo "Invalid parameter $1."
+        exit 1
+        ;;
+
+    esac
+
+    shift
+
+  done
+
+  unset -f help_message
+}
+
+main() {
+
+  parse_args "$@"
+
+  log 1 "sabayon-brokenlinks: Examine system broken links"
+  check_arch
+  detect_libs_dir
+  summary
+
+  if [[ "$(id -u)" != "0" && "${DRY_RUN}" != "1" ]]; then
+     echo "This script must be run as root" 1>&2
+     exit 1
+  fi
+
+  parse_args
+  unset -f parse_args
+
+  if [ "${USE_EQUO}" = "0" ] ; then
+    which equery 2>&1 >/dev/null || {
+      echo "equery tool is needed. Please install app-portage/gentoolkit."
+      exit 1
+    }
+
+    which qlist 2>&1 >/dev/null || {
+      echo "qlist tool is needed. Please install app-portage/portage-utils."
+      exit 1
+    }
+  fi
+
+  examine_libs
+
+  if [ ${#BROKEN_LINKS2REMOVE[@]} -gt 0 ] ; then
+    log 1 "Remove Broken Links!"
+    rm_broken_links
+  fi
+
+  if [ ${#MANUALLY_REMOVED_LINKS[@]} -gt 0 ] ; then
+    if [ "${FORCE}" = 1 ] ; then
+      log 1 "Hereinafter, links removed with force:"
+    else
+      log 1 "Hereinafter, links to manually remove:"
+    fi
+    print_links2remove
+  fi
+
+  echo "All Done."
+}
+
+main $@

sabayon-buildpackages

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 SAB_WORKSPACE="${SAB_WORKSPACE:-$PWD}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/builder-amd64}"
@@ -8,7 +24,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
 
@@ -41,6 +57,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -z "$ENMAN_REPOSITORIES" ] || docker_env+=(-e "ENMAN_REPOSITORIES=$ENMAN_REPOSITORIES")
 [ -z "$REMOVE_ENMAN_REPOSITORIES" ] || docker_env+=(-e "REMOVE_ENMAN_REPOSITORIES=$REMOVE_ENMAN_REPOSITORIES")
 [ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles")
+[ -z "$INTERNAL_BUILDER" ] || docker_volumes+=(-v "$INTERNAL_BUILDER:/usr/sbin/builder")
 [ -z "$ENTROPY_DOWNLOADED_PACKAGES" ] || docker_volumes+=(-v "$ENTROPY_DOWNLOADED_PACKAGES:/var/lib/entropy/client/packages")
 [ -z "$DISTCC_HOSTS" ] || docker_env+=(-e "DISTCC_HOSTS=$DISTCC_HOSTS")
 [ -z "${PRUNE_VIRTUALS}" ] || docker_env+=(-e "PRUNE_VIRTUALS=$PRUNE_VIRTUALS")
@@ -56,7 +73,14 @@ 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 "$BUILDER_VERBOSE" ] || docker_env+=(-e "BUILDER_VERBOSE=$BUILDER_VERBOSE")
+[ -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")
+[ -z "$SHARE_WORKSPACE" ] || docker_volumes+=(-v "$SAB_WORKSPACE:/devkit-workspace")
+[ -z "$PRE_SCRIPT" ] || docker_volumes+=(-v "$PRE_SCRIPT:/pre-script")
+[ -z "$POST_SCRIPT" ] || docker_volumes+=(-v "$POST_SCRIPT:/post-script")
 
 if [ -e $MAKE_CONF ]; then
   echo "You specified a make.conf. I hope you know what are you doing"
@@ -84,4 +108,4 @@ echo "Spawning the package builder container for '$@'."
 echo ""
 echo "docker run $DOCKER_OPTS \"${docker_env[@]}\" \"${docker_volumes[@]}\" $DOCKER_IMAGE $@"
 
-docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE $@
+docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE "$@"

sabayon-bz2brokenlibs

@@ -1,5 +1,20 @@
 #!/bin/bash
 
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 . /sbin/sabayondevkit-functions.sh
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

sabayon-commit

@@ -0,0 +1,95 @@
+#!/usr/bin/perl
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+use feature 'say';
+use Cwd;
+use File::Temp;
+
+my $current_git_directory = qx|git rev-parse --show-toplevel 2>/dev/null|;
+chomp $current_git_directory;
+my $cwd = getcwd;
+chdir($current_git_directory);
+my $commit_message_tmpfile = File::Temp->new();
+my @changed_files          = qx|git status -s|;
+my $n_changed_files        = scalar @changed_files;
+
+die "No files changed. Exiting." if $n_changed_files <= 0;
+my %atoms = ();
+
+sub _build_git_repo {
+    my ($file_name) = @_;
+    my $commit_message;
+
+    if ( $file_name
+        =~ /conf\/(home|intel|arm(arch|hfp|v6l|vtl))\/(entropy|portage|repo)\/(.*)/
+        )
+    {
+        $commit_message = "$1/$4: ";
+    }
+    elsif ( $filename eq
+        "conf/noarch/entropy/packages/packages.server.dep_blacklist" )
+    {
+        $commit_message = "dep_blacklist: ";
+    }
+    elsif ( $filename eq
+        "conf/noarch/entropy/packages/packages.server.dep_rewrite" )
+    {
+        $commit_message = "dep_rewrite: ";
+    }
+
+    if ($commit_message) {
+        print $commit_message_tmpfile $commit_message;
+        system( "git commit -eF " . $commit_message_tmpfile->filename );
+        unlink($commit_message_tmpfile) if -e $commit_message_tmpfile;
+    }
+
+}
+
+sub _overlay_git_repo {
+    die "If you are in the overlay, call me in the ebuild dir"
+        if $current_git_directory eq getcwd;
+    chdir($cwd);
+    die "I'm not pleased.. but you could force with --force"
+        if ( _system("repoman") && $ARGV[0] ne "--force" );
+    _system("repoman commit $ARGV[0]");
+}
+
+sub _system {
+    my $prog = shift;
+    my $rv = system( {$prog} $prog => @_ );
+    if ( $rv == -1 ) { say("Can't launch $prog: $!"); return 1; }
+    elsif ( my $s = $rv & 127 ) {
+        say("$prog died from signal $s");
+        return 1;
+    }
+    elsif ( my $e = $rv >> 8 ) { say("$prog exited with code $e"); return 1; }
+    return 0;
+}
+
+foreach my $file (@changed_files) {
+    chomp $file;
+    my @words = split( ' ', $file, 2 );
+    next if $words[0] eq "??";    # allow "dangling" files
+    my $file_name = $words[1];
+    if ( $file_name =~ /conf\/(intel|arm|noarch)/ ) {
+        _build_git_repo($file_name);
+    }
+    elsif ( $file_name =~ /\.ebuild/ ) {
+        _overlay_git_repo($file_name);
+    }
+
+}

sabayon-createrepo

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 . /sbin/sabayondevkit-functions.sh
 
@@ -68,8 +84,8 @@ fi
 eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
 
 echo "=== Injecting packages ==="
-echo "Yes" | eit inject \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
-echo "Yes Yes Yes" | eit commit --quick
+eit inject --quick \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
+eit commit --quick
 
 echo "=== Pushing built packages locally ==="
 eit push --quick --force
@@ -88,8 +104,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-createrepo-cleanup

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 . /sbin/sabayondevkit-functions.sh
 

sabayon-createrepo-remove

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 . /sbin/sabayondevkit-functions.sh
 

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,110 @@
+#!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+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,59 +1,88 @@
 #!/bin/bash
 
+set -e
+
+export BUILD_DIR="${BUILD_DIR:-/opt/sabayon-build/}"
+
 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)"
   fi
-  ps aux | grep -q '[d]ocker' || echo "--> Be sure to have the docker daemon running (sudo systemctl start docker) of configure it to run on boot (sudo systemctl enable docker). Trying to start it anyway" && sudo systemctl start docker || true
+  ps aux | grep -q '[d]ocker' || echo "--> Be sure to have the docker daemon running (sudo systemctl start docker) or configure it to run on boot (sudo systemctl enable docker). Trying to start it anyway" && systemctl start docker || true
 }
 
 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 "${BUILD_DIR}"
+    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
 }