[sabayon-buildpackages] adding support for REMOVE_REMOTE_OVERLAY REMOVE_LAYMAN_OVERLAY

builder

@@ -27,6 +27,8 @@ 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;
@@ -83,14 +85,23 @@ sub append_to_file {
 
 sub add_portage_repository {
     my $repo = $_[0];
-    my $sync_type = ( split( /\:/, $repo ) )[0];
+    my $reponame;
-    $sync_type = "git"
+    my $sync_type;
-      if $repo =~ /github|bitbucket/
+    my @repodef = split( /\|/, $repo );
-      or $sync_type eq "https"
+    ( $reponame, $repo ) = @repodef if ( @repodef == 2 );
-      or $sync_type eq "http";
+    ( $reponame, $sync_type, $repo ) = @repodef if ( @repodef == 3 );
-    $sync_type = "svn" if $repo =~ /\/svn\//;
+
-    my @reposplit = split( /\//, $repo );
+    # try to detect sync-type
-    my $reponame = $reposplit[-2] . "-" . $reposplit[-1];
+    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/" );
 
@@ -100,9 +111,8 @@ echo '[$reponame]
 location = /usr/local/overlay/$reponame
 sync-type = $sync_type
 sync-uri = $repo
-masters = gentoo
 auto-sync = yes' > /etc/portage/repos.conf/$reponame.conf
-};    # Declaring the repo and giving priority
+};                            # Declaring the repo and giving priority
 
     system("emaint sync -r $reponame");
 }
@@ -241,7 +251,7 @@ 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}");
@@ -270,6 +280,17 @@ if ( $remote_overlay and $remote_overlay ne "" ) {
     add_portage_repository($_) for ( split( / /, $remote_overlay ) );
 }
 
+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 ) {
@@ -396,7 +417,7 @@ if ( $emerge_remove and $emerge_remove ne "" ) {
 
 if ($emerge_split_install) {
     for my $pack (@packages) {
-        say "==== Compiling $pack ====";
+        say "\n" x 2, "==== Compiling $pack ====", "\n" x 2;
         my $tmp_rt = system("emerge $emerge_defaults_args -j $jobs $pack");
 
 #  $rt=$tmp_rt if ($? == -1 or $? & 127 or !$rt); # if one fails, the build should be considered failed!

sabayon-buildpackages

@@ -50,6 +50,9 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -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")
+
 [ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
 
 if [ -e $MAKE_CONF ]; then