Исправлены шаблоны merge, использующие функцию module

profiles/templates/3.5/2_ac_install_merge/Depends/calculate-utils

@@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!= module(desktop)!=&&ini(merge-calculate.desktop)==||module(desktop)==&&ini(merge-calculate.desktop)!= merge=gnome-base/gdm,gnome-base/gnome-shell,kde-base/kdm,lxde-base/lxdm,x11-misc/slim,x11-misc/lightdm,x11-misc/sddm
+# Calculate append=skip merge(sys-apps/calculate-utils)!= pkg(sys-apps/calculate-utils[desktop])!=&&ini(merge-calculate.desktop)==||pkg(sys-apps/calculate-utils[desktop])==&&ini(merge-calculate.desktop)!= merge=gnome-base/gdm,gnome-base/gnome-shell,kde-base/kdm,lxde-base/lxdm,x11-misc/slim,x11-misc/lightdm,x11-misc/sddm

profiles/templates/3.5/2_ac_install_merge/kde-base/kdm/kdmrc

@@ -21,13 +21,13 @@ AutoReLogin=false
 ClientLogFile=.xsession-errors-%d
 Resources=/usr/share/wallpapers/fulmine.jpg
 SessionsDirs=/usr/share/xsessions
-#?module(desktop)!=#
+#?pkg(sys-apps/calculate-utils[desktop])!=#
 Reset=/usr/share/calculate/xdm/xdm --logout
 Startup=/usr/share/calculate/xdm/xdm --login
-#!module#
+#!pkg#
 Reset=/usr/share/config/kdm/Xreset
 Startup=/usr/share/config/kdm/Xstartup
-#module#
+#pkg#
 
 [X-*-Greeter]
 AntiAliasing=true

profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout

@@ -1,9 +1,9 @@
 # Calculate comment=# chmod=0755
 #!/bin/sh
 
-#?module(desktop)!=#
+#?pkg(sys-apps/calculate-utils[desktop])!=#
 /usr/bin/sessreg -d -l $DISPLAY $USER
 /usr/share/calculate/xdm/xdm --logout
-#!module#
+#!pkg#
 # Note: this is a sample and will not be run as is.
-#module#
+#pkg#

profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre

@@ -1,4 +1,4 @@
-# Calculate comment=# chmod=0755 module(desktop)!=
+# Calculate comment=# chmod=0755 pkg(sys-apps/calculate-utils[desktop])!=
 #!/bin/sh
 #
 if pgrep -f 'xdm/xdm --logout'

profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove

@@ -1 +1 @@
-# Calculate append=remove name=Pre module(desktop)==
+# Calculate append=remove name=Pre pkg(sys-apps/calculate-utils[desktop])==

profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin

@@ -1,9 +1,9 @@
 # Calculate comment=# chmod=0755
 #!/bin/sh
 r
-#?module(desktop)!=#
+#?pkg(sys-apps/calculate-utils[desktop])!=#
 bash -c "/usr/bin/sessreg -a -l $DISPLAY $USER &" &
 /usr/share/calculate/xdm/xdm --login || kill -9 $PPID
-#!module#
+#!pkg#
 # Note: this is a sample and will not be run as is.
-#module#
+#pkg#

profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot

@@ -1,7 +1,7 @@
 # Calculate comment=# chmod=0755
 #!/bin/sh
 #
-#?module(desktop)!=#
+#?pkg(sys-apps/calculate-utils[desktop])!=#
 sleep 1
 if pgrep -f 'xdm/xdm --logout'
 then
@@ -18,6 +18,6 @@ then
 	done
 	kill -9 $XMESPID &>/dev/null
 fi
-#!module#
+#!pkg#
 # Note: this is a sample and will not be run as is.
-#module#
+#pkg#

profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown

@@ -1,7 +1,7 @@
 # Calculate comment=# chmod=0755
 #!/bin/sh
 #
-#?module(desktop)!=#
+#?pkg(sys-apps/calculate-utils[desktop])!=#
 sleep 1
 if pgrep -f 'xdm/xdm --logout'
 then
@@ -18,6 +18,6 @@ then
 	done
 	kill -9 $XMESPID &>/dev/null
 fi
-#!module#
+#!pkg#
 # Note: this is a sample and will not be run as is.
-#module#
+#pkg#

profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth

@@ -1,55 +1,12 @@
 # Calculate chmod=0644 chown=root:root comment=#
 auth       required     pam_env.so
-#?module(unix)==||server.sr_unix_set!=on#
-#?pkg(sys-auth/pam_client)!=&&module(client)!=&&pkg(sys-apps/calculate-server)==#
-auth       [success=3 new_authtok_reqd=done default=ignore]   pam_unix.so try_first_pass
-auth       requisite    pam_client.so
-auth       [success=1 new_authtok_reqd=done default=ignore]   pam_ldap.so use_first_pass
-auth       requisite     pam_deny.so
-auth       required     pam_permit.so
-#pkg#
-#module#
-#?pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on#
-auth       [success=2 new_authtok_reqd=done default=ignore]   pam_unix.so try_first_pass
-auth       [success=1 new_authtok_reqd=done default=ignore]   pam_ldap.so use_first_pass
-auth       requisite    pam_deny.so
-auth       required     pam_permit.so
-#pkg#
-#?module(unix)==||server.sr_unix_set!=on#
-#?pkg(sys-auth/pam_client)==&&pkg(sys-apps/calculate-server)==||module(client)==&&pkg(sys-apps/calculate-server)==#
 auth       required     pam_unix.so try_first_pass
-#pkg#
-#module#
-#?pkg(sys-auth/pam_keystore)!=#
-auth       optional     pam_keystore.so use_first_pass
-#pkg#
-#?pkg(sys-fs/ecryptfs-utils)!=#
-auth       optional     pam_ecryptfs.so unwrap
-#pkg#
 
 account    required     pam_unix.so
-#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on#
-account    sufficient   pam_ldap.so
-#pkg#
 
 password   required     pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
 password   sufficient   pam_unix.so nullok sha256 shadow use_authtok
-#?pkg(sys-fs/ecryptfs-utils)!=#
-password   optional     pam_ecryptfs.so
-#pkg#
-#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on#
-password   sufficient   pam_ldap.so
-#pkg#
 password   required     pam_deny.so
 
 session    required     pam_limits.so
 session    required     pam_unix.so
-#?pkg(sys-fs/ecryptfs-utils)!=#
-session    optional     pam_ecryptfs.so unwrap
-#pkg#
-#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on#
-session    optional     pam_ldap.so
-#pkg#
-#?pkg(sys-apps/systemd)!=#
-session    optional     pam_systemd.so
-#pkg#

profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm

@@ -1,4 +1,4 @@
-# Calculate path=/usr/share/calculate/xdm/logout.d module(desktop)!=
+# Calculate path=/usr/share/calculate/xdm/logout.d pkg(sys-apps/calculate-utils[desktop])!=
 #!/bin/bash
 
 chvt $(ps ax | grep -v root/$DISPLAY | sed -rn 's/^.*lightdm\/root.*vt([0-9]+).*$/\1/p' | awk '{print $1}')

profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove

@@ -1 +1 @@
-# Calculate path=/usr/share/calculate/xdm/logout.d name=99lightdm append=remove module(desktop)==
+# Calculate path=/usr/share/calculate/xdm/logout.d name=99lightdm append=remove pkg(sys-apps/calculate-utils[desktop])==

profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf

@@ -1,10 +1,10 @@
 # Calculate format=kde path=/etc/lightdm
 
 [SeatDefaults]
-#?module(desktop)!=#
+#?pkg(sys-apps/calculate-utils[desktop])!=#
 session-setup-script=/usr/share/calculate/xdm/xdm --login
 session-cleanup-script=/usr/share/calculate/xdm/xdm --logout
-#!module#
+#!pkg#
 !session-setup-script=
 !session-cleanup-script=
-#module#
+#pkg#

profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin

@@ -2,9 +2,9 @@
 #!/bin/sh
 # Xlogin - run as root before user login
 
-#?module(desktop)!=#
+#?pkg(sys-apps/calculate-utils[desktop])!=#
 VT="vt$(( ${DISPLAY#:} + 7 ))"
 XAUTHORITY=$(ps ax | sed -nr "s/.*usr\/bin\/X.*-auth (\S+).*$VT.*/\1/p")
 export XAUTHORITY
 /usr/share/calculate/xdm/xdm --login
-#module#
+#pkg#

profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout

@@ -2,9 +2,9 @@
 #!/bin/sh
 # Xlogout - run as root after user logout
 
-#?module(desktop)!=#
+#?pkg(sys-apps/calculate-utils[desktop])!=#
 VT="vt$(( ${DISPLAY#:} + 7 ))"
 XAUTHORITY=$(ps ax | sed -nr "s/.*usr\/bin\/X.*-auth (\S+).*$VT.*/\1/p")
 export XAUTHORITY
 /usr/share/calculate/xdm/xdm --logout
-#module#
+#pkg#

profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth

@@ -0,0 +1,56 @@
+# Calculate chmod=0644 chown=root:root comment=#
+auth       required     pam_env.so
+#?module(unix)==||server.sr_unix_set!=on#
+#?pkg(sys-auth/pam_client)!=&&module(client)!=&&pkg(sys-apps/calculate-server)==#
+auth       [success=3 new_authtok_reqd=done default=ignore]   pam_unix.so try_first_pass
+auth       requisite    pam_client.so
+auth       [success=1 new_authtok_reqd=done default=ignore]   pam_ldap.so use_first_pass
+auth       requisite     pam_deny.so
+auth       required     pam_permit.so
+#pkg#
+#module#
+#?pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on#
+auth       [success=2 new_authtok_reqd=done default=ignore]   pam_unix.so try_first_pass
+auth       [success=1 new_authtok_reqd=done default=ignore]   pam_ldap.so use_first_pass
+auth       requisite    pam_deny.so
+auth       required     pam_permit.so
+#pkg#
+#?module(unix)==||server.sr_unix_set!=on#
+#?pkg(sys-auth/pam_client)==&&pkg(sys-apps/calculate-server)==||module(client)==&&pkg(sys-apps/calculate-server)==#
+auth       required     pam_unix.so try_first_pass
+#pkg#
+#module#
+#?pkg(sys-auth/pam_keystore)!=#
+auth       optional     pam_keystore.so use_first_pass
+#pkg#
+#?pkg(sys-fs/ecryptfs-utils)!=#
+auth       optional     pam_ecryptfs.so unwrap
+#pkg#
+
+account    required     pam_unix.so
+#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on#
+account    sufficient   pam_ldap.so
+#pkg#
+
+password   required     pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
+password   sufficient   pam_unix.so nullok sha256 shadow use_authtok
+#?pkg(sys-fs/ecryptfs-utils)!=#
+password   optional     pam_ecryptfs.so
+#pkg#
+#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on#
+password   sufficient   pam_ldap.so
+#pkg#
+password   required     pam_deny.so
+
+session    required     pam_env.so
+session    required     pam_limits.so
+session    required     pam_unix.so
+#?pkg(sys-fs/ecryptfs-utils)!=#
+session    optional     pam_ecryptfs.so unwrap
+#pkg#
+#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on#
+session    optional     pam_ldap.so
+#pkg#
+#?pkg(sys-apps/systemd)!=#
+session    optional     pam_systemd.so
+#pkg#

profiles/templates/3.5/6_ac_update_sync/remerge/0-ini

@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20161222
+remerge = 20161222.1

profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222.1

@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-base/kdm,lxde-base/lxdm,sys-auth/pambase,x11-misc/lightdm,x11-misc/sddm
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#

profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env

@@ -1,6 +1,6 @@
 # Calculate format=samba
 
 [merge-calculate]
-utils = #-module(core)-#
+utils = #-pkg(sys-apps/calculate-utils)-#
-desktop = #-module(desktop)-#
+desktop = #-pkg(sys-apps/calculate-utils[desktop])-#
-client = #-module(client)-#
+client = #-pkg(sys-apps/calculate-utils[client])-#