parent
02909cfe91
commit
7177214d0f
@ -0,0 +1,39 @@
|
||||
# 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=""
|
||||
IUSE=""
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.7_alpha2
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
media-gfx/feh
|
||||
x11-apps/xmessage
|
||||
!<sys-apps/calculate-desktop-3.1.0_alpha1
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
sys-auth/pam_client
|
||||
dev-lang/swig"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-desktop-3.1.7_alpha2-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
diff --git desktop/utils/cl_desktop.py desktop/utils/cl_desktop.py
|
||||
index 28cecb5..125a210 100644
|
||||
--- desktop/utils/cl_desktop.py
|
||||
+++ desktop/utils/cl_desktop.py
|
||||
@@ -68,9 +68,10 @@ class ClDesktopAction(Action):
|
||||
'message':__("Mounting encrypted data"),
|
||||
'method':'Desktop.createCryptDir(ur_login,ur_uid,ur_gid,'
|
||||
'ur_home_path,False)',
|
||||
- 'condition':lambda Get:(not isMount(Get('ur_home_path')) and \
|
||||
- Get('ur_home_crypt_set') == 'on' and
|
||||
- Get('install.cl_autologin') != Get('ur_login'))
|
||||
+ 'condition':lambda dv:(not isMount(dv.Get('ur_home_path')) and \
|
||||
+ dv.Get('ur_home_crypt_set') == 'on' and
|
||||
+ (not dv.isModuleInstalled("install") or
|
||||
+ dv.Get('install.cl_autologin') != dv.Get('ur_login')))
|
||||
},
|
||||
{'name':'user_profile',
|
||||
'message':__("Setting up the user profile"),
|
||||
diff --git desktop/wsdl_desktop.py desktop/wsdl_desktop.py
|
||||
index 3cbb78c..e9b883a 100644
|
||||
--- desktop/wsdl_desktop.py
|
||||
+++ desktop/wsdl_desktop.py
|
||||
@@ -20,7 +20,6 @@ from calculate.core.server.func import WsdlBase
|
||||
from desktop import DesktopError
|
||||
from utils.cl_desktop import ClDesktopLogoutAction,ClDesktopAction
|
||||
import desktop
|
||||
-import calculate.install.install as install
|
||||
|
||||
from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
|
||||
setLocalTranslate('cl_desktop3',sys.modules[__name__])
|
||||
@@ -81,7 +80,7 @@ class Wsdl(WsdlBase):
|
||||
# права для запуска метода
|
||||
'rights':['userconfigure'],
|
||||
# объект содержащий модули для действия
|
||||
- 'logic':{'Desktop':desktop.Desktop,'Install':install.Install},
|
||||
+ 'logic':{'Desktop':desktop.Desktop},
|
||||
# описание действия
|
||||
'action':ClDesktopAction,
|
||||
# объект переменных
|
||||
@ -0,0 +1,26 @@
|
||||
# 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=""
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.7_alpha2
|
||||
=sys-apps/calculate-i18n-3.1.7_alpha2
|
||||
=sys-apps/calculate-lib-3.1.7_alpha2
|
||||
=sys-apps/calculate-core-3.1.7_alpha2
|
||||
=sys-apps/calculate-update-3.1.7_alpha2
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.7_alpha2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.7_alpha2-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7_alpha2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.7_alpha2 )
|
||||
"
|
||||
Loading…
Reference in new issue