From 2dd7fecb6a3040080b77aedd94f884209194276e Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Tue, 22 Sep 2015 16:04:58 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20EMERGE=5FDEFAULT=5FOPTS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/builder/builder.py         | 14 +++++++++++---
 pym/builder/variables/linux.py |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pym/builder/builder.py b/pym/builder/builder.py
index cdc9b78..a4a08b6 100644
--- a/pym/builder/builder.py
+++ b/pym/builder/builder.py
@@ -318,7 +318,7 @@ class Builder(Update):
         """
         Вывести информацию об обновлении
         """
-        deo = self.clVars.Get('cl_emerge_default_opts')
+        deo = self.get_default_emerge_opts()
         param = [x for x in params if x.startswith("-")]
         packages = [x for x in params if not x.startswith("-")]
         chroot_path = self.clVars.Get('cl_builder_path')
@@ -358,7 +358,7 @@ class Builder(Update):
         """
         Выполнить очистку системы от лишних пакетов
         """
-        deo = self.clVars.Get('cl_emerge_default_opts')
+        deo = self.get_default_emerge_opts()
         chroot_path = self.clVars.Get('cl_builder_path')
         logfile = self._get_log_file()
         with EmergeParser(self.chrootize(chroot_path, EmergeCommand(
@@ -895,11 +895,19 @@ class Builder(Update):
             process_func = partial(process_func, "/usr/bin/linux32")
         return partial(process_func, chroot_cmd)
 
+    def get_default_emerge_opts(self):
+        dv = self.clVars.Get('builder.cl_builder_linux_datavars')
+        if dv:
+            deo = dv.Get('cl_emerge_default_opts')
+        else:
+            deo = super(Builder, self).get_default_emerge_opts()
+        return deo
+
     def emerge(self, builder_path, use, *params):
         """
         Выполнить сборку пакета
         """
-        deo = self.clVars.Get('cl_emerge_default_opts')
+        deo = self.get_default_emerge_opts()
         extra_params = [x for x in params if x.startswith("-")]
         packages = [x for x in params if not x.startswith("-")]
         with EmergeParser(self.chrootize(builder_path, EmergeCommand(
diff --git a/pym/builder/variables/linux.py b/pym/builder/variables/linux.py
index 792d3c4..6686d99 100644
--- a/pym/builder/variables/linux.py
+++ b/pym/builder/variables/linux.py
@@ -68,6 +68,7 @@ class DataVarsBuilderLinux(linux.LinuxDataVars):
                     env.VariableClDistdir(),
                     env.VariableClEmergeConfig(systemRoot=self.systemRoot),
                     env.VariableClFeatures(),
+                    env.VariableClEmergeDefaultOpts(),
                     env.VariableClEnvLocation(),
                     env.VariableClEnvData(),
                     env.VariableClEnvPath(),