Merge branch 'develop' of git.calculate.ru:/repo/calculate into develop

8 years ago · 9b66800ea4
parent 011a84f2e0 c0ac068cc5
commit 9b66800ea4
79 changed files with 379 additions and 86 deletions
--- a/profiles/base/profile.bashrc
+++ b/profiles/base/profile.bashrc
@ -8,7 +8,13 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-for fn in /etc/calculate/profile.bashrc.d/*;do
+for fn in /var/lib/calculate/profile.bashrc.d/*;do
 	[[ -f $fn ]] && source ${fn} && PROFILE_BASHRC_D=1
 done
+if [[ -z ${PROFILE_BASHRC_D} ]]
+then
+    for fn in /etc/calculate/profile.bashrc.d/*;do
+        [[ -f $fn ]] && source ${fn} && PROFILE_BASHRC_D=1
+    done
+fi
 [[ -z ${PROFILE_BASHRC_D} ]] && source ${BASH_SOURCE}.old
--- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
+++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-CL_CORE_PATCH=/usr/sbin/cl-core-patch
-[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/bin/cl-core-patch
+CL_CORE_PATCH=/usr/bin/cl-core-patch
+[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/sbin/cl-core-patch

 if [[ ${EBUILD_PHASE} == "compile" ]] && [[ -d ${S} ]] && check_skip; then
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-patch.list ]] ||
--- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
+++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
@ -9,8 +9,9 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-CL_UPDATE_PROG=/usr/sbin/cl-core-setup
-[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/bin/cl-core-setup
+CL_UPDATE_PROG=/usr/sbin/cl-core
+CORE_METHOD="--method core_setup"
+

 post_setup_package() {
 	if [ -f ${CL_UPDATE_PROG} ] && [[ -f  /var/lib/calculate/-postmerge ]] && check_skip
@ -23,7 +24,7 @@ post_setup_package() {
 			if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
 				grep ${category}/${pkgname} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
 			then
-				CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} --no-progress --pkg-name $pkgname --pkg-category $category --pkg-path "/"
+				CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} {CORE_METHOD} --no-progress --pkg-name $pkgname --pkg-category $category --pkg-path "/"
 			fi
 			IFS=/
 		done < <(sort /var/lib/calculate/-postmerge | uniq)
--- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
+++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
-CL_UPDATE_PROG=/usr/sbin/cl-core-setup
-[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/bin/cl-core-setup
+CL_UPDATE_PROG="/usr/sbin/cl-core"
+CORE_METHOD="--method core_setup"
 [[ -d /var/lib/calculate ]] || mkdir /var/lib/calculate

 clear_systemd() {
@ -35,7 +35,7 @@ setup_merge_package() {
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
 		grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
 	then
-		[ -f ${CL_UPDATE_PROG} ] && check_skip && CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path "/" --pkg-name ${PN}
+		[ -f ${CL_UPDATE_PROG} ] && check_skip && CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} ${CORE_METHOD} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path "/" --pkg-name ${PN}
 	fi
 	rm -f /var/lib/calculate/-runlevels-$PN

@ -77,7 +77,7 @@ pkg_postrm_unmerge() {
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
 		grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
 	then
-		[ -f ${CL_UPDATE_PROG} ] && check_skip && ${CL_UPDATE_PROG} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path / --pkg-name ${PN}
+		[ -f ${CL_UPDATE_PROG} ] && check_skip && ${CL_UPDATE_PROG} {CORE_METHOD} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path / --pkg-name ${PN}
 	fi
 }

--- a/profiles/templates/3.4/6_ac_update_sync/remerge/00-ini
+++ b/profiles/templates/3.4/6_ac_update_sync/remerge/00-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 = 168
+remerge = 169
--- a/profiles/templates/3.4/6_ac_update_sync/remerge/101-200/169
+++ b/profiles/templates/3.4/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)<168
+# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<169

 [overlay-calculate]
-remerge = 168
+remerge = 169
--- a/profiles/templates/3.5/.calculate_directory
+++ b/profiles/templates/3.5/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.5.0_alpha43
+# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.5.0_alpha44
--- a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory
@ -0,0 +1 @@
+# Calculate path=/etc/calculate name=profile.bashrc.d append=clear mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha43
--- a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44
+++ b/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44
@ -1,7 +1,15 @@
 # Calculate path=/var/lib/calculate name=ini.env format=samba mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44

 [system]
+#?ini(update.last_update)!=#
 last_update = #-ini(update.last_update)-#
+#ini#
+#?ini(update.last_check)!=#
 last_check = #-ini(update.last_check)-#
+#ini#

-[!update]
+[update]
+!remove_old_kernel =
+!last_update =
+!updates =
+!last_check =
--- a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1
+++ b/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1
@ -0,0 +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)!=
--- a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2
+++ b/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2
@ -0,0 +1 @@
+# Calculate path=/etc/calculate name=builder.env append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44
--- a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3
+++ b/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3
@ -0,0 +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)!=
--- a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4
+++ b/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4
@ -0,0 +1 @@
+# Calculate path=/etc/calculate name=calculate.ldap append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44
--- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
@ -1 +1 @@
-# Calculate mergepkg()!= path=/etc/calculate name=profile.bashrc.d
+# Calculate mergepkg()!= path=/var/lib/calculate name=profile.bashrc.d
--- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-CL_CORE_PATCH=/usr/sbin/cl-core-patch
-[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/bin/cl-core-patch
+CL_CORE_PATCH=/usr/bin/cl-core-patch
+[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/sbin/cl-core-patch

 if [[ ${EBUILD_PHASE} == "compile" ]] && [[ -d ${S} ]] && check_skip; then
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-patch.list ]] ||
--- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
@ -9,8 +9,9 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-CL_UPDATE_PROG=/usr/sbin/cl-core-setup
-[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/bin/cl-core-setup
+CL_UPDATE_PROG=/usr/sbin/cl-core
+CORE_METHOD="--method core_setup"
+

 post_setup_package() {
 	if [ -f ${CL_UPDATE_PROG} ] && [[ -f  /var/lib/calculate/-postmerge ]] && check_skip
@ -23,7 +24,7 @@ post_setup_package() {
 			if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
 				grep ${category}/${pkgname} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
 			then
-				CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} --no-progress --pkg-name $pkgname --pkg-category $category --pkg-path "/"
+				CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} {CORE_METHOD} --no-progress --pkg-name $pkgname --pkg-category $category --pkg-path "/"
 			fi
 			IFS=/
 		done < <(sort /var/lib/calculate/-postmerge | uniq)
--- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
-CL_UPDATE_PROG=/usr/sbin/cl-core-setup
-[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/bin/cl-core-setup
+CL_UPDATE_PROG="/usr/sbin/cl-core"
+CORE_METHOD="--method core_setup"
 [[ -d /var/lib/calculate ]] || mkdir /var/lib/calculate

 clear_systemd() {
@ -35,7 +35,7 @@ setup_merge_package() {
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
 		grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
 	then
-		[ -f ${CL_UPDATE_PROG} ] && check_skip && CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path "/" --pkg-name ${PN}
+		[ -f ${CL_UPDATE_PROG} ] && check_skip && CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} ${CORE_METHOD} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path "/" --pkg-name ${PN}
 	fi
 	rm -f /var/lib/calculate/-runlevels-$PN

@ -77,7 +77,7 @@ pkg_postrm_unmerge() {
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
 		grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
 	then
-		[ -f ${CL_UPDATE_PROG} ] && check_skip && ${CL_UPDATE_PROG} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path / --pkg-name ${PN}
+		[ -f ${CL_UPDATE_PROG} ] && check_skip && ${CL_UPDATE_PROG} {CORE_METHOD} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path / --pkg-name ${PN}
 	fi
 }

--- 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-#
--- a/sys-apps/calculate-server/calculate-server-2.1.18-r2.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.18-r2.ebuild
@ -0,0 +1,192 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=(python{2_6,2_7})
+
+inherit distutils-r1 eutils
+
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="Configuration utility for Linux services"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="calculate_nomail
+calculate_nodhcp
+calculate_noftp
+calculate_nojabber
+calculate_nonamed
+calculate_nosamba
+calculate_noproxy"
+
+DEPEND="=sys-apps/calculate-lib-2.1.12
+	>=net-nds/openldap-2.3[-minimal]
+	>=sys-auth/pam_ldap-180[ssl]
+	>=sys-auth/nss_ldap-239
+	!<sys-apps/calculate-utils-3.5.0_alpha44
+	!calculate_nosamba? (
+		|| ( 
+			<net-fs/samba-4[acl,client,cups,ldap,netapi,pam,server,smbclient]
+			>=net-fs/samba-4[acl,client,cups,ldap,pam]
+		)
+	)
+	!calculate_nomail? ( 
+		|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
+			>=net-mail/dovecot-1.2.0[ldap,pam,ssl]
+		)
+		>=mail-filter/procmail-3.22
+		dev-python/pymilter
+		>=mail-mta/postfix-2.2[ldap,pam,ssl,sasl,dovecot-sasl]
+	)
+	!calculate_noftp? (
+		|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,ssl,tcpd]
+			>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd]
+		)
+	)
+	!calculate_nojabber? (
+		|| ( >=net-im/ejabberd-2.1.8[mod_pubsub,ldap]
+			>=net-im/ejabberd-16.04-r1[ldap] )
+		>=media-gfx/imagemagick-6.6
+	)
+	!calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] )
+	!calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] )
+	!calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 )"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# fix calculate.ldap path
+	epatch "${FILESDIR}/calculate-server-2.1.18-config_path.patch"
+}
+
+pkg_postinst() {
+	if [ -d /var/calculate/server-data/mail/imap ] || \
+		[ -d /var/calculate/server-data/samba/win/profiles ] || \
+		[ -d /var/calculate/server-data/samba/unix/profiles ] || \
+		[ -d /var/calculate/server-data/samba/win/netlogon ];
+	then
+		ewarn "Data found in directories of previous version calculate-server"
+	fi
+
+	if [ -d /var/calculate/server-data/mail/imap ];
+	then
+		if ! [ -d /var/calculate/server-data/mail~ ];
+		then
+			if mv /var/calculate/server-data/mail/imap \
+				/var/calculate/server-data/mail~ && \
+				rmdir /var/calculate/server-data/mail && \
+				mv /var/calculate/server-data/mail~ \
+					/var/calculate/server-data/mail;
+			then
+				ewarn
+				ewarn "Data from /var/calculate/server-data/mail/imap"
+				ewarn "was moved to /var/calculate/server-data/mail"
+				MAILUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${MAILUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/mail/imap"
+			eerror "Please manualy move /var/calculate/server-data/mail/imap"
+			eerror "to /var/calculate/server-data/mail"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/win/profiles ];
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/profiles/win ];
+		then
+			if mkdir -p /var/calculate/server-data/samba/profiles && \
+				mv  /var/calculate/server-data/samba/win/profiles \
+					/var/calculate/server-data/samba/profiles/win;
+			then
+				ewarn
+				ewarn "Data from /var/calculate/server-data/samba/win/profiles"
+				ewarn "was moved to /var/calculate/server-data/samba/profiles/win"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/win/profiles"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/win/profiles"
+			eerror "to /var/calculate/server-data/samba/profiles/win"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/unix/profiles ]; \
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/profiles/unix ];
+		then
+			if mkdir -p /var/calculate/server-data/samba/profiles && \
+				mv -f /var/calculate/server-data/samba/unix/profiles \
+					/var/calculate/server-data/samba/profiles/unix;
+			then
+				rmdir /var/calculate/server-data/samba/unix
+				ewarn
+				ewarn "Data from /var/calculate/server-data/samba/unix/profiles"
+				ewarn "was moved to /var/calculate/server-data/samba/profiles/unix"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/unix/profiles"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/unix/profiles"
+			eerror "to /var/calculate/server-data/samba/profiles/unix"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/win/netlogon ];
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/netlogon ];
+		then
+			if mv -f /var/calculate/server-data/samba/win/netlogon \
+				/var/calculate/server-data/samba/netlogon;
+			then
+				rmdir /var/calculate/server-data/samba/win
+				ewarn
+				ewarn "Data form /var/calculate/server-data/samba/win/netlogon"
+				ewarn "was moved to /var/calculate/server-data/samba/netlogon"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/win/netlogon"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/win/netlogon"
+			eerror "/var/calculate/server-data/samba/netlogon"
+		fi
+	fi
+
+	if [ "${MAILUPDATE}" == "TRUE" ];
+	then
+	    ewarn
+		ewarn "Please update mail service by the command:"
+		ewarn "\tcl-update mail"
+	fi
+	if [ "${SAMBAUPDATE}" == "TRUE" ];
+	then
+	    ewarn
+		ewarn "Please update samba service by the command:"
+		ewarn "\tcl-update samba"
+	fi
+
+	ewarn
+	ewarn "WARNING!!! If you have the samba service, then update it by the command:"
+	ewarn "\tcl-update samba"
+}
--- a/sys-apps/calculate-server/calculate-server-2.1.18-r1.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.18-r1.ebuild
@ -14,7 +14,7 @@ DESCRIPTION="Configuration utility for Linux services"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 IUSE="calculate_nomail
 calculate_nodhcp
@ -24,11 +24,10 @@ calculate_nonamed
 calculate_nosamba
 calculate_noproxy"

-DEPEND="=sys-apps/calculate-lib-2.1.12
+DEPEND="=sys-apps/calculate-lib-2.1.11-r5
 	>=net-nds/openldap-2.3[-minimal]
 	>=sys-auth/pam_ldap-180[ssl]
 	>=sys-auth/nss_ldap-239
-	!<sys-apps/calculate-utils-3.5.0_alpha44
 	!calculate_nosamba? (
 		|| ( 
 			<net-fs/samba-4[acl,client,cups,ldap,netapi,pam,server,smbclient]
--- a/sys-apps/calculate-server/files/calculate-server-2.1.18-config_path.patch
+++ b/sys-apps/calculate-server/files/calculate-server-2.1.18-config_path.patch
@ -0,0 +1,13 @@
+diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
+index be22774..a1d0e16 100644
+--- a/pym/cl_ldap.py
+++ b/pym/cl_ldap.py
+@@ -182,7 +182,7 @@ class iniLdapParser(cl_base.iniParser):
+     """Класс для работы c ini-файлом ldap"""
+     def __init__(self):
+         # название ini файла
+-        self.nameIniFile = "/etc/calculate/calculate.ldap"
+        self.nameIniFile = "/var/lib/calculate/calculate.ldap"
+         cl_base.iniParser.__init__(self, self.nameIniFile)
+         # права создаваемого ini-файла
+         self.setMode(0600)
--- a/sys-apps/calculate-utils/Manifest
+++ b/sys-apps/calculate-utils/Manifest
@ -1,29 +1,45 @@
 DIST calculate-builder-3.4.7.3.tar.bz2 33948 SHA256 3481cc1b71551db4eccb8b62df39c52bf018c0f5c5a772930fc6d64d921fac9c SHA512 b47dcc27a69d563bffcd3bd9a5460af2aa37e198b19084f7c461cc265dfbe213f0af823bd1f515ac429329736e95c811e1f289167855dac300ea89d97c429fec WHIRLPOOL af8322118aded669b79560a47152ad5e241159ad4c17548aaf20473403ff31cf4271ac62344164750de1311cb297a641a1437c5229e342d500e683b141f68290
 DIST calculate-builder-3.5.0_alpha4.tar.bz2 34129 SHA256 800cc0944e55662c912ea331baca963ce105be19684782c8e3cd66979a422e94 SHA512 7efef180a079df718ade7d0bbb2672a00cadda7a552031a1d0df08ed0955faa2ec2033e57d37816dbbd91e04ac7d8972148b38d774c9251c003298a821f9bfe1 WHIRLPOOL 610d8cb4b1c18baa972e134d6ea4cf271d57f2cdc5de05ef8560e3615eac8611b7d8c958132ed5c6adf827f0d7b99b2e2317e799251d0b8eb0c0c6562366fdb2
+DIST calculate-builder-3.5.0_alpha5.tar.bz2 34162 SHA256 1e80fbf859f255be335f62b8140403d429481de5442605136fb566b02ce615fd SHA512 42a52442c6bdab9e9d3655a3ac14fdfd0811904ae35150323473482e6a4e468fd1ab8094637562a81088f0b19b9412d338b98e2b0a1da9e07dba6cd8c3c0d8ca WHIRLPOOL c38e3a784ebe8f198bae3014f73b0afec1217a13475e770b516d5371f6b9802399242b6ec429df9c85f56076401f738712591b75ab4dd7d98329b797582fcf98
+DIST calculate-builder-3.5.0_beta1.tar.bz2 34165 SHA256 95691f435320109ec81b448c5922a2c32c45e83773c7cf0a282d5119a1f1b40d SHA512 353d8df53e13a51a0d3da82dfa07f835985626911dbe05ff61ebce2ea574499e2b8620903d53a78f54ea2ff27b3500bb029a849263093364460fbf68db9fa043 WHIRLPOOL ab62be6127197a6db060bf20e28b2848ce38966f9da26120ff4f8566b00c04f1fe62659b7fc5a3e8401b6414c3a828c845a2590e3cd15bfdc3e0d02e28ff6807
 DIST calculate-client-3.4.7.1.tar.bz2 30673 SHA256 a4257d0e1dafd1fdc4f10893969bafe77a20bebb39cfa647d729f4d523d5dcb4 SHA512 029cb804ede7f281eb6761e38aeabb6c0cc50e48e4c005c9116e882cd7987762359e93936b1d2760bf0471549fdffb6ae80bdf26a41ce86bea76bcf872cd5a42 WHIRLPOOL 48a8a6fb84277dd7d397a3394bb560a1213e7d03672b0037fc24a12c47afcfdbc80f46b486aadb6c2658944f23903f171228e8481950514ed3fd1e6d7fc8cda9
 DIST calculate-client-3.5.0_alpha5.tar.bz2 30402 SHA256 363e6be86dfff523875bcd80e7d6e9435e4f144d040124b176610774a0654266 SHA512 cdcd46b3ca78756cf2406313024703b260030016f1ff6573d74323aed7fdc8c03a9e1551175a7579034473e4385c52fdd7ebf8a14a08560b633fca52826dfe2b WHIRLPOOL e49d070b1d7dc9e8518691b0bf7de585224f27df24a260fd18f264a29f06ec74d2e899a207d7f53c0962eca59c71b3d637cb85b6d54434e42b70c27b08eb602e
+DIST calculate-client-3.5.0_beta1.tar.bz2 30410 SHA256 3e9e78ab82114a97d853d24b15f07ed902437dc161e3a3fc87770f6aaee2b5fd SHA512 11417048106eaaefdf157ba4d4ea690750ea2c90cc82e06ef808e3b62e265f9d7be2597aef8c51cbd7995451e24f31e348cadd6a1596a60f84aeef4548cf2ffb WHIRLPOOL 175293da533098766ed43e5f34c72aa597fac70861b9604746a79b01c4ff59436ea699b8c483f09c4f0c85ec67f204f225b8142e18af4718a332e7730efc679c
 DIST calculate-console-3.4.7.tar.bz2 24368 SHA256 157e2a5787078003dcf83a868d402aab2c8f3a5efb4dcc2ccb064df6f2f6f4b8 SHA512 fd01569d867b84d738a25c137612fdfca5db41825da4dc6125354b89270460f21a583a100a292665a7daf10e1ae01f6ebc9c0e91fb844fb7ca60b97111f6d07b WHIRLPOOL 0182abe0d83570afe8858a2ff954c5531ef6b1b046657fe63e4bd7f0bb62061694d7ecdc83253bcb37234c62ffe9a9d50b9c2ddf87a777f81643b380625b506c
 DIST calculate-console-3.5.0_alpha7.tar.bz2 24677 SHA256 c54713e49bee3e864bdb7ac59ce712aa1d632d5f032b2c0052ef7e1e6c4852a5 SHA512 8cfe0ecf10349a17f960d26f990db0241ef0b95e62460df697d7546f321b5f5301046ce3603e2c1e36f5450836c31680e6d9f7d743514c1e6998b5f63f760d66 WHIRLPOOL afe32a85a9cff5ddf43b85208eb4a65266ebb874a6bfe045f5cbe4745bc63020852d58b26dab98398ad046d577d844641320cc45075cf1362d6fbc0343e45485
+DIST calculate-console-3.5.0_beta1.tar.bz2 24705 SHA256 530a1b311f67e1d588b3dd749ee46a51218c3ce1031b6659ee07b0d60ca7e60a SHA512 dbec2e61ed16e3afb2865f16da0bb794ae55800e7724e07373eedc4f68b7da648144e95fb91dffb45c4ff506ce19fc0b6766c302c07e91330d8fc9500a04de73 WHIRLPOOL 75c3bec48274b19a5d70c727afc6b38d8d0b802cd02ca8838605dcb39b840b285b3c1e6ce23878ed57f7f742b4415304b2a2348ebd25b3c825f62e5737069ec4
 DIST calculate-console-gui-3.4.7.3.tar.bz2 430400 SHA256 8fd8c6d4083e288cf0fc5801e09e88973fa2c4258f40615b255770abae22d37e SHA512 3bda4f235a15bc7ef4d52fc2f076097fd4f528cbf22f1471df61960cfd0d017eb97f1df4cdf5e4df7eb15c58ad41a2676b53da7ee4bf2e3290aee7cc5b518c37 WHIRLPOOL bd787f0be6743463efec936ca2facf7357d697c798004e6db0724c18ae5f89b83bd3933ee91b5023245e560a32a2e09318dbba9f87554ba4135660fa311cd6ef
 DIST calculate-console-gui-3.5.0_alpha23.tar.bz2 400713 SHA256 d27d528046359ae8b4fde381cdea517f0828b03c9fc2bfd9eb9696b196999420 SHA512 fa8993ad781175199383060d9ddc9e8c5df2d483435daf01a65a828cf36b91f6cc5ba91892455f3fcbf8a6bad0782252a2528ee7d579c596de2bfff2bc14f5ed WHIRLPOOL c31f48e9e5f582c1c1d1a5d3573c71df7b7691bda684b8ede2510d725870b0261a459bcd2285b6ba829594500f7c03002be8f6c9fb1b263c4aab4c8eca0c7634
+DIST calculate-console-gui-3.5.0_beta1.tar.bz2 400637 SHA256 ebf3376c088278d22e33b700907b52211d62e3c3f9cbb778c218fa9066a2c57d SHA512 726a43887481c7bba7589666a9968ce0ae738b6eb28b68017e271aa64e4152d1beb5c02126fc5a1d2962b76380bf1e5ee30e9afe2abbf498bcb7bec6a12d6e6a WHIRLPOOL cb9ca7975e824911831138e891a72ccff9196be90619b7a3a186c000ec600f0d3617df06947d3efe83512fb8299c616f70f51245647c6eade26cf1872849e833
 DIST calculate-core-3.4.7.2.tar.bz2 86330 SHA256 749a3f6a582885d1ac3e8468ee24a20c77ac54f70da67c550f3e4da6e17f978a SHA512 3dfe7e406e01628563f1fbbe16e7c6e5387bde8971b2f0340c72e9ecd4d7f1103cc8cbfa908f93ed58d93ccfac79e37d0e141096493e86f2ea7e72af7948fee4 WHIRLPOOL 6e0fa3688777e38d43052fb7ea68657ce48cd749f2f4ae7579ec4d4d7d829a21f4ebb133d8094aa48b903489e98978fe008166b7e17cfec92d3ae6fa8acb9242
 DIST calculate-core-3.4.7.3.tar.bz2 86361 SHA256 3f7eb2782d8b2406921e4eba856317ace77df2b5a4f336ef61d73f0be27492fc SHA512 b5943e1d992eebb1525eeb79dc7d76cf4f0f3467bf724b3be5b02f06545b09089f38f89254c6bd6de50f879bf1943576228a2a36fb0bea45998160611beca061 WHIRLPOOL 5f87f1c968a606ba84027f883fff3ece3c29e264bf48200c9075f08797fedf1c7406bf70e340ee623df1ceb210fc718bf87cb7359f49d5bccf5acab8e2ad6ba4
 DIST calculate-core-3.5.0_alpha15.tar.bz2 94533 SHA256 cbe6407afb89a20097809498b99b5d149a0dab44333b311f938e2da23a197f03 SHA512 ff39d5429e7acd7f6be0e28680e0a1c2e5dadd34c359dcb7dba7b9ef555140c25892103dedc4ad82ef271cd104ec486b907708034349e6781839f27ca4dd7cd6 WHIRLPOOL 99c16a20907ee26c5ad7616a7b524a6ba10a1817231227b22aeecbadcf0b1f1b7bdcee388820557984823c2cb018f595c45ae02130210da13f746edfe20a705a
+DIST calculate-core-3.5.0_beta1.tar.bz2 94520 SHA256 d4e563a28fc43401ea5e842e3e8a9b9b7c9eb19aec8905b4db301b80d34f3eb4 SHA512 95a353cf6043c742dd6e11d9b441fddda0daa5249b4aeb3415a9165e669e2c58252a026a3b55322a14155ce3093ca4084e0960c03efa00ecd55bebbe6e1e0275 WHIRLPOOL 18d0b4d6270e55ef13845342a3215063001ad85e89b4bfdffdb7307a8c868757fa29d45a1e432bb4f95fc5a7d1f6c1130fedca673e6bb72256224234bb283847
 DIST calculate-desktop-3.4.7.1.tar.bz2 18064 SHA256 c682a1f06f87afc2094a84ee4ab256f32b859e45aadc09f38ca92d139e2843f7 SHA512 da9818847b6c1c89db924be3c5252c96162b7a92b89e8bef914f684926831e8984658f4def58bedeb86f57af4e31a593163a6cf5931358298a24fc5919ac70d1 WHIRLPOOL 90a1cb2d8deac103ff967b989cf07f059999398b4593cb333d111f9c96479dae4ed73603b0acd6f49b99ef68174a581fed9ddf4afbd8484128f39f7f640e7692
 DIST calculate-desktop-3.5.0_alpha5.tar.bz2 18138 SHA256 778fe6af73b18c2dfaa200c8dd6333b6837dca8b84fd2926499393c90bab9ad0 SHA512 b2b5214b2167597a5b63838d92017e843759a84ae6d4f925d863c6b9899e189ad92da6d76c3338b8cf658641a2d921fdb38eb44309e1d480cf4f43c94363f68e WHIRLPOOL 8b48ef65768958a72a1b187ee032ef15cd30293fc153e81122d47bd3da16539e7c1dbd12e1f4ba1f3cfca9b4901f6e378bd1e400c820a6daa649f4201ed91215
+DIST calculate-desktop-3.5.0_beta1.tar.bz2 18144 SHA256 d9e7291719aa3c5a2c8b641191f53fda734f3eee9d672a0079c2aa4802a02c38 SHA512 dc53f4cabe378b61bf1d6020fbbd4236f8774f35bc7b5e9c922672faab5598363ced3ef5726e73a5db7cc5bf2450b0bd0cf1746c1d7ddef67a6ffa001209265c WHIRLPOOL 1563d0535d3b6a535327256874d946a5556bb1f769f7f8433e0e4002f78c2fba3e48c1ec689350a2268c8722e0e64647a0a542fb7286259acb1f8167af242e92
 DIST calculate-i18n-3.4.7.1.tar.bz2 263777 SHA256 cdb9553dc924080f5083d6c9c659dbd90ee7e4890cd0450bba74b1ae6070df8e SHA512 8f222b589f2d6093c53a06e073c30b4e87ca05f584ce8f7d8b904a570e93e0343989dc5abf41e56177ebd36be6a6f8f15c0a0ed4fdf1c4d4b3066107f62cce88 WHIRLPOOL 8f8755291948aab7660e690516b10aee24bd969c8753d1678e9385669d749c68d3563075195ea588f691d9cb80394233a78b9cccdbf71ccd8336a7371456de45
 DIST calculate-i18n-3.5.0_alpha3.tar.bz2 266934 SHA256 6f845769cdac850e88fd34083895765b0ecaaa36f59267d8d4a6e1fda704aa75 SHA512 cb9ad5024645506fa30f507c00c6345fad3e3549e45c107735c71ef0321e1aa16bb36923c2b346168d3beaaf8f80c33e190e20cb0dbc25c4940a1fd11433395d WHIRLPOOL 0cb5b4ed52595b1166395c31cc1f7d80a9c65bfffb312cc216d2f472d72b63aae22e5151ba78d1230d126c171b81556a3f9ec60903c9d6027310eb86f614bfd8
+DIST calculate-i18n-3.5.0_beta1.tar.bz2 266875 SHA256 e5029a3f1bf4e9b86c42757e4bb7a421b2d47b2d6f25b9a7c4c526d780b65ec4 SHA512 2267de8a005f232ca9bd67344fa520e369518ff2697097932fcfe49c9453bbb9af8da1799f4cc23f192adaa83d8257b54e8607f5c3bed78566b8cb3c843a2626 WHIRLPOOL 5d2361d7197c501665570efb148e080b057a207687b5698eccf9c8f64653d315af454e5a03cf2d0f29ee1eab3e5ff0a01b8ae8d7fdd075df69cb5676d9ccc1a6
 DIST calculate-install-3.4.7.6.tar.bz2 76885 SHA256 94d98ec7f47ff155611875363fe670c895cb74497b51bcf94d55957e1925f03d SHA512 0e1b708f038483ef67464f96744ef59c1020657004a9ef50753b748debdfc347844446a59d7b884c64cc5b1f04f4f938e7a35c2b19265f22ddfc00cc940d64b3 WHIRLPOOL ac23338b008e337d8cd69abc87b5860a6bf5f59bea1568896d854c7037b512039216510d9bbeebc6bc7d0b1a9292b2565b5b075988ee7d65ab9d8ff3cdae3b81
 DIST calculate-install-3.4.7.7.tar.bz2 76874 SHA256 96463a68c09583194809b38bd1ca6faffa7b91a4a2aeffd2ae9feb387f74ce25 SHA512 19dfb12a78685682c1591375b618de0f1af2424338266b3d74a9b3f8cac59dd92937c13c8d1d762bbaa41254b280f1de8f9ec91fba97509cd5c13c947f6ccc9c WHIRLPOOL de0106ef9e53424a7a4f821feb0671156d5f584fde6e97882d3832629b45a8149da0cd4e1ed6ec9b8f2ac49ad4ccf91d0a6c2e7d4e5d22d0d5590fb8c8ef9b4b
 DIST calculate-install-3.4.7.8.tar.bz2 76852 SHA256 a41487fc5387d529ea52560921a26ed11ecf3d9244367d234d3a056c472a3c1d SHA512 6a9c395fa243a567e6adb0541fb6893354232ac15762d50d71ff1a5a5313afaa92c3b81d37966a1a4b62695daf0e65dbf137abecb3e58eb6b550c68dee1d0ac2 WHIRLPOOL 2e3a4b1d12b52875a7f2c7de0f9281ac4843230499745f8b6eb97801c0dc4a41c8901d8acf1cd4b72e38f0b84bffb9b46972730362dffffa76fc30fa1d1b3dff
 DIST calculate-install-3.4.7.9.tar.bz2 76864 SHA256 1f87e75eeea1e599bf02c911dcb0d68ebe4deb681c664450ed438bf0620bc990 SHA512 089efa775287b867bd7468f4a3eabaa4e6bfd302360bffbc21328955567975c32510df75c4b83a04913bdb176a38dd5eb9bde7ae51b404d65682bfa9d931294c WHIRLPOOL a89869479dbcac31efd2555c0236a18ea2b65572d31f347ec4335fcc228113d919554a054bc115b8ac00ecd010f1bba74e24e1e34c7967cd871869136032c5d3
 DIST calculate-install-3.5.0_alpha9.tar.bz2 77000 SHA256 b6cf5ae7cff7e5e04fb018d7ef875811604a7076dbd1cb7924ba7b8fc9822733 SHA512 6f3ed22aef9a2b86398bc8891e4f55d19219573d74a83ad8e7892c47f99d804fb79e7619a4e8e0efbcabbe0531ab31b71fb71711334c7ecfdfce342d0494e586 WHIRLPOOL 3bba84883369f76db2bbae730592c8feaaab1edcb0c007032aca5dfc2dbd8ade365be1ecf4b0be28483a5414e9209e370ec27bd4930206aba9cfe922fc1f1fe5
+DIST calculate-install-3.5.0_beta1.tar.bz2 77033 SHA256 fda069e4459408a24612a67efa356170158e5860c1a2bf32ef676f2e097dccc5 SHA512 b2faedc31ebff89dd02ce5f17f51b0afb75396a6fbf75d5610ba5686b93309d23ec53679081681843c7459172777deed979f4129f29741e8b7b50f3868e9d111 WHIRLPOOL 4d5d771bae8925cfdf16a47ecab753502e6ec2a388d5f8d79886f4dfb466ff98501f4be1dc15a975ce2ad0f699e4b75e4263fbfca6fd9b3b23c91a773a107bbc
 DIST calculate-ldap-3.5.0_alpha8.tar.bz2 11926 SHA256 49dd74c0a0d4cdc6d3afb424a5836b74519e5a3494f252c570118c236b74fbbb SHA512 5882aee892d8b7536cdb0650172152cf52f707384d169f66c9d5e57b2c5fdb752cd9b4159d9016c713025efd771c166bd4e58ae42375a7d3ec37e1a58e8a0b33 WHIRLPOOL 0cf2170b0e1a7c381dded70cc313fb1d2c199b1cfc8c451a5fc81a648b9ba5d157d3840d09426bafb2fb42fafe2050efbe88d3d07ed8d916363547e57c565581
+DIST calculate-ldap-3.5.0_beta1.tar.bz2 11946 SHA256 28542b5c76984846b82baf43faad1f375bef05be6538cfe94d895c379250e001 SHA512 8523b07fa4995dc7257e4a74040a031d827cfe9e26c7d408f3b3edaf184dc789cd2cc8eca701a319ffe728ab3ac413242ea5f7ebc92ec94c62746d5daa6372cd WHIRLPOOL 8b566be9daed888d573ea1db446ac746a32e0935c4346bd3ed6c366086dd20b1b561c31b0f5278912a3ef136476c51dcda1f2d2ad17f724b6d3f302946e265ad
 DIST calculate-lib-3.4.7.2.tar.bz2 166379 SHA256 0c8f83f04d41cbdca8e6a0291d7c36a13724b1c6207d0dd83e1c9394932b4438 SHA512 6e7798dbe335016e750e1a3bc19e1539f92d31ccf950dbe67d863841de0ba06a9af5f02f99549093e05ea80d576c578db1ecae4c417490735cbbd5ceb77111c8 WHIRLPOOL 1037719f470c8f864e554d84b7694d2b47d2f4b9a46823cda2b2bf5f59889d52a7417b6500716ebdb0604c11d2888c56db8965ba6b707ebc98e88eb91e47efb4
 DIST calculate-lib-3.4.7.3.tar.bz2 166195 SHA256 5ba86a793f95a4a7a6a8746688ac70f6d7edc13da7d4971d3be0f2055b98271c SHA512 d8dd78b60f3c35bb3affd77b191975b1cab6f09b9060ea1126fc3e02bf660adee0843a591c850992acee42dee3629fd269a960263de05e89078f77c7bbfaab78 WHIRLPOOL 3459bced747dea82d92c2ed5ca60505ea27684613e0b2e7fe828515d633b3ec6b20a9440502b8df6fc654007186a67d6911c6e0ad01b898cc779fe7f8dcca8d3
 DIST calculate-lib-3.5.0_alpha28.tar.bz2 176938 SHA256 b7d8399a61f25ca193c248bcd3f6e564d9f28c7531ebd2f5de3c2e668ed5a49e SHA512 5931b6328c1688e9f29b823096a27a754841ffe26549fb35af3e46c0fb4c2381385af623a2696893c1be9b5d9dfa291b74f01f381476bc3f9d31cbee5546a7a2 WHIRLPOOL bce3418cbf5852e95d06621801271799adbfec03fb0ae82a443bb5b31ba87e5c4567be83c84cef5be03d69ebc80daed9e6f9f104d465294464324987c296b439
+DIST calculate-lib-3.5.0_alpha29.tar.bz2 176901 SHA256 bc226b66af1c7ff350cc38e8c7094f982af5306920faab1d34e14b3e456768fe SHA512 d3479750547c7be37f5b1e6a04407a48296624a1ed7e1418e50bbe79f795facb10e3ded70f576f55080074b6d7e395dfb5387b74b9c4f70637cf3b4e6ab528ab WHIRLPOOL effbec5ac2c22b90c151a4a78df1cf9ce8d7d79763801181e39e3302ebe2675267d54c573fbedb678690b924aa5b554bf91c99923b7a1b7f5c0787db03fd42de
+DIST calculate-lib-3.5.0_beta1.tar.bz2 176798 SHA256 d9572311195bcbff6456fb81988d2cc804d79322e0caa296f25070bb542ff94f SHA512 be6a6ed9d6479eddeac6e656217df2aad9f11f0c1558d8463956f37ed86402f678c3c465f9dcd4c7fbf95026ecc9d3d7d685b67602478b9a9af4a0d33b85e240 WHIRLPOOL da18b84afcf94aed4ede3a5288921ccd380cd63993d3a55fbee923c32499d09728887a1d20948948d0fa93c3a32313e8628d9e17841b0a8c918024fbdd739b7b
 DIST calculate-server-3.5.0_alpha2.tar.bz2 6668 SHA256 08d8d163342d605ce59990d4c1afaef804179ef782d010d9a324ce1fcbd661bd SHA512 c46454386a9ab1946ec01f0956435215f62d878b9d6ef49f4c6647aa94c5fceee6b225177585bd63690132d5a4798aefe8985bf70501a734b4357c5b35b26cc2 WHIRLPOOL 4ce730734337d6866141905e318fd24916c8aa3261ce8c50490b21ead71001272228ed21942d002e88a20f247d031d9b7e46529e8d64ac7d6a8bb1bb24e4021e
+DIST calculate-server-3.5.0_beta1.tar.bz2 6638 SHA256 ecf05e7eb779011dd0e90a0879db197d2eb18b12e7bc5fc4c40b2b6a941fc37f SHA512 680e0cacd62a32936369e44ba22d474a023ddd2a84f3221afcbbb9c3edc3e8a0689b8399d61ca88e91703a3c56e1d65e37e2f41abacc0bd6863fe34bb393c8cd WHIRLPOOL 2d22ffe68809a7ca46fe9f037795d038fc49ecbd33e453ed6d35da8ba7ed79df799fedb88d4b6848fd2a52b3e9e8615d45827a22673dbefaa2056832f75992bc
 DIST calculate-unix-3.5.0_alpha4.tar.bz2 21764 SHA256 1834dc83decc5280a71900ea6eb092aef9305efb0ef6ca49beb39970bf4509dd SHA512 d0ddd1252581a8ac3173533b72b0ce37a909a66b4f1df0e8e4749af30ef180eeb6e773ed30d57006e4148d14caec88df303529a2ceaece782b9de890a585284b WHIRLPOOL 182a7edea1e33566c7fc2c52ae35bb76e2297dee66f52b506adb85db85f6abf15b8aa6513f74d4161c875bd53b50da20d7f23add5f6c23b71ae5da10f42f8579
+DIST calculate-unix-3.5.0_beta1.tar.bz2 21722 SHA256 4b1198d8ddbf6a77aa3672e5c7694a41e38368b790481f0f17cca25e4533369e SHA512 29235c1d859b58760769f3a1c3992a8d3b3ab5c39931cf53f0f3baf661eb9a2fb19ca8cddba716cf0f566bc863d8fba8002622648320ba8e658ce5b1e32b882f WHIRLPOOL 40ae5169e52a1628a4031d59393f25726102abde7a6f4777c9ca51960db12c62d5ef3d02ab1daef92a2f6ea42342d1bfde1e0c25394aaf2781991a470d0e14cf
 DIST calculate-update-3.4.7.4.tar.bz2 33564 SHA256 bfae076d06cd0f3be1bed85e04669cca98ea199ffbf47f71335ddef206ce617d SHA512 34fc287431461f00322875a9f3bd5f467e2946d051ff1f6340a669e93ecb27f3bbeb4e0f6073ec5067b9392f4fe8d6581c4ad2ed3462ade4917f5a2879bf82b4 WHIRLPOOL e2b6f5f64bb9470fd99bc9f7ed090a47090cb0e4682628ff0e96115416e74bb1690ad4693cffb1a1bb472e9a87ccbc09816c0ce49d448cb5ce3a28fdb9a47704
 DIST calculate-update-3.4.7.5.tar.bz2 33610 SHA256 615ac4a101caaa88cb14026f871a585a46fd65bcfe279337ac07f75567c6c841 SHA512 0b1bbc0726e06706bdbf00f49fd48204a166294b17d0a3f7f65812825733364eca2cca15e736636802141a6dc7ef8648dddf848baa0d1897f064130514eba3db WHIRLPOOL b1aa709756fb6060736777731cbd093f2d9981cdef9e8c9c112c7888b37517724873672b5d53eaa7de36daa6943a170fd7639a6155e9c05929936388425bb4da
 DIST calculate-update-3.5.0_alpha6.tar.bz2 33692 SHA256 ed47b773ea8e9cd48ff9432a4de9eb55799ad00b071eace0d7faa2172fd0394b SHA512 ca311f4090fea917b6adfb742ebe20a600ff7bd7f311e90aae29d5b6e044d653eb2426aa9f89d1b2777aefbd35ece3c6efd256c73432065372c851140184118e WHIRLPOOL 5ac6e34806be1d5d59c487a6c751badbda7ee6b83730e61f0e06e2e8f38b8133528e8c07c64986ec76a20c47dcc5bc2c5c18885c4811d2975d1380fc571caf9c
+DIST calculate-update-3.5.0_alpha7.tar.bz2 33693 SHA256 1301ac7537f6c126dff17a2af4072e4e6649307bc77dc90dac537a35486adf49 SHA512 7ecbc518c812f17665be922f3bda4334dbc668208d5a008f5deeeff9ca122072de536245947e6fc789addc2d4b07362acd90b11aeabfebdc4635da9f5de74091 WHIRLPOOL 8a2fd63fd373cf2f45d562d1b06045e7118bca4f3a51168e7eea5433ce935d5070882c3c56582f964f1e0d9369e64c13f56775e821a27481e480e3bc88ec3aa2
+DIST calculate-update-3.5.0_beta1.tar.bz2 33689 SHA256 adfef7e2837570be985a51552a46cbbab864fd39c3336e4e474d1d9738a36639 SHA512 14873bce9fe469cb4d671588577f641392d04425fae46618398d5502d04fc2e099b1191ba631cbadf3f2d0a8b6831366749a16e44948f0eaa983a48bb2836db4 WHIRLPOOL dad2c744d7a61718ed49713f3a4a96831aef4531b489e39887a2e30e7e5cd29ed9380a72a2c1b6070370f481c9f92f2c8447bacbfe9641a230869362983ba4e0
--- a/sys-apps/calculate-utils/calculate-utils-3.5.0_alpha44.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.5.0_alpha44.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+UTILS_PV="3.5.0_alpha2"
+
+
+declare -A CALCULATE_MODULES=(
+	["lib"]="3.5.0_alpha29"
+	["install"]="3.5.0_alpha9"
+	["core"]="3.5.0_alpha15"
+	["i18n"]="3.5.0_alpha3"
+	["client"]="3.5.0_alpha5"
+	["desktop"]="3.5.0_alpha5"
+	["console"]="3.5.0_alpha7"
+	["console-gui"]="3.5.0_alpha23"
+	["update"]="3.5.0_alpha7"
+	["builder"]="3.5.0_alpha5"
+	["ldap"]="3.5.0_alpha8"
+	["unix"]="3.5.0_alpha4"
+)
+
+inherit calculate-utils-r1
+
+DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+
--- a/sys-apps/calculate-utils/calculate-utils-3.5.0_beta1.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.5.0_beta1.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+UTILS_PV="3.5.0_beta1"
+
+inherit calculate-utils-r1
+
+DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
				`@ -0,0 +1 @@`
				`# Calculate path=/etc/calculate name=profile.bashrc.d append=clear mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha43`
				`@ -0,0 +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)!=`
				`@ -0,0 +1 @@`
				`# Calculate path=/etc/calculate name=builder.env append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44`
				`@ -0,0 +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)!=`
				`@ -0,0 +1 @@`
				`# Calculate path=/etc/calculate name=calculate.ldap append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha44`