Исправлены remerge шаблоны для 3.5

8 years ago · 32b70ccd3a
parent 0037643e3a
commit 32b70ccd3a
56 changed files with 58 additions and 58 deletions
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip ini(overlay-calculate.remerge)=>100,200
+# Calculate path=/var/lib name=calculate append=skip ini(overlay-calculate.remerge)=>100,200
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/101
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/101
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<101
+# Calculate format=samba name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<101

 [overlay-calculate]
 remerge = 101
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/102
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/102
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<102
+# Calculate format=samba name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<102

 [overlay-calculate]
 remerge = 102
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/103
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/103
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=net-misc/netifrc ini(overlay-calculate.remerge)<103
+# Calculate format=samba name=ini.env merge=net-misc/netifrc ini(overlay-calculate.remerge)<103

 [overlay-calculate]
 remerge = 103
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/104
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/104
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=kde-frameworks/breeze-icons ini(overlay-calculate.remerge)<104
+# Calculate format=samba name=ini.env merge=kde-frameworks/breeze-icons ini(overlay-calculate.remerge)<104

 [overlay-calculate]
 remerge = 104
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/105
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/105
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<105
+# Calculate format=samba name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<105

 [overlay-calculate]
 remerge = 105
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/107
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/107
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=kde-apps/kmail,net-irc/konversation,kde-apps/kopete,app-office/libreoffice,media-gfx/gimp,kde-apps/gwenview,media-sound/amarok,media-video/smplayer,kde-apps/kwrite ini(overlay-calculate.remerge)<107
+# Calculate format=samba name=ini.env merge=kde-apps/kmail,net-irc/konversation,kde-apps/kopete,app-office/libreoffice,media-gfx/gimp,kde-apps/gwenview,media-sound/amarok,media-video/smplayer,kde-apps/kwrite ini(overlay-calculate.remerge)<107

 [overlay-calculate]
 remerge = 107
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/108
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/108
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<108
+# Calculate format=samba name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<108

 [overlay-calculate]
 remerge = 108
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/109
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/109
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-devel/prelink ini(overlay-calculate.remerge)<109
+# Calculate format=samba name=ini.env merge=sys-devel/prelink ini(overlay-calculate.remerge)<109

 [overlay-calculate]
 remerge = 109
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/110
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/110
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-devel/prelink ini(overlay-calculate.remerge)<110
+# Calculate format=samba name=ini.env merge=sys-devel/prelink ini(overlay-calculate.remerge)<110

 [overlay-calculate]
 remerge = 110
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/113
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/113
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/openrc,net-dns/bind,net-im/ejabberd,sys-libs/glibc,sys-fs/eudev ini(overlay-calculate.remerge)<113
+# Calculate format=samba name=ini.env merge=sys-apps/openrc,net-dns/bind,net-im/ejabberd,sys-libs/glibc,sys-fs/eudev ini(overlay-calculate.remerge)<113

 [overlay-calculate]
 remerge = 113
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/116
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/116
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=kde-apps/kde4-l10n,kde-apps/kde-l10n,kde-apps/kdepim-l10n ini(overlay-calculate.remerge)<116
+# Calculate format=samba name=ini.env merge=kde-apps/kde4-l10n,kde-apps/kde-l10n,kde-apps/kdepim-l10n ini(overlay-calculate.remerge)<116

 [overlay-calculate]
 remerge = 116
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/117
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/117
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<117
+# Calculate format=samba name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<117

 [overlay-calculate]
 remerge = 117
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/118
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/118
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<118
+# Calculate format=samba name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<118

 [overlay-calculate]
 remerge = 118
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/119
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/119
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=app-shells/bash ini(overlay-calculate.remerge)<119
+# Calculate format=samba name=ini.env merge=app-shells/bash ini(overlay-calculate.remerge)<119

 [overlay-calculate]
 remerge = 119
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/120
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/120
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=kde-apps/gwenview ini(overlay-calculate.remerge)<120
+# Calculate format=samba name=ini.env merge=kde-apps/gwenview ini(overlay-calculate.remerge)<120

 [overlay-calculate]
 remerge = 120
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/121
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/121
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<121
+# Calculate format=samba name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<121

 [overlay-calculate]
 remerge = 121
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/122
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/122
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-themes/gnome-themes-standard ini(overlay-calculate.remerge)<122
+# Calculate format=samba name=ini.env merge=x11-themes/gnome-themes-standard ini(overlay-calculate.remerge)<122

 [overlay-calculate]
 remerge = 122
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/123
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/123
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/baselayout,sys-boot/grub ini(overlay-calculate.remerge)<123
+# Calculate format=samba name=ini.env merge=sys-apps/baselayout,sys-boot/grub ini(overlay-calculate.remerge)<123

 [overlay-calculate]
 remerge = 123
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/124
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/124
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=kde-plasma/breeze ini(overlay-calculate.remerge)<124
+# Calculate format=samba name=ini.env merge=kde-plasma/breeze ini(overlay-calculate.remerge)<124

 [overlay-calculate]
 remerge = 124
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/125
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/125
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<125
+# Calculate format=samba name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<125

 [overlay-calculate]
 remerge = 125
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/126
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/126
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<126
+# Calculate format=samba name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<126

 [overlay-calculate]
 remerge = 126
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/127
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/127
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/openrc ini(overlay-calculate.remerge)<127
+# Calculate format=samba name=ini.env merge=sys-apps/openrc ini(overlay-calculate.remerge)<127

 [overlay-calculate]
 remerge = 127
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/128
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/128
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-kernel/dracut ini(overlay-calculate.remerge)<128
+# Calculate format=samba name=ini.env merge=sys-kernel/dracut ini(overlay-calculate.remerge)<128

 [overlay-calculate]
 remerge = 128
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/129
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/129
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=app-portage/eix ini(overlay-calculate.remerge)<129
+# Calculate format=samba name=ini.env merge=app-portage/eix ini(overlay-calculate.remerge)<129

 [overlay-calculate]
 remerge = 129
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/130
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/130
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-kernel/calculate-sources ini(overlay-calculate.remerge)<130
+# Calculate format=samba name=ini.env merge=sys-kernel/calculate-sources ini(overlay-calculate.remerge)<130

 [overlay-calculate]
 remerge = 130
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/132
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/132
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<132
+# Calculate format=samba name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<132

 [overlay-calculate]
 remerge = 132
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/133
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/133
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=media-video/mplayer ini(overlay-calculate.remerge)<133
+# Calculate format=samba name=ini.env merge=media-video/mplayer ini(overlay-calculate.remerge)<133

 [overlay-calculate]
 remerge = 133
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/134
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/134
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<134
+# Calculate format=samba name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<134

 [overlay-calculate]
 remerge = 134
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/135
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/135
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=media-sound/volumeicon ini(overlay-calculate.remerge)<135
+# Calculate format=samba name=ini.env merge=media-sound/volumeicon ini(overlay-calculate.remerge)<135

 [overlay-calculate]
 remerge = 135
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/136
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/136
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-apps/xinit ini(overlay-calculate.remerge)<136
+# Calculate format=samba name=ini.env merge=x11-apps/xinit ini(overlay-calculate.remerge)<136

 [overlay-calculate]
 remerge = 136
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/138
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/138
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=lxqt-base/lxqt-session,x11-terms/qterminal,lxqt-base/lxqt-about,media-gfx/lximage-qt ini(overlay-calculate.remerge)<138
+# Calculate format=samba name=ini.env merge=lxqt-base/lxqt-session,x11-terms/qterminal,lxqt-base/lxqt-about,media-gfx/lximage-qt ini(overlay-calculate.remerge)<138

 [overlay-calculate]
 remerge = 138
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/139
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/139
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-misc/lightdm,x11-base/xorg-server ini(overlay-calculate.remerge)<139
+# Calculate format=samba name=ini.env merge=x11-misc/lightdm,x11-base/xorg-server ini(overlay-calculate.remerge)<139

 [overlay-calculate]
 remerge = 139
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/140
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/140
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=xfce-base/xfce4-session ini(overlay-calculate.remerge)<140
+# Calculate format=samba name=ini.env merge=xfce-base/xfce4-session ini(overlay-calculate.remerge)<140

 [overlay-calculate]
 remerge = 140
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/142
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/142
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-libs/qtermwidget,lxqt-base/lxqt-session ini(overlay-calculate.remerge)<142
+# Calculate format=samba name=ini.env merge=x11-libs/qtermwidget,lxqt-base/lxqt-session ini(overlay-calculate.remerge)<142

 [overlay-calculate]
 remerge = 142
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/143
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/143
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=media-gfx/calculate-wallpapers ini(overlay-calculate.remerge)<143
+# Calculate format=samba name=ini.env merge=media-gfx/calculate-wallpapers ini(overlay-calculate.remerge)<143

 [overlay-calculate]
 remerge = 143
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/145
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/145
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-kernel/calculate-sources ini(overlay-calculate.remerge)<145
+# Calculate format=samba name=ini.env merge=sys-kernel/calculate-sources ini(overlay-calculate.remerge)<145

 [overlay-calculate]
 remerge = 145
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/148
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/148
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=app-shells/gentoo-bashcomp ini(overlay-calculate.remerge)<148
+# Calculate format=samba name=ini.env merge=app-shells/gentoo-bashcomp ini(overlay-calculate.remerge)<148

 [overlay-calculate]
 remerge = 148
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/149
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/149
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-fs/udev-init-scripts ini(overlay-calculate.remerge)<149
+# Calculate format=samba name=ini.env merge=sys-fs/udev-init-scripts ini(overlay-calculate.remerge)<149

 [overlay-calculate]
 remerge = 149
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/152
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/152
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=app-editors/vim ini(overlay-calculate.remerge)<152
+# Calculate format=samba name=ini.env merge=app-editors/vim ini(overlay-calculate.remerge)<152

 [overlay-calculate]
 remerge = 152
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/153
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/153
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=media-sound/alsa-utils ini(overlay-calculate.remerge)<153
+# Calculate format=samba name=ini.env merge=media-sound/alsa-utils ini(overlay-calculate.remerge)<153

 [overlay-calculate]
 remerge = 153
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/154
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/154
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<154
+# Calculate format=samba name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<154

 [overlay-calculate]
 remerge = 154
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/155
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/155
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=net-im/telegram-desktop-bin ini(overlay-calculate.remerge)<155
+# Calculate format=samba name=ini.env merge=net-im/telegram-desktop-bin ini(overlay-calculate.remerge)<155

 [overlay-calculate]
 remerge = 155
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/157
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/157
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-libs/glibc ini(overlay-calculate.remerge)<157
+# Calculate format=samba name=ini.env merge=sys-libs/glibc ini(overlay-calculate.remerge)<157

 [overlay-calculate]
 remerge = 157
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/158
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/158
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<158
+# Calculate format=samba name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<158

 [overlay-calculate]
 remerge = 158
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/159
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/159
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-themes/gnome-themes-standard ini(overlay-calculate.remerge)<159
+# Calculate format=samba name=ini.env merge=x11-themes/gnome-themes-standard ini(overlay-calculate.remerge)<159

 [overlay-calculate]
 remerge = 159
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/161
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/161
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=x11-libs/libX11,x11-base/xorg-server ini(overlay-calculate.remerge)<161
+# Calculate format=samba name=ini.env merge=x11-libs/libX11,x11-base/xorg-server ini(overlay-calculate.remerge)<161

 [overlay-calculate]
 remerge = 161
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/162
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/162
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<162
+# Calculate format=samba name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<162

 [overlay-calculate]
 remerge = 162
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/163
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/163
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-fs/fuse ini(overlay-calculate.remerge)<163
+# Calculate format=samba name=ini.env merge=sys-fs/fuse ini(overlay-calculate.remerge)<163

 [overlay-calculate]
 remerge = 163
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/164
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/164
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-auth/pambase,app-admin/sudo ini(overlay-calculate.remerge)<164
+# Calculate format=samba name=ini.env merge=sys-auth/pambase,app-admin/sudo ini(overlay-calculate.remerge)<164

 [overlay-calculate]
 remerge = 164
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/165
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/165
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<165
+# Calculate format=samba name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<165

 [overlay-calculate]
 remerge = 165
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/166
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/166
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=app-office/scribus ini(overlay-calculate.remerge)<166
+# Calculate format=samba name=ini.env merge=app-office/scribus ini(overlay-calculate.remerge)<166

 [overlay-calculate]
 remerge = 166
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/167
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/167
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=net-misc/netifrc ini(overlay-calculate.remerge)<167
+# Calculate format=samba name=ini.env merge=net-misc/netifrc ini(overlay-calculate.remerge)<167

 [overlay-calculate]
 remerge = 167
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/168
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/168
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env merge=app-misc/tmux ini(overlay-calculate.remerge)<168
+# Calculate format=samba name=ini.env merge=app-misc/tmux ini(overlay-calculate.remerge)<168

 [overlay-calculate]
 remerge = 168
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/169
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/169
@ -1,4 +1,4 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<169
+# Calculate format=samba name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<#-cl_pass_file-#

 [overlay-calculate]
-remerge = 169
+remerge = #-cl_pass_file-#
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/170
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/101-200/170
@ -1,4 +1,4 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=media-sound/alsa-utils ini(overlay-calculate.remerge)<170
+# Calculate format=samba name=ini.env merge=media-sound/alsa-utils ini(overlay-calculate.remerge)<#-cl_pass_file-#

 [overlay-calculate]
-remerge = 170
+remerge = #-cl_pass_file-#