Обновление условий в шаблонах на calculate-utils

Так как основная версия calculate-utils:3, то все проверки ведутся по
ней
mhiretskiy
parent b6b54657ce
commit 294235d209

@ -1,4 +1,4 @@
# Calculate format=raw name=calculate.env comment=# mergepkg(sys-apps/calculate-utils)>=3.4.0_beta1
# Calculate format=raw name=calculate.env comment=# mergepkg(sys-apps/calculate-utils)!=
[install]
#?os_root_type==hdd&&cl_autopartition_set==off#
@ -17,7 +17,7 @@ cl_autologin = #-cl_autologin-#
#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
cl_autologin =
#cl_autologin#
#?pkg(sys-apps/calculate-utils)>=3.6.4.12&&cl_ver>=3.6.4.12#
#?pkg(sys-apps/calculate-utils:3)>=3.6.4.12&&cl_ver>=3.6.4.12#
os_install_fb_resolution_preferred = #-os_install_fb_resolution_preferred-#
#pkg#

@ -1 +1 @@
# Calculate mergepkg(sys-apps/calculate-utils[client])!=&&env(client.os_remote_auth)!= path=/var name=calculate
# Calculate mergepkg(sys-apps/calculate-utils:3[client])!=&&env(client.os_remote_auth)!= path=/var name=calculate

@ -1 +1 @@
# 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,x11-misc/slim,x11-misc/lightdm,x11-misc/sddm
# Calculate append=skip merge(sys-apps/calculate-utils:3)!= pkg(sys-apps/calculate-utils:3[desktop])!=&&ini(merge-calculate.desktop)==||pkg(sys-apps/calculate-utils:3[desktop])==&&ini(merge-calculate.desktop)!= merge=gnome-base/gdm,gnome-base/gnome-shell,kde-base/kdm,x11-misc/slim,x11-misc/lightdm,x11-misc/sddm

@ -1,4 +1,4 @@
# Calculate env=client exec=/bin/bash mergepkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase,sys-auth/nss_ldap,sys-libs/glibc
# Calculate env=client exec=/bin/bash mergepkg(sys-apps/calculate-utils:3[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase,sys-auth/nss_ldap,sys-libs/glibc
#?cl_remote_host!=&&cl_remote_pw!=&&cl_chroot_status==off#
/usr/sbin/cl-core --method client --mount

@ -1 +1 @@
# Calculate append=skip merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase
# Calculate append=skip merge(sys-apps/calculate-utils:3)!=&&pkg(sys-apps/calculate-utils:3[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase

@ -1 +1 @@
# Calculate path=/etc/local.d name=logout.stop append=remove merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha1
# Calculate path=/etc/local.d name=logout.stop append=remove merge(sys-apps/calculate-utils:3)!=&&pkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.3.0_alpha1

@ -1,4 +1,4 @@
# Calculate path=/var/lib/calculate name=ini.env format=samba mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha2 merge=sys-process/htop,x11-terms/xterm,sys-process/vixie-cron,media-gfx/calculate-wallpapers,sys-apps/sysvinit,sys-auth/pambase,x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme,app-portage/layman,app-portage/eix
# Calculate path=/var/lib/calculate name=ini.env format=samba mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.3.0_alpha2 merge=sys-process/htop,x11-terms/xterm,sys-process/vixie-cron,media-gfx/calculate-wallpapers,sys-apps/sysvinit,sys-auth/pambase,x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme,app-portage/layman,app-portage/eix
[update]
!packages =

@ -1,4 +1,4 @@
# Calculate path=/etc/calculate name=calculate.env format=samba mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha3&&env(client.os_remote_client)!=
# Calculate path=/etc/calculate name=calculate.env format=samba mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.3.0_alpha3&&env(client.os_remote_client)!=
[client]
!os_remote_client =

@ -1 +1 @@
# Calculate append=skip mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.2.5 merge=sys-fs/eudev
# Calculate append=skip mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.3.2.5 merge=sys-fs/eudev

@ -1 +1 @@
# Calculate append=skip mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.4.6.15 merge=sys-libs/glibc,sys-apps/openrc
# Calculate append=skip mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.4.6.15 merge=sys-libs/glibc,sys-apps/openrc

@ -1 +1 @@
# Calculate append=skip mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.4.6.19 merge=sys-apps/openrc
# Calculate append=skip mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.4.6.19 merge=sys-apps/openrc

@ -1,3 +1,3 @@
# Calculate path=/etc/calculate name=calculate.env format=patch mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.4.6.6
# Calculate path=/etc/calculate name=calculate.env format=patch mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.4.6.6
<reg>os_install_dev_from</reg>
<text>cl_install_dev_from</text>

@ -1 +1 @@
# Calculate append=skip mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha25 merge=x11-themes/calculate-icon-theme
# Calculate append=skip mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha25 merge=x11-themes/calculate-icon-theme

@ -1 +1 @@
# Calculate path=/var/lib/calculate name=ini.env link=/etc/calculate/ini.env mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha38&&load(/etc/calculate/ini.env)!= protected
# Calculate path=/var/lib/calculate name=ini.env link=/etc/calculate/ini.env mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha38&&load(/etc/calculate/ini.env)!= protected

@ -1 +1 @@
# Calculate path=/etc/calculate name=ini.env append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha38
# Calculate path=/etc/calculate name=ini.env append=remove mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha38

@ -1 +1 @@
# Calculate path=/var/lib/calculate name=calculate.env link=/etc/calculate/calculate.env mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha39&&load(/etc/calculate/calculate.env)!= protected
# Calculate path=/var/lib/calculate name=calculate.env link=/etc/calculate/calculate.env mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha39&&load(/etc/calculate/calculate.env)!= protected

@ -1 +1 @@
# Calculate path=/etc/calculate name=calculate.env append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha39
# Calculate path=/etc/calculate name=calculate.env append=remove mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha39

@ -1 +1 @@
# Calculate path=/etc/calculate name=profile.bashrc.d append=clear mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha43
# Calculate path=/etc/calculate name=profile.bashrc.d append=clear mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha43

@ -1,4 +1,4 @@
# Calculate path=/var/lib/calculate name=ini.env format=samba mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44
# Calculate path=/var/lib/calculate name=ini.env format=samba mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha44
[system]
#?ini(update.last_update)!=#

@ -1 +1 @@
# Calculate path=/var/lib/calculate/calculate-builder name=builder.env link=/etc/calculate/builder.env mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44&&load(/etc/calculate/builder.env)!= protected
# Calculate path=/var/lib/calculate/calculate-builder name=builder.env link=/etc/calculate/builder.env mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha44&&load(/etc/calculate/builder.env)!= protected

@ -1 +1 @@
# Calculate path=/etc/calculate name=builder.env append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44
# Calculate path=/etc/calculate name=builder.env append=remove mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha44

@ -1 +1 @@
# Calculate path=/var/lib/calculate name=calculate.ldap link=/etc/calculate/calculate.ldap mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44&&load(/etc/calculate/calculate.ldap)!= protected
# Calculate path=/var/lib/calculate name=calculate.ldap link=/etc/calculate/calculate.ldap mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha44&&load(/etc/calculate/calculate.ldap)!= protected

@ -1 +1 @@
# Calculate path=/etc/calculate name=calculate.ldap append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44
# Calculate path=/etc/calculate name=calculate.ldap append=remove mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_alpha44

@ -1 +1 @@
# Calculate path=/etc/calculate name=profile.bashrc.d append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_beta2
# Calculate path=/etc/calculate name=profile.bashrc.d append=remove mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.5.0_beta2

@ -1 +1 @@
# Calculate append=skip mergepkg(sys-apps/calculate-utils)>=3.6.0.12&&ini(merge-calculate.utils)<3.6.0.12 merge=media-sound/alsa-utils,media-sound/pulseaudio,kde-plasma/plasma-pa,kde-apps/kmix,media-sound/volumeicon,media-sound/pavucontrol,media-sound/qastools
# Calculate append=skip mergepkg(sys-apps/calculate-utils:3)>=3.6.0.12&&ini(merge-calculate.utils)<3.6.0.12 merge=media-sound/alsa-utils,media-sound/pulseaudio,kde-plasma/plasma-pa,kde-apps/kmix,media-sound/volumeicon,media-sound/pavucontrol,media-sound/qastools

@ -1,4 +1,4 @@
# Calculate format=contents mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.6.0_alpha1
# Calculate format=contents mergepkg(sys-apps/calculate-utils:3)!=&&ini(merge-calculate.utils)<3.6.0_alpha1
!sys-apps/openrc /etc/conf.d/net
!sys-apps/openrc /etc/init.d/net.*
!sys-apps/openrc /etc/runlevels/default/net.*

@ -1,4 +1,4 @@
# Calculate exec=/bin/bash mergepkg(sys-apps/calculate-utils)>=3.6.6&&ini(merge-calculate.utils)<3.6.6
# Calculate exec=/bin/bash mergepkg(sys-apps/calculate-utils:3)>=3.6.6&&ini(merge-calculate.utils)<3.6.6
declare -A name_url=()
rep_name=( $( /usr/libexec/calculate/cl-variable --value update.cl_update_rep_name | tr "," " " ) )

@ -1 +1 @@
# Calculate append=skip mergepkg(sys-apps/calculate-utils)>=3.6.8.17&&ini(merge-calculate.utils)<3.6.8.17 merge=sys-boot/grub
# Calculate append=skip mergepkg(sys-apps/calculate-utils:3)>=3.6.8.17&&ini(merge-calculate.utils)<3.6.8.17 merge=sys-boot/grub

@ -1 +1 @@
# Calculate pkg(sys-apps/calculate-utils[desktop])!= path=/usr/share/calculate name=xdm
# Calculate pkg(sys-apps/calculate-utils:3[desktop])!= path=/usr/share/calculate name=xdm

@ -1 +1 @@
# Calculate name=conf.d path=/etc ini(container.type)==desktop&&pkg(sys-apps/calculate-utils[client])!=
# Calculate name=conf.d path=/etc ini(container.type)==desktop&&pkg(sys-apps/calculate-utils:3[client])!=

@ -1 +1 @@
# Calculate path=/etc/portage/repos.conf append=remove pkg(sys-apps/calculate-utils)>=3.6.6
# Calculate path=/etc/portage/repos.conf append=remove pkg(sys-apps/calculate-utils:3)>=3.6.6

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

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

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

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

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

@ -1,4 +1,4 @@
# Calculate comment=# protected pkg(sys-apps/calculate-utils)>=3.6.0.12
# Calculate comment=# protected pkg(sys-apps/calculate-utils:3)>=3.6.0.12
#?os_audio==alsa#
defaults.pcm.!card #-os_audio_card_default-#
defaults.pcm.!device #-os_audio_device_default-#

@ -1,4 +1,4 @@
# Calculate comment=# name=asound.conf protected pkg(sys-apps/calculate-utils)<3.6.0.12
# Calculate comment=# name=asound.conf protected pkg(sys-apps/calculate-utils:3)<3.6.0.12
#?os_audio==alsa#
pcm.!default {
type hw

@ -3,7 +3,7 @@
[install]
os_audio = alsa
#?cl_ver>=3.6.0.12#
#?os_audio_card_default!=&&pkg(sys-apps/calculate-utils)>=3.6.0.12#
#?os_audio_card_default!=&&pkg(sys-apps/calculate-utils:3)>=3.6.0.12#
os_audio_hw = #-os_audio_card_default-#,#-os_audio_device_default-#
#os_audio_card_default#
#cl_ver#

@ -3,7 +3,7 @@
[install]
os_audio = pulseaudio
#?cl_ver>=3.6.0.12#
#?os_audio_card_default!=&&pkg(sys-apps/calculate-utils)>=3.6.0.12#
#?os_audio_card_default!=&&pkg(sys-apps/calculate-utils:3)>=3.6.0.12#
os_audio_hw = #-os_audio_card_default-#,#-os_audio_device_default-#
#os_audio_card_default#
#cl_ver#

@ -1,2 +1,2 @@
# Calculate env=client path=/etc/runlevels mergepkg(sys-apps/calculate-utils[client])!=
# Calculate env=client path=/etc/runlevels mergepkg(sys-apps/calculate-utils:3[client])!=

@ -1 +1 @@
# Calculate chown=portage:portage path=/var/calculate pkg(sys-apps/calculate-utils)>=3.6.6&&exists(/var/calculate/custom-overlay/metadata/layout.conf)==
# Calculate chown=portage:portage path=/var/calculate pkg(sys-apps/calculate-utils:3)>=3.6.6&&exists(/var/calculate/custom-overlay/metadata/layout.conf)==

@ -1,4 +1,4 @@
# Calculate append=after path=/etc/portage/repos.conf name=zz-calculate.conf pkg(sys-apps/calculate-utils)>=3.6.6&&grep(/etc/portage/repos.conf/zz-calculate.conf,\[custom\])==
# Calculate append=after path=/etc/portage/repos.conf name=zz-calculate.conf pkg(sys-apps/calculate-utils:3)>=3.6.6&&grep(/etc/portage/repos.conf/zz-calculate.conf,\[custom\])==
[custom]
location = /var/calculate/custom-overlay

@ -1,4 +1,4 @@
# Calculate comment=# path=/etc/udev/rules.d pkg(sys-apps/calculate-utils)>=3.6.6.5
# Calculate comment=# path=/etc/udev/rules.d pkg(sys-apps/calculate-utils:3)>=3.6.6.5
#?list(os_install_net_interfaces,0)!=&&list(os_install_net_mac_type,0)==OUI#
# #-list(os_install_net_name,0)-#

@ -1,4 +1,4 @@
# Calculate comment=# path=/etc/udev/rules.d name=70-persistent-net.rules pkg(sys-apps/calculate-utils)<3.6.6.4
# Calculate comment=# path=/etc/udev/rules.d name=70-persistent-net.rules pkg(sys-apps/calculate-utils:3)<3.6.6.4
#?list(os_install_net_interfaces,0)!=#
# #-list(os_install_net_name,0)-#

@ -1,4 +1,4 @@
# Calculate pkg(sys-apps/calculate-utils[desktop])!= format=kde name=sddm.conf
# Calculate pkg(sys-apps/calculate-utils:3[desktop])!= format=kde name=sddm.conf
#?cl_autologin!=#
[Autologin]

@ -1 +1 @@
# Calculate link=/etc/init.d/calculate-core symbolic pkg(x11-base/xorg-server)!=&&pkg(sys-apps/calculate-utils)<3.5.8
# Calculate link=/etc/init.d/calculate-core symbolic pkg(x11-base/xorg-server)!=&&pkg(sys-apps/calculate-utils:3)<3.5.8

@ -1 +1 @@
# Calculate name=calculate-core append=remove pkg(x11-base/xorg-server)==||pkg(sys-apps/calculate-utils)>=3.5.8
# Calculate name=calculate-core append=remove pkg(x11-base/xorg-server)==||pkg(sys-apps/calculate-utils:3)>=3.5.8

@ -1,6 +1,6 @@
# Calculate format=samba merge=x11-base/xorg-server,gnome-base/gdm,gnome-base/gdm,sys-boot/grub,media-gfx/calculate-wallpapers,media-gfx/dm-themes-calculate,media-gfx/kdm-themes-calculate cl_setup==video||cl_setup== path=/var/lib/calculate name=calculate.env
#?pkg(sys-apps/calculate-utils)>=3.6.4.12#
#?pkg(sys-apps/calculate-utils:3)>=3.6.4.12#
[install]
os_install_fb_resolution_preferred = #-os_install_fb_resolution_preferred-#
#pkg#

@ -1 +1 @@
# Calculate pkg(sys-apps/calculate-utils)!= append=skip
# Calculate pkg(sys-apps/calculate-utils:3)!= append=skip

@ -16,7 +16,7 @@
#-ini(runlevels.cups,)-#
#ini#
#?ini(runlevels.calculate-utils/calculate-core)==on&&pkg(sys-apps/calculate-utils)==#
#?ini(runlevels.calculate-utils/calculate-core)==on&&pkg(sys-apps/calculate-utils:3)==#
#-ini(runlevels.calculate-utils/calculate-core,)-#
#ini#
@ -72,7 +72,7 @@
#-ini(runlevels.mdadm,)-#
#ini#
#?ini(runlevels.calculate-utils/laptopd)==on&&pkg(sys-apps/calculate-utils)==#
#?ini(runlevels.calculate-utils/laptopd)==on&&pkg(sys-apps/calculate-utils:3)==#
#-ini(runlevels.calculate-utils/laptopd,)-#
#ini#

@ -1,4 +1,4 @@
# Calculate run=/bin/bash pkg(sys-apps/calculate-utils)>=3.6.6 ini(overlay-calculate.revision)>=20191116.3
# Calculate run=/bin/bash pkg(sys-apps/calculate-utils:3)>=3.6.6 ini(overlay-calculate.revision)>=20191116.3
is_old_path() {
/usr/libexec/calculate/cl-variable --value main.cl_template_path | grep -q var/lib/layman

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

Loading…
Cancel
Save