[sabayon-buildpackages] add support for ETP_NOCACHE

builder

@@ -35,8 +35,11 @@ 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 $repoman_check             = $ENV{QA_CHECKS} // 0;
+my $remote_conf_portdir       = $ENV{REMOTE_CONF_PORTDIR};
+my $remote_portdir            = $ENV{REMOTE_PORTDIR};
 
 my $make_conf = $ENV{MAKE_CONF};
 
@@ -244,7 +247,24 @@ 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 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("echo 'y' | layman -f -a $_") for @overlays;
 
@@ -343,7 +363,6 @@ if ($use_equo) {
 
 system("cp -rf $make_conf /etc/portage/make.conf") if $make_conf;
 
-
 my @packages          = @ARGV;
 my @injected_packages = ();
 if ($build_injected_args) {
@@ -393,7 +412,7 @@ if ($use_equo) {
     say "", "[install] Those dependencies will be installed with equo :",
       @packages_deps, "";
     if ($equo_split_install) {
-        safe_call("equo i --bdeps $_")
+        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 ) {
@@ -401,7 +420,8 @@ if ($use_equo) {
         }
     }
     else {
-        safe_call("equo i --bdeps @packages_deps @equo_install")
+        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 );
@@ -410,7 +430,11 @@ if ($use_equo) {
 
 if ( $repoman_check == 1 ) {
     say "*** Repoman checks ***";
-     say "*** QA checks for $_" && system("pushd \$(dirname \$(equery which $_ 2>/dev/null)); repoman; popd") for ( @packages, @injected_packages );
+    for ( @packages, @injected_packages ) {
+        say "*** QA checks for $_";
+        system(
+            "pushd \$(dirname \$(equery which $_ 2>/dev/null)); repoman; popd");
+    }
 }
 
 say "*** Ready to compile, finger crossed ***";

sabayon-buildpackages

@@ -53,7 +53,9 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -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