From d77667fde81f858e0c4e899ff3040130dd3b60bc Mon Sep 17 00:00:00 2001
From: mudler <mudler@dark-lab.net>
Date: Fri, 26 Jun 2015 19:00:49 +0200
Subject: [PATCH] [script/post-upgrade] fixing building env

---
 script/post-upgrade.sh | 48 ++++++++++++------------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/script/post-upgrade.sh b/script/post-upgrade.sh
index 5c287be..c4fc35c 100644
--- a/script/post-upgrade.sh
+++ b/script/post-upgrade.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 
 PACKAGES_TO_REMOVE=(
-    "sys-devel/llvm"
-    "dev-libs/ppl"
     "app-admin/sudo"
     "x11-libs/gtk+:3"
     "x11-libs/gtk+:2"
@@ -50,30 +48,8 @@ PACKAGES_TO_REMOVE=(
     "dev-python/snakeoil"
     "dev-libs/atk"
     "dev-perl/DBI"
-    "perl-core/Digest-MD5"
-    "perl-core/MIME-Base64"
-    "perl-core/File-Temp"
-    "perl-core/ExtUtils-MakeMaker"
-    "perl-core/Params-Check"
-    "perl-core/Module-CoreList"
-    "perl-core/Digest"
-    "dev-perl/TermReadKey"
-    "dev-perl/Test-Deep"
-    "virtual/perl-IO-Zlib"
-    "virtual/perl-Package-Constants"
-    "virtual/perl-Term-ANSIColor"
-    "virtual/perl-Time-HiRes"
-    "app-text/asciidoc"
     "app-text/sgml-common"
-    "virtual/python-argparse"
     "sys-power/upower"
-    "dev-python/py"
-    "dev-vcs/git"
-    "dev-tcltk/expect"
-    "app-admin/python-updater"
-    "app-portage/eix"
-    "app-portage/gentoolkit"
-    "app-portage/gentoopm"
 )
 
 FILES_TO_REMOVE=(
@@ -90,18 +66,22 @@ PACKAGES_TO_ADD=(
     "sys-apps/grep"
     "sys-kernel/sabayon-sources"
     "app-misc/sabayon-version"
+    "app-portage/layman"
+    "app-portage/eix"
+    "net-misc/rsync"
     "app-crypt/gnupg"
 )
 
-# Handling install/removal of packages specified in env
+rsync -av -H -A -X --delete-during "rsync://rsync.at.gentoo.org/gentoo-portage/licenses/" "/usr/portage/licenses/"
+ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept
 
-equo repo mirrorsort sabayonlinux.org
-equo up
+# Handling install/removal of packages specified in env
 equo rm --deep --configfiles --force-system "${PACKAGES_TO_REMOVE[@]}"
 equo i "${PACKAGES_TO_ADD[@]}"
 
-# Cleaning accepted licenses
-rm -rf /etc/entropy/packages/license.accept
+# Configuring layman
+mkdir /etc/portage/repos.conf/
+layman-updater -R
 
 # Merging defaults configurations
 echo -5 | equo conf update
@@ -118,11 +98,11 @@ perl-cleaner --ph-clean
 # remove SSH keys
 rm -rf /etc/ssh/*_key*
 
-# Needed by systemd, because it doesn't properly set a good
-# encoding in ttys. Test it with (on tty1, VT1):
-# echo -e "\xE2\x98\xA0"
-# TODO: check if the issue persists with systemd 202.
-echo FONT=LatArCyrHeb-16 > /etc/vconsole.conf
+# Configuring for build
+echo "*" > /etc/eix-sync.conf
+eix-sync
+layman -a sabayon
+echo "y" | layman -a sabayon-distro
 
 # remove LDAP keys
 rm -f /etc/openldap/ssl/ldap.pem /etc/openldap/ssl/ldap.key \