[gentoo-commits] proj/catalyst:catalyst_use commit in: catalyst/base/, targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     95086109d6bd6a9d841c43abd53234ed2a220acf
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo 
<DOT> org>
AuthorDate: Mon Mar  6 10:52:19 2017 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 10:52:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=95086109

Fix portage_prefix, output to log some changes and remove unneeded 
set_portage_prefix.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> 
gentoo.org>

 catalyst/base/stagebase.py   |  4 ----
 targets/support/functions.sh | 11 ++++++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index f0b62d7..417c198 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -601,10 +601,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
                        log.info('portage_overlay directories are set to: %s',
                                ' '.join(self.settings['portage_overlay']))
 
-#      def set_portage_prefix(self):
-#              if "portage_prefix" in self.settings:
-#                      self.settings["portage_prefix"] = ""
-
        def set_overlay(self):
                if self.settings["spec_prefix"] + "/overlay" in self.settings:
                        if 
isinstance(self.settings[self.settings['spec_prefix'] + '/overlay'], str):

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index eded8b7..63000a5 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,11 +24,20 @@ prepare_portage() {
 
 clear_portage() {
        # Clean-up USE again
+       echo "Drop \$CATALYST_USE from USE"
        sed -i "/USE=\"/s/\${CATALYST_USE} //" ${clst_make_conf}
+       echo "Remove \$CATALYST_USE"
        sed -i "/CATALYST_USE/d" ${clist_make_conf}
 
        if [ -n "${clst_portage_prefix}" ]; then
-               rm -R "${clst_chroot_path}/etc/portage/${clst_portage_prefix}"
+               echo "Clear 
${clst_chroot_path}/etc/portage/package.keywords/${clst_portage_prefix}"
+               rm -R 
"${clst_chroot_path}/etc/portage/package.keywords/${clst_portage_prefix}"
+               echo "Clear 
${clst_chroot_path}/etc/portage/package.mask/${clst_portage_prefix}"
+               rm -R 
"${clst_chroot_path}/etc/portage/package.mask/${clst_portage_prefix}"
+               echo "Clear 
${clst_chroot_path}/etc/portage/package.unmask/${clst_portage_prefix}"
+               rm -R 
"${clst_chroot_path}/etc/portage/package.unmask/${clst_portage_prefix}"
+               echo "Clear 
${clst_chroot_path}/etc/portage/package.use/${clst_portage_prefix}"
+               rm -R 
"${clst_chroot_path}/etc/portage/package.use/${clst_portage_prefix}"
        fi
 }