sabayondevkit-functions.sh: add -u as default emerge option to build_category_installed and build_obsolete

Package_deps returned the target package in the output which is not
strictly true (the package is not a dependency of itself really).
In calcuate_missing also means we install the package once using entropy
(if available), and then immediately replace it with portage,
which just wastes effort.

It breaks installation in the cases where the older equo version blocks the
new portage version (e.g. change of slot).

This should remove the target package from the list of packages to be
installed with entropy.

Makefile

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

README.md

@@ -11,7 +11,7 @@ sudo equo i sabayon-devkit
 ## Prerequisites
 
 * docker installed in the machine (`sudo equo i docker`), and the daemon started (`sudo systemctl start docker`)
-* if you don't want to run that as root, the user where are you running the script must be in the docker group (`sudo gpasswd -a $USER docker`)
+* if you don't want to run that as root, the user where are you running the script must be in the docker group (`sudo gpasswd -a $USER docker`), or granting permission to yourself adding your user to the sudoer file.
 
 Packages can be built in a clean environment with docker by running `sabayon-buildpackages`.
 
@@ -92,6 +92,8 @@ you can override the Architecture folder in which files are placed specifying in
 - DOCKER_PULL_IMAGE -- tells the script to update the docker image before compiling, enable it with 1, disable with 0
 - OUTPUT_DIR -- optional, default to "portage_artifacts" in your current working directory, it is the path where emerge generated tbz2 are stored (absolute path)
 - LOCAL_OVERLAY -- optional, you can specify the path to your local overlay (absolute path)
+- REMOTE_OVERLAY -- optional, a space separated list of overlays that can be cloned with git.
+
  The arguments are the packages that you want compile, they can be also in the complete form *e.g. =foo-bar/misc-1.2*
 
 

builder

@@ -1,6 +1,8 @@
 #!/usr/bin/env perl
 
 use Getopt::Long;
+use v5.10;
+no feature "say";
 
 my $profile           = $ENV{BUILDER_PROFILE}   // 3;
 my $jobs              = $ENV{BUILDER_JOBS}      // 1;
@@ -14,33 +16,142 @@ $ENV{FEATURES} = $ENV{FEATURES}
 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 $entropy_repository   = $ENV{ENTROPY_REPOSITORY}   // "main"; # Can be weekly, main, testing
-my $artifacts_folder     = $ENV{ARTIFACTS_DIR};
+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};
+my $dep_scan_depth            = $ENV{DEPENDENCY_SCAN_DEPTH} // 2;
+my $skip_portage_sync         = $ENV{SKIP_PORTAGE_SYNC} // 0;
+my $emerge_split_install      = $ENV{EMERGE_SPLIT_INSTALL} // 0;
+my $webrsync                  = $ENV{WEBRSYNC} // 0;
+my $enman_repositories        = $ENV{ENMAN_REPOSITORIES};
+my $emerge_remove             = $ENV{EMERGE_REMOVE};
+my $remove_enman_repositories = $ENV{REMOVE_ENMAN_REPOSITORIES};
+my $remove_remote_overlay     = $ENV{REMOVE_REMOTE_OVERLAY};
+my $remove_layman_overlay     = $ENV{REMOVE_LAYMAN_OVERLAY};
+my $prune_virtuals            = $ENV{PRUNE_VIRTUALS} // 0;
+my $repository_name           = $ENV{REPOSITORY_NAME};
+my $enman_add_self            = $ENV{ENMAN_ADD_SELF} // 0;
+my $build_injected_args       = $ENV{BUILD_INJECTED_ARGS};
+my $equo_masks                = $ENV{EQUO_MASKS};
+my $equo_unmasks              = $ENV{EQUO_UNMASKS};
+my $equo_install_args         = $ENV{EQUO_INSTALL_ARGS} // "--multifetch=10";
+my $remote_overlay            = $ENV{REMOTE_OVERLAY};
+my $qualityassurance_checks   = $ENV{QA_CHECKS} // 0;
+my $remote_conf_portdir       = $ENV{REMOTE_CONF_PORTDIR};
+my $remote_portdir            = $ENV{REMOTE_PORTDIR};
 
 my $make_conf = $ENV{MAKE_CONF};
 
 my @overlays;
+my $help = 0;
+GetOptions(
+    'layman|overlay:s{,}' => \@overlays,
+    'equo|install:s{,}'   => \@equo_install,
+    'equorm|remove:s{,}'  => \@equo_remove,
+    'help|?'              => \$help
+);
 
-GetOptions( 'layman|overlay:s{,}' => \@overlays, 'equo|install:s{,}' => \@equo_install,'equorm|remove:s{,}' => \@equo_remove );
+help() if $help;
 
-if ( @ARGV == 0 ) {
-    help();
-    die();
-}
-
-$ENV{LC_ALL} = "en_US.UTF-8";    #here be dragons
+$ENV{LC_ALL}             = "en_US.UTF-8";    #here be dragons
+$ENV{ETP_NONINTERACTIVE} = 1;
+$ENV{ACCEPT_LICENSE} = "*";    # we can use wildcard since entropy 302
 
 # A barely print replacement
 sub say { print join( "\n", @_ ) . "\n"; }
 
+sub safe_call {
+    my $cmd    = shift;
+    my $rt     = system($cmd);
+    my $return = $rt >> 8;
+    exit($return) if ($rt);
+}
+
+sub append_to_file {
+    my ( $file_name, $package ) = @_;
+
+    if ( -f $file_name ) {
+
+        # Check that the package was not already there
+        open my $fh_ro, '<:encoding(UTF-8)', $file_name
+          or die("Cannot open: $file_name");
+        while ( my $line = <$fh_ro> ) {
+            return if $line eq $package . "\n";
+        }
+        close $fh_ro;
+    }
+
+    open( my $fh_a, '>>', $file_name )
+      or die "Could not open file '$filename' $!";
+    print $fh_a $package . "\n";
+    close $fh_a;
+}
+
+sub add_portage_repository {
+    my $repo = $_[0];
+    my $reponame;
+    my $sync_type;
+    my @repodef = split( /\|/, $repo );
+    ( $reponame, $repo ) = @repodef if ( @repodef == 2 );
+    ( $reponame, $sync_type, $repo ) = @repodef if ( @repodef == 3 );
+
+    # try to detect sync-type
+    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";
+        $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/" );
+
+    say "==== Adding $reponame ====";
+    qx{
+echo '[$reponame]
+location = /usr/local/overlay/$reponame
+sync-type = $sync_type
+sync-uri = $repo
+auto-sync = yes' > /etc/portage/repos.conf/$reponame.conf
+};                            # Declaring the repo and giving priority
+
+    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 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;
-    return
-      map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
-      qx/equery -C -q g --depth=$depth $package/;    #depth=0 it's all
+
+# Since we expect this sub to be called multiple times with the same arguments, cache the results
+    $cache_key = "${package}:${depth}:${atom}";
+
+    if ( !exists $package_dep_cache{$cache_key} ) {
+        my @dependencies =
+          qx/equery -C -q g --depth=$depth $package/;    #depth=0 it's all
+        chomp @dependencies;
+
+# If an unversioned atom is given, equery returns results for all versions in the portage tree
+# 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
+        );
+
+        $package_dep_cache{$cache_key} = \@dependencies;
+    }
+
+    return @{ $package_dep_cache{$cache_key} };
 }
 
 #Input: nothing
@@ -57,26 +168,55 @@ sub available_packages {
 # Input: package (sys-fs/foobarfs)
 # Output: Array of packages to be installed, that aren't installed in a Sabayon machine
 sub calculate_missing {
-    my $package = shift;
-    my $depth = shift;
+    my $package            = shift;
+    my $depth              = shift;
+    my @Installed_Packages = @{ +shift };
+    my @Available_Packages = @{ +shift };
+    my $prune_virtuals     = shift;
 
     # Getting the package dependencies and the installed packages
-    say "[$package] Getting the package dependencies and the installed packages";
-    my @Packages = package_deps( $package, $depth, 1 );
-    my @Installed_Packages = qx/equo q --quiet list installed/;
-    chomp(@Installed_Packages);
-    say "[$package] Getting the package dependencies and the installed packages";
+    my @dependencies = package_deps( $package, $depth, 1 );
+
+    if ($prune_virtuals) {
+        my %install_dependencies = map { $_ => 1 } @dependencies;
+
+        # Look for any virtuals and remove its immediate dependencies to avoid
+        # installing multiple conflicting packages one by one
+        my @virtual_deps = ();
+        for my $dep (@dependencies) {
+            if ( $dep =~ /^virtual\// ) {
+                my @child_deps = package_deps($dep, 1, 1);
+                push( @virtual_deps, @child_deps );
+            }
+        }
+
+        # Deduplicate the list
+        @virtual_deps = uniq(@virtual_deps);
+
+        # Prune the dependencies of the virtual packages from the dependencies list
+        for my $dep (@virtual_deps) {
+            if ( $dep !~ /^virtual\// ) {
+                $install_dependencies{$dep} = 0;
+            }
+        }
+        @dependencies = grep { $install_dependencies{$_} } @dependencies;
+    }
 
     #taking only the 4th column of output as key of the hashmap
     my %installed_packs =
-      map { ( split( /\s/, $_ ) )[3] => 1 } @Installed_Packages;
-    my %available_packs = map { $_ => 1 } available_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{$_}, @Packages ) ) );
-    @to_install=grep { length } @to_install;
-    say "[$package] packages that will be installed with equo: @to_install" if @to_install>0;
+        uniq( grep( !defined $installed_packs{$_}, @dependencies ) ) );
+    @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;
 
     return @to_install;
 }
@@ -84,6 +224,8 @@ sub calculate_missing {
 # Input : complete gentoo package (sys-fs/foobarfs-1.9.2)
 # Output: atom form (sys-fs/foobarfs)
 sub atom { s/-[0-9]{1,}.*$//; }
+# Same again as a function
+sub to_atom { my $p=shift; $p =~ s/-[0-9]{1,}.*$//; return $p; }
 
 # Input: Array
 # Output: array with unique elements
@@ -91,17 +233,66 @@ sub uniq {
     keys %{ { map { $_ => 1 } @_ } };
 }
 
+sub detect_useflags
+{ # Detect useflags defined as [-alsa,avahi] in atom, and fill $hash within the $target sub-hash
+    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 ) ];
+        }
+    }
+}
+
+sub compile_packs {
+    my ( $target, @packages ) = @_;
+    my $extra_arg;
+    $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 )
+        {
+            say "USEFLAGS: "
+              . join( " ",
+                @{ $per_package_useflags->{$target}->[$package_counter] } );
+            $tmp_rt = system(
+                "USE=\""
+                  . join( " ",
+                    @{ $per_package_useflags->{$target}->[$package_counter] } )
+                  . "\" emerge $emerge_defaults_args -j $jobs $extra_arg $pack"
+            );
+        }
+        else {
+            $tmp_rt =
+              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!
+    }
+    return $return;
+}
+
 sub help {
     say "-> You should feed me with something", "", "Examples:", "",
       "\t$0 app-text/tree", "\t$0 plasma-meta --layman kde", "",
-      "\t$0 app-foo/foobar --equo foo-misc/foobar --equo net-foo/foobar --layman foo --layman bar foo",
+"\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
-"************* IF YOU WANT TO SUPPLY ADDITIONAL ARGS TO EMERGE, pass to docker EMERGE_DEFAULT_OPTS env with your options *************";
+say "****************************************************";
 
 if ( @overlays > 0 ) {
     say "Overlay(s) to add";
@@ -110,34 +301,49 @@ if ( @overlays > 0 ) {
     }
 }
 
-say "Installing:";
+say "[*] Installing:";
 
 say "\t* " . $_ for @ARGV;
 
-say "* Syncing stuff for you, if it's the first time, can take a while";
+say "[*] Syncing configurations files, Layman and Portage";
 
 # Syncronizing portage configuration and adding overlays
 system("echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen");    #be sure about that.
-system(
-"cd /etc/portage/;git checkout master; git stash; git pull"
-);
 
-if (`uname -m` eq "x86_64\n"){
-  system(
-  "cd /etc/portage/;rm -rfv make.conf;ln -s make.conf.amd64 make.conf"
-  );
+# 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");
 }
+else {
+    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("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"
+) 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("chown -R portage:portage /usr/local/portage");
 }
 else {
     open FILE, "</usr/local/portage/profiles/repo_name";
@@ -146,6 +352,8 @@ else {
     chomp(@FILE);
     $reponame = $FILE[0];
 }
+system("chown -R portage:portage /usr/local/portage");
+system("chmod -R 755 /usr/local/portage");
 
 qx{
 echo '[$reponame]
@@ -155,68 +363,204 @@ priority=9999
 auto-sync = no' > /etc/portage/repos.conf/local.conf
 };    # Declaring the repo and giving priority
 
-system("mkdir -p /usr/portage/distfiles/git3-src");
-
-# sync portage and overlays
-system("layman -S;emerge --sync");
-
-# preparing for MOAR automation
-qx|eselect profile set $profile|;
-qx{ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept}
-  ;    #HAHA
-
-if ($use_equo  && $entropy_repository eq "weekly" ) {
-  qx|equo repo disable sabayonlinux.org|;
-  qx|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|;
+if ( $remote_overlay and $remote_overlay ne "" ) {
+    add_portage_repository($_) for ( split( / /, $remote_overlay ) );
 }
 
-system("equo repo mirrorsort sabayonlinux.org;equo up && equo u")
-  if $use_equo;    # Better don't be behind
+if ( $remove_layman_overlay and $remove_layman_overlay ne "" ) {
+    say "===== Removing overlays: $remove_remote_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("mkdir -p /usr/portage/distfiles/git3-src");
+
+unless ( $skip_portage_sync == 1 ) {
+
+    # sync portage and overlays
+    system("layman -S");
+    if ( $webrsync == 1 ) {
+        system("emerge-webrsync");
+    }
+    else {
+        system("emerge --sync");
+    }
+}
+
+# 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;
+
+if ( $use_equo && $entropy_repository eq "weekly" ) {
+    qx|equo repo disable sabayonlinux.org|;
+    qx|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|;
+}
+
+if ($use_equo) {
+
+    say "Devkit version:";
+    system("equo s -vq app-misc/sabayon-devkit");
+
+    if ( $enman_repositories and $enman_repositories ne "" ) {
+        my @enman_toadd = split( / /, $enman_repositories );
+        safe_call("enman add $_") for @enman_toadd;
+    }
+
+    if ( $remove_enman_repositories and $remove_enman_repositories ne "" ) {
+        my @enman_toremove = split( / /, $remove_enman_repositories );
+        system("enman remove $_") for @enman_toremove;
+    }
+
+    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("cp -rf $make_conf /etc/portage/make.conf") if $make_conf;
 
-qx|echo 'ACCEPT_LICENSE="*"' >> /etc/portage/make.conf|;    #just plain evil
+my $per_package_useflags;
+my @packages          = @ARGV;
+my @injected_packages = ();
+if ($build_injected_args) {
+    @injected_packages = split( / /, $build_injected_args );
+    say "[*] Injected installs:";
 
-my @packages = @ARGV;
+    say "\t* " . $_ for @injected_packages;
+
+}
+
+# Allow users to specify atoms as: media-tv/kodi[-alsa,avahi]
+if ($emerge_split_install)
+{    # For targets this will be available only if split_install is enabled
+    detect_useflags( "targets", \@packages );
+}
+else {
+    map { $_ =~ s/\[.*?\]//g; $_; }
+      @packages
+      ; # Clean up [] if user didn't specified split_install, but specified a useflag combination
+}
+detect_useflags( "injected_targets", \@injected_packages );
 
 if ($use_equo) {
+
+    # best effort mask
+    if ($equo_masks) {
+        append_to_file( "/etc/entropy/packages/package.mask", $_ )
+          for ( split( / /, $equo_masks ) );
+    }
+
+    # best effort unmask
+    if ($equo_unmasks) {
+        append_to_file( "/etc/entropy/packages/package.unmask", $_ )
+          for ( split( / /, $equo_unmasks ) );
+    }
+
     my @packages_deps;
+    my @Installed_Packages = qx/equo q list installed --quiet/;
+    my @Available_Packages = available_packages();
+    chomp(@Installed_Packages);
+
+    my %installed_packs =
+      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.. ";
-        push( @packages_deps, calculate_missing( $p , 2) )
-          if $equo_install_atoms;
-        push( @packages_deps, package_deps( $p, 2, 0 ) )
+        say
+"[$p] Getting the package dependencies which aren't already installed on the system.. ";
+        push(
+            @packages_deps,
+            calculate_missing(
+                $p,                   $dep_scan_depth,
+                \@Installed_Packages, \@Available_Packages,
+                $prune_virtuals
+            )
+        ) if $equo_install_atoms;
+        push( @packages_deps, package_deps( $p, $dep_scan_depth, 0 ) )
           if $equo_install_version;
-      say "[$p] Done"
     }
     @packages_deps = grep { defined() and length() } @packages_deps;   #cleaning
-    say "", "[install] Installing missing dependencies with equo", @packages_deps, "";
+    say "", "[install] Those dependencies will be installed with equo :",
+      @packages_deps, "";
     if ($equo_split_install) {
-        system("equo i --bdeps $_") for (@packages_deps,@equo_install);
-        system("equo rm --nodeps $_") for (@equo_remove);
+        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);
+        }
     }
     else {
-        system("equo i --bdeps @packages_deps @equo_install");
-        system("equo rm --nodeps @equo_remove");
+        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 );
     }
 }
 
-say "* Ready to compile, finger crossed";
+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");
+    }
+}
 
-my $rt = system("emerge $emerge_defaults_args -j $jobs @packages");
+say "*** Ready to compile, finger crossed ***";
+
+system("emerge --info")
+  ; #always give detailed information about the building environment, helpful to debug
+
+my $rt;
+
+if ( $emerge_remove and $emerge_remove ne "" ) {
+    system("emerge -C $_") for split( / /, $emerge_remove );
+}
+
+if ($emerge_split_install) {
+    compile_packs( "targets", @packages );
+    $rt = 0;    #consider the build good anyway, like a "keep-going"
+}
+else {
+    $rt = system("emerge $emerge_defaults_args -j $jobs @packages");
+}
 
 my $return = $rt >> 8;
 
+# best effort -B
+compile_packs( "injected_targets", @injected_packages );
+
 if ($preserved_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 $_");
+    }
+}
+
 # Copy files to artifacts folder
 system(
     "mkdir -p $artifacts_folder;cp -rfv /usr/portage/packages $artifacts_folder"

depcheck

@@ -0,0 +1,303 @@
+#!/bin/bash
+# PODNAME: depcheck
+#
+# Copyright (c) 2014 Michael Palimaka <kensington@gentoo.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# A tool to report both undeclared and potentially-unused runtime dependencies.
+#
+# Depends on app-misc/pax-utils, app-portage/portage-utils and
+# sys-apps/gentoo-functions.
+
+DEBUG=FALSE
+IGNORE_DEPS=( "sys-libs/glibc" "sys-devel/gcc" )
+IGNORE_LINKS=( "/lib64/libgcc_s.so.1" )
+PKG_DIR="/var/db/pkg/"
+
+. /lib/gentoo/functions.sh
+
+bold() {
+    echo $@
+    return
+    local bold=$(tput bold)
+    local normal=$(tput sgr0)
+    echo "${bold}${@}${normal}"
+}
+
+debug() {
+    if [ $DEBUG = TRUE ]; then
+        # write to stderr so as not to interfere with function returns
+        echo "$@" 1>&2
+    fi
+}
+
+# app-foo/bar-1.2.3-r1 -> app-foo/bar
+remove_atom_version() {
+    local atom=`qatom "${1}" | cut -d " " -f 1-2 | tr " " /`
+    echo $atom
+}
+
+virtualcheck() {
+    debug Checking if ${libowner_pn} is provided by a virtual
+    for virtual in $(qdepends --nocolor --name-only --${1} --query ${libowner_pn} | grep ^virtual/)
+    do
+        debug Checking if ${virtual} is in dependencies
+        local isvirtualdep=$(qdepends --${1} ${atom} | grep ${virtual})
+
+        if [ $? -eq 0 ]; then
+            used_virtuals+=( ${virtual} )
+            continue 2
+        fi
+    done
+
+    if [ "${1}" = "depend" ]; then
+        eerror "${obj} links to ${link}"
+    fi
+    eindent
+    eerror Missing ${1^^} on $(bold ${libowner_pn})
+    eoutdent
+    errors=1
+}
+
+check_atom() {
+
+    local errors=0
+    local atom=$1
+    local checked=()
+    local rdepends=()
+    local used_virtuals=()
+
+    local objects=`qlist -qo ${atom}`
+
+    if [ ! "${objects}" ]; then
+        einfo ${atom} does not have any objects installed, skipping...
+        echo
+        return
+    fi
+
+    if [ -z "${INSIDE_PORTAGE}" ]; then
+        einfo Checking ${atom} for undeclared dependencies
+        eindent
+    fi
+
+    local obj
+    for obj in $objects
+    do
+        debug "Checking ${obj}"
+
+        readelf -h ${obj} > /dev/null 2>&1
+
+        # can it have stuff linked to it?
+        if [ $? -ne 0 ]; then
+            debug "It can't have links, skipping"
+            continue
+        fi
+
+        local elf=`scanelf --format "#f%n" --nobanner --use-ldpath ${obj} 2>&1`
+        local links=`echo ${elf} | tr "," " "`
+
+        # get a list of everything that it's linked to
+        local link
+        for link in $links
+        do
+            local ignore
+            for ignore in "${IGNORE_LINKS[@]}"; do
+                if [ "${ignore}" = "${link}" ]; then
+                    debug "Ignoring ${link} due to blacklist"
+                    continue 2
+                fi
+            done
+
+            # only check a library once per atom for performance reasons
+            local check
+            for check in "${checked[@]}"; do
+                if [ "${check}" = "${link}" ]; then
+                    debug "Already checked ${link} for this atom, skipping"
+                    continue 2
+                fi
+            done
+
+            checked=( "${checked[@]}" "${link}" )
+
+            debug "Found ${link}"
+
+            local libowner=`qfile -vqC ${link} | uniq`
+
+            if [ ! "${libowner}" ]; then
+                ewarn "Warning: installed file ${obj} is linked to ${link} which is not owned by any installed atom."
+                continue
+            fi
+
+            debug "Owning package for ${link} is ${libowner}"
+
+            local libowner_pn=$(remove_atom_version ${libowner})
+            local my_pn=$(remove_atom_version ${atom})
+
+            rdepends+=( "${libowner_pn}" )
+
+            if [ "${libowner_pn}" = "${my_pn}" ]; then
+                debug "Owning package is self, ignoring"
+                continue
+            fi
+
+            local ignorelib
+            for ignorelib in "${IGNORE_DEPS[@]}"
+            do
+                if [ "${libowner_pn}" = "${ignorelib}" ]; then
+                    debug "Ignoring objects belonging to ${ignorelib}"
+                    continue 2
+                fi
+            done
+
+            debug "Checking if ${libowner_pn} is in the [R]DEPEND list of ${atom}"
+
+            local isdep
+            isdep=`qdepends -d ${atom} | grep ${libowner_pn}`
+            if [ $? -ne 0 ]; then
+                virtualcheck depend
+            fi
+
+            local isrdep
+            isrdep=`qdepends -r ${atom} | grep ${libowner_pn}`
+            if [ $? -ne 0 ]; then
+                virtualcheck rdepend
+            fi
+
+
+        done
+
+    done
+
+    local ebuild_rdepends=()
+    for rdepend in $(qdepends --nocolor --quiet --rdepend ${atom} | sed -e "s/\[[^]]*\]//g" | cut -d : -f 2-)
+    do
+        if [[ ${rdepend} = !* ]] ; then
+            debug Skipping blocker: ${rdepend}
+            continue
+        elif [[ ${rdepend} = virtual/* ]] ; then
+            for virtual in "${used_virtuals[@]}"
+            do
+                if [[ ${virtual} == $(remove_atom_version ${rdepend}) ]]; then
+                    debug Skipping virtual: ${rdepend}
+                    continue 2
+                fi
+            done
+        fi
+        ebuild_rdepends+=( $(remove_atom_version $rdepend) )
+    done
+
+    debug "Ebuild RDEPENDS: ${ebuild_rdepends[@]}"
+    debug "Linked RDEPENDS: ${rdepends[@]}"
+
+    local suspect_rdepends=$(comm -13 <(echo ${rdepends[@]} | sed 's/ /\n/g' | sort -u) <(echo ${ebuild_rdepends[@]} | sed 's/ /\n/g' | sort -u))
+    if [ "${suspect_rdepends}" ]; then
+        ewarn "Suspect RDEPEND: $(bold ${suspect_rdepends})"
+    fi
+
+    if [ -z "${INSIDE_PORTAGE}" ]; then
+        eoutdent
+        if [ -n "${CAT}" ]; then
+            echo
+        fi
+    fi
+
+    return $errors
+
+}
+
+check_package() {
+
+    local package=$1
+    local atoms=`qlist -IcCS ${package} | tr ' ' '-' | cut -d : -f1`
+
+    debug Package ${package} own atoms: ${atoms}
+
+    if [ ! "${atoms}" ]; then
+        eerror ERROR: ${package} is not a valid atom
+        exit 1
+    fi
+
+    for atom in ${atoms}; do
+        check_atom ${atom}
+    done
+
+}
+
+check_category() {
+
+    local errors=0
+
+    for package in `ls "${PKG_DIR}/${1}"`; do
+
+        check_package "${1}/${package}"
+
+        if [ $? -ne 0 ]; then
+            errors=1
+        fi
+
+    done;
+
+    return $errors
+
+}
+
+BINNAME=`basename ${0}`
+if [ -z $1 ]; then
+    echo "Checks emerged package(s) for undeclared depedencies"
+    echo
+        echo "Usage: ${BINNAME} [ atom | -c category | -a ]"
+    echo
+        echo "Examples:"
+    echo "Check a single package: ${BINNAME} app-foo/bar-1.2.3"
+    echo "Check a category: ${BINNAME} -c app-foo"
+    echo "Check everything: ${BINNAME} -a"
+    exit 1
+fi
+
+# check a particular category
+if [ "$1" = "-c" ]; then
+
+    CAT=$2
+
+    if [ ! -d "${PKG_DIR}/${CAT}" ]; then
+        eerror ERROR: No packages from the category ${CAT} have been emerged yet
+        exit 1
+    fi
+
+    check_category $CAT
+
+# check everything
+elif [ "$1" = "-a" ]; then
+
+    for category in `ls ${PKG_DIR}`; do
+        check_category $category
+    done;
+
+else
+    check_package $1
+fi
+
+if [ $DEBUG = TRUE ]; then
+    if [ $? -eq 0 ]; then
+        einfo Checking complete, no errors found
+    else
+        eerror Checking complete, errors found
+    fi
+fi

dynlink-scanner

@@ -0,0 +1,50 @@
+#!/bin/bash
+# Maciej Mrozowski <reavertm@gentoo.org>
+ 
+# Returns colon separated list of linking dependencies
+get_link_deps()
+{
+	KEY=
+	for dep in `scanelf --use-ldpath -yBF '%f %n' "$1"`; do
+		if [[ -z $KEY ]]; then
+			KEY="$dep"
+			continue
+		fi
+		echo $dep
+	done
+}
+
+# Print linking deps for given executable or shared object in alphabetical order.
+# Also try to dlopen shared objects in order to detect missing/broken dependencies.
+if [[ "$1" = --linking-deps ]]; then
+	# Sanity check, file-5.12 is broken, bail out early
+	if [[ `file --version | grep --color=never file- | cut -d'-' -f2` == '5.12' ]]; then
+		echo "file-5.12 is broken, bailing out"
+		exit 1
+	fi
+	mime=`file -b --mime-type "$2"`
+	if [[ "$mime" == 'application/x-executable' ]] || [[ "${mime}" == 'application/x-sharedlib' ]]; then
+		LINK=`get_link_deps "$2"`
+		[[ "$mime" == 'application/x-sharedlib' ]] && /usr/bin/try_dlopen "$2"
+		[[ -n $LINK ]] && echo -e ${LINK//,/\\n} | sort -u
+		exit 0
+	fi
+	exit 1
+fi
+
+[[ -z $* ]] && echo "usage: `basename $0` <package>" && exit 0
+
+# Check whether package is installed
+if ! portageq has_version $ROOT/ $1; then
+	echo "$1 is not installed"
+	exit 1
+fi
+
+# For each installed slot
+for cpv in `portageq match $ROOT/ $1`; do
+	echo "Processing $cpv"
+	# 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
+done

sabayon-buildpackages

@@ -8,6 +8,7 @@ MAKE_CONF="${MAKE_CONF:-$SAB_WORKSPACE/specs/make.conf}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/portage_artifacts/}"
 LOCAL_OVERLAY="${LOCAL_OVERLAY:-$SAB_WORKSPACE/local_overlay}"
 ENTROPY_REPOSITORY="${ENTROPY_REPOSITORY:-main}" # Can be weekly, main, testing
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
 
 . /sbin/sabayondevkit-functions.sh
 
@@ -20,18 +21,42 @@ fi
 docker_env=(-e "LC_ALL=en_US.UTF-8")
 docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 
+[ -z "$PORTAGE_CACHE" ] || docker_volumes+=(-v "$PORTAGE_CACHE:/usr/portage")
 [ -z "$BUILDER_PROFILE" ] || docker_env+=(-e "BUILDER_PROFILE=$BUILDER_PROFILE")
+[ -z "$EMERGE_SPLIT_INSTALL" ] || docker_env+=(-e "EMERGE_SPLIT_INSTALL=$EMERGE_SPLIT_INSTALL")
 [ -z "$BUILDER_JOBS" ] || docker_env+=(-e "BUILDER_JOBS=$BUILDER_JOBS")
 [ -z "$USE_EQUO" ] || docker_env+=(-e "USE_EQUO=$USE_EQUO")
 [ -z "$PRESERVED_REBUILD" ] || docker_env+=(-e "PRESERVED_REBUILD=$PRESERVED_REBUILD")
 [ -z "$EQUO_INSTALL_ATOMS" ] || docker_env+=(-e "EQUO_INSTALL_ATOMS=$EQUO_INSTALL_ATOMS")
+[ -z "$DEPENDENCY_SCAN_DEPTH" ] || docker_env+=(-e "DEPENDENCY_SCAN_DEPTH=$DEPENDENCY_SCAN_DEPTH")
+[ -z "$FEATURES" ] || docker_env+=(-e "FEATURES=$FEATURES")
 [ -z "$EMERGE_DEFAULTS_ARGS" ] || docker_env+=(-e "EMERGE_DEFAULTS_ARGS=$EMERGE_DEFAULTS_ARGS")
 [ -z "$EQUO_INSTALL_VERSION" ] || docker_env+=(-e "EQUO_INSTALL_VERSION=$EQUO_INSTALL_VERSION")
 [ -z "$EQUO_SPLIT_INSTALL" ] || docker_env+=(-e "EQUO_SPLIT_INSTALL=$EQUO_SPLIT_INSTALL")
 [ -z "$ARTIFACTS_DIR" ] || docker_env+=(-e "ARTIFACTS_DIR=$ARTIFACTS_DIR")
 [ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY")
-
-[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/portage")
+[ -z "$SKIP_PORTAGE_SYNC" ] || docker_env+=(-e "SKIP_PORTAGE_SYNC=$SKIP_PORTAGE_SYNC")
+[ -z "$EQUO_MIRRORSORT" ] || docker_env+=(-e "EQUO_MIRRORSORT=$EQUO_MIRRORSORT")
+[ -z "$WEBRSYNC" ] || docker_env+=(-e "WEBRSYNC=$WEBRSYNC")
+[ -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 "$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")
+[ -z "$REPOSITORY_NAME" ] || docker_env+=(-e "REPOSITORY_NAME=$REPOSITORY_NAME")
+[ -z "$ENMAN_ADD_SELF" ] || docker_env+=(-e "ENMAN_ADD_SELF=$ENMAN_ADD_SELF")
+[ -z "$EQUO_MASKS" ] || docker_env+=(-e "EQUO_MASKS=$EQUO_MASKS")
+[ -z "$EQUO_UNMASKS" ] || docker_env+=(-e "EQUO_UNMASKS=$EQUO_UNMASKS")
+[ -z "$EMERGE_REMOVE" ] || docker_env+=(-e "EMERGE_REMOVE=$EMERGE_REMOVE")
+[ -z "$REMOTE_OVERLAY" ] || docker_env+=(-e "REMOTE_OVERLAY=$REMOTE_OVERLAY")
+[ -z "$REMOVE_LAYMAN_OVERLAY" ] || docker_env+=(-e "REMOVE_LAYMAN_OVERLAY=$REMOVE_LAYMAN_OVERLAY")
+[ -z "$REMOVE_REMOTE_OVERLAY" ] || docker_env+=(-e "REMOVE_REMOTE_OVERLAY=$REMOVE_REMOTE_OVERLAY")
+[ -z "$QA_CHECKS" ] || docker_env+=(-e "QA_CHECKS=$QA_CHECKS")
+[ -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")
+[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
 
 if [ -e $MAKE_CONF ]; then
   echo "You specified a make.conf. I hope you know what are you doing"
@@ -48,13 +73,15 @@ if [ -d "$SAB_WORKSPACE"/specs ]; then
   [ -e "$SAB_WORKSPACE"/specs/custom.mask ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.mask:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.mask/99-custom.mask")
   [ -e "$SAB_WORKSPACE"/specs/custom.unmask ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.unmask:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.unmask/99-custom.unmask")
   [ -e "$SAB_WORKSPACE"/specs/custom.use ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.use:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.use/99-custom.use")
-  [ -e "$SAB_WORKSPACE"/specs/custom.env ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.env:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.env/99-custom.env")
+  [ -e "$SAB_WORKSPACE"/specs/custom.env ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.env:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.env")
   [ -e "$SAB_WORKSPACE"/specs/custom.keywords ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.keywords:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.keywords/99-custom.keywords")
+  [ -d "$SAB_WORKSPACE"/specs/env ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/env/:/opt/sabayon-build/conf/$SAB_ARCH/portage/env/")
+  [ -d "/vagrant" ] && docker_volumes+=(-v "/vagrant:/vagrant")
 
 fi
 
 echo "Spawning the package builder container for '$@'."
 echo ""
-echo "docker run --rm ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE $@"
+echo "docker run $DOCKER_OPTS \"${docker_env[@]}\" \"${docker_volumes[@]}\" $DOCKER_IMAGE $@"
 
-docker run --rm "${docker_env[@]}" "${docker_volumes[@]}"	-ti $DOCKER_IMAGE $@
+docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE $@

sabayon-createrepo

@@ -10,6 +10,7 @@ REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
 PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
 
 args=("$@")
 EDITOR=cat
@@ -24,6 +25,10 @@ docker_volumes=(
             -v "$entropysrv:/etc/entropy/server.conf"
 )
 
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
+
+
 if [ $# -eq 0 ]
 then
  docker_volumes+=(-v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
@@ -49,15 +54,24 @@ mkdir -p /sabayon/artifacts
 [[ -z "\${built_pkgs}" ]] && echo "ERROR: no tbz2s found" && exit 2
 
 if [ -d "/sabayon/artifacts/standard" ]; then
+  echo "=== Repository already exists, syncronizing ==="
   eit unlock \$repo || true
-  eit pull --quick $repo || true
+  eit pull --quick \$repo || true
   #eit sync \$repo
 else
+  echo "=== Repository is empty, intializing ==="
   echo "Yes" | eit init --quick \$repo
+  eit push --quick --force
 fi
 
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
+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
+
+echo "=== Pushing built packages locally ==="
 eit push --quick --force
 
 EOF
@@ -74,8 +88,8 @@ database-format = bz2
 # disabled-eapis = 1,2
 # expiration-based-scope = disable
 # nonfree-packages-directory-support = disable
-rss-feed = disable
-changelog = disable
+rss-feed = enable
+changelog = enable
 rss-name = packages.rss
 rss-base-url = http://packages.sabayon.org/?quicksearch=
 rss-website-url = http://www.sabayon.org/
@@ -95,12 +109,12 @@ function cleanup {
 
 trap cleanup EXIT
 
-echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+echo "docker $DOCKER_OPTS  ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
 
-docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
+docker run  $DOCKER_OPTS --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
 
 if [ -d "$OUTPUT_DIR/standard" ]; then
-  echo "The Sabayon repository files are in $SAB_WORKSPACE/entropy_artifacts"
+  echo "The Sabayon repository files are in $OUTPUT_DIR"
   echo "Now you can upload its content where you want"
 
   echo ""

sabayon-createrepo-cleanup

@@ -10,6 +10,7 @@ REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
 PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
 
 args=("$@")
 EDITOR=cat
@@ -24,6 +25,8 @@ docker_volumes=(
             -v "$entropysrv:/etc/entropy/server.conf"
             -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
 
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
 
 check_docker_requirements
 
@@ -39,12 +42,15 @@ repo="\${REPOSITORY:-default}"
 
 if [ -d "/sabayon/artifacts/standard" ]; then
   eit unlock \$repo || true
-  eit pull --quick $repo || true
+  eit pull --quick \$repo || true
   #eit sync \$repo
 else
   echo "ouch no repository there" && exit 3;
 fi
 
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
+
 eit clean --quick || { echo "ouch unable to remove" && exit 3; }
 eit vacuum --quick || { echo "ouch unable to remove" && exit 3; }
 
@@ -88,6 +94,6 @@ function cleanup {
 trap cleanup EXIT
 
 
-echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+echo "docker run $DOCKER_OPTS --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
 
-docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
+docker run $DOCKER_OPTS  --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true

sabayon-createrepo-remove

@@ -10,6 +10,7 @@ REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
 PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
 
 args=("$@")
 EDITOR=cat
@@ -23,7 +24,8 @@ docker_volumes=(
             -v "$createrepo:/sabayon/bin/create_repo.sh"
             -v "$entropysrv:/etc/entropy/server.conf"
             -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
-
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
 
 check_docker_requirements
 
@@ -39,12 +41,15 @@ repo="\${REPOSITORY:-default}"
 
 if [ -d "/sabayon/artifacts/standard" ]; then
   eit unlock \$repo || true
-  eit pull --quick $repo || true
+  eit pull --quick \$repo || true
   #eit sync \$repo
 else
   echo "ouch no repository there" && exit 3;
 fi
 
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
+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 "Yes" | eit rm --from \$repo ${args[@]} || { echo "ouch unable to remove" && exit 3; }
 echo "Yes Yes Yes" | eit commit --quick
 eit push --quick --force
@@ -86,6 +91,6 @@ function cleanup {
 trap cleanup EXIT
 
 
-echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+echo "docker run $DOCKER_OPTS --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
 
-docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
+docker run $DOCKER_OPTS  --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true

sabayon-help-info

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+sudo bash << EOF
+echo "Grabbing system informations, the url to share will happear in a minute"
+(echo 'lspci'; lspci; echo 'network'; ifconfig -a; echo 'drivers'; lsmod; find /lib/modules; echo 'kernel'; uname -a) | pastebunz
+EOF

sabayon-maint-helper

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

sabayon-tbz2extract

@@ -0,0 +1,39 @@
+#!/usr/bin/python
+# mudler <mudler@sabayon.org>
+# Edit: create a truncated tbz2 with just data
+import os
+import sys
+from portage import xpak
+
+def usage():
+        sys.stderr.write("usage: %s <tbz2_file>\n" % os.path.basename(sys.argv[0]))
+
+def main():
+        if len(sys.argv) != 2:
+                usage()
+                return 1
+
+        input_file = sys.argv[1]
+
+        if not os.path.isfile(input_file):
+                usage()
+                return 1
+
+        output_file = input_file
+        if output_file.endswith('.tbz2'):
+                output_file = output_file[:-5]
+        output_file += '.truncated'
+
+        t = xpak.tbz2(input_file)
+        t.scan()
+        f = open(input_file, 'rb')
+        data = f.read(os.stat(input_file).st_size  - t.xpaksize)
+        f.close()
+
+        f = open(output_file, 'wb')
+        f.write(data)
+        f.close()
+        return 0
+
+if __name__ == '__main__':
+        sys.exit(main())

sabayon-tbz2truncate

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+# mudler <mudler@sabayon.org>
+# Edit: truncate a tbz2 with just data
+import os
+import sys
+from portage import xpak
+
+def usage():
+        sys.stderr.write("usage: %s <tbz2_file>\n" % os.path.basename(sys.argv[0]))
+
+def main():
+        if len(sys.argv) != 2:
+                usage()
+                return 1
+
+        input_file = sys.argv[1]
+
+        if not os.path.isfile(input_file):
+                usage()
+                return 1
+
+        t = xpak.tbz2(input_file)
+        t.scan()
+        f = open(input_file, 'r+')
+        f.seek(-t.xpaksize, os.SEEK_END)
+        f.truncate()
+        f.close()
+
+        return 0
+
+if __name__ == '__main__':
+        sys.exit(main())

sabayon-xpakextract

@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+import os
+import sys
+from portage import xpak
+
+def usage():
+        sys.stderr.write("usage: %s <tbz2_file>\n" % os.path.basename(sys.argv[0]))
+
+def main():
+        if len(sys.argv) != 2:
+                usage()
+                return 1
+
+        input_file = sys.argv[1]
+
+        if not os.path.isfile(input_file):
+                usage()
+                return 1
+
+        output_file = input_file
+        if output_file.endswith('.tbz2'):
+                output_file = output_file[:-5]
+        output_file += '.xpak'
+
+        t = xpak.tbz2(input_file)
+        t.scan()
+        f = open(input_file, 'rb')
+        f.seek(-t.xpaksize, 2)
+        data = f.read()
+        f.close()
+
+        f = open(output_file, 'wb')
+        f.write(data)
+        f.close()
+        return 0
+
+if __name__ == '__main__':
+        sys.exit(main())

sabayondevkit-functions.sh

@@ -4,55 +4,81 @@ 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
+  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
 }
 
 die() { echo "$@" 1>&2 ; exit 1; }
 
-build() {
-local SEARCH=$1
-local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --verbose --oneshot --nospinner --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
-    emerge $EMERGE_DEFAULT_ARGS -o $i && \
-    emerge $EMERGE_DEFAULT_ARGS $i
-  done
-}
-
-build_installed() {
-  local SEARCH=$1
-  local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --newuse --changed-use --update --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg}
-
-  for i in $(EIX_LIMIT=0 eix -I --only-names --pure-packages "$SEARCH/" | xargs echo | uniq);
-    do
-      #emerge $EMERGE_DEFAULT_ARGS -o $i && \
-      emerge $EMERGE_DEFAULT_ARGS $i
-    done
-}
-
-build_all_availables() {
-for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
-  do
-    build "$i/"
-  done
-}
-
-rebuild_all() {
-for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
-  do
-    build_installed "$i/"
-  done
-}
-
 build_sync() {
-  emerge-webrsync || exit 1
-  emerge --sync
   layman -S
+  emerge --sync
   eix-update || exit 1
   pushd /opt/sabayon-build/
     git stash
     git fetch --all
     git checkout master
-    git reset --heard origin/master
+    git reset --hard origin/master
   popd
 }
+
+build_category() {
+  local SEARCH=$1
+  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
+    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
+    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:---accept-properties=-interactive -u --newuse --noreplace --changed-use --update --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg} $i
+    done
+}
+
+build_all_availables() {
+  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_category_installed "$i/"
+  done
+}
+
+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
+}

try_dlopen.c

@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <dlfcn.h>
+
+/**
+ * Attempts to load shared libraries
+ * @param argc
+ * @param argv files to check (pass only shared libs)
+ * @return 0 - all shared libs loaded, 1 - error occured (invalid or broken files passed)
+ */
+int main(int argc, char* argv[])
+{
+	int i;
+	for (i = 1; i < argc; ++i) {
+		void* handle = dlopen(argv[i], RTLD_NOW);
+		if (!handle) {
+			fprintf(stderr, "%s\n", dlerror());
+			return 1;
+		} else {
+			dlclose(handle);
+		}
+	}
+	return 0;
+}