Extract common func to setup perms, fix git3 perms

- Also print a short summary of compilation result
- Add KEEP_GOING env variable,
  if disabled a failure in split install makes the build fail

.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,22 +1,38 @@
 #!/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 Getopt::Long;
 use v5.10;
 no feature "say";
+use Storable 'dclone';
 
-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";
 
-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}   // 0;
-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
 my $artifacts_folder          = $ENV{ARTIFACTS_DIR};
@@ -43,6 +59,8 @@ 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};
 
@@ -64,13 +82,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 ) = @_;
 
@@ -91,6 +124,15 @@ sub append_to_file {
     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;
@@ -110,7 +152,7 @@ sub add_portage_repository {
     }
     $reponame = ( split( /\//, $repo ) )[-1] if !$reponame;
     $reponame =~ s/\.|//g;    #clean
-    system("mkdir -p /etc/portage/repos.conf/")
+    _system("mkdir -p /etc/portage/repos.conf/")
         if ( !-d "/etc/portage/repos.conf/" );
 
     say "==== Adding $reponame ====";
@@ -122,7 +164,7 @@ 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)
@@ -138,7 +180,7 @@ 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
@@ -148,7 +190,7 @@ sub package_deps {
         @dependencies = uniq(
             sort
                 grep {$_}
-                map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
+                map { $_ =~ s/\[.*\]|\s//g; &abs_atom($_) if $atom; $_ }
                 @dependencies
         );
 
@@ -225,12 +267,22 @@ sub calculate_missing {
     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; $p =~ s/-[0-9]{1,}.*$//; return $p; }
+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
@@ -256,9 +308,9 @@ 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;
@@ -269,28 +321,25 @@ sub compile_packs {
             say "USEFLAGS: "
                 . 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"
+                    . "\" 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 help {
@@ -306,6 +355,17 @@ sub help {
 
 say "****************************************************";
 
+my $per_package_useflags;
+my @packages = @ARGV;
+my @injected_packages =
+    $build_injected_args ? split( / /, $build_injected_args ) : ();
+my @parsed_overlays =
+    grep { $_ !~ /gentoo/i } parse_overlays( @packages, @injected_packages );
+
+say "Detected overlays: @parsed_overlays" if @parsed_overlays;
+
+@overlays = uniq( @overlays, @parsed_overlays );
+
 if ( @overlays > 0 ) {
     say "Overlay(s) to add";
     foreach my $overlay (@overlays) {
@@ -313,11 +373,11 @@ 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.";
@@ -332,39 +392,37 @@ 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("mkdir /var/lib/layman") if ( !-d "/var/lib/layman" );
-system("touch /var/lib/layman/make.conf && layman-updater -R")
+
+_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;
+_system("echo 'y' | layman -f -a $_") for @overlays;
 
 my $reponame = "LocalOverlay";
 
 # Setting up a local overlay if doesn't exists
-system(
+_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(
+    _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 {
@@ -374,8 +432,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]
@@ -390,91 +447,126 @@ 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" )
+    _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");
+    _system("layman -S");
     if ( $webrsync == 1 ) {
-        system("emerge-webrsync");
+        _system("emerge-webrsync");
     }
     else {
-        system("emerge --sync");
+        _system("emerge --sync --quiet");
     }
 }
 
 # preparing for MOAR automation
-say "Setting new profile to $profile" if defined $profile;
-qx|eselect profile set $profile|      if defined $profile;
-system("eselect profile list")        if defined $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 = split( /\n/, $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 );
+        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 ) ) {
-                safe_call("enman add $_");
+                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 );
+        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 ) ) {
-                safe_call("enman remove $_");
+                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")
+    _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("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]
@@ -532,77 +624,105 @@ if ($use_equo) {
     say "", "[install] Those dependencies will be installed with equo :",
         @packages_deps, "";
     if ($equo_split_install) {
-        safe_call("equo i $equo_install_args --bdeps $_")
+        _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);
+            _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 )
+        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 @equo_remove") if ( @equo_remove > 0 );
+        _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")
+_system("emerge --info")
     ; #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 );
+    _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)";
+
+hook_script("./post-script");
+hook_script("/post-script");
 
 if ( $preserved_rebuild and !$pretend ) {
 
-    system("emerge -j $jobs --buildpkg \@preserved-rebuild");
-    system("revdep-rebuild");
+    _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 ) {
-    say "*** Detecting obsoletes ***";
-    system("sabayon-detectobsolete --overlay ${target_overlay}");
+    loud "Obsoletes detection";
+    _system("sabayon-detectobsolete --overlay ${target_overlay}");
 }
 
 # Copy files to artifacts folder

git-hooks/overlays-commit-msg.pl

@@ -1,84 +0,0 @@
-#!/usr/bin/env perl
-# This code is licenced GPLv2 or newer.
-
-use warnings;
-use strict;
-use 5.010;
-
-my $g_thres = shift // 3;
-
-sub set_atoms {
-	my %atoms = ();
-	my $fh = shift;
-	while (my $line = <$fh>) {
-		chomp $line;
-		my @words = split(' ', $line, 2);
-		next if $words[0] eq "??"; # allow "dangling" files
-		my $what = $words[1];
-		@words = split(m:/:, $what);
-		my $pkg;
-		if (@words >= 2) {
-			$pkg = join("/", @words[0..1]);
-		} else {
-			$pkg = $words[0]
-		}
-		$atoms{$pkg} = 1;
-	}
-	keys %atoms
-}
-
-sub num {
-	my $what = shift;
-	my @arr = @_;
-	my $num = 0;
-	for (@arr) {
-		$num++ if index($_, "$what-") == 0
-	}
-	$num
-}
-
-sub replace {
-	my $atom = shift;
-	my @arr = @_;
-	my @new_arr;
-	for my $item (@arr) {
-		if( index($item, $atom) == 0 ) {
-			1;
-		} else {
-			push @new_arr, $item;
-		}
-	}
-	push @new_arr, "$atom*";
-	@new_arr;
-}
-
-# try to make (a*, b, c*) from (a-1, a, a-2, b, c, c-1),
-# for example, if numberOf(/^a-?/) >= $thres
-sub do_reduce {
-	my $thres = shift;
-	my @atoms = @_;
-	my @processed_atoms = @atoms;
-	for my $atom (@atoms) {
-		@processed_atoms = replace($atom, @processed_atoms)
-			if (num($atom, @processed_atoms) >= $thres);
-	}
-	@processed_atoms
-}
-
-#my @atoms = set_atoms(*DATA);
-my @atoms = set_atoms(*STDIN);
-@atoms = do_reduce($g_thres, @atoms);
-say join ",", sort @atoms;
-
-__DATA__
- M net-p2p/transmission-base/metadata.xml
- M net-p2p/transmission-cli/metadata.xml
- M net-p2p/transmission-daemon/metadata.xml
- M net-p2p/transmission-gtk/metadata.xml
- M net-p2p/transmission-qt4/metadata.xml
- M net-p2p/transmission/metadata.xml
- M cat/pkg-1
- M cat/pkg-2
- M cat/pkg
- M net-p2p/nic
-?? betr.pl

git-hooks/prepare-commit-msg.sab-overlay

@@ -1,20 +0,0 @@
-#!/bin/sh
-# This code is licenced GPLv2 or newer.
-
-# An example hook script to prepare the commit log message.
-# Called by "git commit" with the name of the file that has the
-# commit message, followed by the description of the commit
-# message's source.  The hook's purpose is to edit the commit
-# message file.  If the hook fails with a non-zero status,
-# the commit is aborted.
-
-_out=$(git status -s | overlays-commit-msg.pl)
-_ver=$(git status -s | sed -rn 's/^[AR] *(.* -> )?.*-([^-]+)\.ebuild$/\2/p' | head -n 1)
-_bump=${_ver:+version bump to $_ver}
-
-case $2 in
-#message)
-#	sed -i -e "1s:^:[$_subdir/$_curdir] :" "$1" ;;
-"")
-	sed -i -e "1i[$_out] $_bump" "$1" ;;
-esac

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-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}"
@@ -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")
@@ -57,9 +74,13 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -z "$REMOTE_PORTDIR" ] || docker_env+=(-e "REMOTE_PORTDIR=$REMOTE_PORTDIR")
 [ -z "$ETP_NOCACHE" ] || docker_env+=(-e "ETP_NOCACHE=$ETP_NOCACHE")
 [ -z "$PRETEND" ] || docker_env+=(-e "PRETEND=$PRETEND")
+[ -z "$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"
@@ -87,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

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-maint-helper

@@ -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
 

sabayondevkit-functions.sh

@@ -2,11 +2,13 @@
 
 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) of 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; }
@@ -15,7 +17,7 @@ build_sync() {
   layman -S
   emerge --sync
   eix-update
-  pushd /opt/sabayon-build/
+  pushd "${BUILD_DIR}"
     git stash
     git fetch --all || true
     git checkout master || true