diff --git a/sys-apps/calculate-desktop/Manifest b/sys-apps/calculate-desktop/Manifest
index c9f5298b9..4c66863f7 100644
--- a/sys-apps/calculate-desktop/Manifest
+++ b/sys-apps/calculate-desktop/Manifest
@@ -1,4 +1,5 @@
 AUX calculate-desktop-2.2.29-fix_xsession.patch 759 SHA256 6d0d59d5fba4fcdc9e52e18a329bb33ca5ed25a478dc0cee1f4014d1038f2876 SHA512 00ba05f2e385575794c70582b01b630f9e3693e4cab64504a2aebf468f5ee0ed015a18b3053b7c7cf004be6977407b656a80676509f65de3aab2f7b4c8a45e31 WHIRLPOOL 7861502156802129b5d3cc7352caef732521fd3a83378a74660d2669aa9ab1bedc9cb424479f9e8d7195ed97a35e4b90434efdf56953a154684f12da31738bb4
+AUX calculate-desktop-3.1.0_beta1-r1.patch 6418 SHA256 b70dd38b715345ed47ca04394dc7182fde49176ee7e9869c546fc347cf07d088 SHA512 7bcfd654b4ad65c1eeb503015f501d3169cc52ff60af62f2aab3afc53043348d4782d5c3ef3b036f26a9759f81d983c05b75b1f17a074582d56f6f558f16aa72 WHIRLPOOL fc5665075bfa250e6653b17c85ae3bc1d496c661d3d8e0f8c3a64f2cf50db456205a48b11c43e75273a2c21dead110c49b9f1b971595c56879d2a9ef8314423a
 DIST calculate-desktop-2.2.29.tar.bz2 15643 SHA256 6831d85c1615a0b7336000ad611dc2cc8db83f5fa4ad47d4dafecb9ea42d3530 SHA512 978284464799aa92a852d3f9dccd3897605f9a39e599233a470dc04b630434b46b4a93c9a6955dad2fd8fe80acdb59d7fe38c2a74c0f9692f0dffe4450cdc7bb WHIRLPOOL f40a92c11e94e3faffca007304a91d5e37689e83c987653a155eb56876ad7fe484b9b0a3f47fabc4df073740812372d3bc6300e9624fed343a8a3fb29565b3c5
 DIST calculate-desktop-2.2.30.tar.bz2 15658 SHA256 8ad79a480c4cad7915523b707d119a9b05bd3429ac021d85c5aa09fe51fda7fb SHA512 f6570347f109418f3afab2e8c7c8f44caf979c2630caecae2578cc8821ccc299c4eff640c3a3e19fc813ffe36afd81840c2c23a61bdd769262b4a53e8ee92f60 WHIRLPOOL 23cb3c026587fbf3140007159d30a7e9a670d2648eb7a5f5b11a23bc8063e03c035a83b5c9dfd11c18542e6ee6b2973d01f43fd070bf057aad95168c1764087b
 DIST calculate-desktop-3.1.0_alpha1.tar.bz2 13216 SHA256 35a2b315f8d5f9551407cf99a3072d86e8269c7f708bc1b8c962612eca288415 SHA512 5e6820a0a5d2fa2a95e7e922abf4a8761f12feb5114f8c3721e4c8aae3a3b03e5d745169bd7302d8160db9984294624bf6e6dfbf86530465aa24390a52b20cb9 WHIRLPOOL 3133fb170c0a6e5b2a33601667768e20c18040a46da7aa0d6db3b71b0ff159a891bd529718c763f5e79b16f88d569445ee183e1d7507dacac2b11d67e756e0f6
@@ -20,6 +21,7 @@ EBUILD calculate-desktop-3.1.0_alpha4.ebuild 650 SHA256 843ac5d442386302cd31910d
 EBUILD calculate-desktop-3.1.0_alpha5.ebuild 650 SHA256 88039d348bc50870832aad418b5d2693fb95c14424550cf0e4b382f94b34101e SHA512 295f941feebfaaa97acf5bff2697d323de66903fb716c9c32eb3395748d27ab8cc3c52ddc092daa4e0dbf186c6c3bacf704b1cb271d097639015d56b6bd2fc4d WHIRLPOOL ee627897ca245504315c86e0464f611c20e0b99f6c6c6bfe6fa26633dbb758989e01d426d7fd4122faf22bf9f9cc5c896b425a2603ebe0f42b2d4aecce0b6f96
 EBUILD calculate-desktop-3.1.0_alpha7.ebuild 650 SHA256 7dff0d46cf298b33e4e798cee9d3622b7a59afcab25036bd92488aa294c9fe87 SHA512 70b0657484e0d94c22c7518e81ddf3ff36cd6a6dba0064d50e131480f1e70466ea254418a4701a8808395a07e63f30b472955ed302044bcbf6d82ab2bedcb3e6 WHIRLPOOL 4c5138181624832ea908e3082f09686541ab7d47f084612a9a6861a8d9ae4b3576c400c77475d5a578fea4cb2fc5a0d6104dc2d55bde358f48fa371e11c83711
 EBUILD calculate-desktop-3.1.0_alpha8.ebuild 650 SHA256 87bdfb0235a1ca832439f57fe98156184ed5d379c485d72ef1fd30b8cb6e35a8 SHA512 de689251b5cc7b8b83c70c767f2cddb5ca5c33471713bc85c0137bba34880ae02f99a6793684ac2274711ec8a79a38674f476a4e611182a1b78d0893c4eb0e76 WHIRLPOOL 30b637345044801db07f97e63b7701cca5b5857b982784eaa71a62ed050f158ee95a15f52e9e80ce004b37caac7b24085b3b9460f3c862f74268d567f84ffbad
+EBUILD calculate-desktop-3.1.0_beta1-r1.ebuild 803 SHA256 10c7054f14487225fa1cc37b3f11fc08c734cd5d0303fe428bc27535126024f6 SHA512 3f0d5a6f5046f209cb8426269a60696706226a1b16c0fb4db84b6fbcaed618efbd0d07559200dd7b401c27cb6ac412a358a5cd37f19f20eab8bd1a601e3ba03a WHIRLPOOL 33025287934529f81fb789657dbb56a789abc55ca32980dc057a229c8fd4eedad47ac4b449dc2a7bdc97b010cddd2a47f5e075f44ac2274dda4818bafc9fd362
 EBUILD calculate-desktop-3.1.0_beta1.ebuild 660 SHA256 dbf93486dc49be379d2d51cd75275d15b048222c5d71f903717782ab4590a703 SHA512 e28f0768466cd4306f6b08985c28d9f7c940230ab0af08e1dec7f7e39e9049210c0e1603424fe3917d328f89fe2c2adbdef412a7cff5750f3ccd08b6bd1d5b57 WHIRLPOOL a469112691179446e6b9f7bbda2f59855d090a637887d2db657001d5f47f95580bbf6f2ef9a12c0151fd1c643f1c636ef032ccfb3c83c86e555a5fa7f7f6786e
 EBUILD calculate-desktop-3.1.9999.ebuild 976 SHA256 405de66b0f54804d4bc025fe786c21ca1a040d6a25928a535efbf84cacd7f505 SHA512 69ebfdc4c04f7c236f728c9938a5538b3822369cc1e1de2593a6e83178b5441ea2e37068ffcd9cf17aa92bcf00ee133ee98da0be5a5f591d69755e1159eeadac WHIRLPOOL c61f805379983ca23af188ff60a99511251a8afb27b75d0c1f08595012a579c42c2ef36603d837865a155706780ba413f0cac74457425eea0e0a59488e3dfda2
 MISC ChangeLog 16440 SHA256 2a1c3211586d5dd10a249b61e4a8abf96a27a0c4d1706715b8a563bfa8aabf07 SHA512 962d9b69daeef659f2e1d6f2a5c974d6ed152d22fa9f0ed8c35d4c27e901f976167a2fc260a71c798be29d0161c7e90fa030957b2f74e25dcf35ecdb8fdc69e4 WHIRLPOOL df646b1f4c914fcb7142365b2110eb5112f7653cfddaf1b8a79f4a8f4ac99d50b6be59d3d593a8fb9e754ed92ebbe9a2cdebe320b0941d2ddd1bb9fba85c20b0
diff --git a/sys-apps/calculate-desktop/calculate-desktop-3.1.0_beta1-r1.ebuild b/sys-apps/calculate-desktop/calculate-desktop-3.1.0_beta1-r1.ebuild
new file mode 100644
index 000000000..8ff05d930
--- /dev/null
+++ b/sys-apps/calculate-desktop/calculate-desktop-3.1.0_beta1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The program of the desktop configuration Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="~sys-apps/calculate-core-3.1.0_beta1
+	>=dev-python/python-ldap-2.0[ssl]
+	!<sys-apps/calculate-desktop-3.1.0_alpha1"
+
+RDEPEND="${DEPEND}"
+src_unpack() {
+    unpack "${A}"
+    cd "${S}"
+
+    # apply revision changes
+    epatch "${FILESDIR}/calculate-desktop-3.1.0_beta1-r1.patch"
+}
diff --git a/sys-apps/calculate-desktop/files/calculate-desktop-3.1.0_beta1-r1.patch b/sys-apps/calculate-desktop/files/calculate-desktop-3.1.0_beta1-r1.patch
new file mode 100644
index 000000000..642cc22fc
--- /dev/null
+++ b/sys-apps/calculate-desktop/files/calculate-desktop-3.1.0_beta1-r1.patch
@@ -0,0 +1,192 @@
+diff --git data/gtkbg data/gtkbg
+deleted file mode 100644
+index 7489965..0000000
+--- data/gtkbg
++++ /dev/null
+@@ -1,61 +0,0 @@
+-#!/usr/bin/env python2
+-# Copyright 2008-2010 Calculate Ltd. http://www.calculate-linux.org
+-#
+-#  Licensed under the Apache License, Version 2.0 (the "License");
+-#  you may not use this file except in compliance with the License.
+-#  You may obtain a copy of the License at
+-#
+-#      http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License.
+-
+-import pygtk
+-pygtk.require('2.0')
+-import gtk
+-import os
+-import sys
+-import re
+-import subprocess
+-
+-def select_color():
+-    try:
+-        if filter(re.compile(r"(cld|cldx|cldg|cmc|cls)-themes-12").search,
+-           os.listdir('/var/db/pkg/media-gfx')):
+-            return "#73a363"
+-    except:
+-        pass
+-    return '#30648b'
+-
+-if __name__ == "__main__":
+-    if gtk.gdk.get_display():
+-        window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+-        
+-        # Here we connect the "destroy" event to a signal handler 
+-        window.connect("destroy", lambda w: gtk.main_quit())
+-        pipe = subprocess.Popen(["xdpyinfo"],
+-                    stdout=subprocess.PIPE, env=os.environ)
+-        reRes = re.compile("dimensions:\s+(\d+)x(\d+)\s+pixels")
+-        cx, cy = 1024, 768
+-        if pipe.wait() == 0:
+-            for line in pipe.stdout:
+-             searchRes = reRes.search(line)
+-             if searchRes:
+-                 cx, cy = int(searchRes.group(1)), int(searchRes.group(2))
+-                 break
+-        pipe.stdout.close()
+-        window.set_size_request(cx,cy)
+-        window.maximize()
+-        
+-        window.set_border_width(0)
+-        window.modify_bg(gtk.STATE_NORMAL,
+-            gtk.gdk.rgb_get_colormap().alloc_color(select_color()))
+-        
+-        window.show()
+-        pid = os.fork()
+-        if not pid:
+-            gtk.main()
+-    sys.exit(0)
+diff --git data/setbg data/setbg
+new file mode 100755
+index 0000000..86b411a
+--- /dev/null
++++ data/setbg
+@@ -0,0 +1,63 @@
++#!/usr/bin/env python
++
++# Copyright 2008-2012 Calculate Ltd. http://www.calculate-linux.org
++#
++#  Licensed under the Apache License, Version 2.0 (the "License");
++#  you may not use this file except in compliance with the License.
++#  You may obtain a copy of the License at
++#
++#      http://www.apache.org/licenses/LICENSE-2.0
++#
++#  Unless required by applicable law or agreed to in writing, software
++#  distributed under the License is distributed on an "AS IS" BASIS,
++#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++#  See the License for the specific language governing permissions and
++#  limitations under the License.
++
++from PySide import QtCore, QtGui
++import os,sys
++
++class ImageViewer(QtGui.QMainWindow):
++    def __init__(self):
++        super(ImageViewer, self).__init__()
++
++        self.setWindowFlags(QtCore.Qt.X11BypassWindowManagerHint)
++        self.imageLabel = QtGui.QLabel()
++        self.imageLabel.setScaledContents(True)
++        self.setCentralWidget(self.imageLabel)
++
++        screen = QtGui.QDesktopWidget().screenGeometry()
++        self.setGeometry(screen)
++        self.open('/usr/share/wallpapers/dm-background.png') or \
++            self.open('/usr/share/apps/ksplash/Themes/CalculateSplashEn/'
++                      '400x300/background.png') or \
++            self.setBackground()
++
++    def selectColor(self):
++        try:
++            if filter(re.compile(r"(cld|cldx|cldg|cmc|cls)-themes-12").search,
++               os.listdir('/var/db/pkg/media-gfx')):
++                return "#73a363"
++        except:
++            pass
++        return '#30648b'
++
++    def setBackground(self):
++        self.setStyleSheet("background-color: %s"%self.selectColor())
++
++    def open(self,fileName):
++        image = QtGui.QImage(fileName)
++        if image.isNull():
++            return False
++
++        self.imageLabel.setPixmap(QtGui.QPixmap.fromImage(image))
++
++        self.imageLabel.adjustSize()
++        return True
++
++if __name__ == '__main__':
++    import sys
++    app = QtGui.QApplication(sys.argv)
++    imageViewer = ImageViewer()
++    imageViewer.show()
++    sys.exit(app.exec_())
+diff --git data/xdm data/xdm
+index 209f191..113da05 100755
+--- data/xdm
++++ data/xdm
+@@ -64,11 +64,11 @@ die_xmes() {
+ }
+ 
+ gtk_background(){
+-	if [[ -n $(env | grep RUNNING_UNDER_GDM=true) ]] && ls /var/db/pkg/gnome-base/gdm-2* &>/dev/null;
+-	then
+-		/usr/bin/env python2 /usr/share/calculate/xdm/gtkbg
+-		BG_PID=$(ps ax | sed -nr "s/^\s*([0-9]+)\s.*gtkbg$/\1/p")
+-	fi
++	#if [[ -n $(env | grep RUNNING_UNDER_GDM=true) ]] && ls /var/db/pkg/gnome-base/gdm-2* &>/dev/null;
++	#then
++	/usr/bin/env python2 /usr/share/calculate/xdm/setbg &
++	BG_PID=$(ps ax | sed -nr "s/^\s*([0-9]+)\s.*setbg$/\1/p")
++	#fi
+ }
+ 
+ umount_user_res(){
+@@ -153,5 +153,11 @@ do
+ 	FILE_LOG=$FILE_LOG DOMAIN_USER=$DOMAIN_USER /bin/bash $script || die_xmes "failed on execute $script"
+ done
+ 
+-[[ -n $BG_PID ]] && kill $BG_PID
++sleep_kill()
++{
++	sleep 2
++	kill $1
++}
++
++[[ -n $BG_PID ]] && sleep_kill $BG_PID &
+ exit 0
+diff --git setup.py setup.py
+index e0575de..473ec63 100755
+--- setup.py
++++ setup.py
+@@ -34,7 +34,7 @@ data_files = []
+ 
+ data_files += [('/usr/share/calculate/xdm', ['data/cmd_login',
+                                              'data/functions',
+-                                             'data/gtkbg',
++                                             'data/setbg',
+                                              'data/xdm'])] + \
+               [('/usr/share/calculate/xdm/login.d',
+                                             ['data/login.d/00init',
+@@ -77,7 +77,7 @@ def create_data_files(data_dirs, prefix="", replace_dirname=""):
+ class cl_install_data(install_data):
+     def run (self):
+         install_data.run(self)
+-        data_file = [("/usr/share/calculate/xdm/gtkbg",0755),
++        data_file = [("/usr/share/calculate/xdm/setbg",0755),
+                      ("/usr/share/calculate/xdm/cmd_login",0755),
+                      ("/usr/share/calculate/xdm/xdm",0755)]
+         fileNames = map(lambda x: os.path.split(x[0])[1], data_file)
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index b38f23dcf..bcead6dfa 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -55,6 +55,7 @@ EBUILD calculate-utilities-3.1.0_alpha8.ebuild 763 SHA256 e31b5b51b980d7097802d0
 EBUILD calculate-utilities-3.1.0_beta1-r1.ebuild 769 SHA256 2f0ebc7fbbd17fc80232bb8b91a2f10589219485751cb9861d0897feb8361976 SHA512 8f5f851ba57f261b41398de787587fdf1956ac9bce775f27820ac10d77725607980f4e2e07277e854513b994d4d1c852c6ea746905c392aa2f8108caec86400d WHIRLPOOL 8cf641398f42a0510f1858ceac1694a79122f736c3cc4c396ec78b1201baa88672ff26f0cfef05e12f617c54df47bc7e9e7795b54afbcfb071743c3a5a7d99f3
 EBUILD calculate-utilities-3.1.0_beta1-r2.ebuild 769 SHA256 5c261955bd6d19f9184566e6643fc44272174d9642b9a7809f0c551a820d9e9d SHA512 210fc04dd4054e067d798e9df357bea477134aec2af1baa16f7dd07e487143c5cae50e381a99587e7cef7100f1d51ad8c9f6e3a6a73845d438671efd568063b1 WHIRLPOOL 41010879862f2bfb314ff1e15335200ffc33bb1cba141f2a25874c162ce12498c20e87ee38f9b6062b1cd0b5c76e35e9ac28c25fcabcfe61d7e75ede4f4701c2
 EBUILD calculate-utilities-3.1.0_beta1-r3.ebuild 774 SHA256 3d9a74c3c0db3b9572ee1fe96389302f2e606b2f0919f648fe921057180ab132 SHA512 b17dee615b62d24f0e2cf5deb8bfb3d330370b49c41a9547dd7e527eaee03c4ee03057ee97354349006f88bc945a80e1cb5c9bfe5ce8aaa9da52b381a402a74e WHIRLPOOL c7677b9db743dcb773451f23cdd2afa83e9b608828f939abc77eb5260ed6d1d035a15dfd8718f7ff63ad0721334eb540ad5e1a34e6937082dc889ef0b2224edb
+EBUILD calculate-utilities-3.1.0_beta1-r4.ebuild 777 SHA256 cc1b3d886b0cf34810d38fa60241b33c338da31598d22296eaaaeefa5475a871 SHA512 e543e8b6948244b53c5ce0307777f266c5e4a2db1b33533e1cfc34732ea6eca045371755e5bdcf9dc82ad5898f10076a8ce6a6a7cee9223107a902f9fc9dfaf9 WHIRLPOOL 701dde1909caf8af4e2c405d401aa680b2a1e52add87c44e3296e50ea7369b5fee16e35ed843941c0855ba4bec28fa2b318cf76858453c04c34c5cb688cba4f1
 EBUILD calculate-utilities-3.1.0_beta1.ebuild 766 SHA256 b5fb4c34040eb0b1af60cdb0095983a0493f78b8c9b49603ae9be4b181016395 SHA512 ba05fee0c429c5dea0dd72ae8e2df42dd918c5a0c59fc336f317ad1bbdfc4be54e5048627393d460fdd5d3f687d2f74839df11a403e6c951c8b026de5627159d WHIRLPOOL 8044832bc2c1d4767850595e0179c68df663219d126bca5da36ea2177a471d21215434e24680ad6e754f6dec87bfacae4963bcba3967d5bbb04eb17c83122ef1
 EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
 MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.0_beta1-r4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.0_beta1-r4.ebuild
new file mode 100644
index 000000000..4d1e52f53
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.0_beta1-r4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Calculate Utilities meta package"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE="cl_consolegui cl_client cl_desktop cl_console"
+
+RDEPEND="${RDEPEND}
+	=sys-apps/calculate-install-3.1.0_beta1
+	=sys-apps/calculate-i18n-3.1.0_beta1-r1
+	=sys-apps/calculate-lib-3.1.0_beta1-r3
+	=sys-apps/calculate-core-3.1.0_beta1-r1
+	cl_client? ( =sys-apps/calculate-client-3.1.0_beta1 )
+	cl_desktop? ( =sys-apps/calculate-desktop-3.1.0_beta1-r1 )
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.0_beta1 )
+	cl_console? ( =sys-apps/calculate-console-3.1.0_beta1 )
+"