review fixes

sls/lib/timezone-data.sls

@@ -1,4 +1,4 @@
-# TODO: oneshot
 timezone-data:
   pkg.latest:
+    - oneshot: True
     - name: sys-libs/timezone-data

sls/nds/rpcbind.sls

@@ -1,11 +0,0 @@
-# TODO: remove deps on this
-{% set rpcbind_version = salt['pillar.get']('nds:rpcbind:version', '>=0.2.4') %}
-{% set rpcbind_use = salt['pillar.get']('nds:rpcbind:use', ['-tcpd']) %}
-include:
-  - lib.libtirpc
-
-net-nds/rpcbind:
-  pkg.installed:
-    - version: "{{ rpcbind_version }}[{{ ','.join(rpcbind_use) }}]"
-    - require:
-      - pkg: net-libs/libtirpc

sls/nfs/pkg.sls

@@ -1,18 +1,15 @@
+# TODO: refactor
 {% set utils_version = salt['pillar.get']('nfs:utils:version', '>=2.3.1') %}
 {% set utils_use = salt['pillar.get']('nfs:utils:use', ['caps','kerberos','nfsv4','nfsv41','-tcpd']) %}
 
+{% if 'kerberos' in utils_use %}
 include:
-  - nds.rpcbind
-  {% if 'kerberos' in utils_use %}
   - kerberos.pkg
-  {% endif %}
+{% endif %}
 
 net-fs/nfs-utils:
   pkg.installed:
     - version: "{{ utils_version }}[{{ ','.join(utils_use) }}]"
-    - require:
-      - pkg: net-libs/libtirpc
-      - pkg: net-nds/rpcbind
       {% if 'kerberos' in utils_use %}
       - pkg: app-crypt/mit-krb5
       {% endif %}

sls/nodejs/pkg.sls

@@ -1,16 +1,11 @@
-{% set nodejs_packaged = salt.pillar.get('nodejs:packaged', false) %}
-{% set nodejs_version = salt.pillar.get('nodejs:version', '~=8.15.1') %}
-{% set nodejs_use = salt.pillar.get('nodejs:use', ['npm']) %}
+{% import 'pkg/common' as pkg %}
 include:
-  - lib.libuv
-  - lib.http-parser
+  - gentoo.portage.packages
 
 net-libs/nodejs:
-  pkg.installed:
-    - version: "{{ nodejs_version }}[{{ ','.join(nodejs_use) }}]"
-    {% if nodejs_packaged %}
-    - binhost: force
-    {% endif %}
+  pkg.latest:
+    - oneshot: True
+    - pkgs:
+      - {{ pkg.gen_atom('net-libs/nodejs') }}
     - require:
-      - pkg: dev-libs/libuv
-      - pkg: net-libs/http-parser
+      - file: gentoo.portage.packages

sls/opendkim/pkg.sls

@@ -1,8 +1,12 @@
+{% import 'pkg/common' as pkg %}
 include:
+  - gentoo.portage.packages
   - unbound.pkg
 
 mail-filter/opendkim:
-  pkg.installed:
-    - version: '>=2.10.3[berkdb,ssl,unbound]'
+  pkg.latest:
+    - pkgs:
+      - {{ pkg.gen_atom('mail-filter/opendkim') }}
     - require:
-      - pkg: net-dns/unbound
+      - file: gentoo.portage.packages
+      - pkg: net-dns/unbound      

sls/pam/pkg.sls

@@ -1,24 +1,23 @@
 # TODO: remove from deps
-{% set pam_ver = salt['pillar.get']('pam:version', '>=1.3.0-r2') %}
-{% set pam_use = salt['pillar.get']('pam:use', ['-audit','-berkdb','cracklib','filecaps']) %}
-{% set pambase_use = salt['pillar.get']('pam:pambase:use', ['cracklib','nullok','sha512']) %}
-{% set libs_packaged = salt['pillar.get']('libs:packaged', False) %}
+{% import 'pkg/common' as pkg %}
+include:
+  - gentoo.portage.packages
 
 sys-libs/pam:
   pkg.installed:
-    - version: "{{ pam_ver }}[{{ ','.join(pam_use) }}]"
-    {% if libs_packaged %}
-    - binhost: force
-    {% endif %}
+    - oneshot: True
+    - pkgs:
+      - {{ pkg.gen_atom('sys-libs/pam') }}
+    - require:
+      - file: gentoo.portage.packages
 
 sys-auth/pambase:
   pkg.latest:
-    - version: "[{{ ','.join(pambase_use) }}]"
-    {% if libs_packaged %}
-    - binhost: force
-    {% endif %}
+    - oneshot: True
+    - pkgs:
+      - {{ pkg.gen_atom('sys-auth/pambase') }}
     - require:
-      - pkg: sys-libs/pam
+      - file: gentoo.portage.packages
 
 virtual/pam:
   pkg.latest: