From 67781838d37cbd81f431837f0a4a56665bd4314c Mon Sep 17 00:00:00 2001
From: mudler <mudler@sabayon.org>
Date: Thu, 21 Apr 2016 22:01:22 +0200
Subject: [PATCH] [builder/sabayon-buildpackages] safe copy /usr/local/portage

---
 builder               | 11 +++++++----
 sabayon-buildpackages |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/builder b/builder
index cddf05c..eee3ff8 100755
--- a/builder
+++ b/builder
@@ -63,7 +63,7 @@ sub append_to_file {
     # Check that the package was not already there
     open my $fh_ro, '<:encoding(UTF-8)', $file_name or die;
     while ( my $line = <$fh_ro> ) {
-        return if $line eq $package . "\n" ;
+        return if $line eq $package . "\n";
     }
     close $fh_ro;
 
@@ -210,6 +210,10 @@ 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 ( !-f "/usr/local/portage/profiles/repo_name" ) {
     system("mkdir -p /usr/local/portage/{metadata,profiles}");
     system("echo 'LocalOverlay' > /usr/local/portage/profiles/repo_name");
@@ -225,7 +229,6 @@ else {
 system("chown -R portage:portage /usr/local/portage");
 system("chmod -R 755 /usr/local/portage");
 
-
 qx{
 echo '[$reponame]
 location = /usr/local/portage
@@ -285,13 +288,13 @@ if ($use_equo) {
 
     # best effort mask
     if ($equo_masks) {
-        append_to_file ( "/etc/entropy/packages/package.mask", $_ )
+        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", $_ )
+        append_to_file( "/etc/entropy/packages/package.unmask", $_ )
           for ( split( / /, $equo_unmasks ) );
     }
 
diff --git a/sabayon-buildpackages b/sabayon-buildpackages
index bc1961b..5f104f7 100755
--- a/sabayon-buildpackages
+++ b/sabayon-buildpackages
@@ -60,7 +60,7 @@ function cleanup {
 
 trap cleanup EXIT
 
-[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/portage")
+[ -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"