git-hooks: new scripts

move up the adjustment of emerge/equo arguments, avoid to copy artifacts when PRETEND mode is on

builder

@@ -40,6 +40,9 @@ 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 $pretend                   = $ENV{PRETEND} // 0;
+my $obsoleted                 = $ENV{DETECT_OBSOLETE} // 0;
+my $target_overlay            = $ENV{TARGET_OVERLAY};
 
 my $make_conf = $ENV{MAKE_CONF};
 
@@ -124,6 +127,7 @@ auto-sync = yes' > /etc/portage/repos.conf/$reponame.conf
 
 # 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
@@ -143,7 +147,7 @@ sub package_deps {
 # accurate results, pass in a versioned atom.
         @dependencies = uniq(
             sort
-              grep { $_ }
+                grep {$_}
                 map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
                 @dependencies
         );
@@ -185,7 +189,7 @@ sub calculate_missing {
         my @virtual_deps = ();
         for my $dep (@dependencies) {
             if ( $dep =~ /^virtual\// ) {
-                my @child_deps = package_deps($dep, 1, 1);
+                my @child_deps = package_deps( $dep, 1, 1 );
                 push( @virtual_deps, @child_deps );
             }
         }
@@ -210,7 +214,7 @@ sub calculate_missing {
 # 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{$_}, @dependencies ) ) );
-    @to_install = grep { length } @to_install;
+    @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;
@@ -224,8 +228,9 @@ 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; }
+sub to_atom { my $p = shift; $p =~ s/-[0-9]{1,}.*$//; return $p; }
 
 # Input: Array
 # Output: array with unique elements
@@ -233,15 +238,17 @@ sub uniq {
     keys %{ { map { $_ => 1 } @_ } };
 }
 
-sub detect_useflags
+# Detect useflags defined as [-alsa,avahi] in atom,
-{ # Detect useflags defined as [-alsa,avahi] in atom, and fill $hash within the $target sub-hash
+# and fill $hash within the $target sub-hash
+sub detect_useflags {
     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 ) ];
+            $per_package_useflags->{$target}->[$i] =
+                [ +split( /,/, $flags ) ];
         }
     }
 }
@@ -256,21 +263,26 @@ sub compile_packs {
         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 )
+            and @{ $per_package_useflags->{$target}->[$package_counter] }
+            > 0 )
         {
             say "USEFLAGS: "
                 . join( " ",
                 @{ $per_package_useflags->{$target}->[$package_counter] } );
             $tmp_rt = system(
                 "USE=\""
-                  . join( " ",
+                    . join(
-                    @{ $per_package_useflags->{$target}->[$package_counter] } )
+                    " ",
+                    @{  $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");
+                system(
+                "emerge $emerge_defaults_args -j $jobs $extra_arg $pack");
         }
         $package_counter++;
 
@@ -284,9 +296,9 @@ sub compile_packs {
 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",
+        "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;
@@ -307,6 +319,14 @@ say "\t* " . $_ for @ARGV;
 
 say "[*] Syncing configurations files, Layman and Portage";
 
+if ($pretend) {
+    say "[*] PRETEND enabled, no real action will be performed.";
+    say "    Bear in mind that in such way the list of packages";
+    say "    that emerge will try to compile will be bigger";
+    $equo_install_args    .= " -p";
+    $emerge_defaults_args .= " -p";
+}
+
 # Syncronizing portage configuration and adding overlays
 system("echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen");    #be sure about that.
 
@@ -328,8 +348,9 @@ if ( $remote_portdir ne "" ) {
     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("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("touch /var/lib/layman/make.conf && layman-updater -R")
+    if ( !-e "/var/lib/layman/make.conf" );
 
 system("echo 'y' | layman -f -a $_") for @overlays;
 
@@ -337,13 +358,14 @@ 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"
+    "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(
+        "echo 'masters = gentoo' > /usr/local/portage/metadata/layout.conf");
 }
 else {
     open FILE, "</usr/local/portage/profiles/repo_name";
@@ -412,18 +434,32 @@ if ($use_equo) {
     say "Devkit version:";
     system("equo s -vq app-misc/sabayon-devkit");
 
+    my $enman_list_output = qx|enman list --installed -q|;
+    chomp($enman_list_output);
+    my @installed_enman_repos = split( /\n/, $enman_list_output );
+
     if ( $enman_repositories and $enman_repositories ne "" ) {
         my @enman_toadd = split( / /, $enman_repositories );
-        safe_call("enman add $_") for @enman_toadd;
+        for my $enman_add (@enman_toadd) {
+            if ( !grep ( $enman_add, @installed_enman_repos ) ) {
+                safe_call("enman add $_");
+            }
+        }
     }
 
     if ( $remove_enman_repositories and $remove_enman_repositories ne "" ) {
         my @enman_toremove = split( / /, $remove_enman_repositories );
-        system("enman remove $_") for @enman_toremove;
+        for my $enman_remove (@enman_toremove) {
+            if ( grep ( $enman_remove, @installed_enman_repos ) ) {
+                safe_call("enman remove $_");
+            }
+        }
     }
 
     system("enman add $repository_name")
-      if ( $enman_add_self and $repository_name and $repository_name ne "" );
+        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");
 }
@@ -480,7 +516,7 @@ if ($use_equo) {
 
     foreach my $p (@packages) {
         say
-"[$p] Getting the package dependencies which aren't already installed on the system.. ";
+            "[$p] Getting the package dependencies which aren't already installed on the system.. ";
         push(
             @packages_deps,
             calculate_missing(
@@ -499,7 +535,8 @@ if ($use_equo) {
         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 ) {
+        if ( @equo_remove > 0 and !$pretend ) {
+            say "Removing with equo: @equo_remove";
             system("equo rm --nodeps $_") for (@equo_remove);
         }
     }
@@ -517,7 +554,8 @@ if ( $qualityassurance_checks == 1 ) {
     for ( @packages, @injected_packages ) {
         say "*** QA checks for $_";
         system(
-            "pushd \$(dirname \$(equery which $_ 2>/dev/null)); repoman; popd");
+            "pushd \$(dirname \$(equery which $_ 2>/dev/null)); repoman; popd"
+        );
     }
 }
 
@@ -529,6 +567,7 @@ system("emerge --info")
 my $rt;
 
 if ( $emerge_remove and $emerge_remove ne "" ) {
+    say "Removing with emerge: $emerge_remove";
     system("emerge -C $_") for split( / /, $emerge_remove );
 }
 
@@ -545,7 +584,7 @@ my $return = $rt >> 8;
 # best effort -B
 compile_packs( "injected_targets", @injected_packages );
 
-if ($preserved_rebuild) {
+if ( $preserved_rebuild and !$pretend ) {
 
     system("emerge -j $jobs --buildpkg \@preserved-rebuild");
     system("revdep-rebuild");
@@ -554,16 +593,21 @@ if ($preserved_rebuild) {
 
 if ( $qualityassurance_checks == 1 ) {
     say "*** Missing dependencies checks ***";
-    for ( @packages ) {
+    for (@packages) {
         say "*** DEPEND for $_";
         system("dynlink-scanner $_");
         system("depcheck $_");
     }
 }
 
+if ( $obsoleted and $target_overlay ) {
+    say "*** Detecting obsoletes ***";
+    system("sabayon-detectobsolete --overlay ${target_overlay}");
+}
+
 # Copy files to artifacts folder
 system(
     "mkdir -p $artifacts_folder;cp -rfv /usr/portage/packages $artifacts_folder"
-) if ( $artifacts_folder and !$return );
+) if ( $artifacts_folder and !$return and !$pretend );
 
 exit($return);

git-hooks/overlays-commit-msg.pl

@@ -0,0 +1,84 @@
+#!/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

@@ -0,0 +1,20 @@
+#!/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-buildpackages

@@ -8,7 +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}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm --cap-add=SYS_PTRACE}"
 
 . /sbin/sabayondevkit-functions.sh
 
@@ -56,6 +56,9 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -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")
+[ -z "$PRETEND" ] || docker_env+=(-e "PRETEND=$PRETEND")
+[ -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")
 
 if [ -e $MAKE_CONF ]; then

sabayon-detectobsolete

@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+# mudler <mudler@sabayon.org>
+# this tool requires querypkg
+use Getopt::Long;
+use strict;
+use warnings;
+my $arch;
+my $verbose;
+my $overlay;
+GetOptions(
+    "arch=s"    => \$arch,
+    "overlay=s" => \$overlay,
+    "verbose"   => \$verbose
+) or die("Error in command line arguments\n");
+
+die("You should at least supply an overlay with --overlay") if !$overlay;
+
+# Input: Overlay absolute path
+# Output: array with package names (category/name)
+sub get_packages {
+    keys %{
+        {   map {
+                s/$overlay\/|\.ebuild//g;
+                $_ = join( '/', ( split( /\//, $_ ) )[ 0, 1 ] );
+                $_ => 1
+            } glob( $_[0] . "/*/*/*.ebuild" )
+        }
+    };
+}
+
+# Input: package (category/name)
+# Output: returns 1 if obsolete and can be removed
+sub obsolete_package($$) {
+    my $package = $_[0];
+    my $arch    = $_[1];
+    my $l_arch  = ( defined $arch and $arch ne "" ? "--arch $arch" : "" );
+    print "querypkg -q $l_arch $package --show spm_repo\n" if $verbose;
+    my @out = `querypkg -q $l_arch $package --show spm_repo`;
+    chomp(@out);
+    return 1 if "@out" eq "";
+    foreach my $l (@out) {
+        print " >> $l\n" if $verbose;
+        return 1 if ( $l =~ /$package.*\{spm_repo\:gent.*/ );
+    }
+    return 0;
+}
+
+my @packages = get_packages($overlay);
+my @obsoletes;
+
+foreach my $p (@packages) {
+    print "[$p] Checking if there is a version in the repositories.... ";
+    print "\n" if $verbose;
+    if ( obsolete_package( $p, $arch ) ) {
+        print " OBSOLETE! \n";
+        push( @obsoletes, $p );
+    }
+    else {
+        print " ok  \n";
+    }
+}
+
+print "\n";
+print "Obsoletes found:\n\n";
+print "$_\n" for @obsoletes;

sabayon-maint-helper

@@ -81,8 +81,14 @@ main() {
 
   [ -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 "$@"

sabayondevkit-functions.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 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)"
@@ -12,12 +14,12 @@ die() { echo "$@" 1>&2 ; exit 1; }
 build_sync() {
   layman -S
   emerge --sync
-  eix-update || exit 1
+  eix-update
   pushd /opt/sabayon-build/
     git stash
-    git fetch --all
+    git fetch --all || true
-    git checkout master
+    git checkout master || true
-    git reset --heard origin/master
+    git reset --hard origin/master || true
   popd
 }
 
@@ -27,7 +29,7 @@ build_category() {
   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
+      emerge ${EMERGE_DEFAULT_ARGS:---accept-properties=-interactive --verbose --oneshot --nospinner --noreplace --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg} $i || true
     done
 }
 
@@ -36,7 +38,7 @@ build_obsolete() {
   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 --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg --noreplace} $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 || true
     done
 }
 
@@ -46,7 +48,7 @@ build_category_installed() {
   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 --newuse --noreplace --changed-use --update --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg} $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 || true
     done
 }