[builder] guessing sync_type from url

builder

@@ -27,8 +27,6 @@ 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;
@@ -36,7 +34,6 @@ my $build_injected_args       = $ENV{BUILD_INJECTED_ARGS};
 my $equo_masks                = $ENV{EQUO_MASKS};
 my $equo_unmasks              = $ENV{EQUO_UNMASKS};
 my $remote_overlay            = $ENV{REMOTE_OVERLAY};
-my $repoman_check             = $ENV{QA_CHECKS} // 0;
 
 my $make_conf = $ENV{MAKE_CONF};
 
@@ -53,7 +50,6 @@ help() if $help;
 
 $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"; }
@@ -87,23 +83,14 @@ sub append_to_file {
 
 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
+    my $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\//;
+    my @reposplit = split( /\//, $repo );
+    my $reponame = $reposplit[-2] . "-" . $reposplit[-1];
     system("mkdir -p /etc/portage/repos.conf/")
       if ( !-d "/etc/portage/repos.conf/" );
 
@@ -113,8 +100,9 @@ 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");
 }
@@ -253,7 +241,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}");
@@ -282,17 +270,6 @@ 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 ) {
@@ -309,6 +286,8 @@ unless ( $skip_portage_sync == 1 ) {
 
 # 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|;
@@ -321,10 +300,6 @@ elsif ( $use_equo && $entropy_repository eq "testing" ) {
 }
 
 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;
@@ -343,12 +318,9 @@ if ($use_equo) {
 
 system("cp -rf $make_conf /etc/portage/make.conf") if $make_conf;
 
+qx|echo 'ACCEPT_LICENSE="*"' >> /etc/portage/make.conf|;    #just plain evil
 
-my @packages          = @ARGV;
-my @injected_packages = ();
-if ($build_injected_args) {
-    @injected_packages = split( / /, $build_injected_args );
-}
+my @packages = @ARGV;
 
 if ($use_equo) {
 
@@ -408,16 +380,14 @@ if ($use_equo) {
     }
 }
 
-say "*** Repoman checks ***";
-if ( $repoman_check == 1 ) {
-     say "*** QA checks for $_" && system("pushd \$(dirname \$(equery which $_ 2>/dev/null)); repoman; popd") for ( @packages, @injected_packages );
-}
-
 say "*** Ready to compile, finger crossed ***";
 
 system("emerge --info")
   ; #always give detailed information about the building environment, helpful to debug
 
+say "Devkit version:";
+system("equo s -vq app-misc/sabayon-devkit");
+
 my $rt;
 
 if ( $emerge_remove and $emerge_remove ne "" ) {
@@ -426,7 +396,7 @@ if ( $emerge_remove and $emerge_remove ne "" ) {
 
 if ($emerge_split_install) {
     for my $pack (@packages) {
-        say "\n" x 2, "==== Compiling $pack ====", "\n" x 2;
+        say "==== Compiling $pack ====";
         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!
@@ -440,7 +410,10 @@ else {
 my $return = $rt >> 8;
 
 # best effort -B
-system("emerge $emerge_defaults_args -j $jobs -B $_") for (@injected_packages);
+if ($build_injected_args) {
+    system("emerge $emerge_defaults_args -j $jobs -B $_")
+      for ( split( / /, $build_injected_args ) );
+}
 
 if ($preserved_rebuild) {
 

sabayon-buildpackages

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

sabayondevkit-functions.sh

@@ -11,10 +11,9 @@ die() { echo "$@" 1>&2 ; exit 1; }
 
 build() {
 local SEARCH=$1
-local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --verbose --oneshot --nospinner --noreplace --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg}
+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
-    echo "Building $i"
     emerge $EMERGE_DEFAULT_ARGS -o $i && \
     emerge $EMERGE_DEFAULT_ARGS $i
   done
@@ -22,11 +21,11 @@ for i in $(EIX_LIMIT=0 eix --only-names --pure-packages "$SEARCH/" | xargs echo
 
 build_installed() {
   local SEARCH=$1
-  local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --newuse --noreplace --changed-use --update --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg}
+  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
-      echo "Building $i"
+      #emerge $EMERGE_DEFAULT_ARGS -o $i && \
       emerge $EMERGE_DEFAULT_ARGS $i
     done
 }