test fixes

sls/collectd/pkg.sls

@@ -1,6 +1,7 @@
 {% import 'pkg/common' as pkg %}
 include:
   - gentoo.makeconf
+  - lib.glibc
 
 {%- set extra_plugins = salt.pillar.get('collectd:extra-plugins', []) %}
 {% set makeconf_collectd_plugins = 'aggregation apcups cgroups chrony contextswitch conntrack cpu cpufreq csv curl curl_json curl_xml dbi df disk entropy ethstat exec filecount fscache interface iptables ipvs irq load logfile memcached memory nfs netlink network nginx numa hugepages processes python sensors swap syslog log_logstash statsd table tail target_notification treshold unixsock uptime users vmem write_graphite write_riemann write_prometheus ' + ' '.join(extra_plugins) %}

sls/core/binutils.sls

@@ -1,15 +1,12 @@
-{% import 'pkg/common' as pkg %}
-{% set arch_conf = salt.pillar.get('arch_conf') %}
-{% set binutils_version = salt.pillar.get('gentoo:portage:packages:sys-devel/binutils:version') %}
+{% set arch_conf = salt['pillar.get']('arch_conf', False) %}
+{% set binutils_version = salt['pillar.get']('binutils:version', '2.31.1-r4') %}
 {% set binutils_target = arch_conf['CHOST'] + '-' + binutils_version.split('-')[0] %}
 
 sys-devel/binutils:
   pkg.installed:
    - pkgs:
-      - {{ pkg.gen_atom('sys-devel/binutils') }}
-      - {{ pkg.gen_atom('sys-devel/binutils-config') }}
-  {{ pkg.gen_portage_config('sys-devel/binutils', watch_in={'pkg': 'sys-devel/binutils'})|indent(8) }}
-  {{ pkg.gen_portage_config('sys-devel/binutils-config', watch_in={'pkg': 'sys-devel/binutils'})|indent(8) }}
+      - sys-devel/binutils: "{{ binutils_version }}[cxx,multitarget]"
+      - sys-devel/binutils-config: ">=5-r4"
 
 eselect-binutils:
   eselect.set:

sls/editors/emacs/pkg.sls

@@ -1,4 +1,5 @@
+{% import 'pkg/common' as pkg %}
 emacs:
   pkg.installed:
-    - name: app-editors/emacs
-    - version: '>=26.1:26'
+    - pkgs:
+      - {{ pkg.gen_atom('app-editors/emacs') }} 

sls/editors/emacs/yaml-mode.sls

@@ -1,10 +1,7 @@
+{% import 'pkg/common' as pkg %}
 include:
   - .pkg
 
 app-emacs/yaml-mode:
-  pkg.installed:
-    - version: '~>=0.0.13'
-    - require:
-      - pkg: emacs
-
-
+  pkg.latest
+  {{ pkg.gen_portage_config('app-emacs/yaml-mode', watch_in={'pkg': 'app-emacs/yaml-mode'})|indent(8) }}

sls/filebeat/pkg.sls

@@ -1,16 +1,9 @@
-{% set filebeat_version = salt['pillar.get']('filebeat:version', '>=6.3') %}
-{% set filebeat_packaged = salt['pillar.get']('filebeat:packaged', True) %}
-{% if not filebeat_packaged %}
-include:
-  - go
-{% endif %}
-
+{% import 'pkg/common' as pkg %}
 app-admin/filebeat:
   pkg.installed:
-    - version: "{{ filebeat_version }}"
-    {% if filebeat_packaged %}
-    - binhost: force
-    {% endif %}
+    - pkgs:
+      - {{ pkg.gen_atom('app-admin/filebeat') }}
+  {{ pkg.gen_portage_config('app-admin/filebeat', watch_in={'pkg': 'app-admin/filebeat'})|indent(8) }}
 
 /var/lib/filebeat/module/:
   file.recurse:

sls/gentoo/dev-utils.sls

@@ -4,12 +4,10 @@ include:
 app-portage/repoman:
   pkg.latest:
     - pkgs:
-      - dev-python/lxml: ">=3.6"
-      - sys-apps/portage: ">=2.3"
-      - app-portage/repoman: ">=2.3"
-
-app-portage/overlint:
-  pkg.latest
+      - dev-python/lxml
+      - sys-apps/portage
+      - app-portage/repoman
+      - app-portage/overlint
 
 app-portage/gentoolkit-dev:
   pkg.purged

sls/gentoo/portage/init.sls

@@ -1,18 +1,12 @@
+{% import 'pkg/common' as pkg %}
 include:
   - vcs.git
 
 sys-apps/portage:
   pkg.latest:
     - pkgs:
-      - sys-apps/portage: "[xattr,-rsync-verify]"
-    - watch:
-      - portage_config: sys-apps/portage
-  portage_config.flags:
-    - accept_keywords: []
-    - use:
-      - xattr
-      - -rsync-verify
-    - reload_modules: true
+      - {{ pkg.gen_atom('sys-apps/portage') }}
+  {{ pkg.gen_portage_config('sys-apps/portage', watch_in={'pkg': 'sys-apps/portage'})|indent(8) }}
 
 app-portage-purged:
   pkg.purged:

sls/go/init.sls

@@ -1,8 +1,5 @@
 include:
   - lib.glibc
-  - core.gcc
-  - core.binutils
 
 dev-lang/go:
   pkg.latest
-

sls/jemalloc/init.sls

@@ -1,6 +1,6 @@
+{% import 'pkg/common' as pkg %}
 dev-libs/jemalloc:
   pkg.latest:
     - pkgs:
-      - dev-libs/jemalloc: '[stats]'
-
-        
+      - {{ pkg.gen_atom('dev-libs/jemalloc') }}
+  {{ pkg.gen_portage_config('dev-libs/jemalloc', watch_in={'pkg': 'dev-libs/jemalloc'})|indent(8) }}

sls/keepalived/pkg.sls

@@ -1,4 +1,6 @@
+{% import 'pkg/common' as pkg %}
 pkg_keepalived:
   pkg.installed:
     - pkgs:
-      - sys-cluster/keepalived: '[ipv6,snmp]'
+      - {{ pkg.gen_atom('sys-cluster/keepalived') }}
+  {{ pkg.gen_portage_config('sys-cluster/keepalived', watch_in={'pkg': 'pkg_keepalived'})|indent(8) }}

sls/lib/glibc.sls

@@ -1,13 +1,11 @@
-{% set glibc_use = salt['pillar.get']('glibc:use', ['-audit','caps','-docs','gd','multiarch','hardened']) %}
-{% set libs_packaged = salt['pillar.get']('libs:packaged', False) %}
+{% import 'pkg/common' as pkg %}
 sys-libs/glibc:
   pkg.latest:
-    - version: "[{{ ','.join(glibc_use) }}]"
-    {% if libs_packaged %}
-    - binhost: force
-    {% endif %}
     - require:
       - file: /etc/locale.gen
+    - pkgs:
+      - {{ pkg.gen_atom('sys-libs/glibc') }}
+  {{ pkg.gen_portage_config('sys-libs/glibc', watch_in={'pkg': 'sys-libs/glibc'})|indent(8) }}
 
 /etc/env.d/02locale:
   file.managed:

sls/pkg/common

@@ -50,4 +50,3 @@
 {{- package_name -}}
 {% endif %}
 {%- endmacro -%}
-