3.5 refactoring

profiles/templates/3.5/1_ac_install_disk/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip env=install cl_ver>=3.4.0_beta3&&ac_install_disk==on
+# Calculate append=skip env=install ac_install_disk==on

profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/etc
+# Calculate pkg()!= path=/etc
 

profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/etc
+# Calculate pkg()!= path=/etc
 

profiles/templates/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory

@@ -1,2 +1 @@
-# Calculate merge()!=&&pkg()!= path=/etc
+# Calculate pkg()!= path=/etc
-

profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= name=etc
+# Calculate pkg()!= name=etc
 

profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge(sys-fs/udev)!=&&pkg(sys-fs/udev)<197||merge(sys-fs/eudev)!=&&pkg(sys-fs/eudev)!= path=/etc/udev name=rules.d 
+# Calculate pkg(sys-fs/udev)<197||pkg(sys-fs/eudev)!= path=/etc/udev name=rules.d 
 

profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg(sys-apps/baselayout)!= name=etc
+# Calculate pkg()!= name=etc
 

profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg(sys-apps/openrc)!= name=etc
+# Calculate pkg()!= name=etc
 

profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/openrc/init.d/root

@@ -1,43 +0,0 @@
-# Calculate os_install_scratch==on chmod=0755
-#!/sbin/runscript
-
-description="Mount the root fs read/write"
-
-depend()
-{
-	need fsck
-	keyword nojail noopenvz noprefix novserver
-}
-
-start()
-{
-	if echo 2>/dev/null >/.test.$$; then
-		rm -f /.test.$$ /fastboot /forcefsck
-		return 0
-	fi
-
-	ebegin "Remounting root filesystem read/write"
-	case "${RC_UNAME}" in
-		Linux)	SCRATCH_ROOT=`sed -nr 's/(\S+)\s+\/newroot\s+.*/\1/p' /proc/mounts`
-			if [ "$SCRATCH_ROOT" -a "${SCRATCH_ROOT}" != "tmpfs" ];
-			then
-				mount -n $SCRATCH_ROOT /mnt/scratch
-				if [[ -n `cat /proc/mounts | grep "none / aufs"` ]];
-				then
-					mount -n -t aufs -o remount,rw none /
-					mount -n -t aufs -o remount,rw none /mnt/builder
-				else
-					mount -n -t unionfs -o remount,dirs=/mnt/scratch/workspace=rw:/mnt/scratch/delta=ro:/mnt/scratch/calculate=ro unionfs /
-					mount -n -t unionfs -o remount,dirs=/mnt/scratch/delta=rw:/mnt/scratch/calculate=ro unionfs /mnt/builder
-				fi
-				mount -o loop -t squashfs /mnt/scratch/livecd.squashfs /mnt/scratch/calculate
-			else
-				mount -n -o remount,rw /
-			fi
-			;;
-		*)	mount -u -o rw /;;
-	esac
-	if eend $? "Root filesystem could not be mounted read/write"; then
-		rm -f /fastboot /forcefsck
-	fi
-}

profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg(sys-apps/sysvinit)!= name=etc
+# Calculate pkg()!= name=etc
 

profiles/templates/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory

@@ -1 +1 @@
-# Calculate path=/usr/share name=os-prober merge()!=&&pkg()!=
+# Calculate path=/usr/share name=os-prober pkg()!=

profiles/templates/3.5/2_ac_install_merge/Remerge/client-3.3.0_alpha2

@@ -1,4 +1,4 @@
-# Calculate env=client exec=/bin/bash 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,sys-auth/nss_ldap,sys-libs/glibc
+# 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
 
 #?cl_remote_host!=&&cl_remote_pw!=&&cl_chroot_status==off#
 /usr/sbin/cl-core --method client --mount

profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha2

@@ -1,4 +1,4 @@
-# Calculate path=/etc/calculate name=ini.env format=samba merge(sys-apps/calculate-utils)!=&&pkg(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=/etc/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
 
 [update]
 !packages =

profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha3

@@ -1,4 +1,4 @@
-# Calculate path=/etc/calculate name=calculate.env format=samba merge(sys-apps/calculate-utils)!=&&pkg(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)!=&&ini(merge-calculate.utils)<3.3.0_alpha3&&env(client.os_remote_client)!=
 
 [client]
 !os_remote_client =

profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.2.5

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

profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.15

@@ -1 +1 @@
-# Calculate append=skip merge(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)!=&&ini(merge-calculate.utils)<3.4.6.15 merge=sys-libs/glibc,sys-apps/openrc

profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.19

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

profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.6

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

profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha25

@@ -1 +1 @@
-# Calculate append=skip merge(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)!=&&ini(merge-calculate.utils)<3.5.0_alpha25 merge=x11-themes/calculate-icon-theme

profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=applications
+# Calculate mergepkg()!= path=/usr/share name=applications

profiles/templates/3.5/2_ac_install_merge/app-admin/sudo/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=sudoers.d
+# Calculate mergepkg()!= path=/etc name=sudoers.d
 

profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate append=skip merge()!=&&pkg()!=
+# Calculate append=skip mergepkg()!=
 

profiles/templates/3.5/2_ac_install_merge/app-arch/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip

profiles/templates/3.5/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/usr/include name=scsilib.backup append=remove
+# Calculate mergepkg()!= path=/usr/include name=scsilib.backup append=remove
 

profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=myspell
+# Calculate mergepkg()!= path=/usr/share name=myspell

profiles/templates/3.5/2_ac_install_merge/app-editors/vim/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip

profiles/templates/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip merge()!=&&pkg()!=
+# Calculate append=skip mergepkg()!=

profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/ name=etc
+# Calculate mergepkg()!= path=/ name=etc

profiles/templates/3.5/2_ac_install_merge/app-office/libreoffice/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/app-office/scribus/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()==1.4.6 append=skip
+# Calculate mergepkg()==1.4.6 append=skip
 

profiles/templates/3.5/2_ac_install_merge/app-portage/eix/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= name=etc
+# Calculate mergepkg()!= name=etc
 

profiles/templates/3.5/2_ac_install_merge/app-portage/layman/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/etc
+# Calculate merge(pkg()!= path=/etc

profiles/templates/3.5/2_ac_install_merge/app-portage/layman/layman.cfg

@@ -1,3 +1,3 @@
-# Calculate comment=# format=patch multiline merge(app-portage/layman)!=
+# Calculate comment=# format=patch multiline
 <reg>^#?(git_command\s*:\s*)/.*$</reg>
 <text>\1/usr/libexec/calculate/cl-git-wrapper</text>

profiles/templates/3.5/2_ac_install_merge/app-shells/bash/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()>=4.3_p42-r1 path=/etc
+# Calculate mergepkg()>=4.3_p42-r1 path=/etc

profiles/templates/3.5/2_ac_install_merge/app-text/evince/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/icons/hicolor/scalable name=apps
+# Calculate mergepkg()!= path=/usr/share/icons/hicolor/scalable name=apps
 

profiles/templates/3.5/2_ac_install_merge/dev-db/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip

profiles/templates/3.5/2_ac_install_merge/dev-lang/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip

profiles/templates/3.5/2_ac_install_merge/dev-lang/python/.calculate_directory

@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg(dev-lang/python:2.7)!= append=skip

profiles/templates/3.5/2_ac_install_merge/dev-lang/python/python2.7_env

@@ -1,15 +0,0 @@
-# Calculate exec=/bin/bash cl_merge_pkg!=
-
-if [[ -e /etc/env.d/python/config ]]
-then
-	if grep -q python2\.6 /etc/env.d/python/config ||
-		grep -q python2\.5 /etc/env.d/python/config
-	then
-		if [[ -x /usr/bin/eselect ]]
-		then
-			eselect python set python2.7
-		else
-			echo python2.7 >/etc/env.d/python/config
-		fi
-	fi
-fi

profiles/templates/3.5/2_ac_install_merge/dev-python/pexpect/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()>=3.3 path=/usr/lib/python2.7/site-packages
+# Calculate mergepkg()>=3.3 path=/usr/lib/python2.7/site-packages

profiles/templates/3.5/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml

@@ -8,16 +8,10 @@
 					<entry name="picture_filename" mtime="1267285026" type="schema" stype="string" owner="gnome">
 						<local_schema locale="C" short_desc="Picture Filename">
 							<default type="string">
-#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldg-themes)!=&&pkg(media-gfx/cldg-themes)<12.0_alpha1#
-								<stringvalue>/usr/share/pixmaps/calculate-gdm.jpg</stringvalue>
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldg-themes)>=12.0_alpha1#
-								<stringvalue>/usr/share/pixmaps/calculate-gdm-#-os_x11_standart-#.jpg</stringvalue>
-#pkg#
 #?pkg(media-gfx/dm-themes-calculate)>=14-r1#
 								<stringvalue>/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg</stringvalue>
 #pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
+#?pkg(media-gfx/dm-themes-calculate)<=0,14-r1#
                                                                 <stringvalue>/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg</stringvalue>
 #pkg#
 							</default>

profiles/templates/3.5/2_ac_install_merge/gnome-base/gconf/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/etc/gconf name=gconf.xml.mandatory
+# Calculate mergepkg()!= path=/etc/gconf name=gconf.xml.mandatory

profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory

@@ -1 +1 @@
-# Calculate pkg()!=&&merge()!= path=/etc/xdg name=autostart
+# Calculate mergepkg()!= path=/etc/xdg name=autostart

profiles/templates/3.5/2_ac_install_merge/gnome-base/gvfs/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/gnome-base/nautilus/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()>=3.4 path=/etc/xdg name=autostart
+# Calculate mergepkg()>=3.4 path=/etc/xdg name=autostart

profiles/templates/3.5/2_ac_install_merge/gnome-extra/nemo/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()>=3.4 path=/etc/xdg name=autostart
+# Calculate mergepkg()>=3.4 path=/etc/xdg name=autostart

profiles/templates/3.5/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()==15.12.3-r1 append=skip
+# Calculate mergepkg()==15.12.3-r1 append=skip

profiles/templates/3.5/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip

profiles/templates/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()==15.12.3 append=skip
+# Calculate mergepkg()==15.12.3 append=skip

profiles/templates/3.5/2_ac_install_merge/kde-apps/konsole/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()>=15 path=/usr/share name=konsole
+# Calculate mergepkg()>=15 path=/usr/share name=konsole

profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/apps name=desktoptheme
+# Calculate mergepkg()!= path=/usr/share/apps name=desktoptheme
 

profiles/templates/3.5/2_ac_install_merge/kde-base/kdelibs/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate append=skip merge()!=&&pkg()!=
+# Calculate append=skip mergepkg()!=
 

profiles/templates/3.5/2_ac_install_merge/kde-base/kdelibs/kdeglobals

@@ -7,8 +7,7 @@ dir_mime=
 #?pkg(media-fonts/droid)==#
 menuFont=Verdana,10,-1,5,50,0,0,0,0,0
 font=Verdana,10,-1,5,50,0,0,0,0,0
-#pkg#
+#!pkg#
-#?pkg(media-fonts/droid)!=#
 menuFont=Droid Sans,10,-1,5,50,0,0,0,0,0
 font=Droid Sans,10,-1,5,50,0,0,0,0,0
 #pkg#

profiles/templates/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/apps name=desktoptheme
+# Calculate mergepkg()!= path=/usr/share/apps name=desktoptheme
 

profiles/templates/3.5/2_ac_install_merge/kde-base/kdm/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/config
+# Calculate mergepkg()!= path=/usr/share/config
 

profiles/templates/3.5/2_ac_install_merge/kde-base/konqueror/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/kde-base/marble/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/applications name=kde4
+# Calculate mergepkg()!= path=/usr/share/applications name=kde4

profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=15
+# Calculate append=skip mergepkg()!=&&pkg(x11-themes/calculate-icon-theme)>=15

profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6
+# Calculate append=skip mergepkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6

profiles/templates/3.5/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6
+# Calculate append=skip mergepkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6

profiles/templates/3.5/2_ac_install_merge/kde-misc/networkmanagement/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip merge()!=&&pkg()>=0.9
+# Calculate append=skip mergepkg()>=0.9

profiles/templates/3.5/2_ac_install_merge/kde-plasma/breeze/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/themes/Breeze/gtk-2.0 name=Lines
+# Calculate mergepkg()!= path=/usr/share/themes/Breeze/gtk-2.0 name=Lines

profiles/templates/3.5/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/etc/X11 name=Sessions
+# Calculate mergepkg()!= path=/etc/X11 name=Sessions

profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip

profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm.conf

@@ -27,20 +27,11 @@ greeter=/usr/libexec/lxdm-greeter-gtk
 [display]
 ## gtk theme used by greeter
 
-#?main.os_linux_ver>=13#
+#?os_linux_ver>=13#
 gtk_theme=Calculate
-#main.os_linux_ver#
+#!os_linux_ver#
-#?main.os_linux_ver<13#
 gtk_theme=Adwaita
-#main.os_linux_ver#
+#os_linux_ver#
-
-## background of the greeter
-#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldx-themes)>=11.15-r1&&pkg(media-gfx/cldx-themes)<12.0_alpha1#
-bg=/usr/share/lxdm/themes/Calculate/bg.jpg
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldx-themes)>=12.0_alpha1#
-bg=/usr/share/lxdm/themes/Calculate/calculate-lxdm-#-os_x11_standart-#.jpg
-#pkg#
 
 ## if show bottom pane
 bottom_pane=1
@@ -52,7 +43,7 @@ lang=0
 keyboard=0
 
 ## the theme of greeter
-#?pkg(media-gfx/cldx-themes)>=11.15-r1||pkg(media-gfx/lxdm-themes-calculate)!=#
+#?pkg(media-gfx/lxdm-themes-calculate)!=#
 theme=Calculate
 #pkg#
 

profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip

profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip

profiles/templates/3.5/2_ac_install_merge/mail-client/claws-mail/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/mail-client/trojita/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=fonts
+# Calculate mergepkg()!= path=/etc name=fonts
 

profiles/templates/3.5/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/media-gfx/feh/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=applications
+# Calculate mergepkg()!= path=/usr/share name=applications

profiles/templates/3.5/2_ac_install_merge/media-gfx/fontforge/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip merge()!=&&pkg(media-gfx/fontforge[-X])!=
+# Calculate append=skip mergepkg(media-gfx/fontforge[-X])!=

profiles/templates/3.5/2_ac_install_merge/media-gfx/gdm-themes-calculate/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/gdm/themes name=calculate
+# Calculate mergepkg()!= path=/usr/share/gdm/themes name=calculate
 

profiles/templates/3.5/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png

@@ -1 +1 @@
-# Calculate pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1 link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg symbolic
+# Calculate pkg(media-gfx/dm-themes-calculate)<>0,14-r1 link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg symbolic

profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=env.d
+# Calculate mergepkg()!= path=/etc name=env.d
 

profiles/templates/3.5/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!=&&exists(/usr/share/kwin/tabbox/thumbnails/contents/ui/main.qml)!= path=/usr/share/plasma/look-and-feel/org.kde.calculate name=contents
+# Calculate mergepkg()!=&&exists(/usr/share/kwin/tabbox/thumbnails/contents/ui/main.qml)!= path=/usr/share/plasma/look-and-feel/org.kde.calculate name=contents
 

profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= name=etc
+# Calculate mergepkg()!= name=etc
 

profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=fonts
+# Calculate mergepkg()!= path=/etc name=fonts
 

profiles/templates/3.5/2_ac_install_merge/media-libs/libsdl/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=env.d
+# Calculate mergepkg()!= path=/etc name=env.d
 

profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= name=etc
+# Calculate mergepkg()!= name=etc
 

profiles/templates/3.5/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/media-tv/kodi/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip

profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/xbmc name=addons
+# Calculate mergepkg()!= path=/usr/share/xbmc name=addons
 

profiles/templates/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/media-video/mplayer/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= name=etc
+# Calculate mergepkg()!= name=etc
 

profiles/templates/3.5/2_ac_install_merge/media-video/mplayer/mplayer.conf

@@ -2,8 +2,7 @@
 [default]
 #?pkg(media-fonts/droid)!=#
 font="Droid Sans"
-#pkg#
+#!pkg#
-#?pkg(media-fonts/droid)==#
 font="Verdana"
 #pkg#
 !ao=

profiles/templates/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/media-video/smtube/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip
 

profiles/templates/3.5/2_ac_install_merge/net-dns/bind/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!=&&pkg(net-nds/openldap)!= path=/etc name=conf.d
+# Calculate mergepkg()!=&&pkg(net-nds/openldap)!= path=/etc name=conf.d

profiles/templates/3.5/2_ac_install_merge/net-im/ejabberd/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!=&&pkg(net-nds/openldap)!= path=/etc name=conf.d
+# Calculate mergepkg()!=&&pkg(net-nds/openldap)!= path=/etc name=conf.d

profiles/templates/3.5/2_ac_install_merge/net-im/skype/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=env.d
+# Calculate mergepkg()!= path=/etc name=env.d
 

profiles/templates/3.5/2_ac_install_merge/net-misc/dhcp/.calculate_directory

@@ -1 +1 @@
-# Calculate path=/etc merge()!=&&pkg()!=
+# Calculate path=/etc mergepkg()!=

profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=applications
+# Calculate mergepkg()!= path=/usr/share name=applications

profiles/templates/3.5/2_ac_install_merge/net-misc/modemmanager/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate merge()!=&&pkg()!= append=skip
+# Calculate mergepkg()!= append=skip