parent
75a3251e5a
commit
5d3acd0ecf
@ -0,0 +1,38 @@
|
||||
# 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 setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha10
|
||||
!<sys-apps/calculate-client-3.1.0
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
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-client-3.2.0_alpha10-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
diff --git client/utils/cl_client_sync.py client/utils/cl_client_sync.py
|
||||
index 59d9197..fbcdc71 100644
|
||||
--- client/utils/cl_client_sync.py
|
||||
+++ client/utils/cl_client_sync.py
|
||||
@@ -86,7 +86,8 @@ class ClClientSyncLoginAction(Action):
|
||||
},
|
||||
# проверка на попытку открыть вторую сессию для этого пользователя
|
||||
{'name':'two_session',
|
||||
- 'error':__("Second X session for user {ur_login} cannot be opened."),
|
||||
+ 'error':
|
||||
+ __("A second X session cannot be opened for user {ur_login}."),
|
||||
'condition':lambda dv: (dv.Get('ur_login') in
|
||||
dv.Get('desktop.cl_desktop_online_user') and
|
||||
int(dv.Select('desktop.cl_desktop_online_count',
|
||||
diff --git data/client data/client
|
||||
index e3285f2..13695bb 100644
|
||||
--- data/client
|
||||
+++ data/client
|
||||
@@ -41,7 +41,7 @@ start() {
|
||||
ebegin "Mounting domain resources"
|
||||
|
||||
local NET_CONF=`cl-core-variables-show --only-value install.os_install_net_conf`
|
||||
- if [[ $NET_CONF = "networkmanager" ]]
|
||||
+ if [[ $NET_CONF = "networkmanager" ]] && type qdbus &>/dev/null
|
||||
then
|
||||
for COUNT in $( seq 0 24 )
|
||||
do
|
||||
@ -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="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.2.0_alpha10-r3
|
||||
=sys-apps/calculate-i18n-3.2.0_alpha10-r4
|
||||
=sys-apps/calculate-lib-3.2.0_alpha10-r5
|
||||
=sys-apps/calculate-core-3.2.0_alpha10-r9
|
||||
=sys-apps/calculate-update-3.2.0_alpha10-r7
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha10-r2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha10 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha10 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha10-r1 )
|
||||
"
|
||||
Loading…
Reference in new issue